Commit d55f7ea1 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Merge branch 'remove_key_response_option' into 'master'

Remove 'respond to key requests' functionality

See merge request !10
parents a6167824 453c8cd1
Pipeline #1473 passed with stage
in 54 minutes and 6 seconds
......@@ -157,12 +157,12 @@
</message>
<message>
<location line="+34"/>
<location line="+284"/>
<location line="+286"/>
<source>Confirm invite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-283"/>
<location line="-285"/>
<source>Do you really want to invite %1 (%2)?</source>
<translation type="unfinished"></translation>
</message>
......@@ -227,12 +227,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+187"/>
<location line="+189"/>
<source>Do you really want to start a private chat with %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-725"/>
<location line="-727"/>
<source>Cache migration failed!</source>
<translation type="unfinished"></translation>
</message>
......@@ -352,7 +352,7 @@
<context>
<name>CrossSigningSecrets</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+187"/>
<location filename="../../src/ChatPage.cpp" line="+189"/>
<source>Decrypt secrets</source>
<translation type="unfinished"></translation>
</message>
......@@ -604,6 +604,44 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImagePackSettingsDialog</name>
<message>
<location filename="../qml/dialogs/ImagePackSettingsDialog.qml" line="+22"/>
<source>Image pack settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+151"/>
<source>Private pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Pack from this room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Globally enabled pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+59"/>
<source>Enable globally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Enables this pack to be used in all rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+62"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>InputBar</name>
<message>
......@@ -906,7 +944,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+394"/>
<location line="+405"/>
<source>&amp;Copy</source>
<translation type="unfinished"></translation>
</message>
......@@ -1247,7 +1285,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
<location filename="../../src/Cache.cpp" line="+4169"/>
<location filename="../../src/Cache.cpp" line="+4180"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
......@@ -1264,6 +1302,16 @@ Example: https://server.my:8787</source>
<source>Enter the tag you want to use:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Leave Room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to leave this room?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Leave room</source>
......@@ -1381,7 +1429,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+45"/>
<location line="+55"/>
<source>SETTINGS</source>
<translation type="unfinished"></translation>
</message>
......@@ -1437,19 +1485,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
<source>Respond to key requests</source>
<location line="+16"/>
<source>Sticker &amp; Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Whether or not the client should respond automatically with the session keys
upon request. Use with caution, this is a temporary measure to test the
E2E implementation until device verification is completed.</source>
<location line="+4"/>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+21"/>
<location line="+1"/>
<source>Change what packs are enabled, remove packs or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>INFO</source>
<translation type="unfinished"></translation>
</message>
......@@ -1464,7 +1515,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/ui/RoomSettings.cpp" line="+268"/>
<location filename="../../src/ui/RoomSettings.cpp" line="+255"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
......@@ -1619,7 +1670,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+1132"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+1107"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
......@@ -1765,12 +1816,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-909"/>
<location line="-884"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+875"/>
<location line="+850"/>
<source>%1 has changed their avatar and changed their display name to %2.</source>
<translation type="unfinished"></translation>
</message>
......@@ -1840,7 +1891,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineViewManager</name>
<message>
<location filename="../../src/timeline/TimelineViewManager.cpp" line="+472"/>
<location filename="../../src/timeline/TimelineViewManager.cpp" line="+527"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation type="unfinished"></translation>
</message>
......@@ -2464,7 +2515,7 @@ This usually causes the application icon in the task bar to animate in some fash
<context>
<name>descriptiveTime</name>
<message>
<location filename="../../src/Utils.cpp" line="+210"/>
<location filename="../../src/Utils.cpp" line="+184"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
......@@ -2646,7 +2697,7 @@ Media size: %2
<context>
<name>message-description sent:</name>
<message>
<location filename="../../src/Utils.h" line="+124"/>
<location filename="../../src/Utils.h" line="+115"/>
<source>You sent an audio clip</source>
<translation type="unfinished"></translation>
</message>
......
......@@ -157,12 +157,12 @@
</message>
<message>
<location line="+34"/>
<location line="+284"/>
<location line="+286"/>
<source>Confirm invite</source>
<translation>Einladung bestätigen</translation>
</message>
<message>
<location line="-283"/>
<location line="-285"/>
<source>Do you really want to invite %1 (%2)?</source>
<translation>Nutzer %1 (%2) wirklich einladen?</translation>
</message>
......@@ -227,12 +227,12 @@
<translation>Verbannung aufgehoben: %1</translation>
</message>
<message>
<location line="+187"/>
<location line="+189"/>
<source>Do you really want to start a private chat with %1?</source>
<translation>Möchtest du wirklich eine private Konversation mit %1 beginnen?</translation>
</message>
<message>
<location line="-725"/>
<location line="-727"/>
<source>Cache migration failed!</source>
<translation>Migration des Caches fehlgeschlagen!</translation>
</message>
......@@ -352,7 +352,7 @@
<context>
<name>CrossSigningSecrets</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+187"/>
<location filename="../../src/ChatPage.cpp" line="+189"/>
<source>Decrypt secrets</source>
<translation>Geheimnisse entschlüsseln</translation>
</message>
......@@ -604,6 +604,44 @@
<translation>Nachricht weiterleiten</translation>
</message>
</context>
<context>
<name>ImagePackSettingsDialog</name>
<message>
<location filename="../qml/dialogs/ImagePackSettingsDialog.qml" line="+22"/>
<source>Image pack settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+151"/>
<source>Private pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Pack from this room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Globally enabled pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+59"/>
<source>Enable globally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Enables this pack to be used in all rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+62"/>
<source>Close</source>
<translation type="unfinished">Schließen</translation>
</message>
</context>
<context>
<name>InputBar</name>
<message>
......@@ -910,7 +948,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Optionen</translation>
</message>
<message>
<location line="+394"/>
<location line="+405"/>
<source>&amp;Copy</source>
<translation>&amp;Kopieren</translation>
</message>
......@@ -1251,7 +1289,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>RoomInfo</name>
<message>
<location filename="../../src/Cache.cpp" line="+4169"/>
<location filename="../../src/Cache.cpp" line="+4180"/>
<source>no version stored</source>
<translation>keine Version gespeichert</translation>
</message>
......@@ -1268,6 +1306,16 @@ Beispiel: https://mein.server:8787</translation>
<source>Enter the tag you want to use:</source>
<translation>Gib den Tag, den du verwenden willst, ein:</translation>
</message>
<message>
<location line="+9"/>
<source>Leave Room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to leave this room?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Leave room</source>
......@@ -1384,7 +1432,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>%1 Teilnehmer</translation>
</message>
<message>
<location line="+45"/>
<location line="+55"/>
<source>SETTINGS</source>
<translation>EINSTELLUNGEN</translation>
</message>
......@@ -1440,19 +1488,22 @@ Beispiel: https://mein.server:8787</translation>
<translation>Verschlüsselung ist derzeit experimentell und könnte unerwartete Probleme verursachen.&lt;br&gt;Bitte beachte, dass dies später nicht mehr deaktiviert werden kann.</translation>
</message>
<message>
<location line="+17"/>
<source>Respond to key requests</source>
<translation>Auf Schlüsselanfragen antworten</translation>
<location line="+16"/>
<source>Sticker &amp; Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Whether or not the client should respond automatically with the session keys
upon request. Use with caution, this is a temporary measure to test the
E2E implementation until device verification is completed.</source>
<translation>Soll der Client automatisch mit den Sitzungsschlüsseln auf Anfragen antworten oder nicht? Bitte mit Vorsicht benutzen, dies ist eine vorübergehende Maßnahme, um die Ende-zu-Ende-Implementierung zu testen, bis die Geräteverifizierung abgeschlossen ist.</translation>
<location line="+4"/>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+21"/>
<location line="+1"/>
<source>Change what packs are enabled, remove packs or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
<source>INFO</source>
<translation>INFO</translation>
</message>
......@@ -1467,7 +1518,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Raumversion</translation>
</message>
<message>
<location filename="../../src/ui/RoomSettings.cpp" line="+268"/>
<location filename="../../src/ui/RoomSettings.cpp" line="+255"/>
<source>Failed to enable encryption: %1</source>
<translation>Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation>
</message>
......@@ -1622,7 +1673,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineModel</name>
<message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+1132"/>
<location filename="../../src/timeline/TimelineModel.cpp" line="+1107"/>
<source>Message redaction failed: %1</source>
<translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
</message>
......@@ -1767,12 +1818,12 @@ Beispiel: https://mein.server:8787</translation>
<translation>%1 hat das Anklopfen zurückgezogen.</translation>
</message>
<message>
<location line="-909"/>
<location line="-884"/>
<source>You joined this room.</source>
<translation>Du bist dem Raum beigetreten.</translation>
</message>
<message>
<location line="+875"/>
<location line="+850"/>
<source>%1 has changed their avatar and changed their display name to %2.</source>
<translation>%1 hat den eigenen Avatar und Namen geändert zu %2.</translation>
</message>
......@@ -1842,7 +1893,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineViewManager</name>
<message>
<location filename="../../src/timeline/TimelineViewManager.cpp" line="+472"/>
<location filename="../../src/timeline/TimelineViewManager.cpp" line="+527"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Keinen verschlüsselten Chat mit diesem User gefunden. Erstelle einen verschlüsselten 1:1 Chat mit diesem Nutzer und versuche es erneut.</translation>
</message>
......@@ -2476,7 +2527,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
<context>
<name>descriptiveTime</name>
<message>
<location filename="../../src/Utils.cpp" line="+210"/>
<location filename="../../src/Utils.cpp" line="+184"/>
<source>Yesterday</source>
<translation>Gestern</translation>
</message>
......@@ -2660,7 +2711,7 @@ Medien-Größe: %2
<context>
<name>message-description sent:</name>
<message>
<location filename="../../src/Utils.h" line="+124"/>
<location filename="../../src/Utils.h" line="+115"/>
<source>You sent an audio clip</source>
<translation>Du hast eine Audiodatei gesendet</translation>
</message>
......
......@@ -157,12 +157,12 @@
</message>
<message>
<location line="+34"/>
<location line="+284"/>
<location line="+286"/>
<source>Confirm invite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-283"/>
<location line="-285"/>
<source>Do you really want to invite %1 (%2)?</source>
<translation type="unfinished"></translation>
</message>
......@@ -227,12 +227,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+187"/>
<location line="+189"/>
<source>Do you really want to start a private chat with %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-725"/>
<location line="-727"/>
<source>Cache migration failed!</source>
<translation type="unfinished"></translation>
</message>
......@@ -352,7 +352,7 @@
<context>
<name>CrossSigningSecrets</name>
<message>
<location filename="../../src/ChatPage.cpp" line="+187"/>
<location filename="../../src/ChatPage.cpp" line="+189"/>
<source>Decrypt secrets</source>
<translation type="unfinished"></translation>
</message>
......@@ -604,6 +604,44 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ImagePackSettingsDialog</name>
<message>
<location filename="../qml/dialogs/ImagePackSettingsDialog.qml" line="+22"/>
<source>Image pack settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+151"/>
<source>Private pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Pack from this room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source>Globally enabled pack</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+59"/>
<source>Enable globally</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Enables this pack to be used in all rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+62"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>InputBar</name>
<message>
......@@ -906,7 +944,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+394"/>
<location line="+405"/>
<source>&amp;Copy</source>
<translation type="unfinished"></translation>
</message>
......@@ -1247,7 +1285,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
<location filename="../../src/Cache.cpp" line="+4169"/>
<location filename="../../src/Cache.cpp" line="+4180"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
......@@ -1264,6 +1302,16 @@ Example: https://server.my:8787</source>
<source>Enter the tag you want to use:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+9"/>
<source>Leave Room</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Are you sure you want to leave this room?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
<source>Leave room</source>
......@@ -1380,7 +1428,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+45"/>
<location line="+55"/>
<source>SETTINGS</source>
<translation type="unfinished"></translation>
</message>
......@@ -1436,19 +1484,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
<source>Respond to key requests</source>
<location line="+16"/>
<source>Sticker &amp; Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Whether or not the client should respond automatically with the session keys
upon request. Use with caution, this is a temporary measure to test the
E2E implementation until device verification is completed.</source>
<location line="+4"/>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+21"/>
<location line="+1"/>
<source>Change what packs are enabled, remove packs or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>