diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-07-24 23:24:28 +0000 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-07-24 23:24:28 +0000 |
| commit | d55f7ea12b221bcd1861356bbc6b8763c2191002 (patch) | |
| tree | 4887df15c8da20f439fbf22a89caf2087ff707e3 | |
| parent | Fix edge case that could lead to no new one time keys being uploaded (diff) | |
| parent | Update translations (diff) | |
| download | nheko-d55f7ea12b221bcd1861356bbc6b8763c2191002.tar.xz | |
Merge branch 'remove_key_response_option' into 'master'
Remove 'respond to key requests' functionality See merge request nheko-reborn/nheko!10
28 files changed, 1620 insertions, 576 deletions
diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts index 7c1134aa..99813f81 100644 --- a/resources/langs/nheko_cs.ts +++ b/resources/langs/nheko_cs.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 3cd35781..cb5b54fb 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Optionen</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation>&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> @@ -1269,6 +1307,16 @@ Beispiel: https://mein.server:8787</translation> <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> <translation>Raum verlassen</translation> @@ -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.<br>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 & 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> diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 6df73f73..d40a6433 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Βγές</translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 97a67b06..1851fff1 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Confirm invite</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Do you really want to invite %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Unbanned user: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Do you really want to start a private chat with %1?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Cache migration failed!</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>Decrypt secrets</translation> </message> @@ -605,6 +605,44 @@ </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">Close</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Example: https://server.my:8787</translation> <translation>Options</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation>&Copy</translation> </message> @@ -1251,7 +1289,7 @@ Example: https://server.my: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>no version stored</translation> </message> @@ -1269,6 +1307,16 @@ Example: https://server.my:8787</translation> <translation>Enter the tag you want to use:</translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation>Leave room</translation> @@ -1384,7 +1432,7 @@ Example: https://server.my:8787</translation> <translation>%1 member(s)</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>SETTINGS</translation> </message> @@ -1440,21 +1488,22 @@ Example: https://server.my:8787</translation> <translation>Encryption is currently experimental and things might break unexpectedly.<br>Please take note that it can't be disabled afterwards.</translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Respond to key requests</translation> + <location line="+16"/> + <source>Sticker & 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>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.</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> @@ -1469,7 +1518,7 @@ E2E implementation until device verification is completed.</translation> <translation>Room Version</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>Failed to enable encryption: %1</translation> </message> @@ -1624,7 +1673,7 @@ E2E implementation until device verification is completed.</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>Message redaction failed: %1</translation> </message> @@ -1769,12 +1818,12 @@ E2E implementation until device verification is completed.</translation> <translation>%1 redacted their knock.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>You joined this room.</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 has changed their avatar and changed their display name to %2.</translation> </message> @@ -1844,7 +1893,7 @@ E2E implementation until device verification is completed.</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>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</translation> </message> @@ -2479,7 +2528,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>Yesterday</translation> </message> @@ -2663,7 +2712,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>You sent an audio clip</translation> </message> diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts index f3529f28..a77c5c25 100644 --- a/resources/langs/nheko_eo.ts +++ b/resources/langs/nheko_eo.ts @@ -158,12 +158,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Konfirmu inviton</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Ĉu vi certe volas inviti uzanton %1 (%2)?</translation> </message> @@ -228,12 +228,12 @@ <translation>Malforbaris uzanton: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Ĉu vi certe volas komenci privatan babilon kun %1?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Malsukcesis migrado de kaŝmemoro!</translation> </message> @@ -353,7 +353,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>Malĉifri sekretojn</translation> </message> @@ -606,6 +606,44 @@ </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">Fermi</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -913,7 +951,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Elektebloj</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1254,7 +1292,7 @@ Ekzemplo: https://servilo.mia: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 type="unfinished"></translation> </message> @@ -1272,6 +1310,16 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Eliri el ĉambro</translation> @@ -1387,7 +1435,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>%1 ĉambrano(j)</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>AGORDOJ</translation> </message> @@ -1443,19 +1491,22 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Ĉifrado nun estas eksperimenta kaj povus rompiĝi neatendite.<br>Bonvole sciu, ke ne eblas ĝin malŝalti poste.</translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Respondi al petoj de ŝlosiloj</translation> + <location line="+16"/> + <source>Sticker & 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>INFORMOJ</translation> </message> @@ -1470,7 +1521,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Versio de ĉambro</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>Malsukcesis ŝalti ĉifradon: %1</translation> </message> @@ -1626,7 +1677,7 @@ Ekzemplo: https://servilo.mia: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 type="unfinished"></translation> </message> @@ -1773,12 +1824,12 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Vi aliĝis ĉi tiun ĉambron.</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> @@ -1848,7 +1899,7 @@ Ekzemplo: https://servilo.mia: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 type="unfinished"></translation> </message> @@ -2490,7 +2541,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>Hieraŭ</translation> </message> @@ -2672,7 +2723,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> diff --git a/resources/langs/nheko_es.ts b/resources/langs/nheko_es.ts index 8eb4675a..922e0500 100644 --- a/resources/langs/nheko_es.ts +++ b/resources/langs/nheko_es.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Confirmar invitación</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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1773,12 +1824,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">Te has unido a esta sala.</translation> </message> <message> - <location line="+911"/> + <location line="+886"/> <source>Rejected the knock from %1.</source> <translation type="unfinished"></translation> </message> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts index 20261395..57eac1c3 100644 --- a/resources/langs/nheko_et.ts +++ b/resources/langs/nheko_et.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Kinnita kutse</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Kas sa tõesti soovid saata kutset kasutajale %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Suhtluskeeld eemaldatud: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Kas sa kindlasti soovid alustada otsevestlust kasutajaga %1?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Puhvri versiooniuuendus ebaõnnestus!</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>Dekrüpti andmed</translation> </message> @@ -605,6 +605,44 @@ </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">Sulge</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Valikud</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation>&Kopeeri</translation> </message> @@ -1251,7 +1289,7 @@ Näiteks: https://server.minu: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>salvestatud versiooni ei leidu</translation> </message> @@ -1269,6 +1307,16 @@ Näiteks: https://server.minu:8787</translation> <translation>Kirjuta silt, mida soovid kasutada:</translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation>Lahku jututoast</translation> @@ -1384,7 +1432,7 @@ Näiteks: https://server.minu:8787</translation> <translation>%1 liige(t)</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>SEADISTUSED</translation> </message> @@ -1440,21 +1488,22 @@ Näiteks: https://server.minu:8787</translation> <translation>Krüptimine on nhekos hetkel veel katseline ning nii mõndagi võib ootamatult katki minna. <br>Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Vasta krüptovõtmete päringutele</translation> + <location line="+16"/> + <source>Sticker & 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>Kas klient peaks automaatselt vastama või mitte vastama sessioonivõtmete päringule. -Kasuta seda võimalust ettevaatlikult. Tegemist on ajutise lahendusega läbiva krüptimise -testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.</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>TEAVE</translation> </message> @@ -1469,7 +1518,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <translation>Jututoa versioon</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>Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation> </message> @@ -1624,7 +1673,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <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>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation> </message> @@ -1769,12 +1818,12 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <translation>%1 muutis oma koputust jututoa uksele.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Sa liitusid jututoaga.</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 muutis oma tunnuspilti ja seadistas uueks kuvatavaks nimeks %2.</translation> </message> @@ -1844,7 +1893,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <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>Ühtegi krüptitud vestlust selle kasutajaga ei leidunud. Palun loo temaga krüptitud vestlus ja proovi uuesti.</translation> </message> @@ -2479,7 +2528,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim <context> <name>descriptiveTime</name> <message> - <location filename="../../src/Utils.cpp" line="+210"/> + <location filename="../../src/Utils.cpp" line="+184"/> <source>Yesterday</source> <translation>Eile</translation> </message> @@ -2663,7 +2712,7 @@ Meedia suurus: %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>Sa saatsid helifaili</translation> </message> diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index e884e0ac..422c2957 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -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> @@ -605,6 +605,44 @@ </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">Sulje</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation>Asetukset</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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>ei tallennettua versiota</translation> </message> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation>Poistu huoneesta</translation> @@ -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 & 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> @@ -1463,7 +1514,7 @@ Example: https://server.my:8787</source> <translation>Huoneen versio</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>Salauksen aktivointi epäonnistui: %1</translation> </message> @@ -1618,7 +1669,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>Viestin muokkaus epäonnistui: %1</translation> </message> @@ -1763,12 +1814,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>Sinä liityit tähän huoneeseen.</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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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>Eilen</translation> </message> @@ -2646,7 +2697,7 @@ Median koko: %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>Lähetit äänileikkeen</translation> </message> diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index fb3c0e11..c6d42299 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Confirmer l'invitation</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation> </message> @@ -227,12 +227,12 @@ <translation>%1 n'est plus banni(e)</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Voulez-vous vraimer commencer une discussion privée avec %1 ?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Échec de la migration du cache !</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>Déchiffrer les secrets</translation> </message> @@ -605,6 +605,44 @@ </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">Fermer</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Options</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1251,7 +1289,7 @@ Exemple : https ://monserveur.example.com :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>pas de version enregistrée</translation> </message> @@ -1269,6 +1307,16 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Quitter le salon</translation> @@ -1384,7 +1432,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>%1 membre(s)</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>CONFIGURATION</translation> </message> @@ -1440,21 +1488,22 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Le chiffrement actuellement expérimental et des comportements inattendus peuvent être rencontrés. <br>Veuillez noter qu'il n'est pas possible de le désactiver par la suite.</translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Répondre aux demandes de clé</translation> + <location line="+16"/> + <source>Sticker & 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>Si le client doit répondre automatiquement avec les clés de session lorsqu'elles sont -demandées. Utiliser précautionneusement, il s'agit d'une mesure temporaire afin de -tester le chiffrement de bout en bout tant que la vérification des appareils n'est pas au point.</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> @@ -1469,7 +1518,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <translation>Version du salon</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>Échec de l'activation du chiffrement  : %1</translation> </message> @@ -1624,7 +1673,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <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>Échec de la suppression du message : %1</translation> </message> @@ -1769,12 +1818,12 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <translation>%1 ne frappe plus au salon.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Vous avez rejoint ce salon.</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> @@ -1844,7 +1893,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <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>Pas de discussion privée et chiffrée trouvée avec cet utilisateur. Créez-en une et réessayez.</translation> </message> @@ -2481,7 +2530,7 @@ Cela met l'application en évidence dans la barre des tâches.</translation <context> <name>descriptiveTime</name> <message> - <location filename="../../src/Utils.cpp" line="+210"/> + <location filename="../../src/Utils.cpp" line="+184"/> <source>Yesterday</source> <translation>Hier</translation> </message> @@ -2665,7 +2714,7 @@ Taille du média : %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>Vous avez envoyé un message audio</translation> </message> diff --git a/resources/langs/nheko_hu.ts b/resources/langs/nheko_hu.ts index a85f9ff3..7c29338c 100644 --- a/resources/langs/nheko_hu.ts +++ b/resources/langs/nheko_hu.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Meghívás megerősítése</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Biztos, hogy meg akarod hívni a következő felhasználót: %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Kitiltás feloldva a felhasználónak: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Biztosan privát csevegést akarsz indítani %1 felhasználóval?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Gyorsítótár migráció nem sikerült!</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>Titkos tároló feloldása</translation> </message> @@ -605,6 +605,44 @@ </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">Bezárás</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Példa: https://szerver.em:8787</translation> <translation>Műveletek</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1251,7 +1289,7 @@ Példa: https://szerver.em: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>nincs tárolva verzió</translation> </message> @@ -1269,6 +1307,16 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Szoba elhagyása</translation> @@ -1383,7 +1431,7 @@ Példa: https://szerver.em:8787</translation> <translation>%1 tag</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>BEÁLLÍTÁSOK</translation> </message> @@ -1439,21 +1487,22 @@ Példa: https://szerver.em:8787</translation> <translation>A titkosítás jelenleg kísérleti stádiumú és váratlan furcsaságok történhetnek.<br>Kérlek, vedd vigyelembe, hogy ha egyszer aktiváltad, nem lehet utána kikapcsolni.</translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Válasz kulcskérelmekre</translation> + <location line="+16"/> + <source>Sticker & 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>Válaszoljon-e kérés esetén a kliens munkamenetkulcsokkal automatikusan. -Óvatosan használandó, mivel ez csak egy átmeneti megoldás a végponttól -végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközhitelesítés.</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>INFÓ</translation> </message> @@ -1468,7 +1517,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <translation>Szoba verziója</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>Nem sikerült a titkosítás aktiválása: %1</translation> </message> @@ -1623,7 +1672,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <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>Az üzenet visszavonása nem sikerült: %1</translation> </message> @@ -1767,12 +1816,12 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <translation>%1 visszavonta a kopogását.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Csatlakoztál ehhez a szobához.</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> @@ -1842,7 +1891,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <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>Nem található titkosított privát csevegés ezzel a felhasználóval. Hozz létre egy titkosított privát csevegést vele, és próbáld újra!</translation> </message> @@ -2478,7 +2527,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő <context> <name>descriptiveTime</name> <message> - <location filename="../../src/Utils.cpp" line="+210"/> + <location filename="../../src/Utils.cpp" line="+184"/> <source>Yesterday</source> <translation>Tegnap</translation> </message> @@ -2662,7 +2711,7 @@ Média mérete: %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>Küldtél egy hangfájlt</translation> </message> diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts index 6056b31a..5a1d45f8 100644 --- a/resources/langs/nheko_it.ts +++ b/resources/langs/nheko_it.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Conferma Invito</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Vuoi davvero inviare %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Rimosso il ban dall'utente: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Sei sicuro di voler avviare una chat privata con %1?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Migrazione della cache fallita!</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>Decifra i segreti</translation> </message> @@ -605,6 +605,44 @@ </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">Chiudi</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Esempio: https://server.mio:8787</translation> <translation type="unfinished">Opzioni</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1252,7 +1290,7 @@ Verificare %1 adesso?</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>nessuna versione memorizzata</translation> </message> @@ -1270,6 +1308,16 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Lascia la stanza</translation> @@ -1385,7 +1433,7 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> @@ -1441,19 +1489,22 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> + <location line="+16"/> + <source>Sticker & 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> @@ -1468,7 +1519,7 @@ Verificare %1 adesso?</translation> <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">Impossibile abilitare la crittografia: %1</translation> </message> @@ -1623,7 +1674,7 @@ Verificare %1 adesso?</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>Oscuramento del messaggio fallito: %1</translation> </message> @@ -1768,12 +1819,12 @@ Verificare %1 adesso?</translation> <translation>%1 ha oscurato la sua bussata.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Sei entrato in questa stanza.</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> @@ -1843,7 +1894,7 @@ Verificare %1 adesso?</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 type="unfinished"></translation> </message> @@ -2467,7 +2518,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>Ieri</translation> </message> @@ -2651,7 +2702,7 @@ Peso media: %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>Hai inviato una clip audio</translation> </message> diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index a8c18795..1ec862b0 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -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>永久追放を解除されたユーザー: %1</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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished">オプション</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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>バージョンが保存されていません</translation> </message> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">部屋を出る</translation> @@ -1379,7 +1427,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> @@ -1435,19 +1483,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 & 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> @@ -1462,7 +1513,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">暗号化を有効にできませんでした: %1</translation> </message> @@ -1617,7 +1668,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>メッセージを編集できませんでした: %1</translation> </message> @@ -1761,12 +1812,12 @@ Example: https://server.my:8787</source> <translation>%1がノックを編集しました。</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> @@ -1836,7 +1887,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> @@ -2460,7 +2511,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>昨日</translation> </message> @@ -2644,7 +2695,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>音声データを送信しました</translation> </message> diff --git a/resources/langs/nheko_ml.ts b/resources/langs/nheko_ml.ts index aeb704eb..011107c2 100644 --- a/resources/langs/nheko_ml.ts +++ b/resources/langs/nheko_ml.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>ക്ഷണം ഉറപ്പാക്കു</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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index ba3ceec1..b21db075 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Kamer verlaten</translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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">Je bent lid geworden van deze kamer.</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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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 @@ Mediagrootte: %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> diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 4b6c31f2..72e4e771 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -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>Czy na pewno chcesz zaprosić %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Odblokowano użytkownika: %1</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>Nie udało się przenieść pamięci podręcznej!</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> @@ -605,6 +605,44 @@ </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">Zamknij</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -908,7 +946,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1249,7 +1287,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> @@ -1267,6 +1305,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Opuść pokój</translation> @@ -1383,7 +1431,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> @@ -1439,19 +1487,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 & 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> @@ -1466,7 +1517,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">Nie udało się włączyć szyfrowania: %1</translation> </message> @@ -1621,7 +1672,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">Redagowanie wiadomości nie powiodło się: %1</translation> </message> @@ -1767,12 +1818,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">Dołączyłeś(-łaś) do tego pokoju.</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> @@ -1842,7 +1893,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> @@ -2466,7 +2517,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> @@ -2650,7 +2701,7 @@ Rozmiar multimediów: %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> diff --git a/resources/langs/nheko_pt_BR.ts b/resources/langs/nheko_pt_BR.ts index 7774ba58..b83585fb 100644 --- a/resources/langs/nheko_pt_BR.ts +++ b/resources/langs/nheko_pt_BR.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Confirmar convite</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>Usuário desbanido: %1</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>Migração do cache falhou!</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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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">Você entrou nessa sala.</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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts index cafbcdd6..a0a8c8a8 100644 --- a/resources/langs/nheko_pt_PT.ts +++ b/resources/langs/nheko_pt_PT.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts index 8ff28d24..6ea496f1 100644 --- a/resources/langs/nheko_ro.ts +++ b/resources/langs/nheko_ro.ts @@ -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>Utilizator dezinterzis: %1</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>Nu s-a putut migra cache-ul!</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> @@ -605,6 +605,44 @@ </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">Închide</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished">Opțiuni</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1251,7 +1289,7 @@ Exemplu: https://serverul.meu: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>nicio versiune stocată</translation> </message> @@ -1269,6 +1307,16 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Părăsește camera</translation> @@ -1385,7 +1433,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> @@ -1441,19 +1489,22 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> + <location line="+16"/> + <source>Sticker & 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> @@ -1468,7 +1519,7 @@ Exemplu: https://serverul.meu:8787</translation> <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">Nu s-a putut activa criptarea: %1</translation> </message> @@ -1623,7 +1674,7 @@ Exemplu: https://serverul.meu: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>Redactare mesaj eșuată: %1</translation> </message> @@ -1769,12 +1820,12 @@ Exemplu: https://serverul.meu:8787</translation> <translation>%1 și-a redactat ciocănitul.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Te-ai alăturat camerei.</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> @@ -1844,7 +1895,7 @@ Exemplu: https://serverul.meu: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 type="unfinished"></translation> </message> @@ -2468,7 +2519,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>Ieri</translation> </message> @@ -2652,7 +2703,7 @@ Dimensiune media: %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>Ai trimis un clip audio</translation> </message> diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index be97413f..67a306f2 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Подтвердите приглашение</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Вы точно хотите пригласить %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Разблокированный пользователь: %1</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Do you really want to start a private chat with %1?</source> <translation>Вы действительно хотите начать личную переписку с %1?</translation> </message> <message> - <location line="-725"/> + <location line="-727"/> <source>Cache migration failed!</source> <translation>Миграция кэша не удалась!</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>Расшифровать секреты</translation> </message> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Example: https://server.my:8787</source> <translation>Опции</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1251,7 +1289,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>нет сохраненной версии</translation> </message> @@ -1269,6 +1307,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Покинуть комнату</translation> @@ -1385,7 +1433,7 @@ Example: https://server.my:8787</source> <translation>%1 участник(ов)</translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation>НАЙСТРОЙКИ</translation> </message> @@ -1441,19 +1489,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> - <translation>Отвечать на запрос ключей</translation> + <location line="+16"/> + <source>Sticker & 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>ИНФОРМАЦИЯ</translation> </message> @@ -1468,7 +1519,7 @@ Example: https://server.my:8787</source> <translation>Версия Комнаты</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>Не удалось включить шифрование: %1</translation> </message> @@ -1623,7 +1674,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>Ошибка редактирования сообщения: %1</translation> </message> @@ -1769,12 +1820,12 @@ Example: https://server.my:8787</source> <translation>%1 отредактировал его "стук".</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Вы присоединились к этой комнате.</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> @@ -1844,7 +1895,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>Не найдено личного чата с этим пользователем. Создайте зашифрованный личный чат с этим пользователем и попытайтесь еще раз.</translation> </message> @@ -2474,7 +2525,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>Вчера</translation> </message> @@ -2658,7 +2709,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>Вы отправили аудио запись</translation> </message> diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts index 67f09710..cf425990 100644 --- a/resources/langs/nheko_si.ts +++ b/resources/langs/nheko_si.ts @@ -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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished"></translation> @@ -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 & 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> @@ -1463,7 +1514,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> @@ -1618,7 +1669,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> @@ -1763,12 +1814,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> @@ -1838,7 +1889,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> @@ -2462,7 +2513,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> @@ -2644,7 +2695,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> diff --git a/resources/langs/nheko_sv.ts b/resources/langs/nheko_sv.ts index fb662292..25db1c4b 100644 --- a/resources/langs/nheko_sv.ts +++ b/resources/langs/nheko_sv.ts @@ -157,12 +157,12 @@ </message> <message> <location line="+34"/> - <location line="+284"/> + <location line="+286"/> <source>Confirm invite</source> <translation>Bekräfta inbjudan</translation> </message> <message> - <location line="-283"/> + <location line="-285"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Är du säker på att du vill bjuda in %1 (%2)?</translation> </message> @@ -227,12 +227,12 @@ <translation>Hävde bannlysningen av användare: %1</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>Cache-migration misslyckades!</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>Dekryptera hemliga nycklar</translation> </message> @@ -605,6 +605,44 @@ </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">Stäng</translation> + </message> +</context> +<context> <name>InputBar</name> <message> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -910,7 +948,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished">Alternativ</translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> @@ -1251,7 +1289,7 @@ Exempel: https://server.my: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>ingen version lagrad</translation> </message> @@ -1269,6 +1307,16 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">Lämna rum</translation> @@ -1384,7 +1432,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="+55"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> @@ -1440,19 +1488,22 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>Respond to key requests</source> + <location line="+16"/> + <source>Sticker & 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> @@ -1467,7 +1518,7 @@ Exempel: https://server.my:8787</translation> <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">Kunde inte aktivera kryptering: %1</translation> </message> @@ -1622,7 +1673,7 @@ Exempel: https://server.my: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>Kunde inte maskera meddelande: %1</translation> </message> @@ -1767,12 +1818,12 @@ Exempel: https://server.my:8787</translation> <translation>%1 maskerade sin knackning.</translation> </message> <message> - <location line="-909"/> + <location line="-884"/> <source>You joined this room.</source> <translation>Du gick med i detta rum.</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> @@ -1842,7 +1893,7 @@ Exempel: https://server.my: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>Ingen krypterad privat chatt med denna användare kunde hittas. Skapa en krypterad privat chatt med användaren och försök igen.</translation> </message> @@ -2474,7 +2525,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.< <context> <name>descriptiveTime</name> <message> - <location filename="../../src/Utils.cpp" line="+210"/> + <location filename="../../src/Utils.cpp" line="+184"/> <source>Yesterday</source> <translation>Igår</translation> </message> @@ -2658,7 +2709,7 @@ Mediastorlek: %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 skickade ett ljudklipp</translation> </message> diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index c84e3c82..75e9db95 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -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>解禁用户: %1</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>缓存迁移失败！</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> @@ -605,6 +605,44 @@ </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> <location filename="../../src/timeline/InputBar.cpp" line="+234"/> @@ -906,7 +944,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+394"/> + <location line="+405"/> <source>&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> @@ -1265,6 +1303,16 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> + <location line="+9"/> + <source>Leave Room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Are you sure you want to leave this room?</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+7"/> <source>Leave room</source> <translation type="unfinished">离开聊天室</translation> @@ -1379,7 +1427,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> @@ -1435,19 +1483,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 & 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> @@ -1462,7 +1513,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">启用加密失败：%1</translation> </message> @@ -1617,7 +1668,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">删除消息失败：%1</translation> </message> @@ -1761,12 +1812,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> @@ -1836,7 +1887,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> @@ -2460,7 +2511,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> @@ -2644,7 +2695,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> diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index accb5637..b8e527a5 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -233,23 +233,6 @@ ApplicationWindow { } MatrixText { - visible: roomSettings.isEncryptionEnabled - text: qsTr("Respond to key requests") - } - - ToggleButton { - visible: roomSettings.isEncryptionEnabled - ToolTip.text: qsTr("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.") - checked: roomSettings.respondsToKeyRequests - onClicked: { - roomSettings.changeKeyRequestsPreference(checked); - } - Layout.alignment: Qt.AlignRight - } - - MatrixText { text: qsTr("Sticker & Emote Settings") } diff --git a/src/Olm.cpp b/src/Olm.cpp index 0c9962f9..69503e6e 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -964,13 +964,12 @@ handle_key_request_message(const mtx::events::DeviceEvent<mtx::events::msg::KeyR } } - if (!verifiedDevice && !shouldSeeKeys && - !utils::respondsToKeyRequests(req.content.room_id)) { + if (!verifiedDevice && !shouldSeeKeys) { nhlog::crypto()->debug("ignoring key request for room {}", req.content.room_id); return; } - if (verifiedDevice || utils::respondsToKeyRequests(req.content.room_id)) { + if (verifiedDevice) { // share the minimum index we have minimumIndex = -1; } diff --git a/src/Utils.cpp b/src/Utils.cpp index 484b45cf..41013e39 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -172,32 +172,6 @@ utils::scaleFactor() return settings.value("settings/scale_factor", -1).toFloat(); } -bool -utils::respondsToKeyRequests(const std::string &roomId) -{ - return respondsToKeyRequests(QString::fromStdString(roomId)); -} - -bool -utils::respondsToKeyRequests(const QString &roomId) -{ - if (roomId.isEmpty()) - return false; - - QSettings settings; - return settings.value("rooms/respond_to_key_requests/" + roomId, false).toBool(); -} - -void -utils::setKeyRequestsPreference(QString roomId, bool value) -{ - if (roomId.isEmpty()) - return; - - QSettings settings; - settings.setValue("rooms/respond_to_key_requests/" + roomId, value); -} - QString utils::descriptiveTime(const QDateTime &then) { diff --git a/src/Utils.h b/src/Utils.h index 1d48e2c7..8f37a574 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -67,15 +67,6 @@ scaleFactor(); void setScaleFactor(float factor); -//! Whether or not we should respond to key requests for the given room. -bool -respondsToKeyRequests(const QString &roomId); -bool -respondsToKeyRequests(const std::string &roomId); - -void -setKeyRequestsPreference(QString roomId, bool value); - //! Human friendly timestamp representation. QString descriptiveTime(const QDateTime &then); diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index f78ef09b..fcba8205 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -291,19 +291,6 @@ RoomSettings::accessJoinRules() return accessRules_; } -bool -RoomSettings::respondsToKeyRequests() -{ - return usesEncryption_ && utils::respondsToKeyRequests(roomid_); -} - -void -RoomSettings::changeKeyRequestsPreference(bool isOn) -{ - utils::setKeyRequestsPreference(roomid_, isOn); - emit keyRequestsChanged(); -} - void RoomSettings::enableEncryption() { diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h index cf36f795..1c8b47d6 100644 --- a/src/ui/RoomSettings.h +++ b/src/ui/RoomSettings.h @@ -78,7 +78,6 @@ class RoomSettings : public QObject Q_PROPERTY(bool canChangeJoinRules READ canChangeJoinRules CONSTANT) Q_PROPERTY(bool canChangeNameAndTopic READ canChangeNameAndTopic CONSTANT) Q_PROPERTY(bool isEncryptionEnabled READ isEncryptionEnabled NOTIFY encryptionChanged) - Q_PROPERTY(bool respondsToKeyRequests READ respondsToKeyRequests NOTIFY keyRequestsChanged) public: RoomSettings(QString roomid, QObject *parent = nullptr); @@ -91,7 +90,6 @@ public: int memberCount() const; int notifications(); int accessJoinRules(); - bool respondsToKeyRequests(); bool isLoading() const; //! Whether the user has enough power level to send m.room.join_rules events. bool canChangeJoinRules() const; @@ -106,7 +104,6 @@ public: Q_INVOKABLE void openEditModal(); Q_INVOKABLE void changeAccessRules(int index); Q_INVOKABLE void changeNotifications(int currentIndex); - Q_INVOKABLE void changeKeyRequestsPreference(bool isOn); signals: void loadingChanged(); @@ -114,7 +111,6 @@ signals: void roomTopicChanged(); void avatarUrlChanged(); void encryptionChanged(); - void keyRequestsChanged(); void notificationsChanged(); void accessJoinRulesChanged(); void displayError(const QString &errorMessage); |