diff --git a/resources/langs/nheko_ca.ts b/resources/langs/nheko_ca.ts
index c713088bd90d6ccc40beb4606cc76186d699198d..aa521bbb36b3b7d02cbd698e5d2dcdc283195cec 100644
--- a/resources/langs/nheko_ca.ts
+++ b/resources/langs/nheko_ca.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,8 +1191,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1186,27 +1214,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1219,12 +1247,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1249,8 +1277,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1289,7 +1317,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1369,12 +1397,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1409,7 +1432,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1437,7 +1465,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1465,12 +1493,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1480,7 +1518,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1491,18 +1529,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1516,6 +1554,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1528,7 +1571,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1591,12 +1634,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1748,29 +1791,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1795,7 +1838,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1805,10 +1848,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1816,7 +1910,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1957,12 +2051,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2002,8 +2096,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2017,6 +2111,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2067,7 +2189,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2092,12 +2219,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,8 +2249,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2169,6 +2291,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2191,7 +2318,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2199,7 +2326,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2250,7 +2377,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,105 +2617,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2751,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2675,7 +2803,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2819,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2885,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3012,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3331,12 +3454,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3370,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3429,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3637,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3709,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3794,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3999,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4063,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4127,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4158,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4283,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4342,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4366,7 +4504,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts
index fb5b43822f213f18dc704583ab274fe4d637febf..b8255ea7bdcc674cd6bfc70e4bedc9dfa635aca4 100644
--- a/resources/langs/nheko_cs.ts
+++ b/resources/langs/nheko_cs.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -200,12 +228,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -220,13 +243,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -307,7 +324,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -335,7 +357,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -389,12 +417,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -461,23 +489,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -504,12 +532,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -595,7 +623,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1071,7 +1099,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1081,7 +1109,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,8 +1193,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1188,27 +1216,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1221,12 +1249,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1251,8 +1279,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1291,7 +1319,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1371,12 +1399,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1411,7 +1434,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1439,7 +1467,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1467,12 +1495,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1482,7 +1520,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1493,18 +1531,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1518,6 +1556,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1530,7 +1573,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1593,12 +1636,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1750,29 +1793,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1797,7 +1840,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1807,10 +1850,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1818,7 +1912,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1959,12 +2053,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2004,8 +2098,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2019,6 +2113,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2069,7 +2191,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2094,12 +2221,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2129,8 +2251,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2171,6 +2293,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2193,7 +2320,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2201,7 +2328,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2252,7 +2379,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2494,105 +2621,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2627,12 +2755,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2679,7 +2807,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2695,7 +2823,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2761,7 +2889,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2824,7 +2952,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2849,7 +2977,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2884,7 +3012,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2970,19 +3098,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3017,12 +3145,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3340,12 +3463,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3379,10 +3507,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3439,17 +3572,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3648,7 +3786,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3720,12 +3858,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3805,12 +3938,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -4010,12 +4138,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4165,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4074,14 +4192,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4208,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4108,7 +4229,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4138,12 +4286,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4169,12 +4312,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4294,7 +4432,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4353,7 +4491,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4377,7 +4515,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 5ed85bd425b79d78ea2d27e4812ed83c8e0d1449..9be4599f518e0b6ac83acc0a9786b5714392cea5 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -99,10 +99,38 @@
<translation>Hinzufügen</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 und %n anderer Teilnehmer</numerusform>
@@ -199,12 +227,7 @@
<translation>Eingeladener Benutzer: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Das Migrieren des Caches auf die aktuelle Version ist fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte melde den Fehler und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du den Cache manuell löschen.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Das Datenbankformat auf der Festplatte ist neuer als die von dieser Nhekoversion unterstützte Version. Bitte update Nheko oder lösche die Datenbank.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Raumbeitritt anfragen (anklopfen)</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Konnte %1 nicht betreten. Du kannst stattdessen versuchen anzuklopfen, damit andere Leute bescheid wissen, dass sie dich einladen sollen. Möchtest du das versuchen?
-Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sollen:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Möchstest du wirklich an %1 anklopfen? Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sollen:</translation>
</message>
@@ -307,7 +323,12 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<translation>Migration des Caches fehlgeschlagen!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Inkompatible Version des Caches</translation>
</message>
@@ -335,7 +356,13 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<translation>Bitte melde dich erneut an: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Konnte Raum nicht betreten: %1</translation>
</message>
@@ -389,13 +416,13 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Zeige keine Benachrichtigungen für diese Gruppierung oder diesen Tag an.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Verstecke Räume mit diesem Tag oder von dieser Gruppe standardmäßig.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,24 +488,24 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<translation>Nachrichten von deinem Server oder Administrator.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Konnte untergeordneten Raum nicht aktualisieren: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Konnte untergeordneten Raum nicht löschen: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Konnte übergeordneten Raum nicht aktualisieren: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Konnte übergeordneten Raum nicht löschen: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -503,13 +530,13 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>Dieser Raum kann nicht direkt betreten werden. Du kannst stattdessen anklopfen und die existierenden Mitglieder können den Beitritt akzeptieren oder ablehnen. Zusätzlich kannst du hier einen Grund angeben, warum du beitreten willst:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Möchtest du den Raum betreten? Du kannst unten einen Grund angeben:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Möchtest du den Raum betreten? Du kannst unten einen Grund angeben:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -594,8 +621,8 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Öffentliche Räume können von jedem betreten werden, private Räume brauchen eine Einladung.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1097,7 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Datei auswählen</translation>
</message>
@@ -1080,7 +1107,7 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
<translation>Alle Dateien (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Das Hochladen von '%1' ist fehlgeschlagen</translation>
</message>
@@ -1164,14 +1191,11 @@ Du kannst zusätzlich einen Grund angeben, warum die anderen dich reinlassen sol
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Dein Anmeldename sollte mit einem @ anfangen, gefolgt von deinem Benutzernamen. Nach deinem Benutzernamen sollte ein Doppelpunkt (:) und der Servername folgen.
-Nach dem Doppelpunkt kann alternativ die Serveradresse (mit oder ohne Port) angegeben werden, wenn der Server nicht via .well-known auffindbar ist.
-Beispiel: @benutzer:dein.server
-Wenn Nheko deinen Server nicht automatisch erkennen kann, bekommst du eine Eingabemaske gezeigt in die du die Serverdaten manuell eintragen kannst.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,11 +1214,17 @@ Wenn Nheko deinen Server nicht automatisch erkennen kann, bekommst du eine Einga
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Ein Name für dieses Gerät, das anderen angezeigt wird, wenn Sie deine Geräte verifizieren. Wird keiner angegeben, wird ein Standard genutzt.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Heimserveradresse</translation>
</message>
@@ -1204,14 +1234,7 @@ Wenn Nheko deinen Server nicht automatisch erkennen kann, bekommst du eine Einga
<translation>dein.server:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Die Adresse unter der dein Heimserver erreichbar ist.
-Beispiel: https://mein.server:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ANMELDEN</translation>
</message>
@@ -1224,12 +1247,12 @@ Beispiel: https://mein.server:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Du hast eine invalide Matrix ID eingegeben. Normalerwise sehen die so aus: @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation>
</message>
@@ -1254,9 +1277,9 @@ Beispiel: https://mein.server:8787</translation>
<translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>Der ausgewählte Server spricht nicht die gleiche Version des Matrixprotocols (v1.1, v1.2 oder v1.3) wie Nheko. Du kannst dich nicht anmelden.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1294,7 +1317,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Leeres Passwort</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO Anmeldung fehlgeschlagen</translation>
</message>
@@ -1375,8 +1398,8 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 hat die übergeordneten Spaces für diesen Raum geändert.</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1442,7 +1465,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Schreibe eine Nachricht…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Sticker</translation>
</message>
@@ -1470,12 +1493,22 @@ Beispiel: https://mein.server:8787</translation>
<translation>Bearbeiten</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reaktion senden</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Antworten</translation>
</message>
@@ -1485,7 +1518,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Optionen</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Grund für die Löschung</translation>
</message>
@@ -1496,18 +1529,18 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopieren</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopiere &Link</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&agieren</translation>
</message>
@@ -1521,6 +1554,11 @@ Beispiel: https://mein.server:8787</translation>
<source>&Edit</source>
<translation>&Editieren</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1571,8 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Lesebes&tätigungen</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1596,13 +1634,13 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Damit andere Nutzer sehen, welche Geräte tatsächlich dir gehören, kannst du sie verifizieren. Das erlaubt auch Schlüsselbackup zu nutzen ohne ein Passwort einzugeben. Jetzt ein unverifiziertes Gerät verifizieren? (Bitte stelle sicher, dass sich das unverifizierte Gerät in deiner Nähe befindet.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Damit andere Nutzer sehen, welche Geräte tatsächlich dir gehören, kannst du sie verifizieren. Das erlaubt auch Schlüsselbackup zu nutzen ohne ein Passwort einzugeben. %1 jetzt verifizieren?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Administrator (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderator (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Benutzer (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Benutzerdefiniert (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Eventtyp entfernen</translation>
</message>
@@ -1800,7 +1838,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Verschiebe Nutzer zwischen Rollen um deren Rolle zu ändern</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Benutzer entfernen</translation>
</message>
@@ -1810,10 +1848,61 @@ Beispiel: https://mein.server:8787</translation>
<translation>Benutzer hinzufügen</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Konnte Berechtigungen nicht aktualisieren: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Konnte Berechtigungen nicht aktualisieren: %1</translation>
</message>
@@ -1821,7 +1910,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Andere Events</translation>
</message>
@@ -1962,13 +2051,13 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Liste untergeordneter Räume modifizieren</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Liste übergeordneter Räume modifizieren</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2007,9 +2096,9 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Benutze ein separates Profil, wodurch mehrere Accounts und Nheko-Instanzen zur gleichen Zeit verwendet werden können.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2111,34 @@ Beispiel: https://mein.server:8787</translation>
<translation>Profilname</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Beispiel: https://mein.server:8787</translation>
<translation>Passwortbestätigung</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Heimserver</translation>
</message>
@@ -2097,12 +2219,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Gerätename</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Ein Name für dieses Gerät, das der anderen Seite gezeigt wird, wenn das Gerät verifiziert wird. Wird nichts angegeben, wird einer generiert.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTRIEREN</translation>
</message>
@@ -2132,9 +2249,9 @@ Beispiel: https://mein.server:8787</translation>
<translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>Der ausgewählte Server spricht nicht die gleiche Version des Matrixprotocols (v1.1, v1.2 oder v1.3) wie Nheko. Du kannst dich nicht registrieren.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2174,6 +2291,11 @@ Beispiel: https://mein.server:8787</translation>
<source>Cancel Edit</source>
<translation>Editieren abbrechen</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>keine Version gespeichert</translation>
</message>
@@ -2204,7 +2326,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Neuer Tag</translation>
</message>
@@ -2255,8 +2377,8 @@ Beispiel: https://mein.server:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Zu Gruppe hinzufügen oder entfernen</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2495,42 +2617,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Alle Nachrichten</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Zugangsberechtigungen</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Jeder (inkl. Gäste)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Jeder</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Eingeladene Nutzer</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Durch Anklopfen</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Durch Teilnahme an anderen Räumen</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Durch Teilnahme an anderen Räumen oder Anklopfen</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Verschlüsselung</translation>
</message>
@@ -2567,17 +2654,13 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
<translation>Sticker- & Emoteeinstellungen</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Ändern</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Ändere welche Packungen aktiviert sind, entferne oder erstelle neue Packungen</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Versteckte Events</translation>
</message>
@@ -2589,12 +2672,52 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
<translation>Konfigurieren</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Raumaddressen</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Wähle aus, weche Events in diesem Raum angezeigt werden</translation>
</message>
@@ -2629,12 +2752,12 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
<translation>mehr anzeigen</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Wähle einen Avatar</translation>
</message>
@@ -2681,7 +2804,7 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Bitte gib dein Anmeldepassword an um fortzufahren:</translation>
</message>
@@ -2697,8 +2820,8 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Bitte gib das Token ein, dass dir soeben zugesendet wurde:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2886,7 @@ Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert wer
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Verbindung zum kryptografischen Speicher fehlgeschlagen</translation>
</message>
@@ -2828,7 +2951,7 @@ Wenn du verifizieren wählst, musst du dein anderes Gerät zur Hand haben. Wenn
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Quersignaturschlüssel konnten nicht erzeugt werden!</translation>
</message>
@@ -2853,7 +2976,7 @@ Wenn du verifizieren wählst, musst du dein anderes Gerät zur Hand haben. Wenn
<translation>Konfiguration der Verschlüsselung fehlgeschlagen: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Die Identitätschlüssel haben sich geändert. Das stört die Verschlüsselung, deswegen wirst du abgemeldet.</translation>
</message>
@@ -2888,8 +3011,8 @@ Wenn du verifizieren wählst, musst du dein anderes Gerät zur Hand haben. Wenn
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Zur Gruppe hinzufügen oder entfernen</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2974,19 +3097,19 @@ Wenn du verifizieren wählst, musst du dein anderes Gerät zur Hand haben. Wenn
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Event konnte nicht verschlüsselt werden, senden wurde abgebrochen!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Bild speichern</translation>
</message>
@@ -3020,12 +3143,7 @@ Wenn du verifizieren wählst, musst du dein anderes Gerät zur Hand haben. Wenn
<translation>%1 hat diesen Raum öffentlich gemacht.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 hat eingestellt, dass dieser Raum eine Einladung benötigt um beizutreten.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 hat erlaubt Leuten diesen Raum durch Anklopfen beizutreten.</translation>
</message>
@@ -3340,12 +3458,17 @@ Grund: %4</translation>
<translation>%1 hat das Anklopfen zurückgezogen.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Du bist dem Raum beigetreten.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 hat %2 eingeladen.</translation>
</message>
@@ -3379,10 +3502,15 @@ Grund: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Bearbeitet</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3566,22 @@ Grund: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Zurück zur Raumliste</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Kein Raum ausgewählt</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Zeige Raummitglieder an.</translation>
</message>
@@ -3646,7 +3779,7 @@ Grund: %4</translation>
<translation>Verifizierung zurückziehen</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Gerät %1 abmelden</translation>
</message>
@@ -3718,12 +3851,7 @@ Grund: %4</translation>
<translation>Im Benachrichtigungsfeld starten</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Gruppen-Seitenleiste</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Sende Nachrichten als Markdown formatiert</translation>
</message>
@@ -3803,12 +3931,7 @@ Grund: %4</translation>
<translation>Entschlüssele Nachrichten in der Raumliste</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Zeige Benachrichtigungsanzahl für diese Gruppe</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Blickschutz</translation>
</message>
@@ -4008,12 +4131,7 @@ Grund: %4</translation>
<translation>Ändere den Klingelton für eingehende Anrufe</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Setze die maximale Breite für die Nachrichtenliste (in Pixeln). Das kann Nachrichten auf breiten Bildschirmen verbessern, wenn Nheko im Vollbildmodus verwendet wird.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4160,7 @@ Maximaler Wert ist eine Stunde (3600 Sekunden).</translation>
<translation>Starte die Applikation im Hintergrund ohne ein Fenster zu öffnen.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Seitenleiste mit Gruppen und Tags neben der Raumliste.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Nutze Markdown als Format für Nachrichten.
@@ -4076,16 +4189,7 @@ This will also enable or disable sending typing notifications to others.</source
Diese Einstellung steuert auch, ob das eigene Tippen an andere gesendet wird.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Zeige Räume mit neuen Nachrichten zuerst an.
-Wenn das aus ist, werden die Räume in der Raumliste rein nach dem Sendezeitpunkt der letzten Nachricht sortiert.
-Wenn das eingeschaltet ist, werden Nachrichten mit aktiven Erwähnung zuerst sortiert (der rote Kreis). Danach kommen andere Benachrichtigungen (weißer Kreis) und zuletzt stummgeschaltete Räume sortiert nach deren Zeitstempel.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Zeige Knöpfe für das schnelle Antworten, Reagieren und zusätzliche Optionen neben jeder Nachricht.</translation>
</message>
@@ -4102,7 +4206,17 @@ OFF - square, ON - circle.</source>
AUS - Quadratisch, AN - Kreisförmig.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>Der Schlüssel um deine eigenen Geräte zu verifizieren. Wenn dieser im Cache ist, dann werden alle deine Geräte als verifiziert für andere Nutzer erscheinen, wenn du diese verifiziert hast.</translation>
</message>
@@ -4114,7 +4228,34 @@ This usually causes the application icon in the task bar to animate in some fash
Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4149,12 +4290,7 @@ Only affects messages in encrypted chats.</source>
Betrifft nur Nachrichten in verschlüsselten Chats.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Wähle aus ob die Benachrichtigungsanzahl von Gruppen angezeigt wird.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Die Zeitliste wird unscharf, wenn das Fenster den Fokus verliert.</translation>
@@ -4180,12 +4316,7 @@ be blurred.</source>
<translation>Sendet Schlüssel für verschlüsselte Nachrichten nur an verifizierte Geräte. Das erhöht die Sicherheit, aber macht die Ende-zu-Ende Verschlüsselung komplizierter, weil jeder Nutzer verifiziert werden muss.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Automatisch Schlüssel an verifizierte Nutzer weiterleiten, auch wenn der Nutzer eigentlich keinen Zugriff auf diese Schlüssel haben sollte.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Speichere eine Kopie der Nachrichtenschlüssel verschlüsselt auf dem Server.</translation>
</message>
@@ -4307,7 +4438,7 @@ Diese Einstellung benötigt einen Neustart von Nheko.</translation>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4366,7 +4497,7 @@ Diese Einstellung benötigt einen Neustart von Nheko.</translation>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Gestern</translation>
</message>
@@ -4390,8 +4521,8 @@ Diese Einstellung benötigt einen Neustart von Nheko.</translation>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Öffne das Fallback, folge den Anweisungen und bestätige nach Abschluss via "Bestätigen".</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index c7517e338339f48da2f8782025d7d6c7658a3abb..a6c65c4fb34ed180487002dd8802ac26e474bbf5 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished">Διάλεξε Îνα αÏχείο</translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished">Όλα τα αÏχεία (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,8 +1191,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1186,27 +1214,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ΕΙΣΟΔΟΣ</translation>
</message>
@@ -1219,12 +1247,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1249,8 +1277,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1289,7 +1317,7 @@ Example: https://server.my:8787</source>
<translation>Κενός κωδικός</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1370,7 +1398,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1437,7 +1465,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ΓÏάψε Îνα μήνυμα...</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1465,12 +1493,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1480,7 +1518,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1491,18 +1529,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1516,6 +1554,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1528,7 +1571,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1591,12 +1634,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1748,29 +1791,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1795,7 +1838,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1805,10 +1848,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1816,7 +1910,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1957,12 +2051,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2002,8 +2096,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2017,6 +2111,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2067,7 +2189,12 @@ Example: https://server.my:8787</source>
<translation>Επαλήθευση κωδικοÏ</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2092,12 +2219,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>ΕΓΓΡΑΦΗ</translation>
</message>
@@ -2127,8 +2249,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2169,6 +2291,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2191,7 +2318,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2199,7 +2326,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2250,7 +2377,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,105 +2617,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2751,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2675,7 +2803,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2819,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2885,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished">Αποθήκευση Εικόνας</translation>
</message>
@@ -3012,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3331,12 +3454,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3370,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3429,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3637,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3709,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3794,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3999,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4063,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4127,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4158,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4283,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4342,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4366,7 +4504,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 3568329818491b4cb090f304c771dd030b3cda0b..fe97cd3597ea8b5783acccd738c8a982fcc0649e 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -99,10 +99,38 @@
<translation>Add</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation>Allowed rooms settings</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation>Parent community</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation>Other room</translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation>Enter additional rooms not in the list yet...</translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 and %n other</numerusform>
@@ -199,12 +227,7 @@
<translation>Invited user: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Knock on room</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</translation>
</message>
@@ -307,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</translatio
<translation>Cache migration failed!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Incompatible cache version</translation>
</message>
@@ -335,7 +356,14 @@ You may optionally provide a reason for others to accept your knock:</translatio
<translation>Please try to login again: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Failed to join room: %1</translation>
</message>
@@ -389,13 +417,13 @@ You may optionally provide a reason for others to accept your knock:</translatio
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Do not show notification counts for this space or tag.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation>Do not show notification counts for this community or tag.</translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Hide rooms with this tag or from this space by default.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation>Hide rooms with this tag or from this community by default.</translation>
</message>
<message>
<location line="+86"/>
@@ -461,24 +489,24 @@ You may optionally provide a reason for others to accept your knock:</translatio
<translation>Messages from your server or administrator.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Failed to update space child: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation>Failed to update community: %1</translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Failed to delete space child: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation>Failed to delete room from community: %1</translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Failed to update space parent: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation>Failed to update community for room: %1</translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Failed to delete space parent: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation>Failed to remove community from room: %1</translation>
</message>
</context>
<context>
@@ -503,13 +531,13 @@ You may optionally provide a reason for others to accept your knock:</translatio
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Do you want to join this room? You can optionally add a reason below:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Do you want to join this room? You can optionally add a reason below:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</translation>
</message>
<message>
<location line="+32"/>
@@ -594,8 +622,8 @@ You may optionally provide a reason for others to accept your knock:</translatio
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Public rooms can be joined by anyone, private rooms need explicit invites.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation>Public rooms can be joined by anyone; private rooms need explicit invites.</translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1098,7 @@ You may optionally provide a reason for others to accept your knock:</translatio
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Select a file</translation>
</message>
@@ -1080,7 +1108,7 @@ You may optionally provide a reason for others to accept your knock:</translatio
<translation>All Files (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Upload of '%1' failed</translation>
</message>
@@ -1164,12 +1192,12 @@ You may optionally provide a reason for others to accept your knock:</translatio
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <translation>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</translation>
</message>
@@ -1190,11 +1218,18 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Homeserver address</translation>
</message>
@@ -1204,14 +1239,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>The address that can be used to contact your homeserver's client API.
-Example: https://server.my:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>LOGIN</translation>
</message>
@@ -1224,12 +1252,12 @@ Example: https://server.my:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>You have entered an invalid Matrix ID e.g @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Autodiscovery failed. Received malformed response.</translation>
</message>
@@ -1254,9 +1282,9 @@ Example: https://server.my:8787</translation>
<translation>An unknown error occured. Make sure the homeserver domain is valid.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</translation>
</message>
<message>
<location line="+20"/>
@@ -1294,7 +1322,7 @@ Example: https://server.my:8787</translation>
<translation>Empty password</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO login failed</translation>
</message>
@@ -1374,12 +1402,7 @@ Example: https://server.my:8787</translation>
<translation>%1 changed the addresses for this room.</translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 changed the parent spaces for this room.</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 created and configured room: %2</translation>
</message>
@@ -1414,7 +1437,12 @@ Example: https://server.my:8787</translation>
<translation>%1 answered the call.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation>%1 changed the parent communities for this room.</translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 ended the call.</translation>
</message>
@@ -1442,7 +1470,7 @@ Example: https://server.my:8787</translation>
<translation>Write a message…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Stickers</translation>
</message>
@@ -1470,12 +1498,22 @@ Example: https://server.my:8787</translation>
<translation>Edit</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>React</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation>Reply in thread</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation>New thread</translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Reply</translation>
</message>
@@ -1485,7 +1523,7 @@ Example: https://server.my:8787</translation>
<translation>Options</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Reason for removal</translation>
</message>
@@ -1496,18 +1534,18 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Copy</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Copy &link location</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&act</translation>
</message>
@@ -1521,6 +1559,11 @@ Example: https://server.my:8787</translation>
<source>&Edit</source>
<translation>&Edit</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation>&Thread</translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1576,8 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Read receip&ts</translation>
+ <source>&Read receipts</source>
+ <translation>&Read receipts</translation>
</message>
<message>
<location line="+6"/>
@@ -1596,12 +1639,12 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</translation>
</message>
<message>
@@ -1753,29 +1796,29 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Administrator (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderator (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>User (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Custom (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Remove event type</translation>
</message>
@@ -1800,7 +1843,7 @@ Example: https://server.my:8787</translation>
<translation>Move users up or down to change their permissions</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Remove user</translation>
</message>
@@ -1810,10 +1853,61 @@ Example: https://server.my:8787</translation>
<translation>Add user</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation>Apply permission changes</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation>Which of the subcommunities and rooms should these permissions be applied to?</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation>Apply permissions recursively</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation>Overwrite exisiting modifications in rooms</translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation>No permissions to apply the new permissions here</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation>No changes needed</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation>Existing modifications to the permissions in this room will be overwritten</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation>Permissions synchronized with community</translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation>Failed to update powerlevel: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Failed to update powerlevel: %1</translation>
</message>
@@ -1821,7 +1915,7 @@ Example: https://server.my:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Other events</translation>
</message>
@@ -1962,13 +2056,13 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Edit child rooms</translation>
+ <source>Edit child communities and rooms</source>
+ <translation>Edit child communities and rooms</translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Change parent spaces</translation>
+ <source>Change parent communities</source>
+ <translation>Change parent communities</translation>
</message>
<message>
<location line="+3"/>
@@ -2007,9 +2101,9 @@ Example: https://server.my:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2116,34 @@ Example: https://server.my:8787</translation>
<translation>profile name</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation>Alias for '--log-level trace'.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation>level</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation>type</translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2194,12 @@ Example: https://server.my:8787</translation>
<translation>Password confirmation</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Homeserver</translation>
</message>
@@ -2097,12 +2224,7 @@ Example: https://server.my:8787</translation>
<translation>Device name</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTER</translation>
</message>
@@ -2132,9 +2254,9 @@ Example: https://server.my:8787</translation>
<translation>An unknown error occured. Make sure the homeserver domain is valid.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</translation>
</message>
<message>
<location line="+11"/>
@@ -2174,6 +2296,11 @@ Example: https://server.my:8787</translation>
<source>Cancel Edit</source>
<translation>Cancel Edit</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation>Cancel Thread</translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2323,7 @@ Example: https://server.my:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>no version stored</translation>
</message>
@@ -2204,7 +2331,7 @@ Example: https://server.my:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>New tag</translation>
</message>
@@ -2255,8 +2382,8 @@ Example: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Add or remove from space</translation>
+ <source>Add or remove from community...</source>
+ <translation>Add or remove from community...</translation>
</message>
<message>
<location line="+263"/>
@@ -2495,42 +2622,7 @@ Example: https://server.my:8787</translation>
<translation>All messages</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Room access</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Anyone and guests</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Anyone</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Invited users</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>By knocking</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Restricted by membership in other rooms</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Restricted by membership in other rooms or by knocking</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Encryption</translation>
</message>
@@ -2567,17 +2659,13 @@ Please take note that it can't be disabled afterwards.</translation>
<translation>Sticker & Emote Settings</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Change</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Change what packs are enabled, remove packs or create new ones</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Hidden events</translation>
</message>
@@ -2589,12 +2677,52 @@ Please take note that it can't be disabled afterwards.</translation>
<translation>Configure</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation>Anyone can join</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation>Allow knocking</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation>Allow joining via other rooms</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation>Rooms to join via</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation>Change the list of rooms users can join this room via. Usually this is the official community of this room.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation>Allow guests to join</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation>Apply access rules</translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Aliases</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation>Change what packs are enabled, remove packs, or create new ones</translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Select events to hide in this room</translation>
</message>
@@ -2629,12 +2757,12 @@ Please take note that it can't be disabled afterwards.</translation>
<translation>show more</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Failed to enable encryption: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Select an avatar</translation>
</message>
@@ -2681,7 +2809,7 @@ Please take note that it can't be disabled afterwards.</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Please enter your login password to continue:</translation>
</message>
@@ -2697,8 +2825,8 @@ Please take note that it can't be disabled afterwards.</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Please enter the token, which has been sent to you:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation>Please enter the token which has been sent to you:</translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2891,7 @@ Please take note that it can't be disabled afterwards.</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Failed to connect to secret storage</translation>
</message>
@@ -2828,7 +2956,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Failed to create keys for cross-signing!</translation>
</message>
@@ -2853,7 +2981,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>Encryption setup failed: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Identity key changed. This breaks E2EE, so logging out.</translation>
</message>
@@ -2888,8 +3016,8 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Add or remove from space</translation>
+ <source>Add or remove from community</source>
+ <translation>Add or remove from community</translation>
</message>
<message>
<location line="+12"/>
@@ -2974,19 +3102,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Message redaction failed: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Failed to encrypt event, sending aborted!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Save image</translation>
</message>
@@ -3020,12 +3148,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 opened the room to the public.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 made this room require an invitation to join.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 allowed to join this room by knocking.</translation>
</message>
@@ -3340,12 +3463,17 @@ Reason: %4</translation>
<translation>%1 redacted their knock.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>You joined this room.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation>%1 made this room require an invitation to join.</translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 invited %2.</translation>
</message>
@@ -3379,10 +3507,15 @@ Reason: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Edited</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation>Part of a thread</translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3571,22 @@ Reason: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Back to room list</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>No room selected</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation>In %1</translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Show room members.</translation>
</message>
@@ -3646,7 +3784,7 @@ Reason: %4</translation>
<translation>Unverify</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Sign out device %1</translation>
</message>
@@ -3718,12 +3856,7 @@ Reason: %4</translation>
<translation>Start in tray</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Groups sidebar</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Send messages as Markdown</translation>
</message>
@@ -3803,12 +3936,7 @@ Reason: %4</translation>
<translation>Decrypt messages in sidebar</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Show message counts for spaces</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Privacy Screen</translation>
</message>
@@ -4008,12 +4136,7 @@ Reason: %4</translation>
<translation>Set the notification sound to play when a call invite arrives</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4165,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation>Start the application in the background without showing the client window.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Show a column containing groups and tags next to the room list.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Allow using markdown in messages.
@@ -4076,16 +4194,7 @@ This will also enable or disable sending typing notifications to others.</source
This will also enable or disable sending typing notifications to others.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Show buttons to quickly reply, react or access additional options next to each message.</translation>
</message>
@@ -4102,7 +4211,17 @@ OFF - square, ON - circle.</source>
OFF - square, ON - circle.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation>Choose where to show the total number of notifications contained within a community or tag.</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</translation>
</message>
@@ -4114,7 +4233,36 @@ This usually causes the application icon in the task bar to animate in some fash
This usually causes the application icon in the task bar to animate in some fashion.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation>Communities sidebar</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation>Show message counts for communities and tags</translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation>Show a column containing communities and tags next to the room list.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4149,12 +4297,7 @@ Only affects messages in encrypted chats.</source>
Only affects messages in encrypted chats.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Choose where to show the total number of notifications contained within a space.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>When the window loses focus, the timeline will
@@ -4181,12 +4324,7 @@ be blurred.</translation>
<translation>Requires a user to be verified to send encrypted messages to them. This improves safety but makes E2EE more tedious.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Download message encryption keys from and upload to the encrypted online key backup.</translation>
</message>
@@ -4308,7 +4446,7 @@ This setting will take effect upon restart.</translation>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4367,7 +4505,7 @@ This setting will take effect upon restart.</translation>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Yesterday</translation>
</message>
@@ -4391,7 +4529,7 @@ This setting will take effect upon restart.</translation>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation>Open the fallback, follow the steps, and confirm after completing them.</translation>
</message>
</context>
diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts
index f3d0636bf794b4491971404b300397ed2e3092a6..0d4489880b9f55988ef761864453acc727cfe1dc 100644
--- a/resources/langs/nheko_eo.ts
+++ b/resources/langs/nheko_eo.ts
@@ -99,10 +99,38 @@
<translation>Aldoni</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation>Invitita uzanto: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Malsukcesis migrado de kaÅmemoro al nuna versio. Tio povas havi diversajn kialojn. Bonvolu raporti eraron kaj dume provi malpli novan version. Alternative, vi povas provi forigi la kaÅmemoron permane.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>La kaÅmemoro sur via disko pli novas, ol tio, kion povas subteni ĉi tiu versio de Nheko. Bonvolu Äisdatigi Nhekon aÅ vakigi vian kaÅmemoron.</translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -307,7 +324,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Malsukcesis migrado de kaÅmemoro!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Neakorda versio de kaÅmemoro</translation>
</message>
@@ -335,7 +357,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Bonvolu provi resaluti: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Malsukcesis aliÄi al ĉambro: %1</translation>
</message>
@@ -389,13 +417,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Implicite kaÅi ĉambrojn kun ĉi tiu etikedo aÅ de ĉi tiu aro.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,23 +489,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>MesaÄoj de via servilo aÅ administranto.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -503,12 +531,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -594,7 +622,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1070,7 +1098,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Elektu dosieron</translation>
</message>
@@ -1080,7 +1108,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Ĉiuj dosieroj (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1164,14 +1192,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Via saluta nomo. Matriksa identigilo devus komenciÄi per @ sekvata de la identigilo de uzanto. Post la identigilo, vi devas meti nomon de via servilo post :.
-Vi ankaÅ povas enmeti adreson de via hejmservilo, se via servilo ne subtenas bone-konatan trovmanieron.
-Ekzemplo: @uzanto:servilo.mia
-Se Nheko malsukcesas trovi vian hejmservilon, Äi montros kampon por Äia permana aldono.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,12 +1215,17 @@ Se Nheko malsukcesas trovi vian hejmservilon, Äi montros kampon por Äia perman
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translatorcomment>Wow, I had to use dictionaries a lot to get this, so there may be a number of mistakes :P</translatorcomment>
- <translation>Nomo por ĉi tiu aparato, montrota al aliuloj, kiam oni kontrolos viajn aparatojn. Se vi neniun donos, uziÄos nomo implicita.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Adreso de hejmservilo</translation>
</message>
@@ -1205,15 +1235,7 @@ Se Nheko malsukcesas trovi vian hejmservilon, Äi montros kampon por Äia perman
<translation>servilo.mia:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translatorcomment>API should be valid for the EO translation of application programming interface.</translatorcomment>
- <translation>La adreso per kiu kontakteblas la klienta API de via hejmservilo.
-Ekzemplo: https://servilo.mia:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translatorcomment>Maybe shouldn't be imperative?</translatorcomment>
<translation>SALUTI</translation>
@@ -1227,12 +1249,12 @@ Ekzemplo: https://servilo.mia:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Vi enigis nevalidan identigilon de Matrikso ekz. @tacuo:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Malsukcesis memaga trovado. Ricevis misformitan respondon.</translation>
</message>
@@ -1257,8 +1279,8 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Okazis nekonata eraro. CertiÄu, ke retnomo de la hejmservilo estas valida.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1297,7 +1319,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Malplena pasvorto</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Malsukcesis ununura saluto</translation>
</message>
@@ -1378,7 +1400,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1445,7 +1467,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Skribu mesaÄon…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Glumarkoj</translation>
</message>
@@ -1473,12 +1495,22 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Redakti</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reagi</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Respondi</translation>
</message>
@@ -1488,7 +1520,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Elektebloj</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Kialo de forigo</translation>
</message>
@@ -1499,18 +1531,18 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopii</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopii celon de &ligilo</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&agi</translation>
</message>
@@ -1524,6 +1556,11 @@ Ekzemplo: https://servilo.mia:8787</translation>
<source>&Edit</source>
<translation>R&edakti</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1536,8 +1573,8 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>K&vitancoj</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1599,13 +1636,13 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Por lasi aliajn uzantojn vidi, kiuj el viaj aparatoj vere apartenas al vi, vi povas kontroli ilin. Tio ankaÅ permesas, ke savkopiado de Ålosiloj funkciu memage. Ĉu vi volas kontroli nekontrolitan aparaton nun? (Bonvolu certigi, ke unu el tiaj aparatoj disponeblas al vi.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Por vidigi al aliuloj, kiuj viaj aparatoj vere apartenas al vi, vi povas ilin kontroli. Tio ankaÅ funkciigus memagan savkopiadon de Ålosiloj. Ĉu vi volas kontroli aparaton %1 nun?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1756,29 +1793,29 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1803,7 +1840,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1813,10 +1850,61 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1824,7 +1912,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1965,12 +2053,12 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2010,9 +2098,9 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Krei unikan profilon, kiu permesos al vi saluti kelkajn kontojn samtempe, kaj startigi plurajn Nhekojn.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2025,6 +2113,34 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>nomo de profilo</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2075,7 +2191,12 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Pasvorta konfirmo</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Hejmservilo</translation>
</message>
@@ -2100,12 +2221,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation type="unfinished">Aparata nomo</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Nomo por ĉi tiu aparato, montrota al aliuloj, kiam oni kontrolos viajn aparatojn. Se vi neniun donos, uziÄos nomo implicita.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTRIÄœI</translation>
</message>
@@ -2135,8 +2251,8 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Okazis nekonata eraro. CertiÄu, ke retnomo de la hejmservilo estas valida.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2177,6 +2293,11 @@ Ekzemplo: https://servilo.mia:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2199,7 +2320,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>neniu versio konservita</translation>
</message>
@@ -2207,7 +2328,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nova etikedo</translation>
</message>
@@ -2258,7 +2379,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2498,42 +2619,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Ĉiuj mesaÄoj</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Aliro al ĉambro</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Ĉiu ajn, inkluzive gastojn</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Ĉiu ajn</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Invititoj</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Per frapado</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Limigita de aneco en aliaj ĉambroj</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Ĉifrado</translation>
</message>
@@ -2569,17 +2655,13 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Agordoj de glumarkoj kaj mienetoj</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>ÅœanÄi</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Åœalti, forigi, aÅ krei novajn pakojn</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>KaÅitaj okazoj</translation>
</message>
@@ -2591,12 +2673,52 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation>Agordi</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2631,12 +2753,12 @@ Ekzemplo: https://servilo.mia:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Malsukcesis Åalti ĉifradon: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Elektu bildon de ĉambro</translation>
</message>
@@ -2683,7 +2805,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Bonvolu enigi vian pasvorton por daÅrigi:</translation>
</message>
@@ -2699,8 +2821,8 @@ Ekzemplo: https://servilo.mia:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Bonvolu enigi la pecon, kiu sendiÄis al vi:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2765,7 +2887,7 @@ Ekzemplo: https://servilo.mia:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Malsukcesis konektiÄi al sekreta deponejo</translation>
</message>
@@ -2830,7 +2952,7 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Malsukcesis krei delege subskribajn Ålosilojn!</translation>
</message>
@@ -2855,7 +2977,7 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
<translation>Starigo de ĉifrado malsukcesis: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Identiga Ålosilo ÅanÄiÄis. Tio rompas tutvojan ĉifradon, kaj tial la programo nun adiaÅas.</translation>
</message>
@@ -2890,7 +3012,7 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2977,19 +3099,19 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Malsukcesis redaktado de mesaÄo: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Malsukcesis ĉifri okazon; sendado nuliÄis!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Konservi bildon</translation>
</message>
@@ -3023,12 +3145,7 @@ Se vi elektos kontrolon, vi devos havi alian aparaton disponeblan. Se vi elektos
<translation>%1 malfermis la ĉambron al publiko.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 ekpostulis inviton por aliÄoj al la ĉamrbo.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 permesis aliÄi al ĉi tiu ĉambro per frapado.</translation>
</message>
@@ -3344,12 +3461,17 @@ Kialo: %4</translation>
<translation>%1 forigis sian frapon.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Vi aliÄis ĉi tiun ĉambron.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3383,10 +3505,15 @@ Kialo: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Redaktita</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3442,17 +3569,22 @@ Kialo: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Reen al listo de ĉambroj</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Neniu ĉambro estas elektita</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3650,7 +3782,7 @@ Kialo: %4</translation>
<translation>Malkontroli</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>AdiaÅigi aparaton %1</translation>
</message>
@@ -3722,12 +3854,7 @@ Kialo: %4</translation>
<translation>Komenci ete sur pleto</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Flanka breto de grupoj</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Sendi mesaÄojn MarkdaÅne</translation>
</message>
@@ -3807,12 +3934,7 @@ Kialo: %4</translation>
<translation>Malĉifri mesaÄojn en flanka breto</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Privateca Åirmilo</translation>
</message>
@@ -3894,7 +4016,7 @@ Kialo: %4</translation>
<message>
<location line="+2"/>
<source>User ID</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">Identigilo de uzanto</translation>
</message>
<message>
<location line="+2"/>
@@ -4012,13 +4134,7 @@ Kialo: %4</translation>
<translation>Agordi sciigan sonon, kiu aÅdiÄos je invito al voko</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Agordas maksimuman larÄecon por mesaÄoj en la historio (en bilderoj).
-Tio povas helpi legeblecon sur larÄaj ekranoj, kiam la fenestro de Nheko grandas.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4048,12 +4164,7 @@ Maksimuma valoro estas 1 horo (3600 sekundoj)</translation>
<translation>Ekigi la aplikaĵon fone sen montro de la klienta fenestro.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Montras kolumnon kun grupoj kaj etikedoj apud la listo de ĉambroj.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Permesas uzon de MarkdaÅno en mesaÄoj.
@@ -4082,20 +4193,7 @@ This will also enable or disable sending typing notifications to others.</source
Ĉi tio ankaÅ Åaltos sciigadon pri via tajpado al aliaj.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Montras ĉambrojn kun novaj mesaÄoj kiel la unuajn.
-Kun ĉi tio malÅaltita, la listo de ĉambroj ordiÄos nur laÅ
-tempo de la lasta mesaÄo en ĉambro.
-Kun ĉi tio Åaltita, ĉambroj kun aktivaj sciigoj (eta cirklo
-kun nombro skribita ene) estos ordigitaj plej supre. Ĉambroj,
-kiujn vi silentigis, ankoraŠestos ordigitaj laŠtempo, ĉar vi
-probable ne pensas ilin same gravaj kiel la aliaj ĉambroj.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Montras butonojn apud ĉiu mesaÄo, por rapide respondi, reagi,
aÅ meti aliajn elekteblojn.</translation>
@@ -4112,7 +4210,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4124,7 +4232,34 @@ This usually causes the application icon in the task bar to animate in some fash
Ĉi tio kutime movbildigas la simbolbildon sur la pleto iumaniere.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4155,12 +4290,7 @@ Only affects messages in encrypted chats.</source>
Influas nur sur mesaÄoj en ĉifritaj babiloj.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Kiam la fenestro ne estos fokusata, la historio
@@ -4187,12 +4317,7 @@ malklariÄos.</translation>
<translation>Postulas, ke uzanto estu kontrolita, por ke Äi povu ricevi mesaÄojn. Ĉi tio plibonigas sekurecon, sed iom maloportunigas tutvojan ĉifradon.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Memage respondas al petoj de aliaj uzantoj je Ålosiloj, se tiuj uzantoj estas kontrolitaj, eĉ se la aparato ne povus aliri tiujn Ålosilojn alie.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>ElÅutu ĉifrajn Ålosilojn por mesaÄoj de la ĉifrita enreta deponejo de Ålosiloj, aÅ alÅutu ilin tien.</translation>
</message>
@@ -4312,7 +4437,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Neniu ĉifrita privata babilo kun ĉi tiu uzanto troviÄis. Kreu ĉifritan privatan babilon kun ĉi tiu uzanto kaj reprovu.</translation>
</message>
@@ -4372,7 +4497,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>HieraÅ</translation>
</message>
@@ -4396,8 +4521,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Iru al la alternativa metodo, sekvu la paÅojn, kaj fininte ilin, konfirmu.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_es.ts b/resources/langs/nheko_es.ts
index 4643e005aa154ec6d14341f99a6d3f409023491d..de8391981a56f0691f6acf977dd4a9ce7aff5046 100644
--- a/resources/langs/nheko_es.ts
+++ b/resources/langs/nheko_es.ts
@@ -99,10 +99,38 @@
<translation type="unfinished">Añadir</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 y %n otro</numerusform>
@@ -199,12 +227,7 @@
<translation>Se invitó al usuario: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>La migración de cache a la versión actual ha fallado. Esto puede deberse a diferentes razones. Por favor, reporte el incidente y mientras tanto intente usar una versión anterior. También puede probar a borrar la cache manualmente.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>La cache en su disco es más reciente de lo que esta versión de Nheko soporta. Por favor actualiza Nheko o limpia la cache.</translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Migración de cache fallida!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versión de cache incompatible</translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Por favor intenta iniciar sesión de nuevo: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>No se pudo unir a la sala %1</translation>
</message>
@@ -388,13 +416,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Esconder salas con esta etiqueta o de este espacio por defecto.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Mensajes de tu servidor o administrador.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1071,7 +1099,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Seleccionar un archivo</translation>
</message>
@@ -1081,7 +1109,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Todos los archivos (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,14 +1193,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Tu nombre para iniciar sesión. Un mxid debe empezar con @ seguido del id de usuario. Después del id de usuario debes incluir el nombre de tu servidor después de un :.
-También puedes poner la dirección de tu servidor base, si tu servidor no soporta busqueda mediante un archivo .well-known.
-Ejemplo: @usuario:mi.servidor
-Si Nheko falla en descubrir tu servidor base, te mostrara una casilla para insertar el servidor manualmente.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1191,11 +1216,17 @@ Si Nheko falla en descubrir tu servidor base, te mostrara una casilla para inser
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Nombre para este dispositivo, el cual será mostrado a otros, cuando verifiques tus dispositivos. Si no se provee uno el nombre por defecto es utilizado.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Dirección del servidor base</translation>
</message>
@@ -1205,14 +1236,7 @@ Si Nheko falla en descubrir tu servidor base, te mostrara una casilla para inser
<translation>mi.servidor:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>La dirección que se puede usar para contactar la API de cliente de tu servidor base.
-Ejemplo: https://mi.servidor:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>INICIAR SESION</translation>
</message>
@@ -1225,12 +1249,12 @@ Ejemplo: https://mi.servidor:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Has insertado un ID de Matrix invalido ej @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>El autodescubrimiento falló. Se ha recibido una respuesta malformada.</translation>
</message>
@@ -1255,8 +1279,8 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Un error desconocido ocurrió. Asegurate de que el dominio del servidor es válido.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1295,7 +1319,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Contraseña vacia</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>El inicio de sesión SSO falló</translation>
</message>
@@ -1375,12 +1399,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>%1 cambió las direcciones para esta sala.</translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 cambió el espacio principal de esta sala.</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 creó y configuró la sala: %2</translation>
</message>
@@ -1415,7 +1434,12 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>%1 atendió la llamada.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 terminó la llamada.</translation>
</message>
@@ -1443,7 +1467,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Escribe un mensaje...</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Stickers</translation>
</message>
@@ -1471,12 +1495,22 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Editar</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reaccionar</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Responder</translation>
</message>
@@ -1486,7 +1520,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Opciones</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1497,18 +1531,18 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Copiar dirección de &enlace</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&accionar</translation>
</message>
@@ -1522,6 +1556,11 @@ Ejemplo: https://mi.servidor:8787</translation>
<source>&Edit</source>
<translation>&Editar</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1534,8 +1573,8 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Vist&os</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1597,13 +1636,13 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Para permitir que otros usuarios vean qué dispositivos son tuyos, puedes verificarlos. Esto también permite que tu copia de seguridad funcione de forma automática. Verificar un dispositivo sin verificar ahora? (Por favor asegurate que tengas uno de esos dispositivos disponibles.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Para permitir que otros usuarios vean qué dispositivos son tuyos, puedes verificarlos. Esto también permite que tu copia de seguridad funcione de forma automática. Verificar %1 ahora?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1754,29 +1793,29 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1801,7 +1840,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1811,10 +1850,61 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1822,7 +1912,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1963,12 +2053,12 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2008,9 +2098,9 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Crear un perfil único, el cual te permite iniciar sesión en multiples cuentas a la vez y empezar multiples instancias de nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2023,6 +2113,34 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>nombre del perfil</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2073,7 +2191,12 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Confirmar contraseña</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Servidor base</translation>
</message>
@@ -2098,12 +2221,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation type="unfinished">Nombre de dispositivo</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Nombre para este dispositivo, el cual será mostrado a otros, cuando verifiques tus dispositivos. Si no se provee uno el nombre por defecto es utilizado.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTRARSE</translation>
</message>
@@ -2133,8 +2251,8 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Un error desconocido ocurrió. Asegurate de que el dominio del servidor es válido.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2175,6 +2293,11 @@ Ejemplo: https://mi.servidor:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2197,7 +2320,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>ninguna version guardada</translation>
</message>
@@ -2205,7 +2328,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nueva etiqueta</translation>
</message>
@@ -2256,7 +2379,7 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2497,42 +2620,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Todos los mensajes</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Accesso a la sala</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Cualquier persona e invitados</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Cualquier persona</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Usuarios invitados</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Tocando a la puerta</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Restringir por la membresÃa en otras salas</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Encriptación</translation>
</message>
@@ -2568,17 +2656,13 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation>Ajustes de Stickers & Emotes</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Cambiar</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Cambiar que paquetes están activos, eliminar paquetes o crear nuevos</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
@@ -2590,12 +2674,52 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2630,12 +2754,12 @@ Ejemplo: https://mi.servidor:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Error al activar la encriptación: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Seleccionar un avatar</translation>
</message>
@@ -2682,7 +2806,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Por favor inserta tu contraseña para iniciar sesión:</translation>
</message>
@@ -2698,8 +2822,8 @@ Ejemplo: https://mi.servidor:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Por favor inserta el token que se acaba de enviar:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2764,7 +2888,7 @@ Ejemplo: https://mi.servidor:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Hubo en error al conectarse al almacenamiento secreto</translation>
</message>
@@ -2829,7 +2953,7 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Falló en la creación de claves para firma cruzada!</translation>
</message>
@@ -2854,7 +2978,7 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q
<translation>Falló en la configuración de encriptación: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>La clave de identidad cambió. Esto rompe la E2EE, por lo que se cierra la sesión.</translation>
</message>
@@ -2889,7 +3013,7 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2975,19 +3099,19 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Falló en la eliminación del mensaje: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Falló al encriptar el evento, abortando el envÃo!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Guardar imagen</translation>
</message>
@@ -3021,12 +3145,7 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q
<translation>%1 hizo la sala pública.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 hizo que la sala requiera una invitación para unirse.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 se le permitió unirse a esta sala tocando la puerta.</translation>
</message>
@@ -3311,7 +3430,12 @@ Razón: %4</translation>
<translation>%1 cambió su avatar y su nombre a %2.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-640"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+644"/>
<source>%1 has changed their display name to %2.</source>
<translation>%1 cambió su nombre a %2.</translation>
</message>
@@ -3356,12 +3480,12 @@ Razón: %4</translation>
<translation>%1 canceló después de tocar la puerta.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Te has unido a esta sala.</translation>
</message>
<message>
- <location line="+1532"/>
+ <location line="+1573"/>
<source>%1 left after having already left!</source>
<comment>This is a leave event after the user already left and shouldn't happen apart from state resets</comment>
<translation>%1 se fue después de ya haberse ido!</translation>
@@ -3380,10 +3504,15 @@ Razón: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Editado</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3439,17 +3568,22 @@ Razón: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Volver a la lista de salas</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Ninguna sala seleccionada</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3647,7 +3781,7 @@ Razón: %4</translation>
<translation>Sin verificar</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Cerrar sesión en el dispositivo %1</translation>
</message>
@@ -3719,12 +3853,7 @@ Razón: %4</translation>
<translation type="unfinished">Abrir automáticamente después de iniciar sesión en el sistema</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Barra lateral del grupo</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Enviar mensajes en Markdown</translation>
</message>
@@ -3804,12 +3933,7 @@ Razón: %4</translation>
<translation type="unfinished">Desencriptar mensajes en la barra lateral</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished">Privacidad de pantalla</translation>
</message>
@@ -4009,12 +4133,7 @@ Razón: %4</translation>
<translation type="unfinished">Escoge el sonido de notificación para las invitaciones de llamadas</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished">Selecciona la anchura máxima en la lÃnea de tiempo (en pÃxeles) Esto puede ayudar con la legibilidad en pantallas amplias cuando Nheko este en pantalla completa</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4043,12 +4162,7 @@ Si se ajusta a 0, la pantalla se desenfoca inmediatamente después de la pérdid
<translation type="unfinished">Ejecutar la aplicación en segundo plano sin mostrar la ventana del cliente.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished">Mostrar una columna con los grupos y etiquetas junto a la lista de salas.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">Permitir usar markdown en los mensajes.
@@ -4077,16 +4191,7 @@ This will also enable or disable sending typing notifications to others.</source
Esto también activa o desactiva enviar notificaciones cuando estes escribiendo.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished">Mostrar salas con mensajes nuevos primero
-Si esta opción está desactivada, la lista de salas será organizada por la fecha y hora de envÃo del último mensaje en la sala
-Si está activada, las salas con notificaciones activas (el pequeño cÃrculo con un número) serán organizadas al principio. Las salas que hayas silenciado seguirán siendo organizadas por la fecha y hora del último mensaje enviado, ya que no pareces considerarlas igual de importantes que el resto de salas.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished">Mostrar botones para responder rápidamente, reaccionar o acceder opciones adicionales junto a cada mensaje.</translation>
</message>
@@ -4102,7 +4207,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4114,7 +4229,34 @@ This usually causes the application icon in the task bar to animate in some fash
Esto usualmente causa que el icono de la aplicación en la barra de tareas sea animado de alguna forma.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4145,12 +4287,7 @@ Only affects messages in encrypted chats.</source>
Sólo afecta a los mensajes en chats encriptados.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished">Cuando la ventana no este enfocada, la lÃnea de tiempo se volverá borrosa.</translation>
@@ -4176,12 +4313,7 @@ be blurred.</source>
<translation type="unfinished">Requerir que un usuario este verificado para enviarle mensajes encriptados. Esto incrementa la seguridad pero hace la encriptación de extremo a extremo más tediosa.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished">Responde automáticamente a las solicitudes de claves de otros usuarios si están verificados, incluso si ese dispositivo no deberÃa tener acceso a las claves de alguna otra forma.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished">Descargar las claves de los mensajes y subirlas a tu copia de seguridad encriptada de la clave.</translation>
</message>
@@ -4301,7 +4433,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>No se han encontrado chats privados encriptados con este usuario. Crea un chat privado encriptado con este usuario e intenta de nuevo.</translation>
</message>
@@ -4360,7 +4492,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Ayer</translation>
</message>
@@ -4384,8 +4516,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Abre el respaldo, sigue los pasos y confirma después de completarlos.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts
index 7eabf09e5b8daaa8d9148999c59799c4a96a2ba7..6a007c367252d6a30a8eeef621d58c0c37fa5b2e 100644
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@@ -99,10 +99,38 @@
<translation>Lisa</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 ja veel %n teine kasutaja</numerusform>
@@ -199,12 +227,7 @@
<translation>Kutsutud kasutaja: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Puhverdatud andmete muutmine sobivaks rakenduse praeguse versiooniga ei õnnestunud. Sellel võib olla erinevaid põhjuseid. Palun saada meile veateade ja seni kasuta vanemat rakenduse versiooni. Aga kui sa soovid proovida, siis kustuta puhverdatud andmed käsitsi.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Sinu andmekandjale salvestatud puhvri versioon on uuem, kui käesolev Nheko versioon kasutada oskab. Palun tee Nheko uuendus või kustuta puhverdatud andmed.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Koputa jututoa uksele</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Jututoaga %1 liitumine ei õnnestunud. Sa võid proovida jututoa uksele koputamist ja seal olijad saavad sind sisse lasta. Kas sa soovid seda teha?
-Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerima:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Kas sa kindlasti soovid koputada %1 jututoa uksele? Kui soovid, siis võid lisada ka selgituse, miks jututoa liikmed peaksid sinu koputusele reageerima:</translation>
</message>
@@ -307,7 +323,12 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<translation>Puhvri versiooniuuendus ebaõnnestus!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Mitteühilduv puhvri versioon</translation>
</message>
@@ -335,7 +356,13 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<translation>Palun proovi uuesti sisse logida: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Jututoaga liitumine ei õnnestunud: %1</translation>
</message>
@@ -389,13 +416,13 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Ära näita selle kogukonna või sildi kohta teavituste loendit.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Vaikimisi peida selle sildiga jututoad.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,24 +488,24 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<translation>Sõnumid sinu serverilt või selle haldajalt.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Alamkogukonna uuendamine ei õnnestunud: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Alamkogukonna kustutamine ei õnnestunud: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Ülemkogukonna uuendamine ei õnnestunud: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Ülemkogukonna kustutamine ei õnnestunud: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -503,13 +530,13 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation type="unfinished"></translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Kas sa soovid liituda selle jututoaga? Kui soovid, siis võid siia lisada ka selgituse:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Kas sa soovid liituda selle jututoaga? Kui soovid, siis võid siia lisada ka selgituse:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -594,8 +621,8 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Avalike jututubadega saavad liituda kõik huvilised, privaatse jututoaga liitumine eeldab kutset.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1097,7 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Vali fail</translation>
</message>
@@ -1080,7 +1107,7 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
<translation>Kõik failid (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>„%1“ üleslaadimine ei õnnestunud</translation>
</message>
@@ -1164,14 +1191,11 @@ Kui soovid, siis võid lisada ka selgituse, miks peaks sinu koputusele reageerim
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Sinu kasutajanimi sisselogimiseks. Matrix'i kasutajatunnus algab @ märgiga ning sellele järgneb kasutajanimi. Seejärel peale koolonit
-on sinu koduserveri nimi. Kui sinu koduserver ei toeta .well-known nimelahendust, siis sa võid lisada ka koduserveri aadressi.
-Näiteks @kadri:server.minu
-Kui Nheko ei suuda tuvastada sinu koduserverit, siis ta kuvab sulle andmevälja selle sisestamiseks.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,11 +1214,17 @@ Kui Nheko ei suuda tuvastada sinu koduserverit, siis ta kuvab sulle andmevälja
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Selle seadme nimi, mida näidetakse verifitseerimise ajal teisele kasutajatele. Kui sa ise nime ei pane, siis kasutame automaatselt pandud nime.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Koduserveri aadress</translation>
</message>
@@ -1204,14 +1234,7 @@ Kui Nheko ei suuda tuvastada sinu koduserverit, siis ta kuvab sulle andmevälja
<translation>server.minu:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Aadress, mida sinu koduserveri kliendipoole API kasutab.
-Näiteks: https://server.minu:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>LOGI SISSE</translation>
</message>
@@ -1224,12 +1247,12 @@ Näiteks: https://server.minu:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Sisestatud Matrix'i kasutajatunnus on vigane - peaks olema @kasutaja:server.tld</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Koduserveri automaatne tuvastamine ei õnnestunud: päringuvastus oli vigane.</translation>
</message>
@@ -1254,9 +1277,9 @@ Näiteks: https://server.minu:8787</translation>
<translation>Tekkis teadmata viga. Palun kontrolli, et koduserveri domeen on õige.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>Valitud server ei oska kasutada Matrix'i protokolli versiooni, mida see klient oskab (v1.1, v1.2 või v1.3). Sa ei saa sisse logida.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1294,7 +1317,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Tühi salasõna</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Ühekordne sisselogimine ei õnnestunud</translation>
</message>
@@ -1374,12 +1397,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>%1 muutis selle jututoa aadresse.</translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 muutis kogukondi, kuhu see jututuba kuulub.</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 lõi ja seadistas jututoa: %2</translation>
</message>
@@ -1414,7 +1432,12 @@ Näiteks: https://server.minu:8787</translation>
<translation>%1 vastas kõnele.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 lõpetas kõne.</translation>
</message>
@@ -1442,7 +1465,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Kirjuta sõnum…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Kleepsud</translation>
</message>
@@ -1470,12 +1493,22 @@ Näiteks: https://server.minu:8787</translation>
<translation>Muuda</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reageeri</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Vasta</translation>
</message>
@@ -1485,7 +1518,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Valikud</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Eemaldamise põhjus</translation>
</message>
@@ -1496,18 +1529,18 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopeeri</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopeeri &lingi asukoht</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&ageeri</translation>
</message>
@@ -1521,6 +1554,11 @@ Näiteks: https://server.minu:8787</translation>
<source>&Edit</source>
<translation>&Muuda</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1571,8 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Lugemis&teatised</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1596,13 +1634,13 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Palun verifitseeri oma seadmed. See tagab, et muud kasutajad saaks kontrollida missugused seadmed on sinu omad ning krüptovõtmete automaatne varundus toimiks. Kas verifitseerime mõne verifitseerimata seadme nüüd? (Selleks peab sul mõni verifitseeritud seadmetest käepärast olema.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Selleks, et muud kasutajad automaatselt usaldaks sinu seadmeid, peaksid nad verifitseerima. Samaga muutub ka krüptovõtmete varundus automaatseks. Kas verifitseerime seadme %1?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Peakasutaja (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderaator (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Kasutaja (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Kohandatud õigused (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Sündmuse tüübi eemaldamine</translation>
</message>
@@ -1800,7 +1838,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Õiguste muutmiseks nihuta kasutajaid üles või alla</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Kasutaja eemaldamine</translation>
</message>
@@ -1810,10 +1848,61 @@ Näiteks: https://server.minu:8787</translation>
<translation>Kasutaja lisamine</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Õiguste muutmine ei õnnestunud: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Õiguste muutmine ei õnnestunud: %1</translation>
</message>
@@ -1821,7 +1910,7 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Muud sündmused</translation>
</message>
@@ -1962,13 +2051,13 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Alamjututubade muutmine</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Ãœlemkogukondade muutmine</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2007,9 +2096,9 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Loo unikaalne profiil, mis võimaldab sul logida samaaegselt sisse erinevatele kasutajakontodele ning käivitada mitu Nheko programmiakent.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2111,34 @@ Näiteks: https://server.minu:8787</translation>
<translation>Profiili nimi</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Näiteks: https://server.minu:8787</translation>
<translation>Korda salasõna</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Koduserver</translation>
</message>
@@ -2097,12 +2219,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Seadme nimi</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Selle seadme nimi, mida näidetakse verifitseerimise ajal teisele kasutajatele. Kui sa ise nime ei pane, siis kasutame automaatselt pandud nime.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTREERI</translation>
</message>
@@ -2132,9 +2249,9 @@ Näiteks: https://server.minu:8787</translation>
<translation>Tekkis teadmata viga. Palun kontrolli, et koduserveri domeen on õige.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>Valitud server ei oska kasutada Matrix'i protokolli versiooni, mida see klient oskab (v1.1, v1.2 või v1.3). Sa ei saa registreeruda.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2174,6 +2291,11 @@ Näiteks: https://server.minu:8787</translation>
<source>Cancel Edit</source>
<translation>Tühista muudatused</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>salvestatud versiooni ei leidu</translation>
</message>
@@ -2204,7 +2326,7 @@ Näiteks: https://server.minu:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Uus silt</translation>
</message>
@@ -2255,8 +2377,8 @@ Näiteks: https://server.minu:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Lisa kogukonda või eemalda sealt</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2495,42 +2617,7 @@ Näiteks: https://server.minu:8787</translation>
<translation>Kõik sõnumid</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Ligipääs jututuppa</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Kõik (sealhulgas külalised)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Kõik</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Kutsutud kasutajad</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Koputades</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Piiratud teiste jututubade liikmelisusega</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Piiratud liikmelisusega teistes jututubades või vajadusega jututoa uksele koputada</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Krüptimine</translation>
</message>
@@ -2567,17 +2654,13 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
<translation>Kleepsude ja emotikonide seadistused</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Muuda</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Muuda missugused efektipakid on kasutusel, eemalda neid ja loo uusi</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Peidetud sündmused</translation>
</message>
@@ -2589,12 +2672,52 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
<translation>Seadista</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Aliased</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Vali sündmused, mida siin jututoas peita</translation>
</message>
@@ -2629,12 +2752,12 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
<translation>näita rohkem</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Vali tunnuspilt</translation>
</message>
@@ -2681,7 +2804,7 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Jätkamaks palun sisesta oma salasõna:</translation>
</message>
@@ -2697,8 +2820,8 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Palun sisesta sulle saadetud tunnusluba:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2886,7 @@ Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Ühenduse loomine võtmehoidlaga ei õnnestunud</translation>
</message>
@@ -2828,7 +2951,7 @@ Kui eelistad verifitseerimist, siis peab sul teine seade olema käepärast. Kui
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Risttunnustamise võtmete loomine ei õnnestunud!</translation>
</message>
@@ -2853,7 +2976,7 @@ Kui eelistad verifitseerimist, siis peab sul teine seade olema käepärast. Kui
<translation>Krüptimise seadistamine ei õnnestunud: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Sinu isikutuvastuse võti on muutunud. Kuna seetõttu läheb läbiv krüptimine katki, siis login välja.</translation>
</message>
@@ -2888,8 +3011,8 @@ Kui eelistad verifitseerimist, siis peab sul teine seade olema käepärast. Kui
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Lisa kogukonda või eemalda sealt</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2974,19 +3097,19 @@ Kui eelistad verifitseerimist, siis peab sul teine seade olema käepärast. Kui
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Sündmuse krüptimine ei õnnestunud, katkestame saatmise!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Salvesta pilt</translation>
</message>
@@ -3020,12 +3143,7 @@ Kui eelistad verifitseerimist, siis peab sul teine seade olema käepärast. Kui
<translation>%1 tegi jututoa avalikuks.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 seadistas, et selle jututoaga liitumine eeldab kutset.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 pääses jututuppa peale uksele koputamist.</translation>
</message>
@@ -3340,12 +3458,17 @@ Põhjus: %4</translation>
<translation>%1 muutis oma koputust jututoa uksele.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Sa liitusid jututoaga.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 saatis kutse kasutajale %2.</translation>
</message>
@@ -3379,10 +3502,15 @@ Põhjus: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Muudetud</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3566,22 @@ Põhjus: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Tagasi jututubade loendisse</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Jututuba on valimata</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Näita jututoas osalejaid.</translation>
</message>
@@ -3646,7 +3779,7 @@ Põhjus: %4</translation>
<translation>Võta verifitseerimine tagasi</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Logi %1 seade võrgust välja</translation>
</message>
@@ -3718,12 +3851,7 @@ Põhjus: %4</translation>
<translation>Käivita tegumiribalt</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Rühmade külgpaan</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Saada sõnumid kasutades Markdown vormindust</translation>
</message>
@@ -3803,12 +3931,7 @@ Põhjus: %4</translation>
<translation>Dekrüpti sõnumid külgribal</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Näita sõnumite arvu kogukonnas</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Privaatsust tagav sirm</translation>
</message>
@@ -4008,12 +4131,7 @@ Põhjus: %4</translation>
<translation>Seadista helin, mis annab märku uuest kõnest</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Seadista sõnumite suurim laius pikslites ajajoonel. See parandab loetavust suurel ekraanil, kui Nheko on avatud täisvaates.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4160,7 @@ peale akna fookuse kadumist ajajoone vaade hägustub.
<translation>Käivita rakendus taustal ilma kliendiakna kuvamiseta.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Näita jututubade loendi kõrval veergu rühmade ja siltidega.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Luba Markdown-vormingu kasutamine sõnumite koostamisel.
@@ -4076,16 +4189,7 @@ This will also enable or disable sending typing notifications to others.</source
Samaga lülitatakse sisse või välja ka sinu kirjutamisteatiste saatmine teistele kasutajatele.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Kuva uute sõnumitega jututoad esimesena.
-Kui see valik on välja lülitatud, siis jututoad järjestatakse viimati saanunud sõnumi ajatempli alusel.
-Kui see valik on sisse lülitatud, siis teavitustega jututoad (pisike ümmargune numbriga ikoon) järjestatakse esimesena. Sinu poolt summutatud jututoad järjestatakse ikkagi ajatempli alusel, sest sa ei pea neid teistega võrreldes piisavalt tähtsaks.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Näita iga sõnumi kõrval nuppe, mis võimaldavad kiiresti vastata, reageerida või teha sõnumiga muid toiminguid.</translation>
</message>
@@ -4102,7 +4206,17 @@ OFF - square, ON - circle.</source>
Väljalülitatuna - ruut, sisselülitatuna - ümmargune.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>Selle võtmega verifitseerid oma seadmeid. Kui ta on puhverdatud, siis sinu seadme verifitseerimine märgib selle seadme usaldusväärseks nii sinu muude seadmete kui selliste kasutajate jaoks, kes on sinu verifitseerinud.</translation>
</message>
@@ -4114,7 +4228,34 @@ This usually causes the application icon in the task bar to animate in some fash
See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti animatsiooniga sulle märku.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4149,12 +4290,7 @@ Only affects messages in encrypted chats.</source>
Kehtib vaid läbivalt krüptitud vestluste puhul.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Vali kogukonnas leiduvate kõikide teavituste arvu kuvamise koht.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Kui aken kaotab fookuse,
@@ -4181,12 +4317,7 @@ siis ajajoone vaade hägustub.</translation>
<translation>Selle tingimuse alusel peab kasutaja olema krüptitud sõnumivahetuse jaoks verifitseeritud. Niisugune nõue parandab turvalisust, kuid teeb läbiva krüptimise natuke ebamugavamaks.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Kui teised kasutajad on verifitseeritud, siis luba automaatselt vastata nende krüptovõtmete päringutele isegi siis, kui too seade ei peaks saama neid võtmeid kasutada.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Luba krüptitud võtmete varunduseks laadida sõnumite krüptovõtmeid sinu serverisse või sinu serverist.</translation>
</message>
@@ -4308,7 +4439,7 @@ Selle funktsionaalsuse jõustumine eeldab rakenduse uuesti käivitamist.</transl
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4367,7 +4498,7 @@ Selle funktsionaalsuse jõustumine eeldab rakenduse uuesti käivitamist.</transl
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Eile</translation>
</message>
@@ -4391,8 +4522,8 @@ Selle funktsionaalsuse jõustumine eeldab rakenduse uuesti käivitamist.</transl
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Ava kasutaja registreerimise tagavaravariant, läbi kõik sammud ja kinnita seda, kui kõik valmis on.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 08ed0697168c51dc39345b3cc417973c9718c501..ada94d48dae45290375aca6d4b5ec89f3c9ea67a 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -99,10 +99,38 @@
<translation>Lisää</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 ja %n muu</numerusform>
@@ -199,12 +227,7 @@
<translation>Kutsuttiin käyttäjä: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Välimuistin tuominen nykyiseen versioon epäonnistui. Tällä voi olla eri syitä. Luo vikailmoitus ja yritä sillä aikaa käyttää vanhempaa versiota. Voit myös vaihtoehtoisesti koettaa tyhjentää välimuistin käsin.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Levylläsi oleva välimuisti on uudempaa kuin mitä tämä Nhekon versio tukee. Päivitä Nheko tai poista välimuistisi.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Koputa huoneeseen</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Liittymisesi huoneeseen %1 epäonnistui. Voit yrittää koputtaa, jotta muut voivat kutsua sinut sisälle. Haluatko tehdä sen?
-Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Haluatko todella koputtaa huoneeseen %1? Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
</message>
@@ -307,7 +323,12 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<translation>Välimuistin siirto epäonnistui!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Yhteensopimaton välimuistin versio</translation>
</message>
@@ -335,7 +356,13 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Huoneeseen liittyminen epäonnistui: %1</translation>
</message>
@@ -389,13 +416,13 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Älä näytä ilmoitusten määriä tästä spacesta tai tagista.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Piilota huoneet tällä tagilla tai tästä Spacesta oletuksena.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,24 +488,24 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<translation>Viestit palvelimeltasi tai ylläpitäjältä.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Spacen lapsen päivitys epäonnistui: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Spacen lapsen poistaminen epäonnistui: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Spacen vanhemman päivitys epäonnistui: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Spacen vanhemman poistaminen epäonnistui: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -503,13 +530,13 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>Tähän huoneeseen ei voi liittyä suoraan. Voit kuitenkin koputtaa huoneeseen, jolloin huoneen jäsenet voivat käsitellä liittymispyyntösi. Voit myös antaa syyn liittymispyyntöösi alhaalla:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Haluatko liittyä tähän huoneeseen? Voit antaa valinnaisen syyn alhaalla:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Haluatko liittyä tähän huoneeseen? Voit antaa valinnaisen syyn alhaalla:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -594,8 +621,8 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Julkisiin huoneisiin voi liittyä kuka tahansa, yksityisiin huoneisiin tarvitsee erillisen kutsun.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1097,7 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Valitse tiedosto</translation>
</message>
@@ -1080,7 +1107,7 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
<translation>Kaikki Tiedostot (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Tiedoston "%1" lähetys epäonnistui</translation>
</message>
@@ -1164,14 +1191,11 @@ Voit antaa valinnaisen syyn muiden hyväksyäkseen koputuksesi:</translation>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Kirjautumisnimesi. MXID:n pitäisi alkaa @ -merkillä, jota seuraa käyttäjätunnus. Käyttäjätunnuksen jälkeen sinun pitää antaa palvelimen nimi kaksoispisteen (:) jälkeen.
-Voit myös laittaa tähän kotipalvelimesi osoitteen, jos palvelimesi ei tunne etsintää.
-Esimerkki: @user:server.my
-Jos Nheko ei onnistu löytämään kotipalvelintasi, se näyttää sinulle kentän, johon laittaa palvelin käsin.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,11 +1214,17 @@ Jos Nheko ei onnistu löytämään kotipalvelintasi, se näyttää sinulle kent
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Tämän laitteen nimi, joka näytetään muille kun laitteitasi vahvistetaan. Oletusta käytetään jos mitään ei anneta.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Kotipalvelimen osoite</translation>
</message>
@@ -1204,14 +1234,7 @@ Jos Nheko ei onnistu löytämään kotipalvelintasi, se näyttää sinulle kent
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Osoite, jota voidaan käyttää ottamaan yhteyttä kotipalvelimesi asiakasrajapintaan.
-Esimerkki: https://palvelime.ni:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>KIRJAUDU</translation>
</message>
@@ -1224,12 +1247,12 @@ Esimerkki: https://palvelime.ni:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Väärä Matrix-tunnus. Esim. @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation>
</message>
@@ -1254,9 +1277,9 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>Valittu palvelin ei tue mitään Matrix-protokollan versiota, jota tämä ohjelma tukee (v1.1, v1.2 tai v1.3). Et voi kirjautua sisään.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1294,7 +1317,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Tyhjä salasana</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO-kirjautuminen epäonnistui</translation>
</message>
@@ -1375,8 +1398,8 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 muutti tämän kanavan yläSpaceja.</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1442,7 +1465,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Kirjoita viesti…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Tarrat</translation>
</message>
@@ -1470,12 +1493,22 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Muokkaa</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reagoi</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Vastaa</translation>
</message>
@@ -1485,7 +1518,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Asetukset</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Syy poistamiselle</translation>
</message>
@@ -1496,18 +1529,18 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopioi</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopioi &linkin kohde</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Rea&goi</translation>
</message>
@@ -1521,6 +1554,11 @@ Esimerkki: https://palvelime.ni:8787</translation>
<source>&Edit</source>
<translation>&Muokkaa</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1571,8 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Lukukuitt&aukset</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1596,13 +1634,13 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Näyttääksesi muille käyttäjille mitkä laitteet oikeasti kuuluvat sinulle, voit varmistaa ne. Tämä sallii myös avainvarmuuskopion toimimisen automaattisesti. Varmistetaanko varmistamaton laite nyt? (Varmistathan käsilläsi olevan yksi varmistetuista laitteista.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Voit vahvistaa laitteesi, jotta sallit muiden nähdä, mitkä niistä oikeasti kuuluvat sinulle. Tämä myös mahdollistaa avaimen varmuuskopioinnin toiminnnan automaattisesti. Vahvistetaanko %1 nyt?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Ylläpitäjä (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderaattori (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Käyttäjä (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Mukautettu (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Poista tapahtumatyyppejä</translation>
</message>
@@ -1800,7 +1838,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Siirrä käyttäjiä ylös tai alas muuttaaksesi heidän oikeuksiaan</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Poista käyttäjiä huoneesta</translation>
</message>
@@ -1810,10 +1848,61 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Lisää käyttäjiä</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Oikeustason päivitys epäonnistui: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Oikeustason päivitys epäonnistui: %1</translation>
</message>
@@ -1821,7 +1910,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Muut tapahtumat</translation>
</message>
@@ -1962,13 +2051,13 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Muokkaa alihuoneita</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Muuta yläspaceja</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2007,9 +2096,9 @@ Esimerkki: https://palvelime.ni:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Luo uniikki profili, joka mahdollistaa kirjautumisen usealle tilille samanaikaisesti ja useamman Nheko-instanssin aloittamisen.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2111,34 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>profiilin nimi</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Salasanan varmistus</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Kotipalvelin</translation>
</message>
@@ -2097,12 +2219,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Laitteen nimi</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Tämän laitteen nimi, joka näytetään muille kun laitteitasi vahvistetaan. Oletusta käytetään jos mitään ei anneta.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REKISTERÖIDY</translation>
</message>
@@ -2132,9 +2249,9 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>Valittu palvelin ei tue mitään Matrix-protokollan versiota, jota tämä ohjelma tukee (v1.1, v1.2 tai v1.3). Et voi rekisteröityä.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2174,6 +2291,11 @@ Esimerkki: https://palvelime.ni:8787</translation>
<source>Cancel Edit</source>
<translation>Peruuta Muokkaus</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>ei tallennettua versiota</translation>
</message>
@@ -2204,7 +2326,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Uusi tagi</translation>
</message>
@@ -2255,8 +2377,8 @@ Esimerkki: https://palvelime.ni:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Lisää tai poista spacesta</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2495,42 +2617,7 @@ Esimerkki: https://palvelime.ni:8787</translation>
<translation>Kaikki viestit</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Huoneeseen pääsy</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Kaikki ja vieraat</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Kuka tahansa</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Kutsutut käyttäjät</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Koputtamalla</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Rajoitettu muiden huoneiden jäsenyyden perusteella</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Rajoitettu tietyissä huoneissa oleville tai huoneeseen on koputettava</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Salaus</translation>
</message>
@@ -2567,17 +2654,13 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
<translation>Tarra- ja emojiasetukset</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Muuta</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Muuta mitkä pakkaukset ovat sallittuja, poista pakkauksia tai luo uusia</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Piilotetut tapahtumat</translation>
</message>
@@ -2589,12 +2672,52 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
<translation>Määritä</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Aliakset</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Valitse huoneesta piilotettavat tapahtumat</translation>
</message>
@@ -2629,12 +2752,12 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
<translation>näytä enemmän</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Salauksen aktivointi epäonnistui: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Valitse profiilikuva</translation>
</message>
@@ -2681,7 +2804,7 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Syötä sisäänkirjautumisen salasanasi jatkaaksesi:</translation>
</message>
@@ -2697,8 +2820,8 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Syötä sinulle lähetetty poletti:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2886,7 @@ Huomaathan ettei sitä voida poistaa käytöstä myöhemmin.</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Salattuun tallennustilaan ei saatu yhteyttä</translation>
</message>
@@ -2828,7 +2951,7 @@ Jos valitset vahvistamisen, toisen laitteen on oltava saatavilla. Jos valitset s
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Ristiinvarmennusavainten luominen epäonnistui!</translation>
</message>
@@ -2853,7 +2976,7 @@ Jos valitset vahvistamisen, toisen laitteen on oltava saatavilla. Jos valitset s
<translation>Salauksen määritys epäonnistui: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Identiteettiavain on muuttunut. Tämä estää päästä-päähän salauksen toiminnan, joten sinut kirjataan ulos.</translation>
</message>
@@ -2888,8 +3011,8 @@ Jos valitset vahvistamisen, toisen laitteen on oltava saatavilla. Jos valitset s
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Lisää tai poista spacesta</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2974,19 +3097,19 @@ Jos valitset vahvistamisen, toisen laitteen on oltava saatavilla. Jos valitset s
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Viestin muokkaus epäonnistui: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Tapahtuman salaus epäonnistui, lähetys keskeytetään!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Tallenna kuva</translation>
</message>
@@ -3020,12 +3143,7 @@ Jos valitset vahvistamisen, toisen laitteen on oltava saatavilla. Jos valitset s
<translation>%1 avasi huoneen kaikelle yleisölle.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 teki tästä huoneesta liittymiskutsun vaativan.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>Käyttäjän %1 sallittiin liittyä tähän huoneeseen koputtamalla.</translation>
</message>
@@ -3340,12 +3458,17 @@ Syy: %4</translation>
<translation>%1 perui koputuksensa.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Liityit tähän huoneeseen.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 kutsui käyttäjän %2.</translation>
</message>
@@ -3379,10 +3502,15 @@ Syy: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Muokattu</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3566,22 @@ Syy: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Takaisin huonelistaan</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Ei valittua huonetta</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Näytä huoneen jäsenet.</translation>
</message>
@@ -3646,7 +3779,7 @@ Syy: %4</translation>
<translation>Peru vahvistus</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Kirjaudu ulos laitteelta %1</translation>
</message>
@@ -3718,12 +3851,7 @@ Syy: %4</translation>
<translation>Aloita ilmoitusalueella</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Ryhmäsivupalkki</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Lähetä viestit Markdownina</translation>
</message>
@@ -3803,12 +3931,7 @@ Syy: %4</translation>
<translation>Pura viestien salaus sivupalkissa</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Näytä spacejen viestimäärät</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Yksityisyysnäkymä</translation>
</message>
@@ -4008,12 +4131,7 @@ Syy: %4</translation>
<translation>Aseta ilmoitusääni puhelukutsujen saapumiselle</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Aseta viestien suurin leveys aikajanalla (pikseleinä). Tämä voi auttaa luettavuutta laajakuvassa, kun Nheko on täyden ruudun tilassa.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4160,7 @@ Aseta nollaan, jotta sumennetaan heti kohdistus kadotetaan. Suurin arvo 1 tunti
<translation>Aloita sovellus taustalla näyttämättä asiakasohjelman ikkunaa.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Näytä huonelistan vieressä tagit ja ryhmät sisältävä sarake.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Salli Markdownin käyttö viesteissä.
@@ -4076,16 +4189,7 @@ This will also enable or disable sending typing notifications to others.</source
Tämä myös sallii tai evää kirjoitusilmoitusten lähettämisen muille.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Näytä ensiksi huoneet, joissa on uusia viestejä.
-Jos tämä on poissa päältä, lista huoneista lajitellaan vain huoneen viimeisimmän viestin aikaleiman mukaan.
-Jos tämä on päällä, huoneet, joissa ilmoitukset ovat päällä (pieni ympyrä, jonka sisässä on numero), lajitellaan päällimmäisiksi. Mykistämäsi huoneet lajitellaan aikaleiman mukaan, koska et nähtävästi pidä niitä yhtä tärkeinä kuin muita huoneita.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Näytä painikkeet vastataksesi nopeasti, reagoidaksesi tai päästäksesi lisätoimintoihin joka viestin vieressä.</translation>
</message>
@@ -4102,7 +4206,17 @@ OFF - square, ON - circle.</source>
POIS - neliö, PÄÄLLÄ - ympyrä.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>Omien laitteidesi vahvistamiseen käytettävä avain. Jos avain on välimuistissa, jonkun laitteesi vahvistus tekee siitä vahvistetun kaikille muille laitteillesi, ja käyttäjille, jotka ovat vahvistaneet sinut.</translation>
</message>
@@ -4114,7 +4228,34 @@ This usually causes the application icon in the task bar to animate in some fash
Tämä yleensä saa sovelluksen kuvakkeen liikkumaan jollain tapaa tehtäväpalkissa.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4149,12 +4290,7 @@ Only affects messages in encrypted chats.</source>
Vaikuttaa vain salattujen keskustelujen viesteihin.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Valitse missä spacen ilmoitusten kokonaismäärä näytetään.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Kun ikkuna ei ole kohdistettuna, tämä aikajana
@@ -4181,12 +4317,7 @@ sumennetaan.</translation>
<translation>Vaatii käyttäjän olevan vahvistettu, jotta hänelle voi lähettää salattuja viestejä. Tämä parantaa turvallisuutta, mutta tekee päästä-päähän -salauksen hankalammaksi.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Automaattisesti vastaa avainpyyntöihin, jos ne ovat vahvistettuja, vaikka tuolla laitteella ei tulisi muuten olla pääsyä noihin avaimiin.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Lataa viestien salausavaimet salatusta verkkoavainvarmuuskopiosta ja lähetä avaimet sinne.</translation>
</message>
@@ -4308,7 +4439,7 @@ Tämä asetus tulee voimaan uudelleenkäynnistyksen jälkeen.</translation>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Salattua keskustelua ei löydetty tälle käyttäjälle. Luo salattu yksityiskeskustelu tämän käyttäjän kanssa ja yritä uudestaan.</translation>
</message>
@@ -4367,7 +4498,7 @@ Tämä asetus tulee voimaan uudelleenkäynnistyksen jälkeen.</translation>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Eilen</translation>
</message>
@@ -4391,8 +4522,8 @@ Tämä asetus tulee voimaan uudelleenkäynnistyksen jälkeen.</translation>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Avaa varajärjestely, seuraa ohjeita ja vahvista kun olet saanut ne valmiiksi.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index e56a7068de94af048c07fc3b187c78c9965c96c5..3c1a120e84cfea270e29276798933f84a42f1193 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -99,10 +99,38 @@
<translation type="unfinished">Ajouter</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 et %n autre</numerusform>
@@ -199,12 +227,7 @@
<translation>Utilisateur %1 invité(e)</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>La migration du cache vers la version actuelle a échoué. Cela peut arriver pour différentes raisons. Signalez le problème et essayez d'utiliser une ancienne version en attendant. Vous pouvez également supprimer le cache manuellement.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Le cache sur votre disque a été créé avec une version de Nheko plus récente que la vôtre. Veuillez mettre Nheko à jour ou vider votre cache.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Frapper à la porte</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Vous n'avez pas pu rejoindre %1. Vous pouvez essayer de toquer pour que les autres vous invitent. Voulez-vous le faire ?
-Vous pouvez donner une raison d'accepter aux autres :</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Voulez-vous vraiment toquer à %1 ? Vous pouvez fournir une raison aux autres de l'accepter :</translation>
</message>
@@ -307,7 +323,12 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<translation>Échec de la migration du cache !</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Version du cache incompatible</translation>
</message>
@@ -335,7 +356,13 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<translation>Veuillez re-tenter vous reconnecter : %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Impossible de rejoindre le salon : %1</translation>
</message>
@@ -389,13 +416,13 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Cacher par défaut les salons avec cette étiquette ou de cet espace.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,23 +488,23 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<translation>Messages de votre serveur ou administrateur.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -503,12 +530,12 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -594,8 +621,8 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Les salons publics sont accessibles à tout le monde tandis que les salons privés ne sont accessibles que sur invitation explicite.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1097,7 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Sélectionnez un fichier</translation>
</message>
@@ -1080,7 +1107,7 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
<translation>Tous les types de fichiers (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1164,14 +1191,11 @@ Vous pouvez donner une raison d'accepter aux autres :</translation>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l'identifiant. L'identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ».
-Vous pouvez également spécifier l'adresse de votre serveur ici, si votre serveur ne supporte pas l'identification .well-known.
-Exemple : @utilisateur :monserveur.example.com
-Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l'indiquer manuellement.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,11 +1214,17 @@ Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l&apos
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Un nom pour cet appareil, qui sera montré aux autres utilisateurs lorsque ceux-ci vérifient vos appareils. Si aucun n'est fourni, un nom par défaut est utilisé.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Adresse du serveur</translation>
</message>
@@ -1204,14 +1234,7 @@ Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l&apos
<translation>monserveur.example.com:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>L'adresse qui peut être utilisée pour joindre l'API client de votre serveur.
-Exemple : https ://monserveur.example.com:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>CONNEXION</translation>
</message>
@@ -1224,12 +1247,12 @@ Exemple : https ://monserveur.example.com:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Vous avez entré un identifiant Matrix invalide exemple correct : @moi:monserveur.example.com)</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Échec de la découverte automatique. Réponse mal formée reçue.</translation>
</message>
@@ -1254,8 +1277,8 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1294,7 +1317,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Mot de passe vide</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Échec de la connexion SSO</translation>
</message>
@@ -1375,8 +1398,8 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 a changé les espaces parents pour ce salon.</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1442,7 +1465,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Écrivez un message…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Autocollants</translation>
</message>
@@ -1470,12 +1493,22 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Modifier</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Réagir</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Répondre</translation>
</message>
@@ -1485,7 +1518,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Options</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Raison de la suppression</translation>
</message>
@@ -1496,18 +1529,18 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Copier</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Copier l'adresse du &lien</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Ré&agir</translation>
</message>
@@ -1521,6 +1554,11 @@ Exemple : https ://monserveur.example.com:8787</translation>
<source>&Edit</source>
<translation>&Editer</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1571,8 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Accusés de lec&ture</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1596,13 +1634,13 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Pour permettre à d'autres utilisateurs de confirmer qu'un appareil est vraiment le vôtre, vous pouvez le vérifier. Cela permet également aux sauvegardes de clés de déchiffrement de fonctionner automatiquement sur ces appareils, pour ne pas perdre vos messages chiffrés. Vérifier un appareil maintenant ? (Vérifiez que celui-ci est à proximité).</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Pour permettre aux autres utilisateurs de vérifier quels appareils de votre compte sont réellement les vôtres, vous pouvez les vérifier. Cela permet également à la sauvegarde des clés de fonctionner automatiquement. Vérifier %1 maintenant ?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1800,7 +1838,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1810,10 +1848,61 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1821,7 +1910,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1962,12 +2051,12 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2007,9 +2096,9 @@ Exemple : https ://monserveur.example.com:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Créer un profil unique, vous permettant de vous connecter simultanément à plusieurs comptes et de lancer plusieurs instances de Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2111,34 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>nom du profil</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Confirmation du mot de passe</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Serveur</translation>
</message>
@@ -2097,12 +2219,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Nom de l'appareil</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Un nom pour cet appareil, qui sera montré aux autres utilisateurs lorsque ceux-ci vérifient vos appareils. Si aucun n'est fourni, un nom par défaut est utilisé.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>S'ENREGISTRER</translation>
</message>
@@ -2132,8 +2249,8 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2174,6 +2291,11 @@ Exemple : https ://monserveur.example.com:8787</translation>
<source>Cancel Edit</source>
<translation>Annuler les modifications</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>pas de version enregistrée</translation>
</message>
@@ -2204,7 +2326,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nouvelle étiquette</translation>
</message>
@@ -2255,7 +2377,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2495,42 +2617,7 @@ Exemple : https ://monserveur.example.com:8787</translation>
<translation>Tous les messages</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Accès au salon</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Tous le monde et les invités</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Tout le monde</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Utilisateurs invités</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>En toquant</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Restreint par l'appartenance à d'autre salons</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Chiffrement</translation>
</message>
@@ -2567,17 +2654,13 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
<translation>Paramètres des autocollants & emotes</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Modifier</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Modifier quels paquets sont activés, retirer des paquets ou bien en créer de nouveaux</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Évènements cachés</translation>
</message>
@@ -2589,12 +2672,52 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
<translation>Configurer</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Sélectionner les évènements à cacher dans ce salon</translation>
</message>
@@ -2629,12 +2752,12 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
<translation>montrer plus</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Échec de l'activation du chiffrement : %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Sélectionner un avatar</translation>
</message>
@@ -2681,7 +2804,7 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Veuillez saisir votre mot de passe pour continuer :</translation>
</message>
@@ -2697,8 +2820,8 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Veuillez entrer le jeton qui vous a été envoyé :</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2886,7 @@ Veuillez noter qu'il ne pourra plus être désactivé par la suite.</transl
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Échec de la connexion au stockage des secrets</translation>
</message>
@@ -2828,7 +2951,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Échec de la création des clés pour l'auto-vérification (cross-signing) !</translation>
</message>
@@ -2853,7 +2976,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si
<translation>Échec de la configuration du chiffrement : %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>La clé d'identité a changé. Cela casse le chiffrement bout-à -bout, donc Nheko va se déconnecter de votre compte.</translation>
</message>
@@ -2888,7 +3011,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2974,19 +3097,19 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Échec de la suppression du message : %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Échec du chiffrement de l'évènement, envoi abandonné !</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Enregistrer l'image</translation>
</message>
@@ -3020,12 +3143,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si
<translation>%1 a ouvert le salon au public.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 a rendu le rendu le salon joignable uniquement sur invitation.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 a permis de rejoindre ce salon en toquant.</translation>
</message>
@@ -3340,12 +3458,17 @@ Raison : %4</translation>
<translation>%1 a arrêté de toquer.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Vous avez rejoint ce salon.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 a invité %2.</translation>
</message>
@@ -3379,10 +3502,15 @@ Raison : %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Modifié</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3566,22 @@ Raison : %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Revenir à la liste des salons</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Pas de salon sélectionné</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3646,7 +3779,7 @@ Raison : %4</translation>
<translation>Dé-vérifier</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Déconnecter l'appareil %1</translation>
</message>
@@ -3718,12 +3851,7 @@ Raison : %4</translation>
<translation>Démarrer dans la barre des tâches</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Barre latérale des groupes</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Composer les messages au format Markdown</translation>
</message>
@@ -3803,12 +3931,7 @@ Raison : %4</translation>
<translation>Déchiffrer les messages dans la liste des salons</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Protection anti-indiscrétion</translation>
</message>
@@ -4008,12 +4131,7 @@ Raison : %4</translation>
<translation>Choisit le son de notification lors de la réception d'un appel</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Règle la largeur maximale des messages dans la discussion (en pixels). Cela peut aider la lisibilité sur les écrans larges quand Nheko est maximisé.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4041,12 +4159,7 @@ Régler à 0 pour flouter immédiatement lorsque la fenêtre devient inactive. V
<translation>Démarrer l'application en arrière-plan sans montrer la fenêtre du client.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Afficher une colonne contenant les groupes et étiquettes à côté de la liste des salons.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Permet l'utilisation de Markdown dans les messages.
@@ -4075,17 +4188,7 @@ This will also enable or disable sending typing notifications to others.</source
Ceci active ou désactive également l'envoi de telles notifications de votre part.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Montrer les salons qui contiennent de nouveaux messages en premier.
-Si non activé, la liste des salons sera uniquement triée en fonction de la date du dernier message.
-Si activé, les salons qui ont des notifications actives (le petit cercle avec un chiffre dedans) seront affichés en premier.
-Les salons que vous avez rendus silencieux seront toujours triés par date du dernier message, puisqu'ils sont considérés comme moins importants.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Afficher des boutons pour rapidement répondre, réagir et accéder à d'autres options près de chaque message.</translation>
</message>
@@ -4102,7 +4205,17 @@ OFF - square, ON - circle.</source>
OFF - carré, ON - circulaire.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>La clef pour vérifier vos propres appareils. Si elle est en cache, vérifier un de vos appareils le marquera comme vérifié pour tous vos autres appareils et pour les utilisateurs qui vous ont vérifié.</translation>
</message>
@@ -4114,7 +4227,34 @@ This usually causes the application icon in the task bar to animate in some fash
Typiquement, l'icône de l'application est mise en évidence dans la barre des tâches.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4147,12 +4287,7 @@ Only affects messages in encrypted chats.</source>
Cela n'affecte que les messages des salons chiffrés.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Lorsque la fenêtre devient inactive, la discussion devient floutée.</translation>
@@ -4178,12 +4313,7 @@ be blurred.</source>
<translation>Requiert qu'un utilisateur soit vérifié pour lui envoyer des messages chiffrés. La sécurité en est améliorée, mais le chiffrement de bout en bout devient plus fastidieux.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Répond automatiquement aux requêtes de clefs des autres utilisateurs, s'ils sont vérifiés, même si cet appareil ne devrait pas avoir accès à ces clefs autrement.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Télécharger les clefs de chiffrement de message depuis et envoie vers la sauvegarde chiffrée en ligne de clefs.</translation>
</message>
@@ -4303,7 +4433,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Aucune discussion privée chiffrée trouvée avec cet utilisateur. Créez-en une et réessayez.</translation>
</message>
@@ -4362,7 +4492,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Hier</translation>
</message>
@@ -4386,8 +4516,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Ouvrez la solution de remplacement, suivez les étapes et confirmez après les avoir terminées.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_hu.ts b/resources/langs/nheko_hu.ts
index 3c0bc14a56bb0bb824085d024f882fcb5f79ef1e..eef785d03911ee4e3794b418cc01ba62fa442e60 100644
--- a/resources/langs/nheko_hu.ts
+++ b/resources/langs/nheko_hu.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -198,12 +226,7 @@
<translation>A felhasználó meg lett hÃvva: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>A gyorsÃtótár átvitele a jelenlegi verzióhoz nem sikerült. Ennek több oka is lehet. Kérlek, Ãrj egy hibajelentést és egyelÅ‘re próbálj meg egy régebbi verziót használni! AlternatÃv megoldásként megprobálhatod eltávolÃtani a gyorsÃtótárat kézzel.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -218,13 +241,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -305,7 +322,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>GyorsÃtótár migráció nem sikerült!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Inkompatibilis gyorsÃtótár-verzió</translation>
</message>
@@ -333,7 +355,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Kérlek, próbálj meg bejelentkezni újra: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Nem sikerült csatlakozni a szobához: %1</translation>
</message>
@@ -387,12 +415,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -459,23 +487,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -500,12 +528,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -591,7 +619,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1067,7 +1095,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Fájl kiválasztása</translation>
</message>
@@ -1077,7 +1105,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Minden fájl (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1161,14 +1189,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>A bejelentkezési neved. Egy MatrixazonosÃtó a @ jellel kezdÅ‘dik, amelyet a felhasználóazonosÃtó követ, ami után pedig egy kettÅ‘sponttal elválasztva kell megadnod a szervered nevét.
-Itt megadhatod a saját homeszervered cÃmét is, amennyiben az nem támogadja a „.well-known†felderÃtést.
-Példa: @felhasznalo:szerver.em
-Ha a Nheko nem tud rátalálni a homeszerveredre, meg fog jelenni egy mező, ahol kézzel megadhatod a szerver adatait.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1187,11 +1212,17 @@ Ha a Nheko nem tud rátalálni a homeszerveredre, meg fog jelenni egy mező, aho
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Egy név ennek az eszköznek, amely meg fog jelenni mások számára, amikor hitelesÃted az eszközeidet. Ha nincs megadva semmi, egy alapértelmezett név lesz használva.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Homeszerver cÃme</translation>
</message>
@@ -1201,14 +1232,7 @@ Ha a Nheko nem tud rátalálni a homeszerveredre, meg fog jelenni egy mező, aho
<translation>szerver.em:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>A cÃm, melyen keresztül el lehet érni a homeszervered kliens API-jét.
-Példa: https://szerver.em:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>BEJELENTKEZÉS</translation>
</message>
@@ -1221,12 +1245,12 @@ Példa: https://szerver.em:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Érvénytelen MatrixazonosÃtót adtál meg. Példa: @janos:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Az automatikus felderÃtés nem sikerült. Helytelen válasz érkezett.</translation>
</message>
@@ -1251,8 +1275,8 @@ Példa: https://szerver.em:8787</translation>
<translation>Egy ismeretlen hiba történt. Ellenőrizd, hogy a homeszervered domainje helyes.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1291,7 +1315,7 @@ Példa: https://szerver.em:8787</translation>
<translation>Üres jelszó</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO bejelentkezés nem sikerült</translation>
</message>
@@ -1371,12 +1395,7 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 létrehozta és beállÃtotta a következÅ‘ szobát: %2</translation>
</message>
@@ -1411,7 +1430,12 @@ Példa: https://szerver.em:8787</translation>
<translation>%1 fogadta a hÃvást.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 befejezte a hÃvást.</translation>
</message>
@@ -1439,7 +1463,7 @@ Példa: https://szerver.em:8787</translation>
<translation>Ãrj egy üzenetet…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1467,12 +1491,22 @@ Példa: https://szerver.em:8787</translation>
<translation>Szerkesztés</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reakció</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Válasz</translation>
</message>
@@ -1482,7 +1516,7 @@ Példa: https://szerver.em:8787</translation>
<translation>Műveletek</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1493,18 +1527,18 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1518,6 +1552,11 @@ Példa: https://szerver.em:8787</translation>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1530,7 +1569,7 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1593,13 +1632,13 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Hogy mások láthassák, melyik eszköz tartozik valóban hozzád, hitelesÃteni tudod Å‘ket. Ez arra is lehetÅ‘séget ad, hogy automatikus biztonsági másolat készüljön a kulcsokról. HitelesÃted a %1 nevű eszközt most?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1750,29 +1789,29 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1797,7 +1836,7 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1807,10 +1846,61 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1818,7 +1908,7 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1959,12 +2049,12 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2004,9 +2094,9 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Egy egyedi profil létrehozása, amellyel be tudsz jelentkezni egyszerre több fiókon keresztül és a Nheko több példányát is tudod futtatni.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2019,6 +2109,34 @@ Példa: https://szerver.em:8787</translation>
<translation>profilnév</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2069,7 +2187,12 @@ Példa: https://szerver.em:8787</translation>
<translation>Jelszó megerÅ‘sÃtése</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Homeszerver</translation>
</message>
@@ -2094,12 +2217,7 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished">Eszköznév</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Egy név ennek az eszköznek, amely meg fog jelenni mások számára, amikor hitelesÃted az eszközeidet. Ha nincs megadva semmi, egy alapértelmezett név lesz használva.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISZTRÃCIÓ</translation>
</message>
@@ -2129,8 +2247,8 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished">Egy ismeretlen hiba történt. Ellenőrizd, hogy a homeszervered domainje helyes.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2171,6 +2289,11 @@ Példa: https://szerver.em:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2193,7 +2316,7 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>nincs tárolva verzió</translation>
</message>
@@ -2201,7 +2324,7 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2252,7 +2375,7 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,42 +2613,7 @@ Példa: https://szerver.em:8787</translation>
<translation>Az összes üzenet</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Bárki és vendégek</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Bárki</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>MeghÃvott felhasználók</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>TitkosÃtás</translation>
</message>
@@ -2561,17 +2649,13 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
@@ -2583,12 +2667,52 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2747,12 @@ Példa: https://szerver.em:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Nem sikerült a titkosÃtás aktiválása: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Profilkép kiválasztása</translation>
</message>
@@ -2675,7 +2799,7 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2815,7 @@ Példa: https://szerver.em:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2881,7 @@ Példa: https://szerver.em:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2944,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2969,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3004,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3090,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Az üzenet visszavonása nem sikerült: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Nem sikerült titkosÃtani az eseményt, küldés megszakÃtva!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Kép mentése</translation>
</message>
@@ -3011,12 +3135,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 nyilvánosan elérhetővé tette a szobát.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 beállÃtotta, hogy meghÃvással lehessen csatlakozni ehhez a szobához.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3326,12 +3445,17 @@ Reason: %4</source>
<translation>%1 visszavonta a kopogását.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Csatlakoztál ehhez a szobához.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3365,10 +3489,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Szerkesztve</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3423,17 +3552,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Vissza a szobák listájára</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Nincs kiválasztva szoba</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3630,7 +3764,7 @@ Reason: %4</source>
<translation>HitelesÃtés visszavonása</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3702,12 +3836,7 @@ Reason: %4</source>
<translation type="unfinished">IndÃtás a tálcán</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Csoport oldalsávja</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Üzenetek küldése Markdownként</translation>
</message>
@@ -3787,12 +3916,7 @@ Reason: %4</source>
<translation type="unfinished">TitkosÃtott üzenetek mutatása az oldalsávban</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished">Idővonal automatikus kitakarása</translation>
</message>
@@ -3992,12 +4116,7 @@ Reason: %4</source>
<translation type="unfinished">Az értesÃtÅ‘hang megadása, amely akkor szól, ha hÃvás érkezik</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished">Az idÅ‘vonalon megjelenÅ‘ üzenetek maximális szélességének megadása (pixelben). Ez javÃthatja az olvashatóságot, amikor a Nheko teljes méretben van széles képernyÅ‘kön.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4027,12 +4146,7 @@ Ha azonnal el legyen homályosÃtva fókuszvesztéskor, állÃtsd
<translation type="unfinished">Induljon az alkalmazás a háttérben, a főablak mutatása nélkül.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished">Csoportok és cÃmkék megjelenÃtése a szobák listája mellett egy oszlopban.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">A Markdown használatának engedélyezése az üzenetekben.
@@ -4061,16 +4175,7 @@ This will also enable or disable sending typing notifications to others.</source
Ez be vagy ki is kapcsolja a gépelési értesÃtések küldését másoknak.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished">Az új üzeneteket tartalmazó szobák jelenjenek meg elöl.
-Ha ki van kapcsolva, a szobák sorrendje csak a bennük lévő utolsó üzenet dátuma alapján történik.
-Ha be van kapcsolva, azok a szobák kerülnek felülre, amelyekhez aktÃv értesÃtés tartozik (amelyet a számot tartalmazó kis kör jelez). A némÃtott szobák továbbra is dátum alapján lesznek rendezve, mivel nem valószÃnű, hogy ezeket annyira fontosnak tartod, mint a többi szobát.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished">Gombok mutatása minden egyes üzenet mellett a gyors válaszhoz, reakcióhoz és egyéb műveletek eléréséhez.</translation>
</message>
@@ -4086,7 +4191,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4098,7 +4213,34 @@ This usually causes the application icon in the task bar to animate in some fash
Ettől általában animálttá válik az alkalmazásablakok listáján szereplő ikon.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4129,12 +4271,7 @@ Only affects messages in encrypted chats.</source>
Csak a titkosÃtott csevegések üzeneteire vonatkozik.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished">Amikor az ablak elveszÃti a fókuszt,
@@ -4161,12 +4298,7 @@ az idÅ‘vonal homályosÃtva lesz.</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4286,7 +4418,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation type="unfinished">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>
@@ -4345,7 +4477,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Tegnap</translation>
</message>
@@ -4369,8 +4501,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Nyisd meg a fallback-ket, kövesd az utasÃtásokat, és erÅ‘sÃtsd meg, ha végeztél velük!</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_id.ts b/resources/langs/nheko_id.ts
index e0527954e8cab48f3d715e69ef8003b83f79bbd6..dac86dedd8ad3b598855a6d245dd03c2f13eedc1 100644
--- a/resources/langs/nheko_id.ts
+++ b/resources/langs/nheko_id.ts
@@ -99,10 +99,38 @@
<translation>Tambahkan</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 dan %n lainnya</numerusform>
@@ -198,12 +226,7 @@
<translation>Pengguna yang diundang: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Migrasi cache ke versi saat ini gagal. Ini dapat memiliki alasan yang berbeda. Silakan buka masalah dan coba gunakan versi yang lebih lama untuk sementara. Alternatifnya kamu bisa mencoba menghapus cache secara manual.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Cache pada diskmu lebih baru daripada versi yang didukung Nheko ini. Harap perbarui Nheko atau bersihkan cachemu.</translation>
</message>
@@ -218,14 +241,7 @@
<translation>Ketuk pada ruangan</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Kamu gagal bergabung %1. Kamu dapat mengetuk, supaya lainnya dapat mengundang kamu masuk. Apakah kamu ingin melakukannya?
-Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketukan kamu:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Apakah kamu ingin mengetuk pada %1? Kamu dapat memberikan alasan secara opsional supaya lainnya dapat menerima ketukan kamu:</translation>
</message>
@@ -306,7 +322,12 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<translation>Migrasi cache gagal!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versi cache tidak kompatibel</translation>
</message>
@@ -334,7 +355,13 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<translation>Mohon mencoba masuk lagi: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Gagal bergabung ruangan: %1</translation>
</message>
@@ -388,13 +415,13 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Jangan tampilkan hitungan notifikasi untuk space atau tag ini.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Sembunyikan ruangan dengan tanda ini atau dari space ini secara default.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -460,24 +487,24 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<translation>Pesan dari servermu atau administratormu.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Gagal memperbarui anak space: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Gagal menghapus anak space: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Gagal memperbarui induk space: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Gagal menghapus induk space: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -501,13 +528,13 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>Ruangan ini tidak bisa digabung secara langsung. Tetapi kamu bisa mengetuk pada ruangan dan anggota ruangan bisa menerima atau menolak permintaan pergabungan ini. Kamu bisa menambahkan alasan secara opsional untuk membuat mereka terima di bawah:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Apakah kamu ingin bergabung ke ruangan ini? Kamu bisa menambahkan alasan secara opsional di bawah:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Apakah kamu ingin bergabung ke ruangan ini? Kamu bisa menambahkan alasan secara opsional di bawah:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -592,8 +619,8 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Ruangan publik dapat digabung oleh siapa pun, ruangan privat membutuhkan undangan.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1068,7 +1095,7 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Pilih sebuah file</translation>
</message>
@@ -1078,7 +1105,7 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
<translation>Semua File (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Pengunggahan '%1' gagal</translation>
</message>
@@ -1162,14 +1189,11 @@ Kamu dapat memberikan alasan secara opsional untuk lainnya untuk menerima ketuka
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Nama loginmu. Sebuah MXID harus mulai dengan @ diikuti dengan ID pengguna. Setelah ID penggunanya kamu harus menambahkan nama server setelah :.
-Kamu juga bisa memasukkan alamat homeserver-mu, jika servermu tidak mendukung pencarian .well-known.
-Misalnya: @pengguna:server.my
-Jika Nheko gagal menemukan homeservermu, Nheko akan menampilkan kolom untuk memasukkan servernya secara manual.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1188,11 +1212,17 @@ Jika Nheko gagal menemukan homeservermu, Nheko akan menampilkan kolom untuk mema
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Sebuah nama perangkat untuk perangkat ini, yang akan ditampilkan untuk yang lain, ketika memverifikasi perangkatmu. Jika tidak dimasukkan nama perangkat yang default akan digunakan.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Alamat homeserver</translation>
</message>
@@ -1202,14 +1232,7 @@ Jika Nheko gagal menemukan homeservermu, Nheko akan menampilkan kolom untuk mema
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Alamat yang dapat digunakan untuk menghubungi API klien homeserver-mu.
-Misalnya: https://server.id:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>MASUK</translation>
</message>
@@ -1222,12 +1245,12 @@ Misalnya: https://server.id:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Kamu telah memasukkan ID Matrix yang tidak valid mis. @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Penemuan otomatis gagal. Menerima respons cacat.</translation>
</message>
@@ -1252,9 +1275,9 @@ Misalnya: https://server.id:8787</translation>
<translation>Terjadi kesalahan yang tidak diketahui. Pastikan domain homeservernya valid.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>Server yang dipilih tidak mendukung sebuah versi protokol Matrix yang klien ini tahu (v1.1, v1.2, atau v1.3). Kamu tidak bisa masuk.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1292,7 +1315,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Kata sandi kosong</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Login SSO gagal</translation>
</message>
@@ -1372,12 +1395,7 @@ Misalnya: https://server.id:8787</translation>
<translation>%1 mengubah alamat-alamat untuk ruangan ini.</translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 mengubah induk space untuk ruangan ini.</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 membuat dan mengkonfigurasikan ruangan: %2</translation>
</message>
@@ -1412,7 +1430,12 @@ Misalnya: https://server.id:8787</translation>
<translation>%1 menjawab panggilan.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 mengakhir panggilan.</translation>
</message>
@@ -1440,7 +1463,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Ketik pesan…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Stiker</translation>
</message>
@@ -1468,12 +1491,22 @@ Misalnya: https://server.id:8787</translation>
<translation>Edit</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reaksi</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Balas</translation>
</message>
@@ -1483,7 +1516,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Opsi</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Alasan untuk menghapus</translation>
</message>
@@ -1494,18 +1527,18 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Salin</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Salin lokasi &tautan</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&aksi</translation>
</message>
@@ -1519,6 +1552,11 @@ Misalnya: https://server.id:8787</translation>
<source>&Edit</source>
<translation>&Edit</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1531,8 +1569,8 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Lapor&an terbaca</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1594,13 +1632,13 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Untuk mengizinkan pengguna lain melihat perangkat mana yang benar-benar milikmu, kamu bisa memverifikasinya. Ini juga memungkinkan cadangan kunci bekerja secara otomatis. Verifikasi perangkat yang belum diverifikasi sekarang? (Pastikan kamu memiliki salah satu perangkat tersebut.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Untuk mengizinkan pengguna yang lain untuk melihat perangkat apa saja yang sebenarnya milikmu, lakukan verifikasi pada perangkatnya. Ini juga dapat membuat kunci cadangan bekerja secara otomatis. Verifikasi %1 sekarang?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1751,29 +1789,29 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Administrator (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderator (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Pengguna (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Kustom (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Hapus tipe peristiwa</translation>
</message>
@@ -1798,7 +1836,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Pindahkan pengguna ke atas atau ke bawah untuk mengubah izin mereka</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Hapus pengguna</translation>
</message>
@@ -1808,10 +1846,61 @@ Misalnya: https://server.id:8787</translation>
<translation>Tambahkan pengguna</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Gagal memperbarui tingkat daya: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Gagal memperbarui tingkat daya: %1</translation>
</message>
@@ -1819,7 +1908,7 @@ Misalnya: https://server.id:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Peristiwa lainnya</translation>
</message>
@@ -1960,13 +2049,13 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Edit ruangan anak</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Mengubah space induk</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2005,9 +2094,9 @@ Misalnya: https://server.id:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Buat profil yang unik, yang memungkinkan kamu untuk masuk ke beberapa akun pada waktu bersamaan dan mulai beberapa instansi Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2020,6 +2109,34 @@ Misalnya: https://server.id:8787</translation>
<translation>nama profil</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2070,7 +2187,12 @@ Misalnya: https://server.id:8787</translation>
<translation>Konfirmasi kata sandi</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Homeserver</translation>
</message>
@@ -2095,12 +2217,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Nama perangkat</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Sebuah nama perangkat untuk perangkat ini, yang akan ditampilkan untuk yang lain, ketika memverifikasi perangkatmu. Jika tidak dimasukkan nama perangkat yang default akan digunakan.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>DAFTAR</translation>
</message>
@@ -2130,9 +2247,9 @@ Misalnya: https://server.id:8787</translation>
<translation>Terjadi kesalahan yang tidak diketahui. Pastikan domain homeservernya valid.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>Server yang dipilih tidak mendukung sebuah versi protokol Matrix yang klien ini tahu (v1.1, v1.2, atau v1.3). Kamu tidak bisa mendaftar.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2172,6 +2289,11 @@ Misalnya: https://server.id:8787</translation>
<source>Cancel Edit</source>
<translation>Batalkan Pengeditan</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2194,7 +2316,7 @@ Misalnya: https://server.id:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>tidak ada versi yang disimpan</translation>
</message>
@@ -2202,7 +2324,7 @@ Misalnya: https://server.id:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Tag baru</translation>
</message>
@@ -2253,8 +2375,8 @@ Misalnya: https://server.id:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Tambahkan atau hilangkan dari space</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2491,42 +2613,7 @@ Misalnya: https://server.id:8787</translation>
<translation>Semua pesan</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Akses ruangan</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Siapa saja dan tamu</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Siapa saja</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Pengguna yang diundang</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Dengan mengetuk</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Dibatasi oleh keanggotaan di ruangan lain</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Dibatasi oleh peranggotaan dalam ruangan lain atau dengan mengetuk</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Enkripsi</translation>
</message>
@@ -2563,17 +2650,13 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
<translation>Pengaturan Stiker & Emote</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Ubah</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Ubah paket apa yang diaktifkan, hapus paket atau buat yang baru</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Peristiwa tersembunyi</translation>
</message>
@@ -2585,12 +2668,52 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
<translation>Konfigurasi</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Alias</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Pilih peristiwa untuk disembunyikan di ruangan ini</translation>
</message>
@@ -2625,12 +2748,12 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
<translation>tampilkan</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Gagal mengaktifkan enkripsi: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Pilih sebuah avatar</translation>
</message>
@@ -2677,7 +2800,7 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Mohon masukkan kata sandi loginmu untuk melanjutkan:</translation>
</message>
@@ -2693,8 +2816,8 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Mohon masukkan tokennya yang telah dikirim ke kamu:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2759,7 +2882,7 @@ Dicatat bahwa ini tidak dapat dinonaktifkan setelah ini.</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Gagal menghubungkan ke penyimpanan rahasia</translation>
</message>
@@ -2824,7 +2947,7 @@ Jika kamu memilih verifikasi, kamu harus memiliki perangkat lain yang tersedia.
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Gagal membuat kunci untuk penandatanganan silang!</translation>
</message>
@@ -2849,7 +2972,7 @@ Jika kamu memilih verifikasi, kamu harus memiliki perangkat lain yang tersedia.
<translation>Penyiapan enkripsi gagal: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Kunci identitas telah berubah. Ini merusak enkripsi ujung-ke-ujung, jadi kamu dikeluarkan.</translation>
</message>
@@ -2884,8 +3007,8 @@ Jika kamu memilih verifikasi, kamu harus memiliki perangkat lain yang tersedia.
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Tambahkan atau hilangkan dari space</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2970,19 +3093,19 @@ Jika kamu memilih verifikasi, kamu harus memiliki perangkat lain yang tersedia.
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Reaksi pesan gagal: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Gagal mendekripsikan peristiwa, pengiriman dihentikan!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Simpan gambar</translation>
</message>
@@ -3015,12 +3138,7 @@ Jika kamu memilih verifikasi, kamu harus memiliki perangkat lain yang tersedia.
<translation>%1 membuka ruangan ke publik.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 membuat ruangan ini membutuhkan undangan untuk bergabung.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 mengizinkan siapa saja untuk bergabung ke ruangan ini dengan mengetuk.</translation>
</message>
@@ -3331,12 +3449,17 @@ Alasan: %4</translation>
<translation>%1 menolak ketukannya.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Kamu bergabung ruangan ini.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 mengundang %2.</translation>
</message>
@@ -3370,10 +3493,15 @@ Alasan: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Diedit</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3428,17 +3556,22 @@ Alasan: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Kembali ke daftar ruangan</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Tidak ada ruangan yang dipilih</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Tampilkan anggota ruangan.</translation>
</message>
@@ -3635,7 +3768,7 @@ Alasan: %4</translation>
<translation>Hapus verifikasi</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Keluarkan perangkat %1</translation>
</message>
@@ -3707,12 +3840,7 @@ Alasan: %4</translation>
<translation>Mulai di baki</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Bilah samping grup</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Kirim pesan sebagai Markdown</translation>
</message>
@@ -3792,12 +3920,7 @@ Alasan: %4</translation>
<translation>Dekripsikan pesan di bilah samping</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Tampilkan hitungan pesan untuk space</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Layar Privasi</translation>
</message>
@@ -3997,12 +4120,7 @@ Alasan: %4</translation>
<translation>Tetapkan suara notifikasi untuk dimainkan ketika ada panggilan</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Tetapkan lebar maksimum pesan di linimasa (dalam pixel). Ini bisa membantu keterbacaan di layar lebar, ketika Nheko dimaksimalkan.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4149,7 @@ Tetapkan ke 0 untuk memburamkan secara langsung setelah kehilangan fokus. Nilai
<translation>Mulai aplikasinya di latar belakang tanpa menunjukkan jendela kliennya.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Tampilkan sebuah kolom yang berisi grup dan tanda di sebelah daftar ruangan.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Memperbolehkan menggunakan Markdown di pesan.
@@ -4065,16 +4178,7 @@ This will also enable or disable sending typing notifications to others.</source
Ini akan mengaktifkan atau menonaktifkan pengiriman pemberitahuan pengetikan ke yang lain.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Menampilkan ruangan dengan pesan baru pertama.
-Jika ini dimatikan, daftar ruangan hanya diurutkan dari waktu pesan terakhir di ruangan.
-Jika ini dinyalakan, ruangan yang mempunyai notifikasi aktif (lingkaran kecil dengan nomor didalam) akan diurutkan di atas. Ruangan, yang dibisukan, masih diurutkan dari waktu, karena kamu tidak pertimbangkan mereka sebagai penting dengan ruangan yang lain.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Tampilkan tombol untuk membalas, bereaksi, atau mengakses opsi tambahan di sebelah pesan dengan cepat.</translation>
</message>
@@ -4091,7 +4195,17 @@ OFF - square, ON - circle.</source>
MATI - kotak, NYALA - bulat.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>Kunci untuk memverifikasi perangkat-perangkatmu. Jika dicache, memverifikasi salah satu perangkatmu akan menandainya sebagai terverifikasi untuk perangkatmu yang lain dan untuk pengguna yang telah memverifikasimu.</translation>
</message>
@@ -4103,7 +4217,34 @@ This usually causes the application icon in the task bar to animate in some fash
Ini biasanya menyebabkan ikon aplikasi di bilah tugas untuk beranimasi.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4138,12 +4279,7 @@ Only affects messages in encrypted chats.</source>
Hanya mempengaruhi pesan di chat terenkripsi.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Pilih di mana untuk menampilkan jumlah notifikasi total dalam sebuah space.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Ketika jendela kehilangan fokus, linimasanya
@@ -4170,12 +4306,7 @@ akan diburamkan.</translation>
<translation>Memerlukan pengguna diverifikasi untuk mengirim pesan terenkripsi ke pengguna. Ini meningkatkan keamanan tetapi membuat enkripsi ujung-ke-ujung lebih susah.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Secara otomatis membalas ke permintaan kunci dari pengguna lain, jika mereka terverifikasi, bahkan jika perangkat itu seharusnya tidak mempunyai akses ke kunci itu secara lain.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Unduh kunci enkripsi pesan dari dan unggah ke cadangan kunci daring terenkripsi.</translation>
</message>
@@ -4297,7 +4428,7 @@ Pengaturan ini akan ditetapkan saat dimulai ulang.</translation>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Tidak ada chat privat terenkripsi ditemukan dengan pengguna ini. Buat sebuah chat privat terenkripsi dengan pengguna ini dan coba lagi.</translation>
</message>
@@ -4356,7 +4487,7 @@ Pengaturan ini akan ditetapkan saat dimulai ulang.</translation>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Kemarin</translation>
</message>
@@ -4380,8 +4511,8 @@ Pengaturan ini akan ditetapkan saat dimulai ulang.</translation>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Buka fallbacknya, ikuti petunjuknya, dan konfirmasi setelah menyelesaikannya.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts
index 613b79b5527128274a954e57eec489dc17b54cc6..ad3c7793b1e1c13909c7f265941cac3c6284fec1 100644
--- a/resources/langs/nheko_it.ts
+++ b/resources/langs/nheko_it.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation>Invitato utente: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Migrazione della cache alla versione corrente fallita. Questo può avere diverse cause. Per favore apri una issue e nel frattempo prova ad usare una versione più vecchia. In alternativa puoi provare a cancellare la cache manualmente.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Migrazione della cache fallita!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versione della cache incompatibile</translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Per favore prova ad accedere nuovamente: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Impossibile accedere alla stanza: %1</translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished">Seleziona un file</translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished">Tutti i File (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,14 +1191,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Il tuo nome utente. Un mxid dovrebbe iniziare con @ seguita dall'user id. Dopo l'user id hai bisogno di includere il nome del tuo server dopo un :.
-Puoi anche inserire qui l'indirizzo del tuo homeserver, se il tuo server non supporta la ricerca con .well-known.
-Esempio: @utente:server.mio
-Se Nheko non conclude la ricerca del tuo homeserver, ti mostrerà un campo in cui inserire il server manualmente.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1189,11 +1214,17 @@ Se Nheko non conclude la ricerca del tuo homeserver, ti mostrerà un campo in cu
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Indirizzo Homeserver</translation>
</message>
@@ -1203,14 +1234,7 @@ Se Nheko non conclude la ricerca del tuo homeserver, ti mostrerà un campo in cu
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>L'indirizzo che può essere usato per contattare le API client del tuo homeserver.
-Esempio: https://server.mio:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ACCEDI</translation>
</message>
@@ -1223,12 +1247,12 @@ Esempio: https://server.mio:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Hai inserito un ID Matrix non valido, es @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Ricerca automatica fallita. Ricevuta risposta malformata.</translation>
</message>
@@ -1253,8 +1277,8 @@ Esempio: https://server.mio:8787</translation>
<translation>Avvenuto un errore sconosciuto. Assicurati che il dominio dell'homeserver sia valido.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1293,7 +1317,7 @@ Esempio: https://server.mio:8787</translation>
<translation>Password vuota</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Accesso SSO fallito</translation>
</message>
@@ -1374,7 +1398,7 @@ Esempio: https://server.mio:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1441,7 +1465,7 @@ Esempio: https://server.mio:8787</translation>
<translation type="unfinished">Scrivi un messaggio…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1469,12 +1493,22 @@ Esempio: https://server.mio:8787</translation>
<translation>Modifica</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reagisci</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished">Risposta</translation>
</message>
@@ -1484,7 +1518,7 @@ Esempio: https://server.mio:8787</translation>
<translation type="unfinished">Opzioni</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1495,18 +1529,18 @@ Esempio: https://server.mio:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1520,6 +1554,11 @@ Esempio: https://server.mio:8787</translation>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1532,7 +1571,7 @@ Esempio: https://server.mio:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1595,14 +1634,13 @@ Esempio: https://server.mio:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Per permettere agli altri utenti di vedere che dispositivi ti appartengono, puoi verificarli. Questo inoltre permette alle chiavi di recupero di funzionare automaticamente.
-Verificare %1 adesso?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Verificare %1 adesso?</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1800,7 +1838,7 @@ Verificare %1 adesso?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1810,10 +1848,61 @@ Verificare %1 adesso?</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1821,7 +1910,7 @@ Verificare %1 adesso?</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1962,12 +2051,12 @@ Verificare %1 adesso?</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2007,8 +2096,8 @@ Verificare %1 adesso?</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2022,6 +2111,34 @@ Verificare %1 adesso?</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Verificare %1 adesso?</translation>
<translation>Conferma della password</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Homeserver</translation>
</message>
@@ -2097,12 +2219,7 @@ Verificare %1 adesso?</translation>
<translation type="unfinished">Nome del dispositivo</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTRATI</translation>
</message>
@@ -2132,8 +2249,8 @@ Verificare %1 adesso?</translation>
<translation type="unfinished">Avvenuto un errore sconosciuto. Assicurati che il dominio dell'homeserver sia valido.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2174,6 +2291,11 @@ Verificare %1 adesso?</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Verificare %1 adesso?</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>nessuna versione memorizzata</translation>
</message>
@@ -2204,7 +2326,7 @@ Verificare %1 adesso?</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2255,7 +2377,7 @@ Verificare %1 adesso?</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2495,105 +2617,106 @@ Verificare %1 adesso?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation type="unfinished"></translation>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
+ <translation type="unfinished">Crittografia End-to-End</translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
- <translation type="unfinished">Crittografia End-to-End</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
- <source>Hidden events</source>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2628,12 +2751,12 @@ Verificare %1 adesso?</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished">Impossibile abilitare la crittografia: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished">Scegli un avatar</translation>
</message>
@@ -2680,7 +2803,7 @@ Verificare %1 adesso?</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2696,7 +2819,7 @@ Verificare %1 adesso?</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2762,7 +2885,7 @@ Verificare %1 adesso?</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2825,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2850,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2885,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2971,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Oscuramento del messaggio fallito: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Salva immagine</translation>
</message>
@@ -3017,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 ha aperto la stanza al pubblico.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 ha configurato questa stanza per richiedere un invito per entrare.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3336,12 +3454,17 @@ Reason: %4</source>
<translation>%1 ha oscurato la sua bussata.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Sei entrato in questa stanza.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3375,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3434,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3642,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3714,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished">Avvia nella tray</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Barra laterale dei gruppi</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Invia messaggi come Markdown</translation>
</message>
@@ -3799,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished">Decripta messaggi nella barra laterale</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -4004,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4036,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4068,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4091,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4102,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4132,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4163,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4288,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4347,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Ieri</translation>
</message>
@@ -4371,8 +4504,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Apri il ripiego, segui i passaggi e conferma dopo averli completati.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index f37ca7f8f37d7d7827abb9a1dd035b946e5b662d..103273b8292c86095e5105098ec4ec97bf43c00f 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -198,12 +226,7 @@
<translation>招待ã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -218,13 +241,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -305,7 +322,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +355,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>ã‚‚ã†ä¸€åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã¿ã¦ä¸‹ã•ã„: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>部屋ã«å‚åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation>
</message>
@@ -387,12 +415,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -459,23 +487,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -500,12 +528,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -591,7 +619,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1067,7 +1095,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished">ファイルをé¸æŠž</translation>
</message>
@@ -1077,7 +1105,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished">å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1161,8 +1189,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1184,27 +1212,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ãƒã‚°ã‚¤ãƒ³</translation>
</message>
@@ -1217,12 +1245,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>自動検出ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ä¸æ£ãªå½¢å¼ã®å¿œç”ã‚’å—ä¿¡ã—ã¾ã—ãŸã€‚</translation>
</message>
@@ -1247,8 +1275,8 @@ Example: https://server.my:8787</source>
<translation>ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ホームサーãƒãƒ¼ã®ãƒ‰ãƒ¡ã‚¤ãƒ³åãŒæœ‰åŠ¹ã§ã‚ã‚‹ã‹ã‚’確èªã—ã¦ä¸‹ã•ã„。</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1287,7 +1315,7 @@ Example: https://server.my:8787</source>
<translation>パスワードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1368,7 +1396,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1435,7 +1463,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">メッセージを書ã...</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1463,12 +1491,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished">返信</translation>
</message>
@@ -1478,7 +1516,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">オプション</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1489,18 +1527,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1514,6 +1552,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1526,7 +1569,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1589,12 +1632,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1746,29 +1789,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1793,7 +1836,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1803,10 +1846,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1814,7 +1908,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1955,12 +2049,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2000,8 +2094,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2015,6 +2109,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2065,7 +2187,12 @@ Example: https://server.my:8787</source>
<translation>パスワード確èª</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2090,12 +2217,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">デãƒã‚¤ã‚¹å</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>登録</translation>
</message>
@@ -2125,8 +2247,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ホームサーãƒãƒ¼ã®ãƒ‰ãƒ¡ã‚¤ãƒ³åãŒæœ‰åŠ¹ã§ã‚ã‚‹ã‹ã‚’確èªã—ã¦ä¸‹ã•ã„。</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2167,6 +2289,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2189,7 +2316,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“</translation>
</message>
@@ -2197,7 +2324,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2248,7 +2375,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2486,105 +2613,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation type="unfinished"></translation>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
+ <translation type="unfinished">エンドツーエンド暗å·åŒ–</translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
- <translation type="unfinished">エンドツーエンド暗å·åŒ–</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
- <source>Hidden events</source>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2619,12 +2747,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished">æš—å·åŒ–を有効ã«ã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished">ã‚¢ãƒã‚¿ãƒ¼ã‚’é¸æŠž</translation>
</message>
@@ -2671,7 +2799,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2687,7 +2815,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2753,7 +2881,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2816,7 +2944,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2841,7 +2969,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2876,7 +3004,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2962,19 +3090,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>メッセージを編集ã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>ç”»åƒã‚’ä¿å˜</translation>
</message>
@@ -3007,12 +3135,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3322,12 +3445,17 @@ Reason: %4</source>
<translation>%1ãŒãƒŽãƒƒã‚¯ã‚’編集ã—ã¾ã—ãŸã€‚</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3361,10 +3489,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3419,17 +3552,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3626,7 +3764,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3698,12 +3836,7 @@ Reason: %4</source>
<translation type="unfinished">トレイã§èµ·å‹•</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">グループサイドãƒãƒ¼</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">メッセージをMarkdownã¨ã—ã¦é€ä¿¡</translation>
</message>
@@ -3783,12 +3916,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3988,12 +4116,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4020,12 +4143,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4052,14 +4170,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4075,7 +4186,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4207,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4116,12 +4264,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4147,12 +4290,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4272,7 +4410,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4331,7 +4469,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>昨日</translation>
</message>
@@ -4355,7 +4493,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_ml.ts b/resources/langs/nheko_ml.ts
index 3ef4b82fa54792818ed90b2cd4ffbb76d04aa6a4..fc4478eeef774fe62aadda29e3163d4568aed999 100644
--- a/resources/langs/nheko_ml.ts
+++ b/resources/langs/nheko_ml.ts
@@ -99,10 +99,38 @@
<translation type="unfinished">ചേർകàµà´•àµà´•</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation>à´•àµà´·à´£à´¿à´šàµà´š ഉപയോകàµà´¤à´¾à´µàµ:% 1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>ദയവായി വീണàµà´Ÿàµà´‚ ലോഗിൻ ചെയàµà´¯à´¾àµ» നോകàµà´•àµà´•: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>à´®àµà´±à´¿à´¯à´¿àµ½ ചേരàµà´¨àµà´¨à´¤à´¿àµ½ പരാജയം: %1</translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>ഒരൠഫയൽ തിരഞàµà´žàµ†à´Ÿàµà´•àµà´•àµà´•</translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>à´Žà´²àµà´²à´¾ ഫയലàµà´•à´³àµà´‚ (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,8 +1191,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1186,27 +1214,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>à´ªàµà´°à´µàµ‡à´¶à´¿à´•àµà´•àµà´•</translation>
</message>
@@ -1219,12 +1247,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1249,8 +1277,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1289,7 +1317,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1369,12 +1397,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1409,7 +1432,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1437,7 +1465,7 @@ Example: https://server.my:8787</source>
<translation>ഒരൠസനàµà´¦àµ‡à´¶à´‚ à´Žà´´àµà´¤àµà´•â€¦.</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>à´¸àµà´±àµà´±à´¿à´•àµà´•à´±àµà´•àµ¾</translation>
</message>
@@ -1465,12 +1493,22 @@ Example: https://server.my:8787</source>
<translation>തിരàµà´¤àµà´¤àµà´•</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>മറàµà´ªà´Ÿà´¿ നൽകàµà´•</translation>
</message>
@@ -1480,7 +1518,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1491,18 +1529,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1516,6 +1554,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1528,7 +1571,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1591,12 +1634,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1748,29 +1791,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1795,7 +1838,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1805,10 +1848,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1816,7 +1910,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1957,12 +2051,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2002,8 +2096,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2017,6 +2111,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2067,7 +2189,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2092,12 +2219,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">ഉപകരണതàµà´¤à´¿à´¨àµà´±àµ† പേരàµ</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,8 +2249,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2169,6 +2291,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2191,7 +2318,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2199,7 +2326,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2250,7 +2377,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,105 +2617,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2751,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2675,7 +2803,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2819,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2885,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3012,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3331,12 +3454,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished">നിങàµà´™àµ¾ à´ˆ à´®àµà´±à´¿à´¯à´¿àµ½ ചേർനàµà´¨àµ.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3370,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3429,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3637,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3709,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3794,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3999,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4063,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4127,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4158,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4283,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4342,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4366,7 +4504,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index c6a49c5215fa91d3b8b5209572ef571971cdfd14..19a581660ddb6bbe0255e9bfaed2364c6953b787 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -99,10 +99,38 @@
<translation>Toevoegen</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 en %n ander</numerusform>
@@ -199,12 +227,7 @@
<translation>Gebruiker uitgenodigd: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Het migreren can de cache naar de huidige versie is mislukt. Dit kan verscheidene redenen hebben. Maak a.u.b een issue aan en probeer in de tussentijd een oudere versie. Je kan ook proberen de cache handmatig te verwijderen.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>De opgeslagen gegevens van Nheko zijn nieuwer dan de versie die je nu draait. Update Nheko of verwijder de gegevens.</translation>
</message>
@@ -219,14 +242,7 @@
<translation>Aankloppen</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Kon %1 niet binnengaan. Je kan proberen aan te kloppen, zo dat anderen je binnen kunnen laten. Wil je dat doen?
-Je kan optioneel een reden voor het aankloppen opgeven:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Wil je echt aankloppen bij %1? Je mag optioneel nog een reden opgeven:</translation>
</message>
@@ -307,7 +323,12 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<translation>Migreren van de cache is mislukt!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Incompatibele cacheversie</translation>
</message>
@@ -335,7 +356,13 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<translation>Probeer a.u.b. opnieuw in te loggen: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Kamer binnengaan mislukt: %1</translation>
</message>
@@ -389,13 +416,13 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Laat geen melding-teller zien voor deze groep of markering.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Verberg standaard kamers met deze markering of uit deze groep.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -461,24 +488,24 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<translation>Berichten van je server of beheerder.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Kon groepskind niet veranderen: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Kon groepskind niet verwijderen: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Kon groepsouder niet bijwerken: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Kon groepsouder niet verwijderen: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -503,13 +530,13 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>Deze kamer kan niet direct binnengegaan worden. Je kan wel aankloppen, en dan kunnen deelnemers je binnenlaten of weigeren. Je kan optioneel hieronder een reden om je binnen te laten invoeren:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Wil je deze kamer binnentreden? Je kan optioneel hieronder een reden opgeven:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Wil je deze kamer binnentreden? Je kan optioneel hieronder een reden opgeven:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -594,8 +621,8 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Publieke kamers kunnen door iedereen worden betreden, privé kamers hebben een expliciete uitnodig nodig.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1070,7 +1097,7 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Selecteer een bestand</translation>
</message>
@@ -1080,7 +1107,7 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
<translation>Alle bestanden (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Versturen van '%1' misluk</translation>
</message>
@@ -1164,14 +1191,11 @@ Je kan optioneel een reden voor het aankloppen opgeven:</translation>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Je inlognaam. Een mxid begint met @ gevolgd door de gebruikersnaam. Daarachter komt een dubbele punt (:) en de servernaam.
-Je kan ook het adres van je thuisserver daar invoeren, als die geen .well-known ondersteund.
-Voorbeeld: @gebruiker:mijnserver.nl
-Als Nheko je thuisserver niet kan vinden, zal er een veld verschijnen om de server handmatig in te voeren.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1190,11 +1214,17 @@ Als Nheko je thuisserver niet kan vinden, zal er een veld verschijnen om de serv
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Een naam voor dit apparaat, welke zichtbaar zal zijn voor anderen als ze je apparaten verifiëren. Als niets is ingevuld zal er een standaardnaam worden gebruikt.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Thuisserveradres</translation>
</message>
@@ -1204,14 +1234,7 @@ Als Nheko je thuisserver niet kan vinden, zal er een veld verschijnen om de serv
<translation>mijnserver.nl:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Het adres dat gebruikt kan worden om contact te zoeken met je thuisserver's gebruikers API.
-Voorbeeld: https://server.my:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>INLOGGEN</translation>
</message>
@@ -1224,12 +1247,12 @@ Voorbeeld: https://server.my:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Je hebt een ongeldige Matrix ID ingevuld. Correct voorbeeld: @jan:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Automatische herkenning mislukt. Ongeldig antwoord ontvangen.</translation>
</message>
@@ -1254,9 +1277,9 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Een onbekende fout trad op. Zorg dat de thuisserver geldig is.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>De gekozen server ondersteund geen versie van het Matrix protocol die deze applicatie begrijpt (v1.1, v1.2 of v1.3). Je kan daardoor niet inloggen.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1294,7 +1317,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Leeg wachtwoord</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO inloggen mislukt</translation>
</message>
@@ -1375,8 +1398,8 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 heeft de groepen voor deze kamer aangepast.</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1442,7 +1465,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Typ een bericht…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Stickers</translation>
</message>
@@ -1470,12 +1493,22 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Bewerken</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reageren</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Beantwoorden</translation>
</message>
@@ -1485,7 +1518,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Opties</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Reden voor verwijdering</translation>
</message>
@@ -1496,18 +1529,18 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopiëren</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopieer &link</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&ageren</translation>
</message>
@@ -1521,6 +1554,11 @@ Voorbeeld: https://server.my:8787</translation>
<source>&Edit</source>
<translation>B&ewerken</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1533,8 +1571,8 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Leesbeves&tigingen</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1596,13 +1634,13 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Om andere gebruikers te laten weten welke apparaten echt van jou zijn, kan je ze verifiëren. Dit zorgt ook dat reservesleutels automatisch werken. Nu een ongeverifiëerd apparaat verifiëren? (Zorg a.u.b. dat je een van de apparaten bij de hand hebt.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Om andere gebruikers te laten weten welke apparaten echt van jou zijn, kan je ze verifiëren. Dit zorgt ook dat reservesleutels automatisch werken. Nu %1 verifiëren?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1753,29 +1791,29 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Beheerder (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Toezichthouder (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Gebruiker (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>Aangepast (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Verwijder evenementtype</translation>
</message>
@@ -1800,7 +1838,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Verplaats gebruikers omhoog of omlaag om hun niveau en toestemmingen aan te passen</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Verwijder gebruiker</translation>
</message>
@@ -1810,10 +1848,61 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Gebruiker toevoegen</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Kon machtsniveau niet bewerken: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Kon machtsniveau niet bewerken: %1</translation>
</message>
@@ -1821,7 +1910,7 @@ Voorbeeld: https://server.my:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Andere evenementen</translation>
</message>
@@ -1962,13 +2051,13 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Kindkamers veranderen</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Ouderkamers veranderen</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2007,9 +2096,9 @@ Voorbeeld: https://server.my:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Creëer een uniek profiel, waardoor je op meerdere accounts tegelijk kan inloggen, en meerdere kopieën van Nheko tegelijk kan starten.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2022,6 +2111,34 @@ Voorbeeld: https://server.my:8787</translation>
<translation>profielnaam</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2072,7 +2189,12 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Wachtwoord bevestigen</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Thuisserver</translation>
</message>
@@ -2097,12 +2219,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Apparaatnaam</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Een naam voor dit apparaat, welke zichtbaar zal zijn voor anderen als ze je apparaten verifiëren. Als niets is ingevuld zal er een standaardnaam worden gebruikt.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTREREN</translation>
</message>
@@ -2132,9 +2249,9 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Een onbekende fout trad op. Zorg dat de thuisserver geldig is.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>De gekozen server ondersteund geen versie van het Matrix protocol die deze toepassing begrijpt (v1.1, v1.2 of v1.3). Je kan je daarom niet registreren.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2174,6 +2291,11 @@ Voorbeeld: https://server.my:8787</translation>
<source>Cancel Edit</source>
<translation>Bewerken annuleren</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2196,7 +2318,7 @@ Voorbeeld: https://server.my:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>geen versie opgeslagen</translation>
</message>
@@ -2204,7 +2326,7 @@ Voorbeeld: https://server.my:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nieuwe markering</translation>
</message>
@@ -2255,8 +2377,8 @@ Voorbeeld: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Toevoegen of verwijderen aan/uit groep</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2495,42 +2617,7 @@ Voorbeeld: https://server.my:8787</translation>
<translation>Alle berichten</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Kamertoegang</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Iedereen (inclusief gasten)</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Iedereen</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Uitgenodigde gebruikers</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>Door aan te kloppen</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Beperkt door deelname aan andere kamers</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Beperkt tot deelnemers aan bepaalde andere kamers of aankloppen</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Versleuteling</translation>
</message>
@@ -2567,17 +2654,13 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
<translation>Sticker & Emoji instellingen</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Bewerken</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Verander welke afbeeldingspakketten zijn ingeschakeld, verwijder ze of voeg nieuwe toe</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Verborgen gebeurtenissen</translation>
</message>
@@ -2589,12 +2672,52 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
<translation>Instellen</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Aliassen</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Selecteer gebeurtenissen die verborgen dienen te worden in deze kamer</translation>
</message>
@@ -2629,12 +2752,12 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
<translation>meer tonen</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Versleuteling kon niet worden ingeschakeld: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Kies een avatar</translation>
</message>
@@ -2681,7 +2804,7 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Voer a.u.b. je wachtwoord in om door te gaan:</translation>
</message>
@@ -2697,8 +2820,8 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Voer a.u.b. de token in die je is toegestuurd:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2763,7 +2886,7 @@ Wees ervan bewust dat het achteraf niet meer uitgeschakeld kan worden.</translat
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Verbinden met geheimopslag mislukt</translation>
</message>
@@ -2828,7 +2951,7 @@ Als je "verifieer" kiest, moet je het andere apparaat bij de hand hebb
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Aanmaken van sleutels voor kruisversleuteling mislukt!</translation>
</message>
@@ -2853,7 +2976,7 @@ Als je "verifieer" kiest, moet je het andere apparaat bij de hand hebb
<translation>Versleuteling instellen mislukt: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Identiteitssleutel is veranderd. Dit breekt eind-tot-eind versleuteling, dus je wordt uitgelogd.</translation>
</message>
@@ -2888,8 +3011,8 @@ Als je "verifieer" kiest, moet je het andere apparaat bij de hand hebb
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Toevoegen aan of verwijderen uit groep</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2974,19 +3097,19 @@ Als je "verifieer" kiest, moet je het andere apparaat bij de hand hebb
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Bericht intrekken mislukt: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Kon evenement niet versleutelen, versturen geannuleerd!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Afbeelding opslaan</translation>
</message>
@@ -3020,12 +3143,7 @@ Als je "verifieer" kiest, moet je het andere apparaat bij de hand hebb
<translation>%1 maakte de kamer openbaar.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 maakte deze kamer uitnodiging-vereist.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 maakte deze kamer aanklopbaar.</translation>
</message>
@@ -3340,12 +3458,17 @@ Reden: %4</translation>
<translation>%1 heeft het aankloppen ingetrokken.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Je neemt nu deel aan deze kamer.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 heeft %2 uitgenodigd.</translation>
</message>
@@ -3379,10 +3502,15 @@ Reden: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Bewerkt</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3438,17 +3566,22 @@ Reden: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Terug naar kamerlijst</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Geen kamer geselecteerd</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Laat kamerdeelnemers zien.</translation>
</message>
@@ -3646,7 +3779,7 @@ Reden: %4</translation>
<translation>On-verifiëren</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Meld apparaat %1 af</translation>
</message>
@@ -3718,12 +3851,7 @@ Reden: %4</translation>
<translation>Geminimaliseerd opstarten</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Zijbalk met groepen</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Verstuur berichten in Markdown</translation>
</message>
@@ -3803,12 +3931,7 @@ Reden: %4</translation>
<translation>Ontsleutel berichten in de zijbalk</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Laat berichtenteller zien voor ruimtes</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Privacy scherm</translation>
</message>
@@ -4008,12 +4131,7 @@ Reden: %4</translation>
<translation>Stel het geluid in dat speelt als een oproep binnen komt</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Stel de maximale breedte in van berichten in de tijdlijn (in pixels). Dit kan helpen bij de leesbaarheid als Nheko gemaximaliseerd is.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4160,7 @@ Kies 0 om direct te blurren. Maximale waarde is 1 uur (3600 seconden)</translati
<translation>Start de applicatie in de achtergrond zonder het scherm te tonen.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Laat een kolom zien met groepen en markeringen naast de kamerlijst.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Sta het gebruik van Markdown in berichten toe.
@@ -4076,16 +4189,7 @@ This will also enable or disable sending typing notifications to others.</source
Dit schakelt ook het versturen van je eigen typnotificaties naar anderen in of uit.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Laat kamers met nieuwe berichten eerst zien.
-Indien uitgeschakeld, staan kamers gesorteerd op de tijd van het laatst ontvangen bericht.
-Indien ingeschakeld, staan kamers met actieve notificaties (het cirkeltje met een getal erin) bovenaan. Kamers die je hebt gedempt zullen nog steeds op tijd zijn gesorteerd, want die vind je blijkbaar niet zo belangrijk als de andere kamers.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Laat knoppen zien om snel te reageren, beantwoorden, of extra opties te kunnen gebruiken naast elk bericht.</translation>
</message>
@@ -4102,7 +4206,17 @@ OFF - square, ON - circle.</source>
UIT - vierkant, AAN - cirkel.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>De sleutel om je eigen apparaten te verifiëren. Indien gecached zal het verifiëren van één van je apparaten die ook als geverifieerd markeren voor je anderen apparaten en gebruikers die jou geverifieerd hebben.</translation>
</message>
@@ -4114,7 +4228,34 @@ This usually causes the application icon in the task bar to animate in some fash
Meestal zorgt dit dat het icoon in de taakbalk op een manier animeert of iets dergelijks.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4149,12 +4290,7 @@ Only affects messages in encrypted chats.</source>
Heeft alleen effect op versleutelde chats.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Kies waar het totale aantal notificaties te laten zien voor binnen een ruimte.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Als het scherm focus verliest, zal de tijdlijn
@@ -4181,12 +4317,7 @@ worden geblurt.</translation>
<translation>Vereist dat een gebruiker geverifieerd is voordat berichten worden versleuteld. Verbetert de beveiliging maar maakt versleutelen irritanter om in te stellen.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Beantwoord automatisch sleutelverzoeken van andere gebruikers, indien geverifieerd, ook als dat apparaat normaal geen toegang tot die sleutels had moeten hebben.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Download van en upload naar de online reservesleutel.</translation>
</message>
@@ -4308,7 +4439,7 @@ Deze instelling wordt toegepast na opnieuw starten van de applicatie.</translati
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Geen versleutelde chat gevonden met deze gebruiker. Maak een versleutelde chat aan met deze gebruiker en probeer het opnieuw.</translation>
</message>
@@ -4367,7 +4498,7 @@ Deze instelling wordt toegepast na opnieuw starten van de applicatie.</translati
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Gisteren</translation>
</message>
@@ -4391,8 +4522,8 @@ Deze instelling wordt toegepast na opnieuw starten van de applicatie.</translati
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Open de fallback, volg de stappen, en bevestig nadat je klaar bent.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 50f722d0df7df56dde2cecc7e3e12be0fe5d383b..1d0208f48fa1ccc057f6cbd348e74590e8c8b590 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -99,10 +99,38 @@
<translation>Dodaj</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 i jeszcze %n inny</numerusform>
@@ -200,12 +228,7 @@
<translation>Zaproszono użytkownika: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Migracja pamięci podręcznej do obecnej wersji zakończyła się niepowodzeniem. Przyczyny mogą być różne. Prosimy zgłosić błąd i w międzyczasie spróbować używać starszej wersji. Możesz również spróbować usunąć pamięć podręczną ręcznie.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>Pamięć podręczna na twoim dysku jest nowsza niż wspierana przez tę wersję Nheko. Zaktualizuj Nheko lub wyczyść pamięć podręczną.</translation>
</message>
@@ -220,14 +243,7 @@
<translation>Zapukaj do pokoju</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>Nie udało ci się dołączyć do %1. Możesz spróbować zapukać, aby inni członkowie mogli cię zaprosić. Czy chcesz to zrobić?
-Możesz podać powód pukania:</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>Czy na pewno chcesz zapukać do %1? Możesz podać powód pukania:</translation>
</message>
@@ -308,7 +324,12 @@ Możesz podać powód pukania:</translation>
<translation>Nie udało się przenieść pamięci podręcznej!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Niekompatybilna wersja pamięci podręcznej</translation>
</message>
@@ -336,7 +357,13 @@ Możesz podać powód pukania:</translation>
<translation>Spróbuj zalogować się ponownie: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Nie udało się dołączyć do pokoju: %1</translation>
</message>
@@ -363,7 +390,7 @@ Możesz podać powód pukania:</translation>
<message>
<location line="+1"/>
<source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source>
- <translation>Podaj powód wyrzucenia %1 (%2) lub wciśnij enter aby nie podawać powodu:</translation>
+ <translation>Podaj powód wyrzucenia %1 (%2) lub wciÅ›nij enter aby nie podawać powodu:</translation>
</message>
<message>
<location line="+15"/>
@@ -390,13 +417,13 @@ Możesz podać powód pukania:</translation>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>Nie pokazuj liczników powiadomień dla tej przestrzeni lub tagu.</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Ukryj pokoje oznaczone tym tagiem lub należące do tej przestrzeni.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -462,24 +489,24 @@ Możesz podać powód pukania:</translation>
<translation>Wiadomości od twojego serwera lub administratora.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
- <translation>Nie udało się zaktualizować przestrzeni podrzędnej: %1</translation>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
- <translation>Nie udało się skasować przestrzeni podrzędnej: %1</translation>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
- <translation>Nie udało się zaktualizować przestrzeni nadrzędnej: %1</translation>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
- <translation>Nie udało się skasować przestrzeni nadrzędnej: %1</translation>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -505,13 +532,13 @@ Możesz podać powód pukania:</translation>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
- <translation>Do tego pokoju nie można dołączyć bezpośrednio. Możesz do niego zapukać, aby jego członkowie mogli zaakceptować lub odrzucić tę prośbę o dołączenie. Dodatkowo możesz podać powód, dla którego członkowie mieliby cię przyjąć:</translation>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <translation>Czy chcesz doÅ‚Ä…czyć do tego pokoju? Możesz podać powód, dla którego czÅ‚onkowie mieliby ciÄ™ przyjąć:</translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
- <translation>Czy chcesz dołączyć do tego pokoju? Możesz podać powód, dla którego członkowie mieliby cię przyjąć:</translation>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+32"/>
@@ -596,8 +623,8 @@ Możesz podać powód pukania:</translation>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>Do publicznych pokoi może dołączyć każdy, zaś prywatne pokoje wymagają zaproszenia.</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -734,7 +761,7 @@ Możesz podać powód pukania:</translation>
<message>
<location line="+379"/>
<source>The displayed emoji might look different in different clients if a different font is used. Similarly they might be translated into different languages. Nonetheless they should depict one of 64 different objects or animals. For example a lion and a cat are different, but a cat is the same even if one client just shows a cat face, while another client shows a full cat body.</source>
- <translation>Wyświetlane emoji mogą różnić się wyglądem między klientami, jeśli używana jest inna czcionka. Ich nazwy mogą też być przetłumaczone na inny język. Niemniej jednak powinny one przedstawiać jedno z 64 różnych obiektów lub zwierząt. Dla przykładu lew i kot są różnymi emoji, zaś twarz kota w jednym kliencie i cały kot w drugim są tak samo traktowane jako emoji kota.</translation>
+ <translation>WyÅ›wietlane emoji mogÄ… różnić siÄ™ wyglÄ…dem miÄ™dzy klientami, jeÅ›li używana jest inna czcionka. Ich nazwy mogÄ… też być przetÅ‚umaczone na inny jÄ™zyk. Niemniej jednak powinny one przedstawiać jedno z 64 różnych obiektów lub zwierzÄ…t. Dla przykÅ‚adu lew i kot sÄ… różnymi emoji, zaÅ› twarz kota w jednym kliencie i caÅ‚y kot w drugim sÄ… tak samo traktowane jako emoji kota.</translation>
</message>
<message>
<location line="+10"/>
@@ -913,7 +940,7 @@ Możesz podać powód pukania:</translation>
<message>
<location line="+1"/>
<source>Sent when a moderator is added/removed or the permissions of a room are changed.</source>
- <translation>Wysyłane gdy moderator zostanie dodany lub usunięty, bądź gdy uprawnienia pokoju ulegną zmianie.</translation>
+ <translation>WysyÅ‚ane gdy moderator zostanie dodany lub usuniÄ™ty, bÄ…dź gdy uprawnienia pokoju ulegnÄ… zmianie.</translation>
</message>
<message>
<location line="+16"/>
@@ -1072,7 +1099,7 @@ Możesz podać powód pukania:</translation>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Wybierz plik</translation>
</message>
@@ -1082,7 +1109,7 @@ Możesz podać powód pukania:</translation>
<translation>Wszystkie pliki (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>Wysyłanie '%1' nie powiodło się</translation>
</message>
@@ -1166,14 +1193,11 @@ Możesz podać powód pukania:</translation>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Twój login. Matrix ID (mxid) powinien zaczynać się od @, po której następuje identyfikator użytkownika. Po identyfikatorze użytkownika musisz podać nazwę twojego serwera domowego oddzielając ją dwukropkiem.
-Zamiast nazwy serwera możesz też podać jego adres (jeżeli nie obsługuje on automatycznego wykrywania przy użyciu .well-known).
-Przykładowy Matrix ID: @użytkownik:serwer.mój
-Jeśli Nheko nie będzie w stanie samodzielnie wykryć twojego serwera domowego, wyświetlony zostanie formularz umożliwiający ręczne podanie jego adresu.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1192,11 +1216,17 @@ Jeśli Nheko nie będzie w stanie samodzielnie wykryć twojego serwera domowego,
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Nazwa dla tego urządzenia, będzie ona widoczna dla innych użytkowników, kiedy będą weryfikować Twoje urządzenia. Jeżeli żadna nie jest podana, używana jest domyślna.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Adres serwera domowego</translation>
</message>
@@ -1206,14 +1236,7 @@ Jeśli Nheko nie będzie w stanie samodzielnie wykryć twojego serwera domowego,
<translation>serwer.mój:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Adres który może być użyty do skontaktowania się z API klienckim twojego serwera domowego.
-Przykład: https://serwer.mój:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ZALOGUJ</translation>
</message>
@@ -1226,12 +1249,12 @@ Przykład: https://serwer.mój:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Wprowadzono nieprawidłowe Matrix ID. Przykład prawidłowego ID: @ania:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Automatyczne odkrywanie zakończone niepowodzeniem. Otrzymano nieprawidłową odpowiedź.</translation>
</message>
@@ -1256,9 +1279,9 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>Wybrany serwer nie obsługuje wersji protokołu Matrix wspieranej przez tego klienta (v1.1, v1.2 lub v1.3). Zalogowanie się nie będzie możliwe.</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1296,7 +1319,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Puste hasło</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Logowanie SSO zakończone niepowodzeniem</translation>
</message>
@@ -1377,8 +1400,8 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 zmienił(a) nadrzędną przestrzeń tego pokoju.</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1444,7 +1467,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Napisz wiadomość…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Naklejki</translation>
</message>
@@ -1472,12 +1495,22 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Edytuj</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Zareaguj</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Odpisz</translation>
</message>
@@ -1487,7 +1520,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Opcje</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>Powód usunięcia</translation>
</message>
@@ -1498,18 +1531,18 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Kopiuj</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Kopiuj &adres odnośnika</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Zar&eaguj</translation>
</message>
@@ -1523,6 +1556,11 @@ Przykład: https://serwer.mój:8787</translation>
<source>&Edit</source>
<translation>&Edytuj</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1535,8 +1573,8 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Potwierdzeni&a przeczytania</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1598,13 +1636,13 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Aby umożliwić innym użytkownikom określenie które z Twoich urządzeń faktycznie należą do Ciebie, możesz je zweryfikować. Umożliwia to także automatyczną kopię zapasową kluczy. Czy chcesz zweryfikować teraz niezweryfikowane urządzenia? (Upewnij się, że masz do przynajmniej jednego z nich dostęp.)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>By pozwolić innym użytkownikom sprawdzić które z twoich urządzeń faktycznie należą do ciebie, możesz je zweryfikować. Pozwoli to również na automatyczne tworzenie kopii zapasowej kluczy. Zweryfikować %1 teraz?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1756,29 +1794,29 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>Administrator (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>Moderator (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>Użytkownik (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>WÅ‚asny (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>Usuń typ zdarzenia</translation>
</message>
@@ -1803,7 +1841,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Przenieś użytkowników wyżej lub niżej aby zmienić ich uprawnienia</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>Usuń użytkownika</translation>
</message>
@@ -1813,10 +1851,61 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Dodaj użytkownika</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">Nie udało się zaktualizować poziomu mocy: %1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>Nie udało się zaktualizować poziomu mocy: %1</translation>
</message>
@@ -1824,7 +1913,7 @@ Przykład: https://serwer.mój:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>Inne zdarzenia</translation>
</message>
@@ -1965,13 +2054,13 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>Edytowanie pokojów potomnych</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>Zmiana przestrzeni nadrzędnych</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2010,9 +2099,9 @@ Przykład: https://serwer.mój:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Stwórz unikalny profil, który pozwoli ci na zalogowanie się do kilku kont jednocześnie i uruchomienie wielu instancji Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2025,6 +2114,34 @@ Przykład: https://serwer.mój:8787</translation>
<translation>nazwa profilu</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2075,7 +2192,12 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Potwierdzenie hasła</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Serwer domowy</translation>
</message>
@@ -2100,12 +2222,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Nazwa urzÄ…dzenia</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Nazwa dla tego urządzenia, która będzie widoczna dla innych użytkowników podczas weryfikowania Twoich urządzeń. Jeżeli nie zostanie podana, wykorzystana zostanie domyślna nazwa.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>ZAREJESTRUJ</translation>
</message>
@@ -2135,9 +2252,9 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>Wybrany serwer nie obsługuje wersji protokołu Matrix wspieranej przez tego klienta (v1.1, v1.2 lub v1.3). Rejestracja nie będzie możliwa.</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2177,6 +2294,11 @@ Przykład: https://serwer.mój:8787</translation>
<source>Cancel Edit</source>
<translation>Anuluj edycjÄ™</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2199,7 +2321,7 @@ Przykład: https://serwer.mój:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>brak zapisanej wersji</translation>
</message>
@@ -2207,7 +2329,7 @@ Przykład: https://serwer.mój:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nowy tag</translation>
</message>
@@ -2258,8 +2380,8 @@ Przykład: https://serwer.mój:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
- <translation>Dodaj lub usuń z przestrzeni</translation>
+ <source>Add or remove from community...</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+263"/>
@@ -2500,42 +2622,7 @@ Przykład: https://serwer.mój:8787</translation>
<translation>Wszystkie wiadomości</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Dostęp do pokoju</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Każdy oraz goście</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Każdy</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Zaproszeni użytkownicy</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>PukajÄ…c</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Ograniczony członkostwem w innych pokojach</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>Ograniczony członkostwem w innych pokojach lub pukaniem</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Szyfrowanie</translation>
</message>
@@ -2572,17 +2659,13 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<translation>Ustawienia naklejek i emotek</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Zmień</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Wybież, które paczki są włączone, usuń paczki, lub utwórz nowe</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>Ukryte zdarzenia</translation>
</message>
@@ -2594,12 +2677,52 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<translation>Konfiguruj</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>Aliasy</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>Wybierz zdarzenia do ukrycia w tym pokoju</translation>
</message>
@@ -2634,12 +2757,12 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<translation>pokaż więcej</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Nie udało się włączyć szyfrowania: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Wybierz awatar</translation>
</message>
@@ -2686,7 +2809,7 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Wprowadź swoje hasło do konta, aby kontynuować:</translation>
</message>
@@ -2702,8 +2825,8 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Wprowadź otrzymany token:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2768,7 +2891,7 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Błąd połączenia do menadżera sekretów</translation>
</message>
@@ -2805,7 +2928,7 @@ Zwróć uwagę, iż nie będzie ono mogło zostać wyłączone.</translation>
<source>Hello and welcome to Matrix!
It seems like you are new. Before you can securely encrypt your messages, we need to setup a few small things. You can either press accept immediately or adjust a few basic options. We also try to explain a few of the basics. You can skip those parts, but they might prove to be helpful!</source>
<translation>Witaj w sieci Matrix!
-Wygląda na to, że jesteś tu nowy(-a). Zanim będzie można bezpiecznie szyfrować Twoje wiadomości, musimy skonfigurować parę drobiazgów. Możesz od razu kliknąć "akceptuj" lub dostosować niektóre opcje. Postaramy się także wyjaśnić kilka podstaw. Możesz pominąć ten samouczek, choć może on okazać się pomocny!</translation>
+WyglÄ…da na to, że jesteÅ› tu nowy(-a). Zanim bÄ™dzie można bezpiecznie szyfrować Twoje wiadomoÅ›ci, musimy skonfigurować parÄ™ drobiazgów. Możesz od razu kliknąć "akceptuj" lub dostosować niektóre opcje. Postaramy siÄ™ także wyjaÅ›nić kilka podstaw. Możesz pominąć ten samouczek, choć może on okazać siÄ™ pomocny!</translation>
</message>
<message>
<location line="+124"/>
@@ -2833,7 +2956,7 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Nie udało się utworzyć kluczy dla podpisywania krzyżowego!</translation>
</message>
@@ -2858,7 +2981,7 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<translation>Konfiguracja szyfrowania zakończona niepowodzeniem: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Klucz identyfikacyjny został zmieniony. Uniemożliwia to dalsze korzystanie z szyfrowania end-to-end, w związku z czym nastąpi wylogowanie.</translation>
</message>
@@ -2893,8 +3016,8 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
- <translation>Dodaj lub usuń z przestrzeni</translation>
+ <source>Add or remove from community</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
@@ -2979,19 +3102,19 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Cenzurowanie wiadomości nie powiodło się: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Szyfrowanie event-u nie powiodło się, wysyłanie anulowane!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Zapisz obraz</translation>
</message>
@@ -3026,12 +3149,7 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<translation>%1 zmienił(a) status pokoju na publiczny.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 oznaczył(a) pokój jako wymagający zaproszenia aby do niego dołączyć.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 zazwolił(a) na dołączenie do tego pokoju poprzez pukanie.</translation>
</message>
@@ -3093,7 +3211,7 @@ Jeśli zdecydujesz się na weryfikację, będziesz potrzebować innego zaufanego
<message>
<location line="+4"/>
<source>%1 can now kick room members.</source>
- <translation>%1 może teraz wyrzucać członków tego pokoju.</translation>
+ <translation>%1 może teraz wyrzucać czÅ‚onków tego pokoju.</translation>
</message>
<message>
<location line="+12"/>
@@ -3350,12 +3468,17 @@ Powód: %4</translation>
<translation>Użytkownik %1 ocenzurował własne pukanie.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Dołączyłeś(-aś) do tego pokoju.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 zaprosił(a) %2.</translation>
</message>
@@ -3389,10 +3512,15 @@ Powód: %4</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Edytowane</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3449,17 +3577,22 @@ Powód: %4</translation>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Wróć do listy pokoi</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Nie wybrano pokoju</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>Pokaż członków pokoju.</translation>
</message>
@@ -3658,7 +3791,7 @@ Powód: %4</translation>
<translation>Udweryfikuj</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Wyloguj urzÄ…dzenie %1</translation>
</message>
@@ -3730,12 +3863,7 @@ Powód: %4</translation>
<translation>Schowaj do zasobnika systemowego na starcie</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>Pasek boczny grupy</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>Wysyłaj wiadomości używając Markdown</translation>
</message>
@@ -3815,12 +3943,7 @@ Powód: %4</translation>
<translation>Pokaż odszyfrowane wiadomości na pasku bocznym</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>Pokaż liczniki wiadomości dla przestrzeni</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>Ochrona prywatności</translation>
</message>
@@ -4020,12 +4143,7 @@ Powód: %4</translation>
<translation>Ustaw dźwięk powiadomienia odtwarzanego podczas zaproszenia do połączenia</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>Ustaw maksymalną szerokość wiadomości na osi czasu (w pikselach). Może to poprawić czytelność na szerokich ekranach, gdy Nheko zostanie zmaksymalizowany.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4053,12 +4171,7 @@ Ustaw na 0 aby rozmywać natychmiast po przejściu okna na drugi plan. Maksymaln
<translation>Uruchamiaj aplikację w tle bez wyświetlania okna głównego.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>Pokaż kolumnę zawierającą grupy i tagi obok listy pokoi.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>Pozwól na używanie Markdown w wiadomościach.
@@ -4087,16 +4200,7 @@ This will also enable or disable sending typing notifications to others.</source
Ta opcja odpowiada również za wysyłanie powiadomień o pisaniu do innych.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>Wyświetlaj wiadomości z nieprzeczytanymi wiadomościami w pierwszej kolejności.
-Gdy ta opcja jest wyłączona, pokoje będą sortowane wyłącznie według czasu wysłania ostatniej wiadomości w pokoju.
-Gdy ta opcja jest włączona, pokoje z aktywnymi powiadomieniami (mało kółko z numerkiem w środku) pojawią się na początku. Wyciszone pokoje będą sortowane po czasie wysłania ostatniej wiadomości, ponieważ zdaje się, że nie uznajesz ich za tak istotne jak pozostałe pokoje.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>Pokazuj przyciski do szybkiej odpowiedzi, reakcji i menu dodatkowych opcji obok każdej wiadomości.</translation>
</message>
@@ -4113,7 +4217,17 @@ OFF - square, ON - circle.</source>
Wyłączone - kwadratowe, włączone - okrągłe.</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>Klucz używany do weryfikacji twoich własnych urządzeń. Jeśli jest on w pamięci podręcznej, zweryfikowanie jednego z twoich urządzeń oznaczy je w ten sam sposób dla wszystkich pozostałych twoich urządzeń oraz dla użytkowników którzy uprzednio ciebie zweryfikowali.</translation>
</message>
@@ -4125,7 +4239,34 @@ This usually causes the application icon in the task bar to animate in some fash
To zwykle sprawia, że ikona aplikacji na pasku zadań jest animowana.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4160,12 +4301,7 @@ Only affects messages in encrypted chats.</source>
Dotyczy wyłącznie czatów z włączonym szyfrowaniem.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>Wybierz gdzie pokazywać licznik wszystkich powiadomień z danej przestrzeni.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>Kiedy okno przejdzie na drugi plan, oÅ› czasu zostanie rozmyta.</translation>
@@ -4191,12 +4327,7 @@ be blurred.</source>
<translation>Wymaga zweryfikowania użytkownika zanim będzie możliwe wysłanie zaszyfrowanych wiadomości do niego. To zwiększa bezpieczeństwo, ale sprawia, że szyfrowanie end-to-end jest mniej wygodne w użyciu.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>Automatycznie odpowiada na prośby o klucze od zweryfikowanych użytkowników, nawet gdy urządzenie wysyłające prośbę nie powinno mieć dostępu do tych kluczy.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>Pobierz i wyślij klucze szyfrowania wiadomości do szyfrowanej kopii zapasowej kluczy online.</translation>
</message>
@@ -4318,7 +4449,7 @@ To ustawienie wejdzie w życie po restarcie aplikacji.</translation>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Nie znaleziono zaszyfrowanego prywatnego czatu z tym użytkownikiem. Utwórz nowy zaszyfrowany prywatny czat z tym użytkownikiem i spróbuj ponownie.</translation>
</message>
@@ -4377,7 +4508,7 @@ To ustawienie wejdzie w życie po restarcie aplikacji.</translation>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Wczoraj</translation>
</message>
@@ -4401,8 +4532,8 @@ To ustawienie wejdzie w życie po restarcie aplikacji.</translation>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Otwórz w przeglądarce i postępuj zgodnie z instrukcją.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_pt_BR.ts b/resources/langs/nheko_pt_BR.ts
index 0ba92e3ca6781b749e9c1ad905f3334a658dea86..7ac98016a3261cfbb6c9f8060d4b99df7e85ba52 100644
--- a/resources/langs/nheko_pt_BR.ts
+++ b/resources/langs/nheko_pt_BR.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation>Usuário convidado: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Falha ao migrar cache para versão atual. Isso pode ter diferentes razões. Por favor reporte o problema e tente usar uma versão antiga no meio tempo. Alternativamente, você pode tentar excluir o cache manualmente.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Migração do cache falhou!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versão de cache incompatÃvel</translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Falha ao entrar na sala: %1</translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,8 +1191,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1186,27 +1214,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1219,12 +1247,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1249,8 +1277,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1289,7 +1317,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1369,12 +1397,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1409,7 +1432,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1437,7 +1465,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1465,12 +1493,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1480,7 +1518,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1491,18 +1529,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1516,6 +1554,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1528,7 +1571,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1591,12 +1634,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1748,29 +1791,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1795,7 +1838,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1805,10 +1848,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1816,7 +1910,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1957,12 +2051,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2002,8 +2096,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2017,6 +2111,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2067,7 +2189,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2092,12 +2219,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,8 +2249,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2169,6 +2291,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2191,7 +2318,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2199,7 +2326,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2250,7 +2377,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,105 +2617,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2751,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2675,7 +2803,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2819,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2885,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3012,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3331,12 +3454,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished">Você entrou nessa sala.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3370,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3429,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3637,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3709,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3794,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3999,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4063,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4127,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4158,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4283,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4342,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4366,7 +4504,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts
index 0e347bc4a016659471fac09ffed9e93c5db8cad4..9e2e44be4d7754121eb78031a3ac35815c01232c 100644
--- a/resources/langs/nheko_pt_PT.ts
+++ b/resources/langs/nheko_pt_PT.ts
@@ -99,10 +99,38 @@
<translation type="unfinished">Adicionar</translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 e outro %n</numerusform>
@@ -199,12 +227,7 @@
<translation>Utilizador convidado: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>A migração da cache para a versão atual falhou, e existem várias razões possÃveis. Por favor abra um problema ("issue") e experimente usar uma versão mais antiga entretanto. Alternativamente, pode tentar apagar a cache manualmente.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>A cache no seu disco é mais recente do que aquela que esta versão do Nheko suporta. Por favor atualize o Nheko ou limpe a sua cache.</translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Falha ao migrar a cache!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versão da cache incompatÃvel</translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Por favor, tente autenticar-se novamente: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Falha ao entrar em sala: %1</translation>
</message>
@@ -388,13 +416,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>Ocultar, por norma, salas com esta etiqueta ou pertencentes a este espaço.</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Mensagens do seu servidor ou administrador.</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Selecionar um ficheiro</translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Todos os ficheiros (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,14 +1191,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>O seu nome de utilizador.
-Um ID Matrix (MXID) deve iniciar com um @ seguido pelo ID do utilizador, uns :, e por fim, o nome do seu servidor. Pode, também, colocar o seu endereço, caso este não suporte pesquisas ".well-known".
-Exemplo: @utilizador:servidor.meu
-Se o Nheko não conseguir encontrar o seu servidor, irá apresentar um campo onde deve inserir o endereço manualmente.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1189,11 +1214,17 @@ Se o Nheko não conseguir encontrar o seu servidor, irá apresentar um campo ond
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Um nome para este dispositivo, que será exibido noutros quando os estiver a verificar. Caso nenhum seja fornecido, será usado um predefinido.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>Endereço do servidor</translation>
</message>
@@ -1203,14 +1234,7 @@ Se o Nheko não conseguir encontrar o seu servidor, irá apresentar um campo ond
<translation>servidor.meu:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>O endereço que pode ser usado para contactar a API de clientes do seu servidor.
-Exemplo: https://servidor.meu:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>INCIAR SESSÃO</translation>
</message>
@@ -1223,12 +1247,12 @@ Exemplo: https://servidor.meu:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Inseriu um ID Matrix inválido p. ex. @ze:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Falha na descoberta automática. Reposta mal formatada recebida.</translation>
</message>
@@ -1253,8 +1277,8 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Erro desconhecido. Certifique-se que o domÃnio do servidor é válido.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1293,7 +1317,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Palavra-passe vazia</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Falha no ISU (SSO)</translation>
</message>
@@ -1373,12 +1397,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 criou e configurou a sala: %2</translation>
</message>
@@ -1413,7 +1432,12 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>%1 atendeu a chamada.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 terminou a chamada.</translation>
</message>
@@ -1441,7 +1465,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Escreva uma mensagem…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>Autocolantes</translation>
</message>
@@ -1469,12 +1493,22 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Editar</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>Reagir</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Responder</translation>
</message>
@@ -1484,7 +1518,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Opções</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1495,18 +1529,18 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>&Copiar</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>Copiar localização da &ligação</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>Re&agir</translation>
</message>
@@ -1520,6 +1554,11 @@ Exemplo: https://servidor.meu:8787</translation>
<source>&Edit</source>
<translation>&Editar</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1532,8 +1571,8 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>Recibos de &leitura</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1595,13 +1634,13 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>Para permitir que outros utilizadores vejam que dispositivos realmente lhe pertencem, pode verificá-los. Este processo permite que a cópia de segurança das chaves funcione automaticamente. Verificar um dispositivo não verificado agora? (Por favor, certifique-se que tem um daqueles dispositivos disponÃveis)</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Para que outros possam ver que dispositivos pertencem realmente a si, pode verificá-los. Isso permite, também, que a cópia de segurança de chaves funcione automaticamente. Verificar %1 agora?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1752,29 +1791,29 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1799,7 +1838,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1809,10 +1848,61 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1820,7 +1910,7 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1961,12 +2051,12 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2006,9 +2096,9 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Crie um perfil único que lhe permite entrar em várias contas simultaneamente e iniciar várias instâncias do Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2021,6 +2111,34 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>nome de perfil</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2071,7 +2189,12 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Confirmação da palavra-passe</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Servidor</translation>
</message>
@@ -2096,12 +2219,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished">Nome do dispositivo</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Um nome para este dispositivo, que será exibido noutros quando os estiver a verificar. Caso nenhum seja fornecido, será usado um predefinido.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTAR</translation>
</message>
@@ -2131,8 +2249,8 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Erro desconhecido. Certifique-se que o domÃnio do servidor é válido.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2173,6 +2291,11 @@ Exemplo: https://servidor.meu:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2195,7 +2318,7 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>nenhuma versão guardada</translation>
</message>
@@ -2203,7 +2326,7 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>Nova etiqueta</translation>
</message>
@@ -2254,7 +2377,7 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2494,42 +2617,7 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Todas as mensagens</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>Acesso à sala</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Qualquer pessoa e visitantes</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Qualquer pessoa</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Utilizadores convidados</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>"Batendo à porta"</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>Impedido por participação noutras salas</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Encriptação</translation>
</message>
@@ -2565,17 +2653,13 @@ Exemplo: https://servidor.meu:8787</translation>
<translation>Definições de autocolantes e emojis</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>Alterar</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>Alterar a seleção de pacotes ativos, remover e criar novos pacotes</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
@@ -2587,12 +2671,52 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2627,12 +2751,12 @@ Exemplo: https://servidor.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Falha ao ativar encriptação: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Selecionar um Ãcone</translation>
</message>
@@ -2679,7 +2803,7 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>Por favor, insira a sua palavra-passe para continuar:</translation>
</message>
@@ -2695,8 +2819,8 @@ Exemplo: https://servidor.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>Por favor, insira o código que lhe foi enviado:</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2761,7 +2885,7 @@ Exemplo: https://servidor.meu:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>Falha ao ligar ao armazenamento secreto</translation>
</message>
@@ -2826,7 +2950,7 @@ Se escolher a verificação, terá que ter o outro dispositivo disponÃvel. Se e
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>Falha ao criar chaves para assinatura cruzada!</translation>
</message>
@@ -2851,7 +2975,7 @@ Se escolher a verificação, terá que ter o outro dispositivo disponÃvel. Se e
<translation>Falha na configuração de encriptação: %1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>Chave de identificação alterada. Isto quebra a encriptação, portanto, a terminar sessão...</translation>
</message>
@@ -2886,7 +3010,7 @@ Se escolher a verificação, terá que ter o outro dispositivo disponÃvel. Se e
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2972,19 +3096,19 @@ Se escolher a verificação, terá que ter o outro dispositivo disponÃvel. Se e
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Falha ao eliminar mensagem: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Falha ao encriptar evento, envio abortado!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Guardar imagem</translation>
</message>
@@ -3018,12 +3142,7 @@ Se escolher a verificação, terá que ter o outro dispositivo disponÃvel. Se e
<translation>%1 abriu a sala ao público.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 tornou esta sala acessÃvel apenas por convite.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 tornou possÃvel entrar na sala "batendo à porta".</translation>
</message>
@@ -3337,12 +3456,17 @@ Reason: %4</source>
<translation>%1 eliminou a sua "batida à porta".</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Entrou na sala.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3376,10 +3500,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Editada</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3435,17 +3564,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Voltar à lista de salas</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Nenhuma sala selecionada</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3643,7 +3777,7 @@ Reason: %4</source>
<translation>Anular verificação</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>Terminar sessão no dispositivo %1</translation>
</message>
@@ -3715,12 +3849,7 @@ Reason: %4</source>
<translation type="unfinished">Iniciar na bandeja</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Barra lateral do grupo</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Enviar mensagens como Markdown</translation>
</message>
@@ -3800,12 +3929,7 @@ Reason: %4</source>
<translation type="unfinished">Desencriptar mensagens na barra lateral</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished">Ecrã de privacidade</translation>
</message>
@@ -4005,12 +4129,7 @@ Reason: %4</source>
<translation type="unfinished">Tocar o som de notificação quando chegar um convite de chamada</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished">Definir largura máxima das mensagens na cronologia (em pixeis). Isto pode ajudar na legibilidade em ecrãs largos, quando o Nheko está maximizado.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4039,12 +4158,7 @@ Defina como 0 para desfocar imediatamente após perder a atenção. Valor máxim
<translation type="unfinished">Iniciar a aplicação em segundo plano sem mostrar a janela do cliente.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished">Mostrar uma coluna contendo grupos e etiquetas ao lado da lista de salas.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">Permitir Markdown em mensagens.
@@ -4073,16 +4187,7 @@ This will also enable or disable sending typing notifications to others.</source
Irá também ativar ou desativar o envio de notificações de escrita para outros.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished">Exibe salas com novas mensagens primeiro.
-Se desativada, a lista de salas será apenas ordenada pela data da última mensagem de cada sala.
-Se ativada, salas com notificações ativas (pequeno cÃrculo com um número dentro) serão ordenadas no topo. Salas silenciadas continuarão a ser ordenadas por data, visto que não são consideradas tão importantes como as outras.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished">Mostrar botões para resposta rápida, reações ou acesso a opções adicionais junto de cada mensagem.</translation>
</message>
@@ -4098,7 +4203,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4109,7 +4224,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished">Mostrar alerta quando é recebida uma mensagem.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4140,12 +4282,7 @@ Only affects messages in encrypted chats.</source>
Apenas afeta mensagens em conversas encriptadas.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished">Quando a janela perde a atenção, a cronologia
@@ -4172,12 +4309,7 @@ será desfocada.</translation>
<translation type="unfinished">Exigir que um utilizador esteja verificado para lhe enviar mensagens encriptadas. Isto melhora a segurança mas torna a encriptação mais entediante.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished">Automaticamente responde a pedidos de chaves de outros utilizadores, se estiverem verificados, mesmo que de outra forma o dispositivo não deveria ter acesso a essas chaves.</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4297,7 +4429,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>Não foi encontrada nenhuma conversa privada e encriptada com este utilizador. Crie uma e tente novamente.</translation>
</message>
@@ -4356,7 +4488,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Ontem</translation>
</message>
@@ -4380,7 +4512,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts
index 386c5365ee60293e1f17fdca26843c11161abe6d..a973a0715e32e53e9b120dd6be921f5d02c3984a 100644
--- a/resources/langs/nheko_ro.ts
+++ b/resources/langs/nheko_ro.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -200,12 +228,7 @@
<translation>Utilizator invitat: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Nu s-a putut muta cache-ul pe versiunea curentă. Acest lucru poate avea diferite cauze. Vă rugăm să deschideți un issue și încercați să folosiți o versiune mai veche între timp. O altă opțiune ar fi să încercați să ștergeți cache-ul manual.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -220,13 +243,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -307,7 +324,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Nu s-a putut migra cache-ul!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Versiune cache incompatibilă</translation>
</message>
@@ -335,7 +357,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Vă rugăm să vă reconectați: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Nu s-a putut alătura la cameră: %1</translation>
</message>
@@ -389,12 +417,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -461,23 +489,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -504,12 +532,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -595,7 +623,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1071,7 +1099,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1081,7 +1109,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished">Toate fișierele (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,14 +1193,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Numele de conectare. Un mxid trebuie să înceapă cu @ urmat de id-ul utilizatorului. După id trebuie să includeți numele serverului dvs. după :.
-Puteți pune și adresa homeserverului, dacă serverul dumneavoastră nu suportă căutare .well-known.
-Exemplu: @utilizator:serverul.meu
-Dacă Nheko nu vă poate găsi homeserverul, vă va arăta un câmp pentru introducerea manuală a serverului.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1191,11 +1216,17 @@ Dacă Nheko nu vă poate găsi homeserverul, vă va arăta un câmp pentru intro
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
@@ -1205,14 +1236,7 @@ Dacă Nheko nu vă poate găsi homeserverul, vă va arăta un câmp pentru intro
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Adresa la care se poate contacta APIul homeserverului dumneavoastră.
-Exemplu: https://serverul.meu:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>CONECTARE</translation>
</message>
@@ -1225,12 +1249,12 @@ Exemplu: https://serverul.meu:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Autodescoperirea a eșuat. Răspunsul primit este defectuos.</translation>
</message>
@@ -1255,8 +1279,8 @@ Exemplu: https://serverul.meu:8787</translation>
<translation>A apărut o eroare necunoscută. Verificați ca domeniul homeserverului să fie valid.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1295,7 +1319,7 @@ Exemplu: https://serverul.meu:8787</translation>
<translation>Parolă necompletată</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Conectarea SSO a eșuat</translation>
</message>
@@ -1376,7 +1400,7 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1443,7 +1467,7 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1471,12 +1495,22 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished">Răspuns</translation>
</message>
@@ -1486,7 +1520,7 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished">Opțiuni</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1497,18 +1531,18 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1522,6 +1556,11 @@ Exemplu: https://serverul.meu:8787</translation>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1534,7 +1573,7 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1597,12 +1636,12 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1754,29 +1793,29 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1801,7 +1840,7 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1811,10 +1850,61 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1822,7 +1912,7 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1963,12 +2053,12 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2008,8 +2098,8 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2023,6 +2113,34 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2073,7 +2191,12 @@ Exemplu: https://serverul.meu:8787</translation>
<translation>Confirmare parolă</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Homeserver</translation>
</message>
@@ -2098,12 +2221,7 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished">Nume dispozitiv</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>ÃŽNREGISTRARE</translation>
</message>
@@ -2133,8 +2251,8 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished">A apărut o eroare necunoscută. Verificați ca domeniul homeserverului să fie valid.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2175,6 +2293,11 @@ Exemplu: https://serverul.meu:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2197,7 +2320,7 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>nicio versiune stocată</translation>
</message>
@@ -2205,7 +2328,7 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2256,7 +2379,7 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2498,105 +2621,106 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation type="unfinished"></translation>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
+ <translation type="unfinished">Criptare Capăt-la-Capăt</translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
- <translation type="unfinished">Criptare Capăt-la-Capăt</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
- <source>Hidden events</source>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2631,12 +2755,12 @@ Exemplu: https://serverul.meu:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished">Nu s-a putut activa criptarea: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished">Selectează un avatar</translation>
</message>
@@ -2683,7 +2807,7 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2699,7 +2823,7 @@ Exemplu: https://serverul.meu:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2765,7 +2889,7 @@ Exemplu: https://serverul.meu:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2828,7 +2952,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2853,7 +2977,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2888,7 +3012,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2974,19 +3098,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Redactare mesaj eșuată: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Salvați imaginea</translation>
</message>
@@ -3021,12 +3145,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 a deschis camera publicului.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 a făcut ca această cameră să necesite o invitație pentru alăturare.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3344,12 +3463,17 @@ Reason: %4</source>
<translation>%1 și-a redactat ciocănitul.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Te-ai alăturat camerei.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3383,10 +3507,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3443,17 +3572,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3652,7 +3786,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3724,12 +3858,7 @@ Reason: %4</source>
<translation type="unfinished">Pornește în bara de notificări</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Bara laterală a grupului</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Trimite mesaje ca Markdown</translation>
</message>
@@ -3809,12 +3938,7 @@ Reason: %4</source>
<translation type="unfinished">Decriptează mesajele din bara laterală</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -4014,12 +4138,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4046,12 +4165,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">Permite folosirea markdown în mesaje. Când este dezactivată, mesajele sunt trimise ca text simplu.</translation>
@@ -4078,14 +4192,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4101,7 +4208,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4112,7 +4229,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished">Arată o alertă când primiți un mesaj. Deobicei pictograma aplicației se animează în taskbar.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4142,12 +4286,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4173,12 +4312,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4298,7 +4432,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4357,7 +4491,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Ieri</translation>
</message>
@@ -4381,8 +4515,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Deschideți fallback, urmăriți pașii și confirmați după ce i-ați completat.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index eed7e6abe7c72906813fdfc6c348b30aa9df1446..270e6dbdf549d2a748ae3f164d3615e2716a5d28 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 и ещё %n</numerusform>
@@ -200,12 +228,7 @@
<translation>Приглашенный пользователь: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>ÐœÐ¸Ð³Ñ€Ð°Ñ†Ð¸Ñ ÐºÑша Ð´Ð»Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑии не удалаÑÑŒ. Ðто может проиÑходить по разным причинам. ПожалуйÑта Ñообщите о проблеме и попробуйте временно иÑпользовать Ñтарую верÑию. Так-же вы можете попробовать удалить кÑш ÑамоÑтоÑтельно.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>ВерÑÐ¸Ñ ÐºÑша на вашем диÑке новее той, что поддерживаетÑÑ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ верÑией Nheko. ПожалуйÑта, обновите Nheko или очиÑтите кÑш.</translation>
</message>
@@ -220,13 +243,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -307,7 +324,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>ÐœÐ¸Ð³Ñ€Ð°Ñ†Ð¸Ñ ÐºÑша не удалаÑÑŒ!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>ÐеÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ ÐºÑша</translation>
</message>
@@ -335,7 +357,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Повторите попытку входа: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Ðе удалоÑÑŒ приÑоединитьÑÑ Ðº комнате: %1</translation>
</message>
@@ -389,12 +417,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -461,23 +489,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -504,12 +532,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -595,7 +623,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1071,7 +1099,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Выберите файл</translation>
</message>
@@ -1081,7 +1109,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Ð’Ñе файлы (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,14 +1193,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Ваш логин. Идентификатор Matrix должен начинатьÑÑ Ñ @ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð°Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑким идентификатором. ПоÑле Ñоздание пользовательÑкого идентификатора, вы должны ввеÑти Ð°Ð´Ñ€ÐµÑ Ñервера поÑле Ð´Ð²Ð¾ÐµÑ‚Ð¾Ñ‡Ð¸Ñ :.
-Так-же вы можете помеÑтить Ð°Ð´Ñ€ÐµÑ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ³Ð¾ Ñервера тут, еÑли ваш Ñервер не поддерживает обычный поиÑк.
-Пример: @user:server.my
-ЕÑли Nheko не удалоÑÑŒ определить ваш домашний Ñервер, то вам покажетÑÑ Ð¿Ð¾Ð»Ðµ, куда можно ввеÑти Ð°Ð´Ñ€ÐµÑ Ñервера вручную.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1191,11 +1216,17 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Ð˜Ð¼Ñ ÑƒÑтройÑтва, которое будет отображатьÑÑ Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ…, когда верифицируют ваше уÑтройÑтво. ЕÑли не предоÑтавить Ð¸Ð¼Ñ ÑƒÑтройÑта,то будет иÑпользоватьÑÑ Ð¸Ð¼Ñ Ð¿Ð¾ умолчанию.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>ÐÐ´Ñ€ÐµÑ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ³Ð¾ Ñервера</translation>
</message>
@@ -1205,14 +1236,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>ÐÐ´Ñ€ÐµÑ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ будет иÑпользоватьÑÑ Ð´Ð»Ñ ÑвÑзи клиентÑкого API вашего домашнего Ñервера.
-Пример: https://server.my:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>ВОЙТИ</translation>
</message>
@@ -1225,12 +1249,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>Вы ввели не правильный Matrix ID, @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>ÐвтоматичеÑкое обнаружение не удалоÑÑŒ. Получен некорректный ответ.</translation>
</message>
@@ -1255,8 +1279,8 @@ Example: https://server.my:8787</source>
<translation>Произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. УбедитеÑÑŒ, что домен homeserver дейÑтвителен.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1295,7 +1319,7 @@ Example: https://server.my:8787</source>
<translation>ПуÑтой пароль</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>Ðе удалоÑÑŒ войти при помощи SSO</translation>
</message>
@@ -1376,7 +1400,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1443,7 +1467,7 @@ Example: https://server.my:8787</source>
<translation>ÐапиÑать Ñообщение…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1471,12 +1495,22 @@ Example: https://server.my:8787</source>
<translation>Редактировать</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>РеакциÑ</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>Ответить</translation>
</message>
@@ -1486,7 +1520,7 @@ Example: https://server.my:8787</source>
<translation>Опции</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1497,18 +1531,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1522,6 +1556,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1534,7 +1573,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1597,12 +1636,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1754,29 +1793,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1801,7 +1840,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1811,10 +1850,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1822,7 +1912,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1963,12 +2053,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2008,9 +2098,9 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Создать уникальный профиль, который позволит одновременно войти в неÑколько аккаунтов и запуÑтить неÑколько ÑкземлÑров Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2023,6 +2113,34 @@ Example: https://server.my:8787</source>
<translation>Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2073,7 +2191,12 @@ Example: https://server.my:8787</source>
<translation>Подтверждение паролÑ</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Домашний Ñервер</translation>
</message>
@@ -2098,12 +2221,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Ð˜Ð¼Ñ ÑƒÑтройÑтва</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Ð˜Ð¼Ñ ÑƒÑтройÑтва, которое будет отображатьÑÑ Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ…, когда верифицируют ваше уÑтройÑтво. ЕÑли не предоÑтавить Ð¸Ð¼Ñ ÑƒÑтройÑта,то будет иÑпользоватьÑÑ Ð¸Ð¼Ñ Ð¿Ð¾ умолчанию.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>РЕГИСТРÐЦИЯ</translation>
</message>
@@ -2133,8 +2251,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished">Произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. УбедитеÑÑŒ, что домен homeserver дейÑтвителен.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2175,6 +2293,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2197,7 +2320,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>нет Ñохраненной верÑии</translation>
</message>
@@ -2205,7 +2328,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2256,7 +2379,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2498,42 +2621,7 @@ Example: https://server.my:8787</source>
<translation>Ð’Ñе ÑообщениÑ</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>Каждый и гоÑти</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>Каждый</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>Приглашённые пользователи</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>Шифрование</translation>
</message>
@@ -2569,17 +2657,13 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
@@ -2591,12 +2675,52 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2631,12 +2755,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>Ðе удалоÑÑŒ включить шифрование: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>Выберите аватар</translation>
</message>
@@ -2683,7 +2807,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2699,7 +2823,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2765,7 +2889,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2828,7 +2952,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2853,7 +2977,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2888,7 +3012,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2974,19 +3098,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Ошибка Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑообщениÑ: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Ðе удалоÑÑŒ зашифровать Ñообщение, отправка отменена!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Сохранить изображение</translation>
</message>
@@ -3021,12 +3145,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 Ñделал комнату публичной.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 Ñделал вход в комнату по приглашению.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3344,12 +3463,17 @@ Reason: %4</source>
<translation>%1 отредактировал его "Ñтук".</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Ð’Ñ‹ приÑоединилиÑÑŒ к комнате.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3383,10 +3507,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>Изменено</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3443,17 +3572,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>ВернутьÑÑ Ðº ÑпиÑку комнат</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Комнаты не выбраны</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3652,7 +3786,7 @@ Reason: %4</source>
<translation>Отменить Верификацию</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3724,12 +3858,7 @@ Reason: %4</source>
<translation type="unfinished">ЗапуÑкать в ÑиÑтемной панели</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ групп</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">ПоÑылать Ñообщение в формате Markdown</translation>
</message>
@@ -3809,12 +3938,7 @@ Reason: %4</source>
<translation type="unfinished">Дешифровывать Ñообщение в Ñайдбаре</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished">Приватное Окно</translation>
</message>
@@ -4014,12 +4138,7 @@ Reason: %4</source>
<translation>Выбрать звук ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð²Ñ…Ð¾Ð´Ñщего звонка</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished">УÑтановить макÑимальную ширину Ñообщений в таймлайне (в пикÑелÑÑ…). Ðто может повыÑить читаемоÑÑ‚ÑŒ на широких Ñкранах, когда Nheko в полноÑкранном режиме.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4046,12 +4165,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished">ЗапуÑкать приложение в фоне, без Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¾ÐºÐ½Ð°.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished">Отображать колонку Ñодержащую группы и Ñ‚Ñги Ñ€Ñдом Ñо ÑпиÑком комнаты.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">Разрешить иÑпользовать markdown в ÑообщениÑÑ….
@@ -4079,16 +4193,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished">Отображать кто печатает в комнате.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished">Отображать Ñначала комнаты Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ ÑообщениÑми.
-ЕÑли Ñто выключено, ÑпиÑок комнат будет отÑортировать по времени поÑледнего ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² комнате.
-ЕÑли Ñто включено, комнаты в которых включены ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ (маленькие кружки Ñ Ñ‡Ð¸Ñлами) буду отÑортированы на верху. Комнаты, которые вы заглушили, будут отÑортированы по времени, пока вы не Ñделаете их важнее чем другие комнаты.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished">Отображать кнопки быÑтрого ответа, реакции или предоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… опций Ñ€Ñдом Ñ ÐºÐ°Ð¶Ð´Ñ‹Ð¼ Ñообщением.</translation>
</message>
@@ -4104,7 +4209,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4116,7 +4231,34 @@ This usually causes the application icon in the task bar to animate in some fash
Ðа Ñто обычно реагирует иконка Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð² таÑкбаре.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4146,12 +4288,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished">Дешифровывать Ñообщение отображающиеÑÑ Ð² Ñайдбаре. ДейÑтвует только на шифрованные чаты.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4177,12 +4314,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4302,7 +4434,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4361,7 +4493,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Вчера</translation>
</message>
@@ -4385,8 +4517,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>ЗапуÑтите резервный вариант, пройдите его шаги и подтвердите завершение.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts
index 7eb21eca0eb798076a0f9e7642b98ef1d11c6baf..9718a9aa5ee7afc09b9125852d26da7facb4c9c3 100644
--- a/resources/langs/nheko_si.ts
+++ b/resources/langs/nheko_si.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,8 +1191,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1186,27 +1214,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1219,12 +1247,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1249,8 +1277,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1289,7 +1317,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1370,7 +1398,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
+ <source>%1 changed the parent communities for this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1437,7 +1465,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1465,12 +1493,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1480,7 +1518,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1491,18 +1529,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1516,6 +1554,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1528,7 +1571,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1591,12 +1634,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1748,29 +1791,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1795,7 +1838,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1805,10 +1848,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1816,7 +1910,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1957,12 +2051,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2002,8 +2096,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2017,6 +2111,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2067,7 +2189,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2092,12 +2219,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,8 +2249,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2169,6 +2291,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2191,7 +2318,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2199,7 +2326,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2250,7 +2377,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2490,105 +2617,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2623,12 +2751,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2675,7 +2803,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2691,7 +2819,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2757,7 +2885,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2820,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2845,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2880,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2966,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3012,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3331,12 +3454,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3370,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3429,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3637,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3709,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3794,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3999,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4063,14 +4181,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4197,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4218,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4127,12 +4275,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4158,12 +4301,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4283,7 +4421,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4342,7 +4480,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4366,7 +4504,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_sr_Latn.ts b/resources/langs/nheko_sr_Latn.ts
index d8ec4a4a4119669fa03b7b35f5b0606e513854c8..16701bb64a51c3d1287c28c64819f36c2d936cc2 100644
--- a/resources/langs/nheko_sr_Latn.ts
+++ b/resources/langs/nheko_sr_Latn.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -200,12 +228,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -220,13 +243,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -307,7 +324,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -335,7 +357,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -389,12 +417,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -461,23 +489,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -504,12 +532,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -595,7 +623,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1071,7 +1099,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1081,7 +1109,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1165,8 +1193,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1188,27 +1216,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1221,12 +1249,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1251,8 +1279,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1291,7 +1319,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1371,12 +1399,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1411,7 +1434,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1439,7 +1467,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1467,12 +1495,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1482,7 +1520,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1493,18 +1531,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1518,6 +1556,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1530,7 +1573,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1593,12 +1636,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1750,29 +1793,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1797,7 +1840,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1807,10 +1850,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1818,7 +1912,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1959,12 +2053,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2004,8 +2098,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2019,6 +2113,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2069,7 +2191,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2094,12 +2221,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2129,8 +2251,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2171,6 +2293,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2193,7 +2320,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2201,7 +2328,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2252,7 +2379,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2494,105 +2621,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2627,12 +2755,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2679,7 +2807,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2695,7 +2823,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2761,7 +2889,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2824,7 +2952,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2849,7 +2977,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2884,7 +3012,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2970,19 +3098,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3017,12 +3145,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3340,12 +3463,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3379,10 +3507,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3439,17 +3572,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3648,7 +3786,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3720,12 +3858,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3805,12 +3938,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -4010,12 +4138,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4042,12 +4165,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4074,14 +4192,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4097,7 +4208,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4108,7 +4229,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4138,12 +4286,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4169,12 +4312,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4294,7 +4432,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4353,7 +4491,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4377,7 +4515,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_sv.ts b/resources/langs/nheko_sv.ts
index bd1dfd39b1a4216d81f849374ea46ba9c8791259..b86aae9e417e34da03e223a574f21cfbe2d23808 100644
--- a/resources/langs/nheko_sv.ts
+++ b/resources/langs/nheko_sv.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -199,12 +227,7 @@
<translation>Bjöd in användare: %1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>Kunde inte migrera cachen till den nuvarande versionen. Detta kan bero på flera anledningar, vänligen rapportera problemet och prova en äldre version under tiden. Du kan också försöka att manuellt radera cachen.</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -219,13 +242,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -306,7 +323,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Cache-migration misslyckades!</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>Inkompatibel cache-version</translation>
</message>
@@ -334,7 +356,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Vänligen försök logga in på nytt: %1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>Kunde inte gå med i rum: %1</translation>
</message>
@@ -388,12 +416,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -460,23 +488,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -502,12 +530,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -593,7 +621,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1069,7 +1097,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>Välj en fil</translation>
</message>
@@ -1079,7 +1107,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>Alla Filer (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1163,14 +1191,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>Ditt inloggningsnamn. Ett mxid inleds med @ efterföljt av användarnamnet. Efter användarnamnet behöver du inkludera ditt servernamn efter ett :.
-Servernamnet kan också vara adressen till din hemserver, om denna inte stödjer uppslag via .well-known.
-Exempel: @användare:server.my
-Om Nheko inte kan hitta din hemserver automatiskt kommer ett fält dyka upp där du kan fylla i adressen manuellt.</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1189,11 +1214,17 @@ Om Nheko inte kan hitta din hemserver automatiskt kommer ett fält dyka upp där
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>Ett namn för denna enhet. Namnet kommer synas för andra när du verifierar dina enheter. Om du inte förser ett namn kommer ett standardnamn användas.</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
@@ -1203,14 +1234,7 @@ Om Nheko inte kan hitta din hemserver automatiskt kommer ett fält dyka upp där
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>Addressen som kan användas för att kontakta din hemservers klient-API.
-Exempel: https://server.my:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>INLOGGNING</translation>
</message>
@@ -1223,12 +1247,12 @@ Exempel: https://server.my:8787</translation>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Autouppslag misslyckades. Mottog felkonstruerat svar.</translation>
</message>
@@ -1253,8 +1277,8 @@ Exempel: https://server.my:8787</translation>
<translation>Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1293,7 +1317,7 @@ Exempel: https://server.my:8787</translation>
<translation>Tomt lösenord</translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO-inloggning misslyckades</translation>
</message>
@@ -1373,12 +1397,7 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation>%1 skapade och konfigurerade rum: %2</translation>
</message>
@@ -1413,7 +1432,12 @@ Exempel: https://server.my:8787</translation>
<translation>%1 besvarade samtalet.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation>%1 avslutade samtalet.</translation>
</message>
@@ -1441,7 +1465,7 @@ Exempel: https://server.my:8787</translation>
<translation>Skriv ett meddelande…</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1469,12 +1493,22 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished">Reagera</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished">Svara</translation>
</message>
@@ -1484,7 +1518,7 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished">Alternativ</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1495,18 +1529,18 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1520,6 +1554,11 @@ Exempel: https://server.my:8787</translation>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1532,7 +1571,7 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1595,13 +1634,13 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>Du kan verifiera dina enheter för att låta andra användare se vilka av dem som faktiskt tillhör dig. Detta gör även att nyckelbackup fungerar automatiskt. Verifiera %1 nu?</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1752,29 +1791,29 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1799,7 +1838,7 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1809,10 +1848,61 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1820,7 +1910,7 @@ Exempel: https://server.my:8787</translation>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1961,12 +2051,12 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2006,9 +2096,9 @@ Exempel: https://server.my:8787</translation>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>Skapa en unik profil, vilket tillåter dig att logga in på flera konton samtidigt och starta flera instanser av Nheko.</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2021,6 +2111,34 @@ Exempel: https://server.my:8787</translation>
<translation>profilnamn</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2071,7 +2189,12 @@ Exempel: https://server.my:8787</translation>
<translation>Bekräfta lösenord</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>Hemserver</translation>
</message>
@@ -2096,12 +2219,7 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished">Enhetsnamn</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished">Ett namn för denna enhet. Namnet kommer synas för andra när du verifierar dina enheter. Om du inte förser ett namn kommer ett standardnamn användas.</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>REGISTRERA</translation>
</message>
@@ -2131,8 +2249,8 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished">Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2173,6 +2291,11 @@ Exempel: https://server.my:8787</translation>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2195,7 +2318,7 @@ Exempel: https://server.my:8787</translation>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>ingen version lagrad</translation>
</message>
@@ -2203,7 +2326,7 @@ Exempel: https://server.my:8787</translation>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2254,7 +2377,7 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2494,105 +2617,106 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation type="unfinished"></translation>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
+ <translation type="unfinished">Totalsträckskryptering</translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
- <translation type="unfinished">Totalsträckskryptering</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
- <source>Hidden events</source>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
+ <location line="+57"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2627,12 +2751,12 @@ Exempel: https://server.my:8787</translation>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished">Kunde inte aktivera kryptering: %1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished">Välj en avatar</translation>
</message>
@@ -2679,7 +2803,7 @@ Exempel: https://server.my:8787</translation>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2695,7 +2819,7 @@ Exempel: https://server.my:8787</translation>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2761,7 +2885,7 @@ Exempel: https://server.my:8787</translation>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2824,7 +2948,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2849,7 +2973,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2884,7 +3008,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2970,19 +3094,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>Kunde inte maskera meddelande: %1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>Kunde inte kryptera event, sändning avbruten!</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>Spara bild</translation>
</message>
@@ -3016,12 +3140,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 öppnade rummet till allmänheten.</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 satte rummet till att kräva inbjudan för att gå med.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3335,12 +3454,17 @@ Reason: %4</source>
<translation>%1 maskerade sin knackning.</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>Du gick med i detta rum.</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3374,10 +3498,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3433,17 +3562,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>Tillbaka till rumlista</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>Inget rum markerat</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3641,7 +3775,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3713,12 +3847,7 @@ Reason: %4</source>
<translation type="unfinished">Starta i systemtråg</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished">Gruppens sidofält</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished">Skicka meddelanden som Markdown</translation>
</message>
@@ -3798,12 +3927,7 @@ Reason: %4</source>
<translation type="unfinished">Dekryptera meddelanden i sidofält</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -4003,12 +4127,7 @@ Reason: %4</source>
<translation type="unfinished">Ställ in notifikationsljudet som spelas upp vid ett inkommande samtal</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished">Ställ in maximal bredd av meddelanden i tidslinjen (i pixlar). Detta kan förbättra läsligheten på breda skärmar när Nheko är maximerat.</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4035,12 +4154,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished">Starta applikationen i bakgrunden utan att visa klienten.</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished">Visa en kolumn innehållande grupper och taggar bredvid listan över rum.</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished">Tillåt användning av Markdown i meddelanden.
@@ -4069,16 +4183,7 @@ This will also enable or disable sending typing notifications to others.</source
Denna inställning avgör också huruvida notifikation skickas till andra när du skriver.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished">Visa rum med nya meddelanden först.
-Om denna inställning är av kommer listan över rum endast sorteras efter när det sista meddelandet i rummet skickades.
-Om denna inställning är på kommer rum med aktiva notifikationer (den lilla cirkeln med ett nummer i) sorteras högst upp. Rum som du stängt av notifikationer för kommer fortfarande sorteras efter när det sista meddelandet skickades, eftersom du inte verkar tycka att de är lika viktiga som andra rum.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished">Visa knappar för att enkelt svara, reagera eller komma åt ytterligare alternativ bredvid varje meddelande.</translation>
</message>
@@ -4094,7 +4199,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4106,7 +4221,34 @@ This usually causes the application icon in the task bar to animate in some fash
Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4137,12 +4279,7 @@ Only affects messages in encrypted chats.</source>
PÃ¥verkar endast krypterade chattar.</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4168,12 +4305,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4293,7 +4425,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation type="unfinished">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>
@@ -4352,7 +4484,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>Igår</translation>
</message>
@@ -4376,8 +4508,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>Öppna reserven, följ stegen och bekräfta när du slutfört dem.</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/resources/langs/nheko_vi.ts b/resources/langs/nheko_vi.ts
index 1085c82b9d2a5b80edd4301137a2c6280fe276ac..a0cc6b59d9244eae4f30a00f08426fc18bc967a6 100644
--- a/resources/langs/nheko_vi.ts
+++ b/resources/langs/nheko_vi.ts
@@ -99,10 +99,38 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -198,12 +226,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation type="unfinished"></translation>
</message>
@@ -218,13 +241,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
@@ -305,7 +322,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -333,7 +355,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -387,12 +415,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
+ <source>Do not show notification counts for this community or tag.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
+ <source>Hide rooms with this tag or from this community by default.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -459,23 +487,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -500,12 +528,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -591,7 +619,7 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1067,7 +1095,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation type="unfinished"></translation>
</message>
@@ -1077,7 +1105,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1161,8 +1189,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
<translation type="unfinished"></translation>
@@ -1184,27 +1212,27 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Homeserver address</source>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>server.my:8787</source>
+ <location line="-4"/>
+ <source>Homeserver address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
+ <location line="+1"/>
+ <source>server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation type="unfinished"></translation>
</message>
@@ -1217,12 +1245,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -1247,8 +1275,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1287,7 +1315,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation type="unfinished"></translation>
</message>
@@ -1367,12 +1395,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+28"/>
<source>%1 created and configured room: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1407,7 +1430,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
+ <location line="-51"/>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+65"/>
<source>%1 ended the call.</source>
<translation type="unfinished"></translation>
</message>
@@ -1435,7 +1463,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation type="unfinished"></translation>
</message>
@@ -1463,12 +1491,22 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -1478,7 +1516,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation type="unfinished"></translation>
</message>
@@ -1489,18 +1527,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation type="unfinished"></translation>
</message>
@@ -1514,6 +1552,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1526,7 +1569,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
+ <source>&Read receipts</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1589,12 +1632,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1746,29 +1789,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation type="unfinished"></translation>
</message>
@@ -1793,7 +1836,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation type="unfinished"></translation>
</message>
@@ -1803,10 +1846,61 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1814,7 +1908,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation type="unfinished"></translation>
</message>
@@ -1955,12 +2049,12 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
+ <source>Edit child communities and rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
+ <source>Change parent communities</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2000,8 +2094,8 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2015,6 +2109,34 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2065,7 +2187,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation type="unfinished"></translation>
</message>
@@ -2090,12 +2217,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation type="unfinished"></translation>
</message>
@@ -2125,8 +2247,8 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2167,6 +2289,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2189,7 +2316,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation type="unfinished"></translation>
</message>
@@ -2197,7 +2324,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation type="unfinished"></translation>
</message>
@@ -2248,7 +2375,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2486,105 +2613,106 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
+ <location line="+105"/>
+ <source>Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+8"/>
- <source>Anyone and guests</source>
+ <location line="+21"/>
+ <source>End-to-End Encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Anyone</source>
+ <location line="+1"/>
+ <source>Encryption is currently experimental and things might break unexpectedly. <br>
+ Please take note that it can't be disabled afterwards.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Invited users</source>
+ <location line="+16"/>
+ <source>Permission</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>By knocking</source>
+ <location line="+6"/>
+ <source>View and change the permissions in this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
+ <location line="+12"/>
+ <source>View and change the addresses/aliases of this room</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
+ <location line="+6"/>
+ <source>Sticker & Emote Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+13"/>
- <source>Encryption</source>
+ <location line="-93"/>
+ <location line="+98"/>
+ <source>Change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
- <source>End-to-End Encryption</source>
+ <location line="+7"/>
+ <source>Hidden events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Encryption is currently experimental and things might break unexpectedly. <br>
- Please take note that it can't be disabled afterwards.</source>
+ <location line="-31"/>
+ <location line="+12"/>
+ <location line="+30"/>
+ <source>Configure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
- <source>Permission</source>
+ <location line="-180"/>
+ <source>Anyone can join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>View and change the permissions in this room</source>
+ <location line="+14"/>
+ <source>Allow knocking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
- <source>View and change the addresses/aliases of this room</source>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Sticker & Emote Settings</source>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Change</source>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+6"/>
- <source>Hidden events</source>
+ <location line="+17"/>
+ <source>Apply access rules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-31"/>
- <location line="+12"/>
- <location line="+30"/>
- <source>Configure</source>
+ <location line="+57"/>
+ <source>Aliases</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-35"/>
- <source>Aliases</source>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation type="unfinished"></translation>
</message>
@@ -2619,12 +2747,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation type="unfinished"></translation>
</message>
@@ -2671,7 +2799,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation type="unfinished"></translation>
</message>
@@ -2687,7 +2815,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
+ <source>Please enter the token which has been sent to you:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2753,7 +2881,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation type="unfinished"></translation>
</message>
@@ -2816,7 +2944,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation type="unfinished"></translation>
</message>
@@ -2841,7 +2969,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation type="unfinished"></translation>
</message>
@@ -2876,7 +3004,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2962,19 +3090,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation type="unfinished"></translation>
</message>
@@ -3007,12 +3135,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation type="unfinished"></translation>
</message>
@@ -3322,12 +3445,17 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation type="unfinished"></translation>
</message>
@@ -3361,10 +3489,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3419,17 +3552,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation type="unfinished"></translation>
</message>
@@ -3626,7 +3764,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3698,12 +3836,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation type="unfinished"></translation>
</message>
@@ -3783,12 +3916,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation type="unfinished"></translation>
</message>
@@ -3988,12 +4116,7 @@ Reason: %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4020,12 +4143,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation type="unfinished"></translation>
@@ -4052,14 +4170,7 @@ This will also enable or disable sending typing notifications to others.</source
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation type="unfinished"></translation>
</message>
@@ -4075,7 +4186,17 @@ OFF - square, ON - circle.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation type="unfinished"></translation>
</message>
@@ -4086,7 +4207,34 @@ This usually causes the application icon in the task bar to animate in some fash
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4116,12 +4264,7 @@ Only affects messages in encrypted chats.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation type="unfinished"></translation>
@@ -4147,12 +4290,7 @@ be blurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation type="unfinished"></translation>
</message>
@@ -4272,7 +4410,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<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>
@@ -4331,7 +4469,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation type="unfinished"></translation>
</message>
@@ -4355,7 +4493,7 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 5cfd163d4bb560acd5aee1a673ce8f2e1124e685..6ac2b84ebaeb4fb0a7fe35ff28a91d5afe97064b 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -99,10 +99,38 @@
<translation>æ·»åŠ </translation>
</message>
</context>
+<context>
+ <name>AllowedRoomsSettingsDialog</name>
+ <message>
+ <location filename="../qml/dialogs/AllowedRoomsSettingsDialog.qml" line="+27"/>
+ <source>Allowed rooms settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>List of rooms that allow access to this room. Anyone who is in any of those rooms can join this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+40"/>
+ <source>Parent community</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Other room</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+42"/>
+ <source>Enter additional rooms not in the list yet...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>Cache</name>
<message numerus="yes">
- <location filename="../../src/Cache.cpp" line="+2733"/>
+ <location filename="../../src/Cache.cpp" line="+2761"/>
<source>%1 and %n other(s)</source>
<translation>
<numerusform>%1 å’Œå¦å¤– %n 人</numerusform>
@@ -198,12 +226,7 @@
<translation>邀请已å‘é€ï¼š%1</translation>
</message>
<message>
- <location line="-513"/>
- <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
- <translation>æ— æ³•è¿ç§»ç¼“å˜åˆ°ç›®å‰ç‰ˆæœ¬ï¼Œå¯èƒ½æœ‰å¤šç§åŽŸå› 引å‘æ¤ç±»é—®é¢˜ã€‚您å¯ä»¥æ–°å»ºä¸€ä¸ªè®®é¢˜å¹¶ç»§ç»ä½¿ç”¨ä¹‹å‰ç‰ˆæœ¬ï¼Œæˆ–者您å¯ä»¥å°è¯•æ‰‹åŠ¨åˆ 除缓å˜ã€‚</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="-500"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update Nheko or clear your cache.</source>
<translation>当å‰è®¾å¤‡ä¸çš„缓å˜æ¯”Nheko支æŒçš„版本更新，请更新Nheko或清ç†ç¼“å˜ã€‚</translation>
</message>
@@ -218,14 +241,7 @@
<translation>è¯·æ±‚åŠ å…¥èŠå¤©å®¤</translation>
</message>
<message>
- <location line="+3"/>
- <source>You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?
-You may optionally provide a reason for others to accept your knock:</source>
- <translation>ä½ æœªèƒ½åŠ å…¥ %1ã€‚ä½ å¯ä»¥å°è¯•è¯·æ±‚åŠ å…¥ï¼Œä»¥ä¾¿å…¶ä»–äººå¯ä»¥é‚€è¯·ä½ è¿›æ¥ã€‚ä½ æƒ³è¿™æ ·åšå—？
-ä½ å¯ä»¥é€‰æ‹©æ供一个ç†ç”±è®©å…¶ä»–人接å—ä½ çš„åŠ å…¥è¯·æ±‚ï¼š</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+4"/>
<source>Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:</source>
<translation>ä½ çœŸçš„æƒ³è¯·æ±‚åŠ å…¥ %1 å—ï¼Ÿä½ å¯ä»¥é€‰æ‹©æ供一个ç†ç”±è®©å…¶ä»–人接å—ä½ çš„åŠ å…¥è¯·æ±‚ï¼š</translation>
</message>
@@ -306,7 +322,12 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>缓å˜è¿ç§»å¤±è´¥ï¼</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+1"/>
+ <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue at https://github.com/Nheko-Reborn/nheko and try to use an older version in the meantime. Alternatively you can try deleting the cache manually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Incompatible cache version</source>
<translation>æ— æ³•å…¼å®¹ç¼“å˜ç‰ˆæœ¬</translation>
</message>
@@ -334,7 +355,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>请å°è¯•å†æ¬¡ç™»å½•ï¼š%1</translation>
</message>
<message>
- <location line="+86"/>
+ <location line="+34"/>
+ <source>You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?
+You may optionally provide a reason for others to accept your knock:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Failed to join room: %1</source>
<translation>æœªèƒ½åŠ å…¥èŠå¤©å®¤ï¼š%1</translation>
</message>
@@ -388,13 +415,13 @@ You may optionally provide a reason for others to accept your knock:</source>
<name>CommunitiesList</name>
<message>
<location filename="../qml/CommunitiesList.qml" line="+51"/>
- <source>Do not show notification counts for this space or tag.</source>
- <translation>ä¸æ˜¾ç¤ºæ¤ç©ºé—´æˆ–æ ‡ç¾çš„通知计数。</translation>
+ <source>Do not show notification counts for this community or tag.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+7"/>
- <source>Hide rooms with this tag or from this space by default.</source>
- <translation>默认éšè—å¸¦è¿™ä¸ªæ ‡ç¾æˆ–æ¥è‡ªæ¤ç©ºé—´çš„èŠå¤©å®¤ã€‚</translation>
+ <source>Hide rooms with this tag or from this community by default.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+86"/>
@@ -460,23 +487,23 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>æ¥è‡ªæœåŠ¡å™¨æˆ–管ç†å‘˜çš„消æ¯ã€‚</translation>
</message>
<message>
- <location line="+643"/>
- <source>Failed to update space child: %1</source>
+ <location line="+657"/>
+ <source>Failed to update community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space child: %1</source>
+ <location line="+18"/>
+ <source>Failed to delete room from community: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+22"/>
- <source>Failed to update space parent: %1</source>
+ <location line="+23"/>
+ <source>Failed to update community for room: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+17"/>
- <source>Failed to delete space parent: %1</source>
+ <location line="+18"/>
+ <source>Failed to remove community from room: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -501,12 +528,12 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+25"/>
- <source>This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
+ <source>Do you want to join this room? You can optionally add a reason below:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+0"/>
- <source>Do you want to join this room? You can optionally add a reason below:</source>
+ <source>This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -592,8 +619,8 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+6"/>
- <source>Public rooms can be joined by anyone, private rooms need explicit invites.</source>
- <translation>任何人都å¯ä»¥åŠ 入公共èŠå¤©å®¤ï¼Œç§äººèŠå¤©å®¤åˆ™éœ€è¦æ˜Žç¡®çš„邀请。</translation>
+ <source>Public rooms can be joined by anyone; private rooms need explicit invites.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+13"/>
@@ -1068,7 +1095,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<context>
<name>InputBar</name>
<message>
- <location filename="../../src/timeline/InputBar.cpp" line="+338"/>
+ <location filename="../../src/timeline/InputBar.cpp" line="+362"/>
<source>Select a file</source>
<translation>选择一个文件</translation>
</message>
@@ -1078,7 +1105,7 @@ You may optionally provide a reason for others to accept your knock:</source>
<translation>所有文件 (*)</translation>
</message>
<message>
- <location line="+806"/>
+ <location line="+771"/>
<source>Upload of '%1' failed</source>
<translation>ä¸Šä¼ â€œ%1†失败</translation>
</message>
@@ -1162,14 +1189,11 @@ You may optionally provide a reason for others to accept your knock:</source>
</message>
<message>
<location line="+3"/>
- <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.
-You can also put your homeserver address there, if your server doesn't support .well-known lookup.
+ <source>Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.
+You can also put your homeserver address there if your server doesn't support .well-known lookup.
Example: @user:server.my
If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
- <translation>ä½ çš„ç™»å½•å。 mxid 应以 @ 开头，åŽè·Ÿç”¨æˆ· ID。在用户 ID 之åŽï¼Œä½ 需è¦åœ¨ : 之åŽåŒ…å«ä½ çš„æœåŠ¡å™¨å称。
-å¦‚æžœä½ çš„æœåŠ¡å™¨ä¸æ”¯æŒ .well-known æŸ¥æ‰¾ï¼Œä½ ä¹Ÿå¯ä»¥å°†ä½ 的主æœåŠ¡å™¨åœ°å€æ”¾åœ¨é‚£é‡Œã€‚
-例如：@user:server.my
-如果 Nheko æ— æ³•å‘çŽ°ä½ çš„ä¸»æœåŠ¡å™¨ï¼Œå®ƒå°†æ˜¾ç¤ºä¸€ä¸ªå—段以手动输入æœåŠ¡å™¨ã€‚</translation>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+27"/>
@@ -1188,11 +1212,17 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
</message>
<message>
<location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>设备å，将在验è¯ä½ 的设备时å‘其他设备展示。如果ä¸è¾“入则会设置为默认值。</translation>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
+ <source>The address that can be used to contact you homeserver's client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-4"/>
<source>Homeserver address</source>
<translation>主æœåŠ¡å™¨åœ°å€</translation>
</message>
@@ -1202,14 +1232,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th
<translation>server.my:8787</translation>
</message>
<message>
- <location line="+3"/>
- <source>The address that can be used to contact you homeservers client API.
-Example: https://server.my:8787</source>
- <translation>å¯ç”¨äºŽè”ç³»ä½ ä¸»æœåŠ¡å™¨çš„客户端 API 的地å€ã€‚
-例如：https://server.my:8787</translation>
- </message>
- <message>
- <location line="+32"/>
+ <location line="+35"/>
<source>LOGIN</source>
<translation>登录</translation>
</message>
@@ -1222,12 +1245,12 @@ Example: https://server.my:8787</source>
<location filename="../../src/LoginPage.cpp" line="+86"/>
<location line="+6"/>
<location line="+58"/>
- <location line="+125"/>
+ <location line="+126"/>
<source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source>
<translation>ä½ è¾“å…¥äº†æ— æ•ˆçš„Matrix ID 例如 @joe:matrix.org</translation>
</message>
<message>
- <location line="-155"/>
+ <location line="-156"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>自动å‘çŽ°å¤±è´¥ã€‚æ”¶åˆ°æ ¼å¼é”™è¯¯çš„回å¤ã€‚</translation>
</message>
@@ -1252,9 +1275,9 @@ Example: https://server.my:8787</source>
<translation>å‘生了一个未知错误。请确认æœåŠ¡å™¨åŸŸååˆæ³•ã€‚</translation>
</message>
<message>
- <location line="+14"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't sign in.</source>
- <translation>所选的æœåŠ¡å™¨ä¸æ”¯æŒè¯¥å®¢æˆ·ç«¯æ‰€å…¼å®¹çš„Matrixå议版本（v1.1ã€v1.2或v1.3ï¼‰ã€‚ä½ æ— æ³•ç™»å½•ã€‚</translation>
+ <location line="+15"/>
+ <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1 to v1.4). You can't sign in.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+20"/>
@@ -1292,7 +1315,7 @@ Example: https://server.my:8787</source>
<translation>空密ç </translation>
</message>
<message>
- <location line="+52"/>
+ <location line="+55"/>
<source>SSO login failed</source>
<translation>SSO登录失败</translation>
</message>
@@ -1373,8 +1396,8 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>%1 changed the parent spaces for this room.</source>
- <translation>%1 更改了æ¤èŠå¤©å®¤çš„父空间。</translation>
+ <source>%1 changed the parent communities for this room.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+14"/>
@@ -1440,7 +1463,7 @@ Example: https://server.my:8787</source>
<translation>写一æ¡æ¶ˆæ¯â€¦</translation>
</message>
<message>
- <location line="+277"/>
+ <location line="+281"/>
<source>Stickers</source>
<translation>贴纸</translation>
</message>
@@ -1468,12 +1491,22 @@ Example: https://server.my:8787</source>
<translation>编辑</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+15"/>
<source>React</source>
<translation>回应</translation>
</message>
<message>
<location line="+17"/>
+ <source>Reply in thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>New thread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
<source>Reply</source>
<translation>回å¤</translation>
</message>
@@ -1483,7 +1516,7 @@ Example: https://server.my:8787</source>
<translation>选项</translation>
</message>
<message>
- <location line="+427"/>
+ <location line="+434"/>
<source>Reason for removal</source>
<translation>ç§»é™¤åŽŸå› </translation>
</message>
@@ -1494,18 +1527,18 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <location line="+134"/>
+ <location line="+141"/>
<source>&Copy</source>
<translation>å¤åˆ¶(&C)</translation>
</message>
<message>
- <location line="-127"/>
- <location line="+134"/>
+ <location line="-134"/>
+ <location line="+141"/>
<source>Copy &link location</source>
<translation>å¤åˆ¶é“¾æŽ¥ä½ç½®(&l)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-133"/>
<source>Re&act</source>
<translation>回应(&a)</translation>
</message>
@@ -1519,6 +1552,11 @@ Example: https://server.my:8787</source>
<source>&Edit</source>
<translation>编辑(&E)</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>&Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location line="+7"/>
<source>Un&pin</source>
@@ -1531,8 +1569,8 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+5"/>
- <source>Read receip&ts</source>
- <translation>已读回执(&t)</translation>
+ <source>&Read receipts</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
@@ -1594,13 +1632,13 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+14"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
- <translation>为了å…è®¸å…¶ä»–ç”¨æˆ·æŸ¥çœ‹ä½ çš„å“ªäº›è®¾å¤‡å®žé™…ä¸Šå±žäºŽä½ ï¼Œä½ å¯ä»¥å¯¹å…¶è¿›è¡ŒéªŒè¯ã€‚这也å…许密钥备份自动工作。现在验è¯ä¸€ä¸ªæœªç»éªŒè¯çš„设备？ （请确ä¿ä½ 有这些设备之一å¯ç”¨ã€‚）</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
- <translation>为了å…è®¸å…¶ä»–ç”¨æˆ·æŸ¥çœ‹ä½ çš„å“ªäº›è®¾å¤‡å®žé™…ä¸Šå±žäºŽä½ ï¼Œä½ å¯ä»¥å¯¹å…¶è¿›è¡ŒéªŒè¯ã€‚这也å…è®¸å¯†é’¥å¤‡ä»½è‡ªåŠ¨å·¥ä½œã€‚çŽ°åœ¨éªŒè¯ %1 ？</translation>
+ <source>To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -1751,29 +1789,29 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+22"/>
- <location line="+235"/>
+ <location line="+240"/>
<source>Administrator (%1)</source>
<translation>管ç†å‘˜ (%1)</translation>
</message>
<message>
- <location line="-233"/>
- <location line="+235"/>
+ <location line="-238"/>
+ <location line="+240"/>
<source>Moderator (%1)</source>
<translation>å管员 (%1)</translation>
</message>
<message>
- <location line="-233"/>
+ <location line="-238"/>
<source>User (%1)</source>
<translation>用户 (%1)</translation>
</message>
<message>
<location line="+2"/>
- <location line="+233"/>
+ <location line="+238"/>
<source>Custom (%1)</source>
<translation>自定义 (%1)</translation>
</message>
<message>
- <location line="-220"/>
+ <location line="-225"/>
<source>Remove event type</source>
<translation>移除事件类型</translation>
</message>
@@ -1798,7 +1836,7 @@ Example: https://server.my:8787</source>
<translation>上下移动用户以更改其æƒé™</translation>
</message>
<message>
- <location line="+137"/>
+ <location line="+142"/>
<source>Remove user</source>
<translation>移除用户</translation>
</message>
@@ -1808,10 +1846,61 @@ Example: https://server.my:8787</source>
<translation>æ·»åŠ ç”¨æˆ·</translation>
</message>
</context>
+<context>
+ <name>PowerLevelSpacesApplyDialog</name>
+ <message>
+ <location filename="../qml/dialogs/PowerLevelSpacesApplyDialog.qml" line="+28"/>
+ <source>Apply permission changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Which of the subcommunities and rooms should these permissions be applied to?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Apply permissions recursively</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Overwrite exisiting modifications in rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+46"/>
+ <source>No permissions to apply the new permissions here</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>No changes needed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Existing modifications to the permissions in this room will be overwritten</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Permissions synchronized with community</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>PowerLevels</name>
+ <message>
+ <location filename="../../src/PowerlevelsEditModels.cpp" line="+736"/>
+ <source>Failed to update powerlevel: %1</source>
+ <translation type="unfinished">未能更新æƒé™ç‰çº§ï¼š%1</translation>
+ </message>
+</context>
<context>
<name>PowerlevelEditingModels</name>
<message>
- <location filename="../../src/PowerlevelsEditModels.cpp" line="+601"/>
+ <location line="-116"/>
<source>Failed to update powerlevel: %1</source>
<translation>未能更新æƒé™ç‰çº§ï¼š%1</translation>
</message>
@@ -1819,7 +1908,7 @@ Example: https://server.my:8787</source>
<context>
<name>PowerlevelsTypeListModel</name>
<message>
- <location line="-450"/>
+ <location line="-465"/>
<source>Other events</source>
<translation>其他事件</translation>
</message>
@@ -1960,13 +2049,13 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+3"/>
- <source>Edit child rooms</source>
- <translation>编辑åèŠå¤©å®¤</translation>
+ <source>Edit child communities and rooms</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
- <source>Change parent spaces</source>
- <translation>更改父空间</translation>
+ <source>Change parent communities</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
@@ -2005,9 +2094,9 @@ Example: https://server.my:8787</source>
<context>
<name>QCoreApplication</name>
<message>
- <location filename="../../src/main.cpp" line="+213"/>
- <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
- <translation>创建一个独特的é…置文件，å…è®¸ä½ åŒæ—¶ç™»å½•å¤šä¸ªå¸æˆ·å¹¶å¯åŠ¨å¤šä¸ª Nheko 实例。</translation>
+ <location filename="../../src/main.cpp" line="+230"/>
+ <source>Create a unique profile which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
@@ -2020,6 +2109,34 @@ Example: https://server.my:8787</source>
<translation>个人资料å称</translation>
</message>
</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <location line="-26"/>
+ <source>Alias for '--log-level trace'.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the global log level, or a comma-separated list of <component>=<level> pairs, or both. For example, to set the default log level to 'warn' but disable logging for the 'ui' component, pass 'warn,ui=off'. levels:{trace,debug,info,warning,error,critical,off} components:{crypto,db,mtx,net,qml,ui}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>level</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Set the log output type. A comma-separated list is allowed. The default is 'file,stderr'. types:{file,stderr,none}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>type</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>ReadReceipts</name>
<message>
@@ -2070,7 +2187,12 @@ Example: https://server.my:8787</source>
<translation>密ç 确认</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="+19"/>
+ <source>A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="-109"/>
<source>Homeserver</source>
<translation>主æœåŠ¡å™¨</translation>
</message>
@@ -2095,12 +2217,7 @@ Example: https://server.my:8787</source>
<translation>设备å</translation>
</message>
<message>
- <location line="+2"/>
- <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source>
- <translation>设备å，将在验è¯ä½ 的设备时å‘其他设备展示。如果ä¸è¾“入则会设置为默认值。</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+33"/>
<source>REGISTER</source>
<translation>注册</translation>
</message>
@@ -2130,9 +2247,9 @@ Example: https://server.my:8787</source>
<translation>收到形å¼é”™è¯¯çš„å“应。请确ä¿ä¸»æœåŠ¡å™¨åŸŸæœ‰æ•ˆã€‚</translation>
</message>
<message>
- <location line="+15"/>
- <source>The selected server does not support a version of the Matrix protocol, that this client understands (v1.1, v1.2 or v1.3). You can't register.</source>
- <translation>所选的æœåŠ¡å™¨ä¸æ”¯æŒè¯¥å®¢æˆ·ç«¯æ‰€å…¼å®¹çš„Matrixå议版本（v1.1ã€v1.2或v1.3ï¼‰ã€‚ä½ æ— æ³•æ³¨å†Œã€‚</translation>
+ <location line="+16"/>
+ <source>The selected server does not support a version of the Matrix protocol that this client understands (v1.1 to v1.4). You can't register.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
@@ -2172,6 +2289,11 @@ Example: https://server.my:8787</source>
<source>Cancel Edit</source>
<translation>å–消编辑</translation>
</message>
+ <message>
+ <location line="+17"/>
+ <source>Cancel Thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RoomDirectory</name>
@@ -2194,7 +2316,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomInfo</name>
<message>
- <location filename="../../src/Cache.cpp" line="+2026"/>
+ <location filename="../../src/Cache.cpp" line="+2027"/>
<source>no version stored</source>
<translation>没有å˜å‚¨ç‰ˆæœ¬</translation>
</message>
@@ -2202,7 +2324,7 @@ Example: https://server.my:8787</source>
<context>
<name>RoomList</name>
<message>
- <location filename="../qml/RoomList.qml" line="+141"/>
+ <location filename="../qml/RoomList.qml" line="+143"/>
<source>New tag</source>
<translation>æ–°æ ‡ç¾</translation>
</message>
@@ -2253,7 +2375,7 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community...</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2491,42 +2613,7 @@ Example: https://server.my:8787</source>
<translation>所有消æ¯</translation>
</message>
<message>
- <location line="+10"/>
- <source>Room access</source>
- <translation>èŠå¤©å®¤è®¿é—®æƒé™</translation>
- </message>
- <message>
- <location line="+8"/>
- <source>Anyone and guests</source>
- <translation>所有人和访客</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Anyone</source>
- <translation>所有人</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Invited users</source>
- <translation>被邀请的用户</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>By knocking</source>
- <translation>é€šè¿‡è¯·æ±‚åŠ å…¥</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms</source>
- <translation>ä»…é™ç‰¹å®šèŠå¤©å®¤æˆå‘˜</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>Restricted by membership in other rooms or by knocking</source>
- <translation>ä»…é™ç‰¹å®šèŠå¤©å®¤æˆå‘˜æˆ–é€šè¿‡è¯·æ±‚åŠ å…¥</translation>
- </message>
- <message>
- <location line="+13"/>
+ <location line="+105"/>
<source>Encryption</source>
<translation>åŠ å¯†</translation>
</message>
@@ -2563,17 +2650,13 @@ Example: https://server.my:8787</source>
<translation>贴纸和表情设置</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-93"/>
+ <location line="+98"/>
<source>Change</source>
<translation>更改</translation>
</message>
<message>
- <location line="+1"/>
- <source>Change what packs are enabled, remove packs or create new ones</source>
- <translation>更改å¯ç”¨çš„表情包ã€åˆ 除表情包或新建表情包</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Hidden events</source>
<translation>éšè—事件</translation>
</message>
@@ -2585,12 +2668,52 @@ Example: https://server.my:8787</source>
<translation>é…ç½®</translation>
</message>
<message>
- <location line="-35"/>
+ <location line="-180"/>
+ <source>Anyone can join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Allow knocking</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Allow joining via other rooms</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Rooms to join via</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Change the list of rooms users can join this room via. Usually this is the official community of this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Allow guests to join</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Apply access rules</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+57"/>
<source>Aliases</source>
<translation>别å</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+18"/>
+ <source>Change what packs are enabled, remove packs, or create new ones</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+18"/>
<source>Select events to hide in this room</source>
<translation>选择在æ¤èŠå¤©å®¤ä¸è¦éšè—的事件</translation>
</message>
@@ -2625,12 +2748,12 @@ Example: https://server.my:8787</source>
<translation>显示更多</translation>
</message>
<message>
- <location filename="../../src/ui/RoomSettings.cpp" line="+182"/>
+ <location filename="../../src/ui/RoomSettings.cpp" line="+215"/>
<source>Failed to enable encryption: %1</source>
<translation>未能å¯ç”¨åŠ 密：%1</translation>
</message>
<message>
- <location line="+320"/>
+ <location line="+344"/>
<source>Select an avatar</source>
<translation>选择一个头åƒ</translation>
</message>
@@ -2677,7 +2800,7 @@ Example: https://server.my:8787</source>
<context>
<name>Root</name>
<message>
- <location filename="../qml/Root.qml" line="+372"/>
+ <location filename="../qml/Root.qml" line="+254"/>
<source>Please enter your login password to continue:</source>
<translation>è¯·è¾“å…¥ä½ çš„ç™»å½•å¯†ç 以继ç»ï¼š</translation>
</message>
@@ -2693,8 +2816,8 @@ Example: https://server.my:8787</source>
</message>
<message>
<location line="+10"/>
- <source>Please enter the token, which has been sent to you:</source>
- <translation>请输入已å‘é€ç»™ä½ 的令牌：</translation>
+ <source>Please enter the token which has been sent to you:</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location line="+16"/>
@@ -2759,7 +2882,7 @@ Example: https://server.my:8787</source>
<context>
<name>SecretStorage</name>
<message>
- <location filename="../../src/Cache.cpp" line="-4570"/>
+ <location filename="../../src/Cache.cpp" line="-4599"/>
<source>Failed to connect to secret storage</source>
<translation>未能连接秘密å˜å‚¨</translation>
</message>
@@ -2824,7 +2947,7 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>SelfVerificationStatus</name>
<message>
- <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+44"/>
+ <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+46"/>
<source>Failed to create keys for cross-signing!</source>
<translation>未能创建用于交å‰ç¾å的密钥ï¼</translation>
</message>
@@ -2849,7 +2972,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>åŠ å¯†è®¾ç½®å¤±è´¥ï¼š%1</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+156"/>
<source>Identity key changed. This breaks E2EE, so logging out.</source>
<translation>身份密钥已改å˜ã€‚è¿™ä¼šç ´å了E2EEï¼Œå› æ¤è¯·æ³¨é”€ã€‚</translation>
</message>
@@ -2884,7 +3007,7 @@ If you choose verify, you need to have the other device available. If you choose
<name>SpaceMenuLevel</name>
<message>
<location filename="../qml/components/SpaceMenuLevel.qml" line="+16"/>
- <source>Add or remove from space</source>
+ <source>Add or remove from community</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2970,19 +3093,19 @@ If you choose verify, you need to have the other device available. If you choose
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+1310"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+1311"/>
<location line="+17"/>
<source>Message redaction failed: %1</source>
<translation>åˆ é™¤æ¶ˆæ¯å¤±è´¥ï¼š%1</translation>
</message>
<message>
- <location line="+74"/>
+ <location line="+116"/>
<location line="+5"/>
<source>Failed to encrypt event, sending aborted!</source>
<translation>æœªèƒ½åŠ å¯†äº‹ä»¶ï¼Œå‘é€ä¸æ¢ï¼</translation>
</message>
<message>
- <location line="+174"/>
+ <location line="+179"/>
<source>Save image</source>
<translation>ä¿å˜å›¾åƒ</translation>
</message>
@@ -3015,12 +3138,7 @@ If you choose verify, you need to have the other device available. If you choose
<translation>%1 公开了æ¤èŠå¤©å®¤ã€‚</translation>
</message>
<message>
- <location line="+2"/>
- <source>%1 made this room require and invitation to join.</source>
- <translation>%1 è¦æ±‚æ¤èŠå¤©å®¤éœ€è¦é‚€è¯·æ‰èƒ½åŠ 入。</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>%1 allowed to join this room by knocking.</source>
<translation>%1 å…è®¸é€šè¿‡è¯·æ±‚åŠ å…¥æ¥åŠ å…¥æ¤èŠå¤©å®¤ã€‚</translation>
</message>
@@ -3331,12 +3449,17 @@ Reason: %4</source>
<translation>%1 åˆ é™¤äº†å…¶åŠ å…¥è¯·æ±‚ã€‚</translation>
</message>
<message>
- <location line="-1528"/>
+ <location line="-1569"/>
<source>You joined this room.</source>
<translation>ä½ å·²åŠ å…¥æ¤èŠå¤©å®¤ã€‚</translation>
</message>
<message>
- <location line="+1480"/>
+ <location line="+893"/>
+ <source>%1 made this room require an invitation to join.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+628"/>
<source>%1 invited %2.</source>
<translation>%1 邀请了 %2。</translation>
</message>
@@ -3370,10 +3493,15 @@ Reason: %4</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+241"/>
+ <location filename="../qml/TimelineRow.qml" line="+243"/>
<source>Edited</source>
<translation>已编辑</translation>
</message>
+ <message>
+ <location line="+18"/>
+ <source>Part of a thread</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TimelineView</name>
@@ -3428,17 +3556,22 @@ Reason: %4</source>
<context>
<name>TopBar</name>
<message>
- <location filename="../qml/TopBar.qml" line="+95"/>
+ <location filename="../qml/TopBar.qml" line="+137"/>
<source>Back to room list</source>
<translation>返回èŠå¤©å®¤åˆ—表</translation>
</message>
<message>
- <location line="-76"/>
+ <location line="-118"/>
<source>No room selected</source>
<translation>未选择èŠå¤©å®¤</translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+100"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+83"/>
<source>Show room members.</source>
<translation>显示èŠå¤©å®¤æˆå‘˜ã€‚</translation>
</message>
@@ -3635,7 +3768,7 @@ Reason: %4</source>
<translation>å–消验è¯</translation>
</message>
<message>
- <location filename="../../src/ui/UserProfile.cpp" line="+155"/>
+ <location filename="../../src/ui/UserProfile.cpp" line="+154"/>
<source>Sign out device %1</source>
<translation>注销设备 %1</translation>
</message>
@@ -3707,12 +3840,7 @@ Reason: %4</source>
<translation>在托盘å¯åŠ¨</translation>
</message>
<message>
- <location line="+2"/>
- <source>Groups sidebar</source>
- <translation>群组侧边æ </translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Send messages as Markdown</source>
<translation>以 Markdown æ ¼å¼å‘é€æ¶ˆæ¯</translation>
</message>
@@ -3792,12 +3920,7 @@ Reason: %4</source>
<translation>解密侧边æ ä¸çš„消æ¯</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show message counts for spaces</source>
- <translation>显示空间的消æ¯è®¡æ•°</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Privacy Screen</source>
<translation>éšç§å±å¹•</translation>
</message>
@@ -3997,12 +4120,7 @@ Reason: %4</source>
<translation>设置当å—到通è¯é‚€è¯·æ—¶å‘出的通知音</translation>
</message>
<message>
- <location line="+7"/>
- <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source>
- <translation>设置时间线ä¸æ¶ˆæ¯çš„最大宽度（以åƒç´ 为å•ä½ï¼‰ã€‚当 Nheko 最大化时，这有助于宽å±ä¸Šçš„å¯è¯»æ€§ã€‚</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+10"/>
<source>Set timeout (in seconds) for how long after window loses
focus before the screen will be blurred.
Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source>
@@ -4031,12 +4149,7 @@ Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds
<translation>在åŽå°å¯åŠ¨åº”用程åºè€Œä¸æ˜¾ç¤ºå®¢æˆ·ç«¯çª—å£ã€‚</translation>
</message>
<message>
- <location line="+2"/>
- <source>Show a column containing groups and tags next to the room list.</source>
- <translation>在èŠå¤©å®¤åˆ—表æ—边显示包å«ç¾¤ç»„å’Œæ ‡ç¾çš„侧æ 。</translation>
- </message>
- <message>
- <location line="+2"/>
+ <location line="+4"/>
<source>Allow using markdown in messages.
When disabled, all messages are sent as a plain text.</source>
<translation>å…许在消æ¯ä¸ä½¿ç”¨ Markdown。
@@ -4065,16 +4178,7 @@ This will also enable or disable sending typing notifications to others.</source
这也将å¯ç”¨æˆ–ç¦ç”¨å‘其他人å‘é€æ£åœ¨è¾“入通知。</translation>
</message>
<message>
- <location line="+4"/>
- <source>Display rooms with new messages first.
-If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
-If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
- <translation>首先显示有新消æ¯çš„èŠå¤©å®¤ã€‚
-如果关é—，èŠå¤©å®¤åˆ—表将仅按èŠå¤©å®¤ä¸æœ€åŽä¸€æ¡æ¶ˆæ¯çš„时间戳排åºã€‚
-如果打开，有活动通知的èŠå¤©å®¤ï¼ˆå¸¦æœ‰æ•°å—çš„å°åœ†åœˆå…¶ä¸ï¼‰å°†è¢«æŽ’åœ¨æœ€ä¸Šæ–¹ã€‚ä½ å·²é™éŸ³çš„èŠå¤©å®¤ä»å°†æŒ‰æ—¶é—´æˆ³æŽ’åºï¼Œå› ä¸ºä½ ä¼¼ä¹Žå¹¶ä¸è®¤ä¸ºå®ƒä»¬ä¸Žå…¶ä»–èŠå¤©å®¤ä¸€æ ·é‡è¦ã€‚</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+12"/>
<source>Show buttons to quickly reply, react or access additional options next to each message.</source>
<translation>在æ¯æ¡æ¶ˆæ¯æ—边显示快速回å¤ã€å›žåº”或访问其他选项的按钮。</translation>
</message>
@@ -4091,7 +4195,17 @@ OFF - square, ON - circle.</source>
OFF - 方形，ON - 圆形。</translation>
</message>
<message>
- <location line="+63"/>
+ <location line="+16"/>
+ <source>Choose where to show the total number of notifications contained within a community or tag.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Automatically replies to key requests from other users if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+31"/>
<source>The key to verify your own devices. If it is cached, verifying one of your devices will mark it verified for all your other devices and for users that have verified you.</source>
<translation>验è¯ä½ 自己的设备的密钥。如果它已被缓å˜ï¼ŒéªŒè¯ä½ çš„è®¾å¤‡ä¹‹ä¸€å°†ä¸ºä½ çš„æ‰€æœ‰å…¶ä»–è®¾å¤‡å’Œå·²éªŒè¯ä½ çš„ç”¨æˆ·æ ‡è®°å®ƒä¸ºå·²éªŒè¯ã€‚</translation>
</message>
@@ -4103,7 +4217,34 @@ This usually causes the application icon in the task bar to animate in some fash
这通常会导致任务æ ä¸çš„应用程åºå›¾æ ‡ä»¥æŸç§æ–¹å¼å‘ˆçŽ°åŠ¨ç”»æ•ˆæžœã€‚</translation>
</message>
<message>
- <location line="-6"/>
+ <location line="-303"/>
+ <source>Communities sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Show message counts for communities and tags</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+215"/>
+ <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen when Nheko is maximized</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Show a column containing communities and tags next to the room list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
+ <source>Display rooms with new messages first.
+If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room.
+If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms that you have muted will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+12"/>
<source>Show if your message was read.
Status is displayed next to timestamps.
Warning: If your homeserver does not support this, your rooms will never be marked as read!</source>
@@ -4138,12 +4279,7 @@ Only affects messages in encrypted chats.</source>
ä»…å½±å“åŠ å¯†èŠå¤©ä¸çš„消æ¯ã€‚</translation>
</message>
<message>
- <location line="+3"/>
- <source>Choose where to show the total number of notifications contained within a space.</source>
- <translation>选择在何处显示空间ä¸åŒ…å«çš„通知总数。</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+6"/>
<source>When the window loses focus, the timeline will
be blurred.</source>
<translation>当窗å£å¤±åŽ»ç„¦ç‚¹æ—¶ï¼Œæ—¶é—´çº¿å°†
@@ -4170,12 +4306,7 @@ be blurred.</source>
<translation>需è¦éªŒè¯ç”¨æˆ·æ‰èƒ½å‘他们å‘é€åŠ 密消æ¯ã€‚ è¿™æ高了安全性，但也使 E2EE æ›´åŠ ç¹ç。</translation>
</message>
<message>
- <location line="+3"/>
- <source>Automatically replies to key requests from other users, if they are verified, even if that device shouldn't have access to those keys otherwise.</source>
- <translation>自动回å¤å…¶ä»–用户的密钥请求，如果他们已被验è¯ï¼Œå³ä½¿è¯¥è®¾å¤‡ä¸åº”该访问这些密钥也自动回å¤ã€‚</translation>
- </message>
- <message>
- <location line="+4"/>
+ <location line="+7"/>
<source>Download message encryption keys from and upload to the encrypted online key backup.</source>
<translation>ä»ŽåŠ å¯†çš„åœ¨çº¿å¯†é’¥å¤‡ä»½ä¸‹è½½æ¶ˆæ¯åŠ å¯†å¯†é’¥å¹¶ä¸Šä¼ åˆ°è¯¥å¤‡ä»½ã€‚</translation>
</message>
@@ -4297,7 +4428,7 @@ This setting will take effect upon restart.</source>
<context>
<name>VerificationManager</name>
<message>
- <location filename="../../src/encryption/VerificationManager.cpp" line="+139"/>
+ <location filename="../../src/encryption/VerificationManager.cpp" line="+140"/>
<source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
<translation>æœªæ‰¾åˆ°ä¸Žè¯¥ç”¨æˆ·çš„åŠ å¯†ç§äººèŠå¤©ã€‚åˆ›å»ºä¸Žè¯¥ç”¨æˆ·çš„åŠ å¯†ç§äººèŠå¤©ï¼Œç„¶åŽé‡è¯•ã€‚</translation>
</message>
@@ -4356,7 +4487,7 @@ This setting will take effect upon restart.</source>
<context>
<name>descriptiveTime</name>
<message>
- <location filename="../../src/Utils.cpp" line="+194"/>
+ <location filename="../../src/Utils.cpp" line="+200"/>
<source>Yesterday</source>
<translation>昨天</translation>
</message>
@@ -4380,8 +4511,8 @@ This setting will take effect upon restart.</source>
</message>
<message>
<location line="+12"/>
- <source>Open the fallback, follow the steps and confirm after completing them.</source>
- <translation>打开回溯程åºï¼ŒæŒ‰ç…§æ¥éª¤è¿›è¡Œï¼Œå®ŒæˆåŽç¡®è®¤ã€‚</translation>
+ <source>Open the fallback, follow the steps, and confirm after completing them.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp
index 84118337419bef8776b70cbb46997d3a29c24ffd..b288066be4d34fb324d5074677163a6e69a181b2 100644
--- a/src/LoginPage.cpp
+++ b/src/LoginPage.cpp
@@ -180,12 +180,13 @@ LoginPage::checkHomeserverVersion()
"v1.1",
"v1.2",
"v1.3",
+ "v1.4",
};
return supported.count(v) != 0;
}) == versions.versions.cend()) {
emit versionErrorCb(
tr("The selected server does not support a version of the Matrix protocol, that this "
- "client understands (v1.1, v1.2 or v1.3). You can't sign in."));
+ "client understands (v1.1 to v1.4). You can't sign in."));
return;
}
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
index 51a682654758be098dbc9359aebc5ea5d757d56e..2285ac29ed433af64264489c93d954de4c104e64 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -132,12 +132,13 @@ RegisterPage::versionsCheck()
"v1.1",
"v1.2",
"v1.3",
+ "v1.4",
};
return supported.count(v) != 0;
}) == versions.versions.cend()) {
emit setHsError(
tr("The selected server does not support a version of the Matrix protocol that "
- "this client understands (v1.1, v1.2 or v1.3). You can't register."));
+ "this client understands (v1.1 to v1.4). You can't register."));
emit hsErrorChanged();
return;
}