diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2024-11-17 18:27:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-17 18:27:24 +0000 |
| commit | 50859f2535025c995248604bec2a89c4f5f49597 (patch) | |
| tree | c62b4817b0059ff1332e80d33e097534e90d7c61 | |
| parent | 1a00d913167fb9f10b5ff15204c189cb4cfb82d1 (diff) | |
| parent | ab64a8eaf507a9acec2db0ef96e559898100b748 (diff) | |
Merge pull request #1804 from Laevos/laevos/fix-untrusted-source-message
grammar fix for untrusted source message
33 files changed, 3900 insertions, 1562 deletions
diff --git a/resources/langs/nheko_ar.ts b/resources/langs/nheko_ar.ts index 15f2c636..d9842445 100644 --- a/resources/langs/nheko_ar.ts +++ b/resources/langs/nheko_ar.ts @@ -242,12 +242,12 @@ </message> <message> <location line="+4"/> - <location line="+940"/> + <location line="+957"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="-692"/> + <location line="-709"/> <source>%n unread message(s) in room %1 </source> <translation type="unfinished"> @@ -295,7 +295,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+35"/> <source>Room %1 created.</source> <translation type="unfinished"></translation> </message> @@ -356,7 +356,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1002"/> + <location line="-1019"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -417,12 +417,12 @@ You may optionally provide a reason for others to accept your knock:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+34"/> <source>Room creation failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+28"/> <source>Failed to leave room: %1</source> <translation type="unfinished"></translation> </message> @@ -779,7 +779,7 @@ You may optionally provide a reason for others to accept your knock:</source> <context> <name>CommunitiesList</name> <message> - <location filename="../qml/CommunitiesList.qml" line="+125"/> + <location filename="../qml/CommunitiesList.qml" line="+130"/> <source>Expand</source> <translation type="unfinished"></translation> </message> @@ -1167,7 +1167,7 @@ You may optionally provide a reason for others to accept your knock:</source> </message> <message> <location line="+2"/> - <source>Key is from an untrusted source like forwarded from another user or the online key backup. For this reason we can't verify who sent the message.</source> + <source>Key is from an untrusted source, possibly forwarded from another user or the online key backup. For this reason we can't verify who sent the message.</source> <translation type="unfinished"></translation> </message> <message> @@ -1416,6 +1416,14 @@ You may optionally provide a reason for others to accept your knock:</source> </message> </context> <context> + <name>ImageMessage</name> + <message> + <location filename="../qml/delegates/ImageMessage.qml" line="+191"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ImagePackDeleteDialog</name> <message> <location filename="../qml/dialogs/ImagePackDeleteDialog.qml" line="+14"/> @@ -1579,7 +1587,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="+424"/> + <location filename="../../src/timeline/InputBar.cpp" line="+419"/> <source>Select file(s)</source> <translation type="unfinished"></translation> </message> @@ -1589,7 +1597,12 @@ You may optionally provide a reason for others to accept your knock:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+625"/> + <location line="+629"/> + <source>You need to pass a valid mxid when ignoring a user. '%1' is not a valid userid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>Failed to fetch user %1</source> <translation type="unfinished"></translation> </message> @@ -1670,12 +1683,12 @@ You may optionally provide a reason for others to accept your knock:</source> <location filename="../../src/LoginPage.cpp" line="+78"/> <location line="+6"/> <location line="+64"/> - <location line="+132"/> + <location line="+133"/> <source>You have entered an invalid Matrix ID e.g. @user:yourserver.example.com</source> <translation type="unfinished"></translation> </message> <message> - <location line="-162"/> + <location line="-163"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1700,7 +1713,7 @@ You may optionally provide a reason for others to accept your knock:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>The selected server does not support a version of the Matrix protocol, that this client understands (%1 to %2). You can't sign in.</source> <translation type="unfinished"></translation> </message> @@ -1900,7 +1913,7 @@ Example: https://yourserver.example.com:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+216"/> + <location filename="../qml/MessageView.qml" line="+236"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -2113,7 +2126,7 @@ Example: https://yourserver.example.com:8787</source> <context> <name>NotificationsManager</name> <message> - <location filename="../../src/notifications/Manager.cpp" line="+22"/> + <location filename="../../src/notifications/Manager.cpp" line="+46"/> <location filename="../../src/notifications/ManagerMac.cpp" line="+90"/> <source>%1 sent an encrypted message</source> <translation type="unfinished"></translation> @@ -2544,7 +2557,7 @@ Example: https://yourserver.example.com:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+242"/> + <location filename="../../src/main.cpp" line="+222"/> <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> @@ -2649,7 +2662,7 @@ Example: https://yourserver.example.com:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+81"/> + <location filename="../../src/RegisterPage.cpp" line="+83"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -2674,7 +2687,7 @@ Example: https://yourserver.example.com:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+21"/> + <location line="+22"/> <source>The selected server does not support a version of the Matrix protocol that this client understands (%1 to %2). You can't register.</source> <translation type="unfinished"></translation> </message> @@ -2935,7 +2948,7 @@ Example: https://yourserver.example.com:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Profile settings</source> <translation type="unfinished"></translation> </message> @@ -2988,7 +3001,7 @@ Example: https://yourserver.example.com:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+374"/> + <location line="+379"/> <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> @@ -3127,7 +3140,7 @@ Example: https://yourserver.example.com:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../../src/ui/RoomSettings.cpp" line="+235"/> + <location filename="../../src/ui/RoomSettings.cpp" line="+244"/> <source>Failed to enable encryption: %1</source> <translation type="unfinished"></translation> </message> @@ -3171,12 +3184,17 @@ Example: https://yourserver.example.com:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+93"/> + <location line="+97"/> <source>Change name of this room</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+23"/> + <source>Since room state can't be encrypted, make sure no confidential information is stored in the room name!</source> + <translation type="unfinished"></translation> + </message> <message numerus="yes"> - <location line="+22"/> + <location line="+11"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -3198,12 +3216,17 @@ Example: https://yourserver.example.com:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <location line="+24"/> <source>Change topic of this room</source> <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+24"/> + <source>Since room state can't be encrypted, make sure no confidential information is stored in the room topic!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>NOTIFICATIONS</source> <translation type="unfinished"></translation> </message> @@ -3776,7 +3799,7 @@ If you choose verify, you need to have the other device available. If you choose <context> <name>TimelineDefaultMessageStyle</name> <message> - <location filename="../qml/TimelineDefaultMessageStyle.qml" line="+161"/> + <location filename="../qml/TimelineDefaultMessageStyle.qml" line="+162"/> <source>Part of a thread</source> <translation type="unfinished"></translation> </message> @@ -3784,7 +3807,7 @@ If you choose verify, you need to have the other device available. If you choose <context> <name>TimelineEvent</name> <message> - <location filename="../qml/TimelineEvent.qml" line="+87"/> + <location filename="../qml/TimelineEvent.qml" line="+88"/> <source>%1 placed a voice call.</source> <translation type="unfinished"></translation> </message> @@ -3856,7 +3879,7 @@ 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="+1596"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1598"/> <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> @@ -3888,7 +3911,7 @@ If you choose verify, you need to have the other device available. If you choose <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+344"/> + <location line="+345"/> <source>%1 and %2 are typing.</source> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <translation type="unfinished"> @@ -4236,7 +4259,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-2298"/> + <location line="-2301"/> <source>%1 changed which servers are allowed in this room.</source> <translation type="unfinished"></translation> </message> @@ -4266,7 +4289,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>%1 removed the room avatar.</source> <translation type="unfinished"></translation> </message> @@ -4301,7 +4324,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1018"/> <source>%1 made this room require an invitation to join.</source> <translation type="unfinished"></translation> </message> @@ -4348,7 +4371,7 @@ Reason: %4</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+49"/> + <location filename="../qml/TimelineView.qml" line="+51"/> <source>No room open</source> <translation type="unfinished"></translation> </message> @@ -4536,7 +4559,7 @@ Reason: %4</source> <context> <name>TrayIcon</name> <message> - <location filename="../../src/TrayIcon.cpp" line="+111"/> + <location filename="../../src/TrayIcon.cpp" line="+109"/> <source>Show</source> <translation type="unfinished"></translation> </message> @@ -4545,6 +4568,19 @@ Reason: %4</source> <source>Quit</source> <translation type="unfinished"></translation> </message> + <message numerus="yes"> + <location line="+27"/> + <source> +%n unread message(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>UIA</name> @@ -4743,8 +4779,8 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+595"/> - <location filename="../../src/UserSettingsPage.h" line="+270"/> + <location filename="../../src/UserSettingsPage.cpp" line="+601"/> + <location filename="../../src/UserSettingsPage.h" line="+280"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -4752,7 +4788,7 @@ Reason: %4</source> <context> <name>UserSettingsModel</name> <message> - <location line="+407"/> + <location line="+420"/> <source>Theme</source> <translation type="unfinished"></translation> </message> @@ -4813,6 +4849,11 @@ Reason: %4</source> </message> <message> <location line="+2"/> + <source>Show images automatically</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Typing notifications</source> <translation type="unfinished"></translation> </message> @@ -5117,7 +5158,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+119"/> + <location line="+121"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -5186,6 +5227,11 @@ When disabled, all messages are sent as a plain text.</source> </message> <message> <location line="+2"/> + <source>If images should be automatically displayed. You can select between always showing images by default, only show them by default in private rooms or always require interaction to show images.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Show who is typing in a room. This will also enable or disable sending typing notifications to others.</source> <translation type="unfinished"></translation> @@ -5251,7 +5297,12 @@ OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+3"/> + <source>Change the scale factor of the whole user interface. Requires a restart to take effect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <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> @@ -5261,23 +5312,23 @@ OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-80"/> + <location line="-81"/> <source>Show an alert when a message is received. This usually causes the application icon in the task bar to animate in some fashion.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-370"/> + <location line="-378"/> <source>Communities sidebar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+48"/> <source>Show message counts for communities and tags</source> <translation type="unfinished"></translation> </message> <message> - <location line="+255"/> + <location line="+257"/> <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> @@ -5287,7 +5338,7 @@ This usually causes the application icon in the task bar to animate in some fash <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+46"/> <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> @@ -5328,12 +5379,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> - <source>Change the scale factor of the whole user interface.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> + <location line="+9"/> <source>Will use turn.matrix.org as assist when your home server does not offer one.</source> <translation type="unfinished"></translation> </message> @@ -5385,7 +5431,22 @@ This setting will take effect upon restart.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+151"/> + <location line="+142"/> + <source>Always</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Only in private rooms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Never</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> <source>System font</source> <translation type="unfinished"></translation> </message> @@ -5395,7 +5456,7 @@ This setting will take effect upon restart.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+330"/> + <location line="+340"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -5414,13 +5475,14 @@ This setting will take effect upon restart.</source> <location line="+18"/> <location line="+8"/> <location line="+18"/> + <location line="+14"/> <location line="+11"/> <location line="+18"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location line="-64"/> + <location line="-78"/> <location line="+26"/> <source>File Password</source> <translation type="unfinished"></translation> @@ -5442,7 +5504,22 @@ This setting will take effect upon restart.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+13"/> + <source>Repeat File Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Repeat the passphrase:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Passwords don't match</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> <source>File to save the exported session keys</source> <translation type="unfinished"></translation> </message> @@ -5567,7 +5644,7 @@ This setting will take effect upon restart.</source> <context> <name>descriptiveTime</name> <message> - <location filename="../../src/Utils.cpp" line="+374"/> + <location filename="../../src/Utils.cpp" line="+375"/> <source>Yesterday</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ca.ts b/resources/langs/nheko_ca.ts index 0ed4895a..4017329d 100644 --- a/resources/langs/nheko_ca.ts +++ b/resources/langs/nheko_ca.ts @@ -243,12 +243,12 @@ </message> <message> <location line="+4"/> - <location line="+940"/> + <location line="+957"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="-692"/> + <location line="-709"/> <source>%n unread message(s) in room %1 </source> <translation type="unfinished"> @@ -353,12 +353,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="+20"/> <source>Room creation failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+15"/> <source>Room %1 created.</source> <translation type="unfinished"></translation> </message> @@ -771,7 +771,7 @@ You may optionally provide a reason for others to accept your knock:</source> <context> <name>CommunitiesList</name> <message> - <location filename="../qml/CommunitiesList.qml" line="+125"/> + <location filename="../qml/CommunitiesList.qml" line="+130"/> <source>Expand</source> <translation type="unfinished"></translation> </message> @@ -1155,7 +1155,7 @@ You may optionally provide a reason for others to accept your knock:</source> </message> <message> <location line="+2"/> - <source>Key is from an untrusted source like forwarded from another user or the online key backup. For this reason we can't verify who sent the message.</source> + <source>Key is from an untrusted source, possibly forwarded from another user or the online key backup. For this reason we can't verify who sent the message.</source> <transl |