diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts
index 38443412..9a79837a 100644
--- a/resources/langs/nheko_cs.ts
+++ b/resources/langs/nheko_cs.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="cs">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+29"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-18"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -922,12 +1111,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -951,17 +1140,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -969,63 +1158,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1035,27 +1224,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1112,9 +1309,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation type="unfinished"></translation>
</message>
@@ -1134,12 +1354,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1342,7 +1562,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation type="unfinished"></translation>
</message>
@@ -1352,7 +1572,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1404,6 +1624,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 0958017f..5dd76df1 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="de">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Abbrechen</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>Du bist dem Raum beigetreten.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>Nutzer konnte nicht eingeladen werden: %1</translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation>Suche</translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation>Leute</translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>Verschlüsselt</translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished">-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished">-- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Entschlüsselungsfehler (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- Verschlüsseltes Event (Unbekannter Eventtyp) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Schließen</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -447,18 +575,18 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>gelöscht</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>Verschlüsselung aktiviert</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>Raumname wurde gändert auf: %1</translation>
</message>
@@ -468,7 +596,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Raumname wurde entfernt</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation>Raumthema wurde geändert auf: %1</translation>
</message>
@@ -478,42 +606,85 @@ Beispiel: https://mein.server:8787</translation>
<translation>Raumthema wurde entfernt.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation>%1 hat den Raum erstellt: %2</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation>%1 hat den Anruf angenommen.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation>%1 hat den Anruf beendet.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Abbrechen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Akzeptieren</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -600,7 +771,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>keine Version gespeichert</translation>
</message>
@@ -701,27 +872,45 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Fehlgeschlagen</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Gesendet</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Empfangen</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>Gelesen</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Schließen</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -745,7 +934,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Datei auswählen</translation>
</message>
@@ -755,7 +944,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Alle Dateien (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -773,20 +962,20 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>Bild speichern</translation>
</message>
@@ -925,12 +1114,12 @@ Beispiel: https://mein.server:8787</translation>
<translation>%1 hat das Anklopfen zurückgezogen.</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>Du bist dem Raum beigetreten.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>Hat das Anklopfen von %1 abgewiesen.</translation>
</message>
@@ -954,17 +1143,17 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Antworten</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Optionen</translation>
</message>
@@ -972,63 +1161,63 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Antworten</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>Lesebestätigungen</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>Als gelesen markieren</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>Zeige rohen Nachrichteninhalt</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation>Zeige rohen, entschlüsselten Nachrichteninhalt</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>Nachricht löschen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>Speichern unter...</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>Kein Raum geöffnet</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">Raumoptionen</translation>
</message>
@@ -1038,27 +1227,35 @@ Beispiel: https://mein.server:8787</translation>
<translation type="unfinished">Benutzer einladen</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Teilnehmer</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Raum verlassen</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Einstellungen</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1115,9 +1312,32 @@ Beispiel: https://mein.server:8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Ins Benachrichtigungsfeld minimieren</translation>
</message>
@@ -1137,12 +1357,12 @@ Beispiel: https://mein.server:8787</translation>
<translation>Runde Profilbilder</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1345,7 +1565,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>VERSCHLÜSSELUNG</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>ALLGEMEINES</translation>
</message>
@@ -1355,7 +1575,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>OBERFLÄCHE</translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation>Emojischriftart</translation>
</message>
@@ -1407,6 +1627,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Abbrechen</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index d0a46653..02cc7878 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="el">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Άκυρο</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Άκυρο</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Αποδοχή</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Διάλεξε ένα αρχείο</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>Όλα τα αρχεία (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">Αποθήκευση Εικόνας</translation>
</message>
@@ -921,12 +1110,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -950,17 +1139,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -968,63 +1157,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1034,27 +1223,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Προσκάλεσε χρήστες</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Μέλη</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Βγές</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Ρυθμίσεις</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1111,9 +1308,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Ελαχιστοποίηση</translation>
</message>
@@ -1133,12 +1353,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1341,7 +1561,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>ΓΕΝΙΚΑ</translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1403,6 +1623,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Άκυρο</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index bfbbd987..cd2a42a5 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="en">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>You joined this room.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>Failed to invite user: %1</translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation>Search</translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation>People</translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>Encrypted</translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation>-- Encrypted Event (No keys found for decryption) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation>-- Decryption Error (failed to retrieve megolm keys from db) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation>-- Decryption Error (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation>-- Encrypted Event (Unknown event type) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Close</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -447,18 +575,18 @@ Example: https://server.my:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>redacted</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>Encryption enabled</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>room name changed to: %1</translation>
</message>
@@ -468,7 +596,7 @@ Example: https://server.my:8787</translation>
<translation>removed room name</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation>topic changed to: %1</translation>
</message>
@@ -478,42 +606,85 @@ Example: https://server.my:8787</translation>
<translation>removed topic</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation>%1 created and configured room: %2</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation>%1 placed a voice call.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation>%1 placed a video call.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation>%1 placed a call.</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+29"/>
<source>Negotiating call...</source>
<translation>Negotiating call…</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-18"/>
<source>%1 answered the call.</source>
<translation>%1 answered the call.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation>%1 ended the call.</translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Accept</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -600,7 +771,7 @@ Example: https://server.my:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>no version stored</translation>
</message>
@@ -701,27 +872,45 @@ Example: https://server.my:8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Failed</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Sent</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Received</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>Read</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Close</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -745,7 +934,7 @@ Example: https://server.my:8787</translation>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Select a file</translation>
</message>
@@ -755,7 +944,7 @@ Example: https://server.my:8787</translation>
<translation>All Files (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation>Place a call</translation>
</message>
@@ -773,20 +962,20 @@ Example: https://server.my:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation>Message redaction failed: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Failed to encrypt event, sending aborted!</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>Save image</translation>
</message>
@@ -925,12 +1114,12 @@ Example: https://server.my:8787</translation>
<translation>%1 redacted their knock.</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>You joined this room.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>Rejected the knock from %1.</translation>
</message>
@@ -954,17 +1143,17 @@ Example: https://server.my:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation>React</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Reply</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Options</translation>
</message>
@@ -972,63 +1161,63 @@ Example: https://server.my:8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation>React</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Reply</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>Read receipts</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>Mark as read</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>View raw message</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation>View decrypted raw message</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>Redact message</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>Save as</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>No room open</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation>Back to room list</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation>No room selected</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation>Room options</translation>
</message>
@@ -1038,27 +1227,35 @@ Example: https://server.my:8787</translation>
<translation>Invite users</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation>Members</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation>Leave room</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>Close</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1115,9 +1312,32 @@ Example: https://server.my:8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Minimize to tray</translation>
</message>
@@ -1137,12 +1357,12 @@ Example: https://server.my:8787</translation>
<translation>Circular Avatars</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation>CALLS</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation>Keep the application running in the background after closing the client window.</translation>
</message>
@@ -1353,7 +1573,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>ENCRYPTION</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>GENERAL</translation>
</message>
@@ -1363,7 +1583,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>INTERFACE</translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation>Emoji Font Family</translation>
</message>
@@ -1415,6 +1635,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancel</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts
index fafddab8..0aef02e8 100644
--- a/resources/langs/nheko_eo.ts
+++ b/resources/langs/nheko_eo.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="eo">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>Vi aliĝis ĉi tiun ĉambron.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -211,6 +257,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -236,13 +305,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation>Trovu</translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation>Homoj</translation>
</message>
@@ -283,9 +352,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -298,25 +390,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -333,6 +427,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -448,18 +576,18 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>Nomo da ĉambro ŝanĝiĝis al: %1</translation>
</message>
@@ -469,7 +597,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -479,42 +607,85 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -570,7 +741,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
<message>
<location line="+17"/>
<source>REGISTER</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">REGISTRU</translation>
</message>
<message>
<location line="+55"/>
@@ -601,7 +772,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -704,28 +875,46 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Estas malsukcesa</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Estas sendita</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Estas ricevita</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translatorcomment>Could this simply be "lega"?</translatorcomment>
<translation>Estas lega</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -749,7 +938,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -759,7 +948,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation>Ĉiuj dosieroj (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -777,20 +966,20 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -931,12 +1120,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>Vi aliĝis ĉi tiun ĉambron.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -960,17 +1149,17 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation>Reagu</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Respondu</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Ebloj</translation>
</message>
@@ -978,63 +1167,63 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation>Reagu</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Respondu</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1044,27 +1233,35 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation>Membroj</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation>Forlasu la ĉambron</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Agordoj</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1121,9 +1318,32 @@ Ekzemplo: https://servisto.mia:8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation type="unfinished"></translation>
</message>
@@ -1143,12 +1363,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation type="unfinished"></translation>
</message>
@@ -1361,7 +1581,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1413,6 +1633,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts
index f3a51bb9..b13e16b6 100644
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="et">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>Sa liitusid selle jututoaga.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>Kutse saatmine kasutajale ei õnnestunud: %1</translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation>Otsi</translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation>Inimesed</translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>Krüptitud</translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation>-- Krüptitud sündmus (Dekrüptimisvõtmeid ei leidunud) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation>-- Dekrüptimise viga (megolm'i võtmete laadimine andmebaasist ei õnnestunud) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation>-- Dekrüptimise viga (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation>-- Krüptitud sündmus (Tundmatu sündmuse tüüp) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Sulge</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -447,18 +575,18 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>muudetud</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>Krüptimine on kasutusel</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>jututoa uus nimi on: %1</translation>
</message>
@@ -468,7 +596,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>eemaldas jututoa nime</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation>jututoa uus teema on: %1</translation>
</message>
@@ -478,42 +606,85 @@ Näiteks: https://server.minu:8787</translation>
<translation>teema on eemaldatud</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation>%1 lõi ja seadistas jututoa: %2</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation>%1 helistas.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation>%1 alustas videokõnet.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation>%1 helistas.</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+29"/>
<source>Negotiating call...</source>
<translation>Ühendan kõnet…</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-18"/>
<source>%1 answered the call.</source>
<translation>%1 vastas kõnele.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation>%1 lõpetas kõne.</translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Nõustu</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -600,7 +771,7 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>salvestatud versiooni ei leidu</translation>
</message>
@@ -701,27 +872,45 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Ebaõnnestus</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Saadetud</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Vastuvõetud</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>Loetud</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Sulge</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -745,7 +934,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Vali fail</translation>
</message>
@@ -755,7 +944,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Kõik failid (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation>Helista</translation>
</message>
@@ -773,20 +962,20 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Sündmuse krüptimine ei õnnestunud, katkestame saatmise!</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>Salvesta pilt</translation>
</message>
@@ -925,12 +1114,12 @@ Näiteks: https://server.minu:8787</translation>
<translation>%1 muutis oma koputust jututoa uksele.</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>Sa liitusid jututoaga.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>Lükkas tagasi %1 koputuse jututoa uksele.</translation>
</message>
@@ -954,17 +1143,17 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation>Reageeri</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Vasta</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Valikud</translation>
</message>
@@ -972,63 +1161,63 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation>Reageeri</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Vasta</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>Lugemisteatised</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>Märgi loetuks</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>Näita sõnumi lähtekoodi</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation>Näita sõnumi dekrüptitud lähtekoodi</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>Muuda sõnumit</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>Salvesta kui</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>Ühtegi jututuba pole avatud</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation>Tagasi jututubade loendisse</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation>Jututuba on valimata</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation>Jututoa valikud</translation>
</message>
@@ -1038,27 +1227,35 @@ Näiteks: https://server.minu:8787</translation>
<translation>Kutsu kasutajaid</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation>Liikmed</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation>Lahku jututoast</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation>Seadistused</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>Sulge</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1115,9 +1312,32 @@ Näiteks: https://server.minu:8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Vähenda tegumiribale</translation>
</message>
@@ -1137,12 +1357,12 @@ Näiteks: https://server.minu:8787</translation>
<translation>Ümmargused tunnuspildid</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation>KÕNED</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation>Peale akna sulgemist jäta rakendus taustal tööle.</translation>
</message>
@@ -1353,7 +1573,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
<translation>KRÜPTIMINE</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>ÜLDISED SEADISTUSED</translation>
</message>
@@ -1363,7 +1583,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
<translation>LIIDES</translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation>Fondiperekond emojide jaoks</translation>
</message>
@@ -1415,6 +1635,34 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 192c07b2..a8171557 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="fi">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Peruuta</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- Salattu viesti (tuntematon viestityyppi) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Sulje</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Peruuta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Hyväksy</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>ei tallennettua versiota</translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Sulje</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Valitse tiedosto</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>Kaikki tiedostot (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished">Viestin poisto epäonnistui: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">Tallenna kuva</translation>
</message>
@@ -921,12 +1110,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -950,17 +1139,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -968,63 +1157,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished">Lukukuittaukset</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">Huonevaihtoehdot</translation>
</message>
@@ -1034,27 +1223,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Kutsu käyttäjiä</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Jäsenet</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Poistu huoneesta</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Asetukset</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished">Sulje</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1111,9 +1308,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Pienennä ilmoitusalueelle</translation>
</message>
@@ -1133,12 +1353,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1341,7 +1561,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>SALAUS</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>YLEISET ASETUKSET</translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1403,6 +1623,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Peruuta</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 48047e32..2958f056 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="fr">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuler</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>Vous avez rejoint ce salon.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>Échec lors de l'invitation de %1</translation>
</message>
@@ -40,12 +86,12 @@
<message>
<location line="+1"/>
<source>Do you really want to invite %1 (%2)?</source>
- <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation>
+ <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation>
</message>
<message>
<location line="+11"/>
<source>Failed to invite %1 to %2: %3</source>
- <translation>Échec de l'invitation de %1 dans %2 : %3</translation>
+ <translation>Échec de l'invitation de %1 dans %2 : %3</translation>
</message>
<message>
<location line="+15"/>
@@ -55,7 +101,7 @@
<message>
<location line="+1"/>
<source>Do you really want to kick %1 (%2)?</source>
- <translation>Voulez-vous vraiment expulser %1 (%2) ?</translation>
+ <translation>Voulez-vous vraiment expulser %1 (%2) ?</translation>
</message>
<message>
<location line="+11"/>
@@ -75,7 +121,7 @@
<message>
<location line="+1"/>
<source>Do you really want to ban %1 (%2)?</source>
- <translation>Voulez-vous vraiment bannir %1 (%2) ?</translation>
+ <translation>Voulez-vous vraiment bannir %1 (%2) ?</translation>
</message>
<message>
<location line="+11"/>
@@ -95,12 +141,12 @@
<message>
<location line="+1"/>
<source>Do you really want to unban %1 (%2)?</source>
- <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2) ?</translation>
+ <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2) ?</translation>
</message>
<message>
<location line="+11"/>
<source>Failed to unban %1 in %2: %3</source>
- <translation>Échec de l'annulation du bannissement de %1 dans %2 : %3</translation>
+ <translation>Échec de l'annulation du bannissement de %1 dans %2 : %3</translation>
</message>
<message>
<location line="+5"/>
@@ -115,7 +161,7 @@
<message>
<location line="+334"/>
<source>Cache migration failed!</source>
- <translation>Échec de la migration du cache !</translation>
+ <translation>Échec de la migration du cache !</translation>
</message>
<message>
<location line="+13"/>
@@ -140,18 +186,18 @@
<message>
<location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
- <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur : %1 %2. Veuillez réessayer plus tard.</translation>
+ <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur : %1 %2. Veuillez réessayer plus tard.</translation>
</message>
<message>
<location line="+99"/>
<location line="+251"/>
<source>Please try to login again: %1</source>
- <translation>Veuillez vous reconnecter : %1</translation>
+ <translation>Veuillez vous reconnecter : %1</translation>
</message>
<message>
<location line="-219"/>
<source>Failed to join room: %1</source>
- <translation>Impossible de rejoindre le salon : %1</translation>
+ <translation>Impossible de rejoindre le salon : %1</translation>
</message>
<message>
<location line="+5"/>
@@ -161,17 +207,17 @@
<message>
<location line="+6"/>
<source>Failed to remove invite: %1</source>
- <translation>Impossible de supprimer l'invitation : %1</translation>
+ <translation>Impossible de supprimer l'invitation : %1</translation>
</message>
<message>
<location line="+19"/>
<source>Room creation failed: %1</source>
- <translation>Échec de la création du salon : %1</translation>
+ <translation>Échec de la création du salon : %1</translation>
</message>
<message>
<location line="+16"/>
<source>Failed to leave room: %1</source>
- <translation>Impossible de quitter le salon : %1</translation>
+ <translation>Impossible de quitter le salon : %1</translation>
</message>
</context>
<context>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation>Chercher</translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation>Personnes</translation>
</message>
@@ -282,40 +351,65 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>Chiffré</translation>
</message>
<message>
<location line="+2"/>
<source>This message is not encrypted!</source>
- <translation>Ce message n'est pas chiffré !</translation>
+ <translation>Ce message n'est pas chiffré !</translation>
</message>
</context>
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation>-- Évènement chiffré (pas de clé trouvé pour le déchiffrement) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation>-- Échec du déchiffrement (échec de la récupération des clés megolm depuis la base de données) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation>-- Erreur de déchiffrement (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation>-- Évènement chiffré (type d'évènement inconnu) --</translation>
@@ -323,12 +417,46 @@
<message>
<location line="+13"/>
<source>-- Replay attack! This message index was reused! --</source>
- <translation>-- Attaque par rejeu (replay attack) ! Cet index de message a été réutilisé ! --</translation>
+ <translation>-- Attaque par rejeu (replay attack) ! Cet index de message a été réutilisé ! --</translation>
</message>
<message>
<location line="+7"/>
<source>-- Message by unverified device! --</source>
- <translation>-- Message d'un appareil non vérifié --</translation>
+ <translation>-- Message d'un appareil non vérifié  --</translation>
+ </message>
+</context>
+<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Fermer</translation>
</message>
</context>
<context>
@@ -357,9 +485,9 @@
You can also put your homeserver address there, if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l'identifiant. L'identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ».
+ <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l'identifiant. L'identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ».
Vous pouvez également spécifier l'adresse de votre serveur ici, si votre serveur ne supporte pas l'identification .well-known.
-Exemple : @utilisateur :monserveur.example.com
+Exemple : @utilisateur :monserveur.example.com
Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l'indiquer manuellement.</translation>
</message>
<message>
@@ -382,7 +510,7 @@ Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l&apos
<source>The address that can be used to contact you homeservers client API.
Example: https://server.my:8787</source>
<translation>L'adresse qui peut être utilisée pour joindre l'API client de votre serveur.
-Exemple : https ://monserveur.example.com :8787</translation>
+Exemple : https ://monserveur.example.com :8787</translation>
</message>
<message>
<location line="+16"/>
@@ -447,20 +575,20 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>effacé</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>Chiffrement activé</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
- <translation>nom du salon changé en : %1</translation>
+ <translation>nom du salon changé en : %1</translation>
</message>
<message>
<location line="+0"/>
@@ -468,9 +596,9 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>nom du salon retiré</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
- <translation>sujet changé pour : %1</translation>
+ <translation>sujet changé pour : %1</translation>
</message>
<message>
<location line="+0"/>
@@ -478,47 +606,90 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>sujet retiré</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
- <translation>%1 a créé et configuré le salon : %2</translation>
+ <translation>%1 a créé et configuré le salon : %2</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation>%1 a effectué un appel vocal.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation>%1 a effectué un appel vidéo.</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation>%1 a appelé.</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation>%1 a répondu à l'appel.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation>1% a terminé l'appel.</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation>Négociation de l'appel…</translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuler</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Accepter</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
<source>unimplemented event: </source>
- <translation>Évènement non implémenté : </translation>
+ <translation>Évènement non implémenté : </translation>
</message>
</context>
<context>
@@ -539,7 +710,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<message>
<location line="+3"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
- <translation>Le nom d'utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et « . _ = - / ».</translation>
+ <translation>Le nom d'utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et « . _ = - / ».</translation>
</message>
<message>
<location line="+4"/>
@@ -574,7 +745,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<message>
<location line="+55"/>
<source>No supported registration flows!</source>
- <translation>Pas de méthode d'inscription supportée !</translation>
+ <translation>Pas de méthode d'inscription supportée !</translation>
</message>
<message>
<location line="+135"/>
@@ -600,7 +771,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>pas de version enregistrée</translation>
</message>
@@ -615,7 +786,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<message>
<location line="+7"/>
<source>Tag room as:</source>
- <translation>Étiqueter le salon comme :</translation>
+ <translation>Étiqueter le salon comme :</translation>
</message>
<message>
<location line="+18"/>
@@ -657,7 +828,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<location line="+1"/>
<source>Tag:</source>
<comment>Tag name prompt</comment>
- <translation>Étiquette :</translation>
+ <translation>Étiquette :</translation>
</message>
<message>
<location line="+173"/>
@@ -701,27 +872,45 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Échec</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Envoyé</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Reçu</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>Lu</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Fermer</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -745,7 +934,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Sélectionnez un fichier</translation>
</message>
@@ -755,7 +944,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>Tous les types de fichiers (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation>Appeler</translation>
</message>
@@ -773,20 +962,20 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
- <translation>Échec de la suppression du message : %1</translation>
+ <translation>Échec de la suppression du message : %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
- <translation>Échec du chiffrement de l'évènement, envoi abandonné !</translation>
+ <translation>Échec du chiffrement de l'évènement, envoi abandonné !</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>Enregistrer l'image</translation>
</message>
@@ -925,12 +1114,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>%1 ne frappe plus au salon.</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>Vous avez rejoint ce salon.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>%1 a été rejeté après avoir frappé au salon.</translation>
</message>
@@ -938,12 +1127,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
<location line="+2"/>
<source>%1 left after having already left!</source>
<comment>This is a leave event after the user already left and shouldn't happen apart from state resets</comment>
- <translation>%1 a quitté le salon après l'avoir déjà quitté !</translation>
+ <translation>%1 a quitté le salon après l'avoir déjà quitté !</translation>
</message>
<message>
<location line="+15"/>
<source> Reason: %1</source>
- <translation>Raison : %1</translation>
+ <translation>Raison : %1</translation>
</message>
<message>
<location line="-5"/>
@@ -954,17 +1143,17 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation>Réagir</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Répondre</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Options</translation>
</message>
@@ -972,63 +1161,63 @@ Exemple : https ://monserveur.example.com :8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation>Réagir</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Réponse</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>Accusés de lecture</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>Marquer comme lu</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>Voir le message brut</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation>Voir le message déchiffré brut</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>Effacer le message</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>Enregistrer sous</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>Aucun salon ouvert</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation>Revenir à la liste des salons</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation>Pas de salon sélectionné</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation>Options du salon</translation>
</message>
@@ -1038,27 +1227,35 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>Inviter des utilisateurs</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation>Membres</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation>Quitter le salon</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation>Paramètres</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1091,7 +1288,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
<message>
<location line="+1"/>
<source>Status:</source>
- <translation>Statut :</translation>
+ <translation>Statut :</translation>
</message>
<message>
<location line="+9"/>
@@ -1115,9 +1312,32 @@ Exemple : https ://monserveur.example.com :8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Réduire à la barre des tâches</translation>
</message>
@@ -1137,12 +1357,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
<translation>Avatars circulaires</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation>APPELS</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation>Conserver l'application en arrière plan après la fermeture de la fenêtre du client.</translation>
</message>
@@ -1354,7 +1574,7 @@ Cela met l'application en évidence dans la barre des tâches.</translation
<translation>CHIFFREMENT</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>GÉNÉRAL</translation>
</message>
@@ -1364,7 +1584,7 @@ Cela met l'application en évidence dans la barre des tâches.</translation
<translation>INTERFACE</translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation>Nom de Police Emoji</translation>
</message>
@@ -1396,7 +1616,7 @@ Cela met l'application en évidence dans la barre des tâches.</translation
<message>
<location line="-31"/>
<source>Enter the passphrase to decrypt the file:</source>
- <translation>Entrez la clé secrète pour déchiffrer le fichier :</translation>
+ <translation>Entrez la clé secrète pour déchiffrer le fichier  :</translation>
</message>
<message>
<location line="+8"/>
@@ -1407,7 +1627,7 @@ Cela met l'application en évidence dans la barre des tâches.</translation
<message>
<location line="-8"/>
<source>Enter passphrase to encrypt your session keys:</source>
- <translation>Entrez une clé secrète pour chiffrer vos clés de session :</translation>
+ <translation>Entrez une clé secrète pour chiffrer vos clés de session  :</translation>
</message>
<message>
<location line="+15"/>
@@ -1416,6 +1636,34 @@ Cela met l'application en évidence dans la barre des tâches.</translation
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuler</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
@@ -1765,7 +2013,7 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
<message>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
- <translation>Échec de l'activation du chiffrement : %1</translation>
+ <translation>Échec de l'activation du chiffrement  : %1</translation>
</message>
<message>
<location line="+147"/>
@@ -1785,13 +2033,13 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
<message>
<location line="+5"/>
<source>Error while reading file: %1</source>
- <translation>Erreur lors de la lecture du fichier : %1</translation>
+ <translation>Erreur lors de la lecture du fichier  : %1</translation>
</message>
<message>
<location line="+35"/>
<location line="+20"/>
<source>Failed to upload image: %s</source>
- <translation>Échec de l'envoi de l'image : %s</translation>
+ <translation>Échec de l'envoi de l'image  : %s</translation>
</message>
</context>
<context>
@@ -1824,7 +2072,7 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
<message>
<location line="+1"/>
<source>Do you really want to invite %1 (%2) to a direct chat?</source>
- <translation>Voulez-vous vraiment inviter %1 (%2) dans un chat privé ?</translation>
+ <translation>Voulez-vous vraiment inviter %1 (%2) dans un chat privé  ?</translation>
</message>
<message>
<location line="+54"/>
@@ -1940,12 +2188,12 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
<message>
<location line="+5"/>
<source>You: %1</source>
- <translation>Vous : %1</translation>
+ <translation>Vous  : %1</translation>
</message>
<message>
<location line="+3"/>
<source>%1: %2</source>
- <translation>%1 : %2</translation>
+ <translation>%1  : %2</translation>
</message>
<message>
<location line="+7"/>
diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts
index 4b9c32d4..1c71b43e 100644
--- a/resources/langs/nheko_it.ts
+++ b/resources/langs/nheko_it.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="it">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annulla</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation>Sei entrato in questa stanza.</translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>Impossibile invitare l'utente: %1</translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>Criptato</translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished">-- Evento Criptato (Chiavi per la decriptazione non trovate) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished">-- Errore di Decrittazione (impossibile recuperare le chiavi megolm dal DB) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Errore di Decrittazione (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- Evento Criptato (Tipo di evento ignoto) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Chiudi</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -447,18 +575,18 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>oscurato</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>Crittografia abilitata</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>nome della stanza cambiato in: %1</translation>
</message>
@@ -468,7 +596,7 @@ Esempio: https://server.mio:8787</translation>
<translation>nome della stanza rimosso</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation>argomento cambiato in: %1</translation>
</message>
@@ -478,42 +606,85 @@ Esempio: https://server.mio:8787</translation>
<translation>argomento rimosso</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation>%1 creato e configurata stanza: %2</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annulla</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Accetta</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -600,7 +771,7 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>nessuna versione memorizzata</translation>
</message>
@@ -701,27 +872,45 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>Fallito</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>Inviato</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>Ricevuto</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>Letto</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Chiudi</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -745,7 +934,7 @@ Esempio: https://server.mio:8787</translation>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Seleziona un file</translation>
</message>
@@ -755,7 +944,7 @@ Esempio: https://server.mio:8787</translation>
<translation>Tutti i file (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -773,20 +962,20 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation>Oscuramento del messaggio fallito: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>Salva immagine</translation>
</message>
@@ -925,12 +1114,12 @@ Esempio: https://server.mio:8787</translation>
<translation>%1 ha oscurato la sua bussata.</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation>Sei entrato in questa stanza.</translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>Rifiutata la bussata di %1.</translation>
</message>
@@ -954,17 +1143,17 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>Rispondi</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>Opzioni</translation>
</message>
@@ -972,63 +1161,63 @@ Esempio: https://server.mio:8787</translation>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation>Risposta</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>Leggi le ricevute</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>Segna come letto</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>Mostra il messaggio grezzo</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation>Mostra il messaggio grezzo decriptato</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>Oscura messaggio</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>Salva come</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>Nessuna stanza aperta</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">Opzioni della stanza</translation>
</message>
@@ -1038,27 +1227,35 @@ Esempio: https://server.mio:8787</translation>
<translation type="unfinished">Invita utenti</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Membri</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Lascia la stanza</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Impostazioni</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>Chiudi</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1115,9 +1312,32 @@ Esempio: https://server.mio:8787</translation>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Minimizza nella tray</translation>
</message>
@@ -1137,12 +1357,12 @@ Esempio: https://server.mio:8787</translation>
<translation>Avatar Circolari</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1345,7 +1565,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>CRITTOGRAFIA</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>GENERALE</translation>
</message>
@@ -1355,7 +1575,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>INTERFACCIA</translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation>Famiglia dei caratteri delle Emoji</translation>
</message>
@@ -1407,6 +1627,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annulla</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 79fdd9a4..4c53bab0 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="ja_JP">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">キャンセル</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation>ユーザーを招待できませんでした: %1</translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation>暗号化されています</translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished">-- 復号エラー (データベースからmegolm鍵を取得できませんでした) --</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- 復号エラー (%1) --</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- 暗号化イベント (不明なイベント型です) --</translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">閉じる</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation>編集済み</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation>暗号化が有効です</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation>部屋名が変更されました: %1</translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation>部屋名が削除されました</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation>話題が変更されました: %1</translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation>話題が削除されました</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">キャンセル</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">容認</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation>バージョンが保存されていません</translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation>失敗</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation>送信済み</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation>受信済み</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation>既読</translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">閉じる</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation>絵文字</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>ファイルを選択</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>全てのファイル (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation>メッセージを編集できませんでした: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation>画像を保存</translation>
</message>
@@ -920,12 +1109,12 @@ Example: https://server.my:8787</source>
<translation>%1がノックを編集しました。</translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation>%1からのノックを拒否しました。</translation>
</message>
@@ -949,17 +1138,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation>返信</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation>オプション</translation>
</message>
@@ -967,63 +1156,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished">返信</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation>開封確認</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation>既読にする</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation>ソースを見る</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation>メッセージを編集</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation>名前を付けて保存</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation>部屋が開いていません</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">部屋のオプション</translation>
</message>
@@ -1033,27 +1222,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ユーザーを招待</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">メンバー</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">部屋を出る</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">設定</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1110,9 +1307,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>トレイへ最小化</translation>
</message>
@@ -1132,12 +1352,12 @@ Example: https://server.my:8787</source>
<translation>円形アバター</translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1340,7 +1560,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>暗号化</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>全般</translation>
</message>
@@ -1350,7 +1570,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1402,6 +1622,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">キャンセル</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index e957c578..5cdbbe9e 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="nl_NL">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuleren</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuleren</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Accepteren</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Kies een bestand</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>Alle bestanden (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">Afbeelding opslaan</translation>
</message>
@@ -921,12 +1110,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -950,17 +1139,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -968,63 +1157,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished">Leesbevestigingen</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1034,27 +1223,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Gebruikers uitnodigen</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Leden</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Kamer verlaten</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Instellingen</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1111,9 +1308,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Minimaliseren naar systeemvak</translation>
</message>
@@ -1133,12 +1353,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1341,7 +1561,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>ALGEMEEN</translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1403,6 +1623,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Annuleren</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index fd4657d7..4e3c1b0b 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="pl">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Anuluj</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Anuluj</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Akceptuj</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation>Emoji</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Wybierz plik</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>Wszystkie pliki (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">Zapisz obraz</translation>
</message>
@@ -922,12 +1111,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -951,17 +1140,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -969,63 +1158,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished">Potwierdzenia przeczytania</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">Ustawienia pokoju</translation>
</message>
@@ -1035,27 +1224,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Zaproś użytkowników</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Członkowie</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Opuść pokój</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Ustawienia</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1112,9 +1309,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Zminimalizuj do paska zadań</translation>
</message>
@@ -1134,12 +1354,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1342,7 +1562,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>SZYFROWANIE</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>OGÓLNE</translation>
</message>
@@ -1352,7 +1572,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1404,6 +1624,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">Anuluj</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts
index 66e07bb4..a4a337b1 100644
--- a/resources/langs/nheko_pt_PT.ts
+++ b/resources/langs/nheko_pt_PT.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="pt_PT">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+29"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-18"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -921,12 +1110,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -950,17 +1139,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -968,63 +1157,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1034,27 +1223,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1111,9 +1308,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation type="unfinished"></translation>
</message>
@@ -1133,12 +1353,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1341,7 +1561,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation type="unfinished"></translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1403,6 +1623,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts
index 9468bb28..30476860 100644
--- a/resources/langs/nheko_ro.ts
+++ b/resources/langs/nheko_ro.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="ro">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -922,12 +1111,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -951,17 +1140,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -969,63 +1158,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1035,27 +1224,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1112,9 +1309,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation type="unfinished"></translation>
</message>
@@ -1134,12 +1354,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1342,7 +1562,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation type="unfinished"></translation>
</message>
@@ -1352,7 +1572,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1404,6 +1624,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 95cef767..5625d591 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished">Закрыть</translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">Принять</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished">Закрыть</translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>Выберите файл</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>Все файлы (*)</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished">Ошибка редактирования сообщения: %1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">Сохранить изображение</translation>
</message>
@@ -922,12 +1111,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -951,17 +1140,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -969,63 +1158,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished">Подтверждать прочтение</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">Настройки комнаты</translation>
</message>
@@ -1035,27 +1224,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Пригласить пользователей</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">Участники</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">Покинуть комнату</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">Настройки</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished">Закрыть</translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1112,9 +1309,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>Сворачивать в системную панель</translation>
</message>
@@ -1134,12 +1354,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1342,7 +1562,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>ШИФРОВАНИЕ</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>ГЛАВНОЕ</translation>
</message>
@@ -1352,7 +1572,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1405,6 +1625,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts
index d490b4d1..b53bec5d 100644
--- a/resources/langs/nheko_si.ts
+++ b/resources/langs/nheko_si.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="si">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -921,12 +1110,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -950,17 +1139,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -968,63 +1157,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished"></translation>
</message>
@@ -1034,27 +1223,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1111,9 +1308,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation type="unfinished"></translation>
</message>
@@ -1133,12 +1353,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1341,7 +1561,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation type="unfinished"></translation>
</message>
@@ -1351,7 +1571,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1403,6 +1623,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index e4927ff6..ae7a871a 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -2,9 +2,55 @@
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
+ <name>ActiveCallBar</name>
+ <message>
+ <location filename="../qml/ActiveCallBar.qml" line="+49"/>
+ <source>Initiating...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Calling...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Connecting...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Unmute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Mute Mic</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>AwaitingVerificationConfirmation</name>
+ <message>
+ <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+ <source>Awaiting Confirmation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Waiting for other side to complete verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cancel</source>
+ <translation type="unfinished">取消</translation>
+ </message>
+</context>
+<context>
<name>Cache</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1658"/>
+ <location filename="../../src/Cache.cpp" line="+1732"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
@@ -12,7 +58,7 @@
<context>
<name>ChatPage</name>
<message>
- <location filename="../../src/ChatPage.cpp" line="+218"/>
+ <location filename="../../src/ChatPage.cpp" line="+215"/>
<source>Failed to invite user: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -210,6 +256,29 @@
</message>
</context>
<context>
+ <name>DigitVerification</name>
+ <message>
+ <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditModal</name>
<message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+72"/>
@@ -235,13 +304,13 @@
<context>
<name>EmojiPicker</name>
<message>
- <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
- <location line="+139"/>
+ <location filename="../qml/emoji/EmojiPicker.qml" line="+112"/>
+ <location line="+181"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-42"/>
+ <location line="-66"/>
<source>People</source>
<translation type="unfinished"></translation>
</message>
@@ -282,9 +351,32 @@
</message>
</context>
<context>
+ <name>EmojiVerification</name>
+ <message>
+ <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+ <source>Verification Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+376"/>
+ <source>They do not match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>They match!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
@@ -297,25 +389,27 @@
<context>
<name>EventStore</name>
<message>
- <location filename="../../src/timeline/EventStore.cpp" line="+418"/>
+ <location filename="../../src/timeline/EventStore.cpp" line="+503"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
+ <location line="+62"/>
<source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-48"/>
+ <location line="+61"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-51"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -332,6 +426,40 @@
</message>
</context>
<context>
+ <name>Failed</name>
+ <message>
+ <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+ <source>Verification failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Other client does not support our verification protocol.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Key mismatch detected!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <location line="+4"/>
+ <source>Device verification timed out.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-2"/>
+ <source>Other party canceled the verification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>InviteeItem</name>
<message>
<location filename="../../src/InviteeItem.cpp" line="+18"/>
@@ -443,18 +571,18 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
- <location line="+6"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+ <location line="+9"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Encryption enabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>room name changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -464,7 +592,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>topic changed to: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -474,42 +602,85 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+12"/>
<source>%1 placed a voice call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a video call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>%1 placed a call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+11"/>
<source>%1 answered the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>Negotiating call...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>NewVerificationRequest</name>
+ <message>
+ <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+ <source>Send Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Recieved Device Verification Request</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>To ensure that no malicious user can eavesdrop on your encrypted communications, you can verify this device.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The device was requested to be verified</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cancel</source>
+ <translation type="unfinished">取消</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Deny</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Start verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Accept</source>
+ <translation type="unfinished">接受</translation>
+ </message>
+</context>
+<context>
<name>Placeholder</name>
<message>
<location filename="../qml/delegates/Placeholder.qml" line="+4"/>
@@ -596,7 +767,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+1443"/>
+ <location filename="../../src/Cache.cpp" line="+1815"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -697,27 +868,45 @@ Example: https://server.my:8787</source>
<context>
<name>StatusIndicator</name>
<message>
- <location filename="../qml/StatusIndicator.qml" line="+14"/>
+ <location filename="../qml/StatusIndicator.qml" line="+17"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Sent</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Received</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Success</name>
+ <message>
+ <location filename="../qml/device-verification/Success.qml" line="+6"/>
+ <source>Successful Verification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Verification successful! Both sides verified their devices!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TextInputWidget</name>
<message>
<location filename="../../src/TextInputWidget.cpp" line="+574"/>
@@ -741,7 +930,7 @@ Example: https://server.my:8787</source>
<translation></translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+96"/>
<source>Select a file</source>
<translation>选择一个文件</translation>
</message>
@@ -751,7 +940,7 @@ Example: https://server.my:8787</source>
<translation>所有文件（*）</translation>
</message>
<message>
- <location line="+64"/>
+ <location line="+63"/>
<source>Place a call</source>
<translation type="unfinished"></translation>
</message>
@@ -769,20 +958,20 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+805"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished">删除消息失败：%1</translation>
</message>
<message>
- <location line="+114"/>
+ <location line="+125"/>
<location line="+17"/>
- <location line="+101"/>
+ <location line="+88"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+236"/>
<source>Save image</source>
<translation type="unfinished">保存图像</translation>
</message>
@@ -920,12 +1109,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-943"/>
+ <location line="-982"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+945"/>
+ <location line="+984"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -949,17 +1138,17 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+94"/>
+ <location filename="../qml/TimelineRow.qml" line="+95"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+15"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+14"/>
<source>Options</source>
<translation type="unfinished"></translation>
</message>
@@ -967,63 +1156,63 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineView</name>
<message>
- <location filename="../qml/TimelineView.qml" line="+61"/>
+ <location filename="../qml/TimelineView.qml" line="+66"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Read receipts</source>
<translation type="unfinished">阅读回执</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+4"/>
<source>View raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>View decrypted raw message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Redact message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Save as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+43"/>
<source>No room open</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+50"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+12"/>
<location line="+15"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+27"/>
<source>Room options</source>
<translation type="unfinished">聊天室选项</translation>
</message>
@@ -1033,27 +1222,35 @@ Example: https://server.my:8787</source>
<translation type="unfinished">邀请用户</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Members</source>
<translation type="unfinished">成员</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Leave room</source>
<translation type="unfinished">离开聊天室</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Settings</source>
<translation type="unfinished">设置</translation>
</message>
<message>
- <location line="+253"/>
+ <location line="+286"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>TimelineViewManager</name>
+ <message>
+ <location filename="../../src/timeline/TimelineViewManager.cpp" line="+412"/>
+ <source>No share room with this user found. Create an encrypted room with this user and try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>TrayIcon</name>
<message>
<location filename="../../src/TrayIcon.cpp" line="+122"/>
@@ -1110,9 +1307,32 @@ Example: https://server.my:8787</source>
</message>
</context>
<context>
+ <name>UserProfile</name>
+ <message>
+ <location filename="../qml/UserProfile.qml" line="+60"/>
+ <source>Verify</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Ban the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Start a private chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Kick the user</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+566"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+565"/>
<source>Minimize to tray</source>
<translation>最小化至托盘</translation>
</message>
@@ -1132,12 +1352,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-63"/>
+ <location line="-62"/>
<source>CALLS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+57"/>
<source>Keep the application running in the background after closing the client window.</source>
<translation type="unfinished"></translation>
</message>
@@ -1340,7 +1560,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation>加密</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-77"/>
<source>GENERAL</source>
<translation>通用</translation>
</message>
@@ -1350,7 +1570,7 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+172"/>
+ <location line="+171"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
@@ -1402,6 +1622,34 @@ This usually causes the application icon in the task bar to animate in some fash
</message>
</context>
<context>
+ <name>Waiting</name>
+ <message>
+ <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+ <source>Waiting for other party</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Waiting for other side to accept the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to continue the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Waiting for other side to complete the verification request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Cancel</source>
+ <translation type="unfinished">取消</translation>
+ </message>
+</context>
+<context>
<name>WelcomePage</name>
<message>
<location filename="../../src/WelcomePage.cpp" line="+47"/>
|
