diff --git a/CMakeLists.txt b/CMakeLists.txt index 9393432adf7dd4c3d816ccdb63f41c04305d00e9..81d13be532331ffe5aee2bc0118f2104ac2f19b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG 25857f17272809ce2359f214d76fa11d46b1fa7e + GIT_TAG a3fec0ae53762a8a482cde50c9709671bcf0548d ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") @@ -692,7 +692,7 @@ if(USE_BUNDLED_COEURL) FetchContent_Declare( coeurl GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git - GIT_TAG v0.1.1 + GIT_TAG v0.1.2 ) FetchContent_MakeAvailable(coeurl) target_link_libraries(nheko PUBLIC coeurl::coeurl) diff --git a/appveyor.yml b/appveyor.yml index 53f4d105bdde0ec82c10fc4aa32da807d7cb467e..b64cb206b44dae8976e92a63fad74544cbf5ff42 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -101,10 +101,8 @@ after_build: - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y - move NhekoRelease\nheko.exe installer\packages\io.github.nhekoreborn.nheko\data - mkdir tools - #- curl -L -O https://download.qt.io/official_releases/qt-installer-framework/3.0.4/QtInstallerFramework-win-x86.exe - # Since the official download.qt.io is down atm - - curl -L -O https://qt-mirror.dannhauer.de/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-win-x86.exe - - 7z x QtInstallerFramework-win-x86.exe -otools -aoa + - curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-windows-x86-4.3.0.exe + - 7z x QtInstallerFramework-windows-x86-4.3.0.exe -otools -aoa - set PATH=%BUILD%\tools\bin;%PATH% - binarycreator.exe -f -c installer\config\config.xml -p installer\packages nheko-installer.exe diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index 562be71f56b7d8a211c9ec270173382dee4408ab..847439875cc37e9642f775a2e5b7e0e97e0c11f1 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -177,8 +177,8 @@ modules: - -Ddefault_library=static name: coeurl sources: - - commit: fa108b25a92b0e037723debc4388a300e737dc2d - tag: v0.1.1 + - commit: 1c530c153687c9072619f00ad77fff9960bdb048 + tag: v0.1.2 type: git url: https://nheko.im/nheko-reborn/coeurl.git - config-opts: @@ -189,7 +189,7 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: 25857f17272809ce2359f214d76fa11d46b1fa7e + - commit: a3fec0ae53762a8a482cde50c9709671bcf0548d #tag: v0.6.2 type: git url: https://github.com/Nheko-Reborn/mtxclient.git diff --git a/resources/langs/nheko_ca.ts b/resources/langs/nheko_ca.ts index f80cb03ec2762a9c27c8cf0b5553c5e614d69149..14193764ec42b676eca421b12bd25c9d7fab478c 100644 --- a/resources/langs/nheko_ca.ts +++ b/resources/langs/nheko_ca.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -181,32 +181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -241,7 +221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -299,10 +279,30 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -992,20 +992,20 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1025,17 +1025,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -1164,7 +1189,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1174,7 +1199,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1184,7 +1209,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1224,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1232,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1227,19 +1252,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1329,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1645,7 +1680,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1653,7 +1688,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1693,7 +1728,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1816,12 +1851,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1829,17 +1864,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1854,12 +1889,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1884,19 +1919,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1905,7 +1940,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1920,7 +1955,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1935,12 +1970,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1997,7 +2037,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2079,7 +2119,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2250,13 +2290,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3134,23 +3174,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3202,12 +3247,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts index ddc6eb637cad4bd9ead05251f00f302aa08f5358..5a780a7d403f0d0b9c07b3f9e4ddbaff911b4609 100644 --- a/resources/langs/nheko_cs.ts +++ b/resources/langs/nheko_cs.ts @@ -167,12 +167,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -182,32 +182,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -242,7 +222,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -300,10 +280,30 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -384,7 +384,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -666,12 +666,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -993,20 +993,20 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1026,17 +1026,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -1165,7 +1190,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1175,7 +1200,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1185,7 +1210,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1200,7 +1225,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1208,7 +1233,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1228,19 +1253,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1295,7 +1330,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1646,7 +1681,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1654,7 +1689,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1694,7 +1729,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1818,12 +1853,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1832,17 +1867,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1857,12 +1892,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1887,19 +1922,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1908,7 +1943,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1923,7 +1958,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1938,12 +1973,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -2000,7 +2040,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2082,7 +2122,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2253,13 +2293,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2431,12 +2471,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2470,7 +2510,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2526,7 +2566,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2546,7 +2586,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2746,7 +2786,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3138,23 +3178,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3206,12 +3251,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 9e1014839b7187718ddf02bcd0435f02c8500f8b..da16a7c84cfd7b69ca3488eac3715c6218d31a4c 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Einladung bestätigen</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Nutzer %1 (%2) wirklich einladen?</translation> </message> @@ -181,32 +181,12 @@ <translation>Einladung von %1 in Raum %2 fehlgeschlagen: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Kicken bestätigen</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Nutzer %1 (%2) wirklich kicken?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Gekickter Benutzer: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Bann bestätigen</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Nutzer %1 (%2) wirklich bannen?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>%1 konnte nicht aus %2 verbannt werden: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Möchtest du wirklich eine private Konversation mit %1 beginnen?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migration des Caches fehlgeschlagen!</translation> </message> @@ -299,10 +279,30 @@ <translation>Konnte den Raum nicht verlassen: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation>Grund für das Entfernen des Nutzers</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation>Grund warum %1 (%2) aus dem Raum geworfen wird oder die Entertaste drücken um keinen Grund anzugeben:</translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Konnte %1 nicht aus %2 entfernen: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation>Grund für die Verbannung</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation>Gib den Grund ein, warum %1 (%2) verbannt wird oder drücke die Entertaste um keinen Grund anzugeben:</translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Geheimnisse entschlüsseln</translation> </message> @@ -665,13 +665,13 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> - <translation>Diese Events werden <b>angezeigt</b> in %1:</translation> + <source>These events will be <b>shown</b> in %1:</source> + <translation>Diese Events werden in %1 <b>angezeigt</b>:</translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> - <translation>Diese Events werden <b>angezeigt</b> in allen Räumen:</translation> + <source>These events will be <b>shown</b> in all rooms:</source> + <translation>Diese Events werden in allen Räumen <b>angezeigt</b>:</translation> </message> <message> <location line="+15"/> @@ -796,7 +796,7 @@ <message> <location line="+6"/> <source>Save</source> - <translation>Spechern</translation> + <translation>Speichern</translation> </message> </context> <context> @@ -996,20 +996,20 @@ Beispiel: https://mein.server:8787</translation> <translation>ANMELDEN</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation>Zurück</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation> </message> @@ -1029,17 +1029,42 @@ Beispiel: https://mein.server:8787</translation> <translation>Erhaltene Antwort war fehlerhaft. Bitte Homeserverdomain prüfen.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation>Anmelden mit %1</translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO ANMELDUNG</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Leeres Passwort</translation> </message> @@ -1168,7 +1193,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Auflegen</translation> </message> @@ -1178,7 +1203,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Anrufen</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Versende Datei</translation> </message> @@ -1188,7 +1213,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Schreibe eine Nachricht…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Sticker</translation> </message> @@ -1203,7 +1228,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Senden</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Du darfst hier keine Nachrichten senden</translation> </message> @@ -1211,7 +1236,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> @@ -1231,19 +1256,29 @@ Beispiel: https://mein.server:8787</translation> <translation>Optionen</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation>Grund für die Löschung</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation>Grund für das Nachrichtenlöschen oder Entertaste drücken für keinen Grund:</translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopieren</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopiere &Link</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&agieren</translation> </message> @@ -1298,7 +1333,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Na&chricht löschen</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Speichern als</translation> </message> @@ -1649,7 +1684,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>keine Version gespeichert</translation> </message> @@ -1657,7 +1692,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Neuer Tag</translation> </message> @@ -1697,7 +1732,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Neuen Tag erstellen…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Statusnachricht</translation> </message> @@ -1820,12 +1855,12 @@ Beispiel: https://mein.server:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Raumeinstellungen</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n Mitglied</numerusform> @@ -1833,17 +1868,17 @@ Beispiel: https://mein.server:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>EINSTELLUNGEN</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Stumm</translation> </message> @@ -1858,12 +1893,12 @@ Beispiel: https://mein.server:8787</translation> <translation>Alle Nachrichten</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Zugangsberechtigungen</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Jeder (inkl. Gäste)</translation> </message> @@ -1888,20 +1923,21 @@ Beispiel: https://mein.server:8787</translation> <translation>Durch Teilnahme an anderen Räumen</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Verschlüsselung</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Ende-zu-Ende Verschlüsselung</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> - <translation>Verschlüsselung ist derzeit experimentell und könnte unerwartete Probleme verursachen.<br>Bitte beachte, dass dies später nicht mehr deaktiviert werden kann.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation>Verschlüsselung ist aktuell experimental und manche Sachen können kaputt gehen.<br> +Die Verschlüsselung des Raumes kann nach Aktivierung nicht mehr deaktiviert werden.</translation> </message> <message> <location line="+16"/> @@ -1909,7 +1945,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Sticker- & Emoteeinstellungen</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Ändern</translation> </message> @@ -1924,7 +1960,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Versteckte Events</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation>Konfigurieren</translation> </message> @@ -1939,12 +1975,17 @@ Beispiel: https://mein.server:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Interne ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation>In die Zwischenablage kopiert</translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Raumversion</translation> </message> @@ -2001,7 +2042,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Bitte gib dein Anmeldepassword an um fortzufahren:</translation> </message> @@ -2083,7 +2124,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Verbindung zum kryptografischen Speicher fehlgeschlagen</translation> </message> @@ -2256,13 +2297,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Nachricht zurückziehen fehlgeschlagen: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Event konnte nicht verschlüsselt werden, senden wurde abgebrochen!</translation> @@ -2434,12 +2475,12 @@ Grund: %4</translation> <translation>%1 hat das Anklopfen zurückgezogen.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Du bist dem Raum beigetreten.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation>%1 hat %2 eingeladen.</translation> </message> @@ -2473,7 +2514,7 @@ Grund: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Bearbeitet</translation> </message> @@ -2529,7 +2570,7 @@ Grund: %4</translation> <translation>Kein Raum ausgewählt</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Dieser Raum ist nicht verschlüsselt!</translation> </message> @@ -2549,7 +2590,7 @@ Grund: %4</translation> <translation>Dieser Raum enthält unverifizierte Geräte!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Angehefte Nachrichten anzeigen oder verstecken</translation> </message> @@ -2749,7 +2790,7 @@ Grund: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Standard</translation> @@ -3148,25 +3189,30 @@ Der Status wird neben der Nachricht angezeigt.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation>Zeige Benachrichtigungen für empfangene Nachrichten, wenn der Client ist nicht fokussiert.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation>Benachrichtigungen pber neue Nachrichten, wenn der Client nicht im Vordergrund ist.</translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation>Ändere das aussehen der Chatavatare. +AUS - Quadratisch, AN - Kreisförmig.</translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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>Hebe das Fenster hervor, wenn eine Nachricht empfangen wurde. Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation>Ändert das Aussehen von Benutzeravataren. -AUS - Quadratisch, AN - Kreis.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation>Zeigen einen "Identicon" anstelle eines Buchstaben, wenn etwas keinen Avatar gesetzt hat.</translation> </message> @@ -3219,12 +3265,7 @@ be blurred.</source> <translation>Der Schlüssel um Schlüssel aus der Onlinesicherung zu laden. Wenn dieser vorhanden ist, können die Schlüssel für verschlüsselte Nachrichten sicher online gespeichert und wieder runtergeladen werden.</translation> </message> <message> - <location line="+4"/> - <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 lokal zwischengespeichert ist, dann werden durch eine Verifizierung eines deiner eigenen Geräte diese für alle deine anderen Geräte und für andere Nutzer als verifiziert makiert.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation>Der Schlüssel um andere Nutzer zu verifizieren. Wenn der lokal zwischengespeichert ist, dann werden durch eine Nutzerverifizierung alle Geräte verifiziert.</translation> </message> diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 96adfb86be53b9142909ce049403da81494df997..d31b70de7b8795ba8e749a642cebf838be87912d 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -181,32 +181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -241,7 +221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -299,10 +279,30 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -992,20 +992,20 @@ Example: https://server.my:8787</source> <translation>ΕΙΣΟΔΟΣ</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1025,17 +1025,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Κενός κωδικός</translation> </message> @@ -1164,7 +1189,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1174,7 +1199,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1184,7 +1209,7 @@ Example: https://server.my:8787</source> <translation type="unfinished">ΓÏάψε Îνα μήνυμα...</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1224,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1232,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1227,19 +1252,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1329,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1645,7 +1680,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1653,7 +1688,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1693,7 +1728,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1816,12 +1851,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1829,17 +1864,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1854,12 +1889,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1884,19 +1919,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1905,7 +1940,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1920,7 +1955,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1935,12 +1970,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1997,7 +2037,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2079,7 +2119,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2250,13 +2290,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3134,23 +3174,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3202,12 +3247,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 67a296767cc9765b4c9a58436d220a7e43867d07..ef762c6f3b35847d14d79287c949959ce0db3dcc 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Confirm invite</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Do you really want to invite %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Failed to invite %1 to %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Confirm kick</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Do you really want to kick %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Kicked user: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Confirm ban</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Do you really want to ban %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Failed to ban %1 in %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Do you really want to start a private chat with %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Cache migration failed!</translation> </message> @@ -299,10 +279,30 @@ <translation>Failed to leave room: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation>Reason for the kick</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation>Enter reason for kicking %1 (%2) or hit enter for no reason:</translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Failed to kick %1 from %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation>Reason for the ban</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation>Enter reason for banning %1 (%2) or hit enter for no reason:</translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Decrypt secrets</translation> </message> @@ -665,13 +665,13 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> - <translation>These events will be be <b>shown</b> in %1:</translation> + <source>These events will be <b>shown</b> in %1:</source> + <translation>These events will be <b>shown</b> in %1:</translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> - <translation>These events will be be <b>shown</b> in all rooms:</translation> + <source>These events will be <b>shown</b> in all rooms:</source> + <translation>These events will be <b>shown</b> in all rooms:</translation> </message> <message> <location line="+15"/> @@ -996,20 +996,20 @@ Example: https://server.my:8787</translation> <translation>LOGIN</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation>Back</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autodiscovery failed. Received malformed response.</translation> </message> @@ -1029,17 +1029,42 @@ Example: https://server.my:8787</translation> <translation>Received malformed response. Make sure the homeserver domain is valid.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>An unknown error occured. Make sure the homeserver domain is valid.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation>Sign in with Apple</translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation>Continue with Facebook</translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation>Sign in with Google</translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation>Sign in with Twitter</translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation>Login using %1</translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO LOGIN</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Empty password</translation> </message> @@ -1168,7 +1193,7 @@ Example: https://server.my:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Hang up</translation> </message> @@ -1178,7 +1203,7 @@ Example: https://server.my:8787</translation> <translation>Place a call</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Send a file</translation> </message> @@ -1188,7 +1213,7 @@ Example: https://server.my:8787</translation> <translation>Write a message…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Stickers</translation> </message> @@ -1203,7 +1228,7 @@ Example: https://server.my:8787</translation> <translation>Send</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>You don't have permission to send messages in this room</translation> </message> @@ -1211,7 +1236,7 @@ Example: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Edit</translation> </message> @@ -1231,19 +1256,29 @@ Example: https://server.my:8787</translation> <translation>Options</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation>Reason for removal</translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation>Enter reason for removal or hit enter for no reason:</translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Copy</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Copy &link location</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&act</translation> </message> @@ -1298,7 +1333,7 @@ Example: https://server.my:8787</translation> <translation>Remo&ve message</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Save as</translation> </message> @@ -1649,7 +1684,7 @@ Example: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>no version stored</translation> </message> @@ -1657,7 +1692,7 @@ Example: https://server.my:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>New tag</translation> </message> @@ -1697,7 +1732,7 @@ Example: https://server.my:8787</translation> <translation>Create new tag…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Status Message</translation> </message> @@ -1820,12 +1855,12 @@ Example: https://server.my:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Room Settings</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n member</numerusform> @@ -1833,17 +1868,17 @@ Example: https://server.my:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>SETTINGS</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Notifications</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Muted</translation> </message> @@ -1858,12 +1893,12 @@ Example: https://server.my:8787</translation> <translation>All messages</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Room access</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Anyone and guests</translation> </message> @@ -1888,20 +1923,21 @@ Example: https://server.my:8787</translation> <translation>Restricted by membership in other rooms</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Encryption</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>End-to-End Encryption</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> - <translation>Encryption is currently experimental and things might break unexpectedly.<br>Please take note that it can't be disabled afterwards.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation>Encryption is currently experimental and things might break unexpectedly. <br> +Please take note that it can't be disabled afterwards.</translation> </message> <message> <location line="+16"/> @@ -1909,7 +1945,7 @@ Example: https://server.my:8787</translation> <translation>Sticker & Emote Settings</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Change</translation> </message> @@ -1924,7 +1960,7 @@ Example: https://server.my:8787</translation> <translation>Hidden events</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation>Configure</translation> </message> @@ -1939,12 +1975,17 @@ Example: https://server.my:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Internal ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation>Copied to clipboard</translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Room Version</translation> </message> @@ -2001,7 +2042,7 @@ Example: https://server.my:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Please enter your login password to continue:</translation> </message> @@ -2083,7 +2124,7 @@ Example: https://server.my:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Failed to connect to secret storage</translation> </message> @@ -2256,13 +2297,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Message redaction failed: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Failed to encrypt event, sending aborted!</translation> @@ -2434,12 +2475,12 @@ Reason: %4</translation> <translation>%1 redacted their knock.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>You joined this room.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation>%1 invited %2.</translation> </message> @@ -2473,7 +2514,7 @@ Reason: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Edited</translation> </message> @@ -2529,7 +2570,7 @@ Reason: %4</translation> <translation>No room selected</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>This room is not encrypted!</translation> </message> @@ -2549,7 +2590,7 @@ Reason: %4</translation> <translation>This room contains unverified devices!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Show or hide pinned messages</translation> </message> @@ -2749,7 +2790,7 @@ Reason: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Default</translation> @@ -3148,25 +3189,30 @@ Status is displayed next to timestamps.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation>Notify about received message when the client is not currently focused.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation>Notify about received messages when the client is not currently focused.</translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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>Show an alert when a message is received. This usually causes the application icon in the task bar to animate in some fashion.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation>Display an identicon instead of a letter when no avatar is set.</translation> </message> @@ -3220,12 +3266,7 @@ be blurred.</translation> <translation>The key to decrypt online key backups. If it is cached, you can enable online key backup to store encryption keys securely encrypted on the server.</translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation>The key to verify other users. If it is cached, verifying a user will verify all their devices.</translation> </message> diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts index 99a5a5ea5a6556108ac368c2de06b4cf427a8134..3084386640848a58c52ef3189c20cd4106f10f61 100644 --- a/resources/langs/nheko_eo.ts +++ b/resources/langs/nheko_eo.ts @@ -167,12 +167,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Konfirmu inviton</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Ĉu vi certe volas inviti uzanton %1 (%2)?</translation> </message> @@ -182,32 +182,12 @@ <translation>Malsukcesis inviti uzanton %1 al %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Konfirmu forpelon</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Ĉu vi certe volas forpeli uzanton %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Forpelis uzanton: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Konfirmu forbaron</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Ĉu vi certe volas forbari uzanton %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Malsukcesis forbari uzanton %1 en %2: %3</translation> </message> @@ -242,7 +222,7 @@ <translation>Ĉu vi certe volas komenci privatan babilon kun %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Malsukcesis migrado de kaÅmemoro!</translation> </message> @@ -300,10 +280,30 @@ <translation>Malsukcesis eliri el ĉambro: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Malsukcesis forpeli uzanton %1 de %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -384,7 +384,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Malĉifri sekretojn</translation> </message> @@ -666,12 +666,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -1000,20 +1000,20 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>SALUTI</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Malsukcesis memaga trovado. Ricevis misformitan respondon.</translation> </message> @@ -1033,17 +1033,42 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Ricevis misformitan respondon. CertiÄu, ke retnomo de la hejmservilo estas valida.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Okazis nekonata eraro. CertiÄu, ke retnomo de la hejmservilo estas valida.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>UNUNURA SALUTO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Malplena pasvorto</translation> </message> @@ -1172,7 +1197,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Fini</translation> </message> @@ -1182,7 +1207,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Voki</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Sendi dosieron</translation> </message> @@ -1192,7 +1217,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Skribu mesaÄon…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Glumarkoj</translation> </message> @@ -1207,7 +1232,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Sendi</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Vi ne rajtas sendi mesaÄojn en ĉi tiu ĉambro</translation> </message> @@ -1215,7 +1240,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Redakti</translation> </message> @@ -1235,19 +1260,29 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Elektebloj</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopii</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopii celon de &ligilo</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&agi</translation> </message> @@ -1302,7 +1337,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>&Forigi mesaÄon</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>Kon&servi kiel</translation> </message> @@ -1653,7 +1688,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>neniu versio konservita</translation> </message> @@ -1661,7 +1696,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nova etikedo</translation> </message> @@ -1701,7 +1736,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Krei novan etikedon…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>StatmesaÄo</translation> </message> @@ -1824,12 +1859,12 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Agordoj de ĉambro</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1837,17 +1872,17 @@ Ekzemplo: https://servilo.mia:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>AGORDOJ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Sciigoj</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Neniuj</translation> </message> @@ -1862,12 +1897,12 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Ĉiuj mesaÄoj</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Aliro al ĉambro</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Ĉiu ajn, inkluzive gastojn</translation> </message> @@ -1892,20 +1927,20 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Limigita de aneco en aliaj ĉambroj</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Ĉifrado</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Tutvoja ĉifrado</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> - <translation>Ĉifrado nun estas eksperimenta kaj povus rompiÄi neatendite.<br>Bonvole sciu, ke ne eblas Äin malÅalti poste.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1913,7 +1948,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>Agordoj de glumarkoj kaj mienetoj</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>ÅœanÄi</translation> </message> @@ -1928,7 +1963,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1943,12 +1978,17 @@ Ekzemplo: https://servilo.mia:8787</translation> <translation>INFORMOJ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Interna identigilo</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Versio de ĉambro</translation> </message> @@ -2005,7 +2045,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Bonvolu enigi vian pasvorton por daÅrigi:</translation> </message> @@ -2087,7 +2127,7 @@ Ekzemplo: https://servilo.mia:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Malsukcesis konektiÄi al sekreta deponejo</translation> </message> @@ -2261,13 +2301,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Malsukcesis redaktado de mesaÄo: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Malsukcesis ĉifri okazon; sendado nuliÄis!</translation> @@ -2440,12 +2480,12 @@ Kialo: %4</translation> <translation>%1 forigis sian frapon.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Vi aliÄis ĉi tiun ĉambron.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2479,7 +2519,7 @@ Kialo: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Redaktita</translation> </message> @@ -2535,7 +2575,7 @@ Kialo: %4</translation> <translation>Neniu ĉambro estas elektita</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Ĉi tiu ĉambro ne estas ĉifrata!</translation> </message> @@ -2555,7 +2595,7 @@ Kialo: %4</translation> <translation>Ĉi tiu ĉambro enhavas nekontrolitajn aparatojn!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2755,7 +2795,7 @@ Kialo: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Implicita</translation> @@ -3161,25 +3201,29 @@ Stato estas montrita apud tempindikoj.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Sciigi pri ricevitaj mesaÄoj kiam la kliento ne estas fokusata.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Atentigas je ricevo de mesaÄo. Ĉi tio kutime movbildigas la simbolbildon sur la pleto iumaniere.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">ÅœanÄas la aspekton de profilbildoj de uzantoj en babilujo. -NE – kvadrataj, JES – rondaj.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished">Montras identigan bildon anstataÅ litero, kiam ne disponeblas profilbildo.</translation> </message> @@ -3233,12 +3277,7 @@ malklariÄos.</translation> <translation type="unfinished">La Ålosilo por malĉifrado de enretaj savkopioj de Ålosiloj. Se Äi estas kaÅmemorata, vi povas Åalti enretan savkopiadon de Ålosiloj por deponi Ålosilojn sekure ĉifritajn al la servilo.</translation> </message> <message> - <location line="+4"/> - <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">La Ålosilo por kontrolado de viaj propraj aparatoj. Se Äi estas kaÅmemorata, kontrolo de unu el viaj aparatoj markos Äin kontrolita por aliaj viaj aparatoj, kaj por uzantoj, kiuj vin kontrolis.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">Åœlosilo por kontrolado de aliaj uzantoj. Se Äi estas kaÅmemorata, kontrolo de uzanto kontrolos ankaŠĉiujn Äiajn aparatojn.</translation> </message> diff --git a/resources/langs/nheko_es.ts b/resources/langs/nheko_es.ts index 09338bf5a27bef185dff39b1e6dea7a02ae4b4a5..bb3b79544d212c9d1529e63111a0d8a1e57c812d 100644 --- a/resources/langs/nheko_es.ts +++ b/resources/langs/nheko_es.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Confirmar invitación</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>¿Seguro que quieres invitar a %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>No se ha podido invitar a %1 a %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Confirmar expulsión</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>¿Seguro que quieres expulsar a %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Se ha expulsado a %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Confirmar ban</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>¿Seguro que quieres banear a %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Error al banear a %1 en %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>¿Seguro que quieres comenzar un chat privado con %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migración de cache fallida!</translation> </message> @@ -299,10 +279,30 @@ <translation>Error al salir de la sala: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Falló al expulsar a %1 de %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Desencriptar secretos</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -998,20 +998,20 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>INICIAR SESION</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>El autodescubrimiento falló. Se ha recibido una respuesta malformada.</translation> </message> @@ -1031,17 +1031,42 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Se recibió una respuesta malformada. Asegurate de que el dominio del servidor base es valido.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Un error desconocido ocurrió. Asegurate de que el dominio del servidor es válido.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>INICIO DE SESION SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Contraseña vacia</translation> </message> @@ -1170,7 +1195,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Colgar</translation> </message> @@ -1180,7 +1205,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Llamar</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Enviar archivo</translation> </message> @@ -1190,7 +1215,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Escribe un mensaje...</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Stickers</translation> </message> @@ -1205,7 +1230,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Enviar</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>No tienes permisos para enviar mensajes en esta sala</translation> </message> @@ -1213,7 +1238,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Editar</translation> </message> @@ -1233,19 +1258,29 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Opciones</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Copiar</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Copiar dirección de &enlace</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&accionar</translation> </message> @@ -1300,7 +1335,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Elimin&ar mensaje</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Guardar como</translation> </message> @@ -1651,7 +1686,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>ninguna version guardada</translation> </message> @@ -1659,7 +1694,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nueva etiqueta</translation> </message> @@ -1699,7 +1734,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Crear nueva etiqueta...</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Estado</translation> </message> @@ -1822,12 +1857,12 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Ajustes de la sala</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translatorcomment>"miembro" is for a single person, miembros is for many</translatorcomment> <translation> @@ -1836,17 +1871,17 @@ Ejemplo: https://mi.servidor:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>AJUSTES</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Notificationes</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Silenciado</translation> </message> @@ -1861,12 +1896,12 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Todos los mensajes</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Accesso a la sala</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Cualquier persona e invitados</translation> </message> @@ -1891,21 +1926,20 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Restringir por la membresÃa en otras salas</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Encriptación</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Encriptado de extremo a extremo</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> - <translation>La encriptación está en fase experimental de momento y cosas podrÃan romperse de forma inesperada. <br> - Por favor ten en cuenta que se puede desactivar en cualquier momento.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1913,7 +1947,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>Ajustes de Stickers & Emotes</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Cambiar</translation> </message> @@ -1928,7 +1962,7 @@ Ejemplo: https://mi.servidor:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1943,12 +1977,17 @@ Ejemplo: https://mi.servidor:8787</translation> <translation>INFORMACION</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>ID Interno</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Versión de la sala</translation> </message> @@ -2005,7 +2044,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Por favor inserta tu contraseña para iniciar sesión:</translation> </message> @@ -2087,7 +2126,7 @@ Ejemplo: https://mi.servidor:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Hubo en error al conectarse al almacenamiento secreto</translation> </message> @@ -2260,13 +2299,13 @@ Si escoges verificar, necesitas tener otro dispositivo disponible. Si escoges &q <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Falló en la eliminación del mensaje: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Falló al encriptar el evento, abortando el envÃo!</translation> @@ -2453,12 +2492,12 @@ Razón: %4</translation> <translation>%1 canceló después de tocar la puerta.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Te has unido a esta sala.</translation> </message> <message> - <location line="+1072"/> + <location line="+1074"/> <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> @@ -2477,7 +2516,7 @@ Razón: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Editado</translation> </message> @@ -2533,7 +2572,7 @@ Razón: %4</translation> <translation>Ninguna sala seleccionada</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Esta sala no está encriptada!</translation> </message> @@ -2553,7 +2592,7 @@ Razón: %4</translation> <translation>Esta sala contiene dispositivos sin verificar!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Mostrar u ocultar mensajes fijados</translation> </message> @@ -2753,7 +2792,7 @@ Razón: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Por defecto</translation> @@ -3152,25 +3191,29 @@ El estado es mostrado junto a la fecha y hora en la que se envió el mensaje.</t </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Notificar sobre los mensajes recibidos cuando el cliente no está enfocado.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Mostrar una alerta cuando un mensaje sea recibido. 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="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">Cambiar la apariencia de los avatares de los usuarios en los chats. -OFF cuadrado, ON Circulo.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished">Mostrar un identicon en lugar de una letra cuando no hay un avatar seleccionado.</translation> </message> @@ -3223,12 +3266,7 @@ be blurred.</source> <translation type="unfinished">La clave para desencriptar copias de seguridad en lÃnea. Si está en la cache, puedes activar la copia de seguridad en lÃnea para almacenar tus claves de encriptación de forma segura en el servidor.</translation> </message> <message> - <location line="+4"/> - <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">La clave para verificar tus dispositivos. Si está en la cache, verificar uno de tus dispositivos lo verificara para todos tus dispositivos y otros usuarios que te hayan verificado.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">La clave para verificar a otros usuarios. Si está en la cache, verificar a un usuario verificará a todos sus dispositivos.</translation> </message> diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts index 63b742fb5624062f0dd8cc381e01912ca52ed158..7591dc5b0aeafe69596ab42211e84643530366b5 100644 --- a/resources/langs/nheko_et.ts +++ b/resources/langs/nheko_et.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Kinnita kutse</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Kas sa tõesti soovid saata kutset kasutajale %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Kasutaja %1 kutsumine %2 jututuppa ei õnnestunud: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Kinnita väljamüksamine</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Kas sa tõesti soovid müksata kasutaja %1 (%2) jututoast välja?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Väljamüksatud kasutaja: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Kinnita suhtluskeeld</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Kas sa tõesti soovid kasutajale %1 (%2) seada suhtluskeeldu?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Kasutajale %1 suhtluskeelu seadmine %2 jututoas ei õnnestunud: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Kas sa kindlasti soovid alustada otsevestlust kasutajaga %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Puhvri versiooniuuendus ebaõnnestus!</translation> </message> @@ -299,10 +279,30 @@ <translation>Jututoast lahkumine ei õnnestunud: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Kasutaja %1 väljamüksamine %2 jututoast ei õnnestunud: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Dekrüpti andmed</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation>Neid sündmusi <b>kuvatakse</b> %1 jututoas:</translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation>Neid sündmusi <b>kuvatakse</b> igas jututoas:</translation> </message> <message> @@ -996,20 +996,20 @@ Näiteks: https://server.minu:8787</translation> <translation>LOGI SISSE</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation>Tagasi</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Koduserveri automaatne tuvastamine ei õnnestunud: päringuvastus oli vigane.</translation> </message> @@ -1029,17 +1029,42 @@ Näiteks: https://server.minu:8787</translation> <translation>Päringule sain tagasi vigase vastuse. Palun kontrolli, et koduserveri domeen oleks õige.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Tekkis teadmata viga. Palun kontrolli, et koduserveri domeen on õige.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>ÃœHEKORDNE SISSELOGIMINE</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Tühi salasõna</translation> </message> @@ -1168,7 +1193,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Lõpeta kõne</translation> </message> @@ -1178,7 +1203,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Helista</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Saada fail</translation> </message> @@ -1188,7 +1213,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Kirjuta sõnum…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Kleepsud</translation> </message> @@ -1203,7 +1228,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Saada</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Sul puuduvad selles jututoas õigused sõnumite saatmiseks</translation> </message> @@ -1211,7 +1236,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Muuda</translation> </message> @@ -1231,19 +1256,29 @@ Näiteks: https://server.minu:8787</translation> <translation>Valikud</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopeeri</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopeeri &lingi asukoht</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&ageeri</translation> </message> @@ -1298,7 +1333,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Eemal&da sõnum</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Salvesta kui</translation> </message> @@ -1649,7 +1684,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>salvestatud versiooni ei leidu</translation> </message> @@ -1657,7 +1692,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Uus silt</translation> </message> @@ -1697,7 +1732,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Loo uus silt…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Olekuteade</translation> </message> @@ -1820,12 +1855,12 @@ Näiteks: https://server.minu:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Jututoa seadistused</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n liige</numerusform> @@ -1833,17 +1868,17 @@ Näiteks: https://server.minu:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>SEADISTUSED</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Teavitused</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Summutatud</translation> </message> @@ -1858,12 +1893,12 @@ Näiteks: https://server.minu:8787</translation> <translation>Kõik sõnumid</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Ligipääs jututuppa</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Kõik (sealhulgas külalised)</translation> </message> @@ -1888,20 +1923,20 @@ Näiteks: https://server.minu:8787</translation> <translation>Piiratud teiste jututubade liikmelisusega</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Krüptimine</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Läbiv krüptimine</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> - <translation>Krüptimine on nhekos hetkel veel katseline ning nii mõndagi võib ootamatult katki minna. <br>Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1909,7 +1944,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Kleepsude ja emotikonide seadistused</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Muuda</translation> </message> @@ -1924,7 +1959,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Peidetud sündmused</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation>Seadista</translation> </message> @@ -1939,12 +1974,17 @@ Näiteks: https://server.minu:8787</translation> <translation>TEAVE</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Sisemine tunnus</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Jututoa versioon</translation> </message> @@ -2001,7 +2041,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Jätkamaks palun sisesta oma salasõna:</translation> </message> @@ -2083,7 +2123,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Ãœhenduse loomine võtmehoidlaga ei õnnestunud</translation> </message> @@ -2256,13 +2296,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Sündmuse krüptimine ei õnnestunud, katkestame saatmise!</translation> @@ -2434,12 +2474,12 @@ Põhjus: %4</translation> <translation>%1 muutis oma koputust jututoa uksele.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Sa liitusid jututoaga.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation>%1 saatis kutse kasutajale %2.</translation> </message> @@ -2473,7 +2513,7 @@ Põhjus: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Muudetud</translation> </message> @@ -2529,7 +2569,7 @@ Põhjus: %4</translation> <translation>Jututuba on valimata</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>See jututuba on krüptimata!</translation> </message> @@ -2549,7 +2589,7 @@ Põhjus: %4</translation> <translation>Selles jututoas leidub verifitseerimata seadmeid!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Näita klammerdatud sõnumeid või peida nad</translation> </message> @@ -2749,7 +2789,7 @@ Põhjus: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Vaikimisi</translation> @@ -3148,25 +3188,30 @@ Lugemise olekut kuvatakse ajatempli kõrval.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation>Näita saabunud sõnumi teavitust, kui Nheko ei ole parasjagu fookuses.</translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation>Muuda vestlustes kuvatavate tunnuspiltide kuju. +Väljalülitatuna - ruut, sisselülitatuna - ümmargune.</translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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>Sõnumi saabumisel näita teavitust. See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti animatsiooniga sulle märku.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation>Muuda vestlustes kuvatavate tunnuspiltide kuju. -Väljalülitatuna - ruut, sisselülitatuna - ümmargune.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation>Kui tunnuspilt on seadistamata, siis kuva tähe asemel identikoni (matemaatilist tunnuspilti).</translation> </message> @@ -3220,12 +3265,7 @@ siis ajajoone vaade hägustub.</translation> <translation>Selle võtmega dekrüptitakse võrku varundatud muud võtmed. Kui see võti on puhverdatud, siis saad kasutusele võtta oma krüptovõtmete turvalise varundamise sinu koduserveris.</translation> </message> <message> - <location line="+4"/> - <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 sind verifitseerinud.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation>Teiste kasutajate verifitseerimiseks mõeldud võti. Kui see võti on puhverdatud, siis kasutaja verifitseerimine tähendab ka kõikide tema seadmete verifitseerimist.</translation> </message> diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 264607179d48deebfe5736786569666a3fa291d0..acb8a1dace1acbf04255a5a96818eb2fe0ed64b9 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Vahvista kutsu</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Haluatko kutsua %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Epäonnistuttiin kutsuminen %1 huoneeseen %2:%3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Vahvista potkut</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Haluatko potkia %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Potkittiin käyttäjä: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Vahvista porttikielto</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Haluatko antaa porttikiellon käyttäjälle %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Ei onnistuttu antamaan porttikieltoa käyttäjälle %1 huoneessa %2:%3</translation> </message> @@ -241,7 +221,7 @@ <translation>Haluatko luoda yksityisen keskustelun käyttäjän %1 kanssa?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Välimuistin siirto epäonnistui!</translation> </message> @@ -299,10 +279,30 @@ <translation>Huoneesta poistuminen epäonnistui: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Ei onnistuttu potkimaan käyttäjää %1 huoneesta %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Salaisuuksien salauksen purku</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ Esimerkki: https://server.my:8787</translation> <translation>KIRJAUDU</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation> </message> @@ -1029,17 +1029,42 @@ Esimerkki: https://server.my:8787</translation> <translation>Vastaanotettiin virheellinen vastaus. Varmista, että kotipalvelimen osoite on pätevä.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO-kirjautuminen</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Tyhjä salasana</translation> </message> @@ -1168,7 +1193,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Punainen luuri</translation> </message> @@ -1178,7 +1203,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Soita puhelu</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Lähetä tiedosto</translation> </message> @@ -1188,7 +1213,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Kirjoita viesti…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Tarrat</translation> </message> @@ -1203,7 +1228,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Lähetä</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Sinulla ei ole lupaa lähettää viestejä tässä huoneessa</translation> </message> @@ -1211,7 +1236,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Muokkaa</translation> </message> @@ -1231,19 +1256,29 @@ Esimerkki: https://server.my:8787</translation> <translation>Asetukset</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopioi</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopioi &linkki sijainti</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Rea&goi</translation> </message> @@ -1298,7 +1333,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Poist&a viesti</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Tallenna nimellä</translation> </message> @@ -1649,7 +1684,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>ei tallennettua versiota</translation> </message> @@ -1657,7 +1692,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Uusi tagi</translation> </message> @@ -1697,7 +1732,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Luo uusi tagi…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Tilapäivitys</translation> </message> @@ -1820,12 +1855,12 @@ Esimerkki: https://server.my:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Huoneen asetukset</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1833,17 +1868,17 @@ Esimerkki: https://server.my:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>ASETUKSET</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Ilmoitukset</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Mykistetty</translation> </message> @@ -1858,12 +1893,12 @@ Esimerkki: https://server.my:8787</translation> <translation>Kaikki viestit</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Huoneeseen pääsy</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Kaikki ja vieraat</translation> </message> @@ -1888,20 +1923,20 @@ Esimerkki: https://server.my:8787</translation> <translation>Rajoitettu jäsenyyden perusteella muissa huoneissa</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Salaus</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Päästä-päähän-salaus</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> - <translation>Salaus on tällä hetkellä kokeellinen ja asiat voivat mennä rikki odottamattomasti.<br>Huomaa että sitä ei voi poistaa jälkikäteen.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1909,7 +1944,7 @@ Esimerkki: https://server.my:8787</translation> <translation>Tarra- ja emojiasetukset</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Muuta</translation> </message> @@ -1924,7 +1959,7 @@ Esimerkki: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1939,12 +1974,17 @@ Esimerkki: https://server.my:8787</translation> <translation>TIETOA</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Sisäinen ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Huoneen versio</translation> </message> @@ -2001,7 +2041,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2083,7 +2123,7 @@ Esimerkki: https://server.my:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Salattuun tallennustilaan ei saatu yhteyttä</translation> </message> @@ -2254,13 +2294,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Viestin muokkaus epäonnistui: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Tapahtuman salaus epäonnistui, lähetys keskeytetään!</translation> @@ -2431,12 +2471,12 @@ Reason: %4</source> <translation>%1 perui koputuksensa.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Sinä liityit tähän huoneeseen.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2470,7 +2510,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Muokattu</translation> </message> @@ -2526,7 +2566,7 @@ Reason: %4</source> <translation>Ei valittua huonetta</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Tämä huone ei ole salattu!</translation> </message> @@ -2546,7 +2586,7 @@ Reason: %4</source> <translation>Tämä huone sisältää varmentamattomia laitteita!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2746,7 +2786,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Oletus</translation> @@ -3145,25 +3185,29 @@ Tila näytetään aikaleimojen vieressä.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Ilmoita vastaanotetusta viestistä kun ohjelma ei ole kohdistettuna.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Näytä hälytys kun viesti on vastaanotettu. Tämä yleensä saa sovelluksen kuvakkeen liikkumaan jollain tapaa tehtäväpalkissa.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">Muuta käyttäjien avatarien ulkonäköä keskusteluissa. -POIS PÄÄLTÄ - neliö, PÄÄLLÄ - pyöreä.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3217,12 +3261,7 @@ sumennetaan.</translation> <translation type="unfinished">Avain purkamaan avainten varmuuskopioita verkossa. Jos se laitetaan välimuistiin, voit sallia avainten varmuuskopioinnin verkossa säilöäksesi salausavaimet, jotka ovat turvallisesti salattuja palvelimella.</translation> </message> <message> - <location line="+4"/> - <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">Avain vahvistamaan omat avaimesi. Jos se on välimuistisas, yhden laitteesi vahvistaminen laittaa sen vahvistetuksi kaikille muille laitteillesi ja käyttäjille, jotka ovat vahvistaneet sinut.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">Avain vahvistamaan muita käyttäjiä. Jos se on välimuistissa, käyttäjän varmistaminen varmistaa hänen kaikki laitteensa.</translation> </message> diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 9ba83680c89a6e7a7455db1b1843a06ded1dc9e1..5937e2a9573c2d17258505c27cb40c0356ad1396 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -95,12 +95,12 @@ <message> <location line="+13"/> <source>Unknown microphone: %1</source> - <translation>Microphone inconnu : %1</translation> + <translation>Microphone inconnu : %1</translation> </message> <message> <location line="+9"/> <source>Unknown camera: %1</source> - <translation>Caméra inconnue : %1</translation> + <translation>Caméra inconnue : %1</translation> </message> <message> <location line="+14"/> @@ -147,7 +147,7 @@ <message> <location line="+41"/> <source>Failed to open database, logging out!</source> - <translation>Impossible d'ouvrir la base de données, déconnexion !</translation> + <translation>Impossible d'ouvrir la base de données, déconnexion !</translation> </message> <message> <location line="+304"/> @@ -166,47 +166,27 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Confirmer l'invitation</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> - <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation> + <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation> </message> <message> <location line="+12"/> <source>Failed to invite %1 to %2: %3</source> - <translation>Échec de l'invitation de %1 dans %2 : %3</translation> + <translation>Échec de l'invitation de %1 dans %2 : %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Confirmer l'expulsion</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Voulez-vous vraiment expulser %1 (%2) ?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>L'utilisateur %1 a été expulsé.</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Confirmer le bannissement</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Voulez-vous vraiment bannir %1 (%2) ?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Échec du bannissement de %1 de %2 : %3</translation> </message> @@ -223,12 +203,12 @@ <message> <location line="+1"/> <source>Do you really want to unban %1 (%2)?</source> - <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2) ?</translation> + <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2) ?</translation> </message> <message> <location line="+10"/> <source>Failed to unban %1 in %2: %3</source> - <translation>Échec de l'annulation du bannissement de %1 dans %2 : %3</translation> + <translation>Échec de l'annulation du bannissement de %1 dans %2 : %3</translation> </message> <message> <location line="+3"/> @@ -241,9 +221,9 @@ <translation>Voulez-vous vraiment commencer une discussion privée avec %1 ?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> - <translation>Échec de la migration du cache !</translation> + <translation>Échec de la migration du cache !</translation> </message> <message> <location line="+13"/> @@ -265,18 +245,18 @@ <message> <location line="+93"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> - <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur : %1 %2. Veuillez réessayer plus tard.</translation> + <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur : %1 %2. Veuillez réessayer plus tard.</translation> </message> <message> <location line="+34"/> <location line="+111"/> <source>Please try to login again: %1</source> - <translation>Veuillez re-tenter vous reconnecter : %1</translation> + <translation>Veuillez re-tenter vous reconnecter : %1</translation> </message> <message> <location line="+43"/> <source>Failed to join room: %1</source> - <translation>Impossible de rejoindre le salon : %1</translation> + <translation>Impossible de rejoindre le salon : %1</translation> </message> <message> <location line="+4"/> @@ -286,22 +266,42 @@ <message> <location line="+6"/> <source>Failed to remove invite: %1</source> - <translation>Impossible de supprimer l'invitation : %1</translation> + <translation>Impossible de supprimer l'invitation : %1</translation> </message> <message> <location line="+19"/> <source>Room creation failed: %1</source> - <translation>Échec de la création du salon : %1</translation> + <translation>Échec de la création du salon : %1</translation> </message> <message> <location line="+18"/> <source>Failed to leave room: %1</source> - <translation>Impossible de quitter le salon : %1</translation> + <translation>Impossible de quitter le salon : %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> - <translation>Échec de l'expulsion de %1 de %2  : %3</translation> + <translation>Échec de l'expulsion de %1 de %2  : %3</translation> + </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> @@ -383,19 +383,19 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Déchiffrer les secrets</translation> </message> <message> <location line="+2"/> <source>Enter your recovery key or passphrase to decrypt your secrets:</source> - <translation>Entrez votre clé de récupération ou phrase de passe pour déchiffrer vos secrets :</translation> + <translation>Entrez votre clé de récupération ou phrase de passe pour déchiffrer vos secrets :</translation> </message> <message> <location line="+2"/> <source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source> - <translation>Entrez votre clé de récupération ou votre phrase de passe nommée %1 pour déchiffrer vos secrets :</translation> + <translation>Entrez votre clé de récupération ou votre phrase de passe nommée %1 pour déchiffrer vos secrets :</translation> </message> <message> <location line="+28"/> @@ -418,17 +418,17 @@ <message> <location line="+13"/> <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press 'They do not match!' to abort verification!</source> - <translation>Veuillez vérifier les chiffres suivants. Vous devriez voir les mêmes chiffres des deux côtés. Si ceux-ci diffèrent, veuillez choisir « Ils sont différents ! » pour annuler la vérification !</translation> + <translation>Veuillez vérifier les chiffres suivants. Vous devriez voir les mêmes chiffres des deux côtés. Si ceux-ci diffèrent, veuillez choisir « Ils sont différents ! » pour annuler la vérification !</translation> </message> <message> <location line="+33"/> <source>They do not match!</source> - <translation>Ils sont différents !</translation> + <translation>Ils sont différents !</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation>Ils sont identiques !</translation> + <translation>Ils sont identiques !</translation> </message> </context> <context> @@ -512,17 +512,17 @@ <message> <location line="+13"/> <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!</source> - <translation>Veuillez vérifier les émoji suivants. Vous devriez voir les mêmes émoji des deux côtés. S'ils diffèrent, veuillez choisir « Ils sont différents ! » pour annuler la vérification !</translation> + <translation>Veuillez vérifier les émoji suivants. Vous devriez voir les mêmes émoji des deux côtés. S'ils diffèrent, veuillez choisir « Ils sont différents ! » pour annuler la vérification !</translation> </message> <message> <location line="+378"/> <source>They do not match!</source> - <translation>Ils sont différents !</translation> + <translation>Ils sont différents !</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation>Ils sont identiques !</translation> + <translation>Ils sont identiques !</translation> </message> </context> <context> @@ -573,7 +573,7 @@ <message> <location filename="../qml/EncryptionIndicator.qml" line="+54"/> <source>This message is not encrypted!</source> - <translation>Ce message n'est pas chiffré !</translation> + <translation>Ce message n'est pas chiffré !</translation> </message> <message> <location line="+4"/> @@ -606,7 +606,7 @@ <message> <location line="+4"/> <source>Key mismatch detected!</source> - <translation>Clés non correspondantes détectées !</translation> + <translation>Clés non correspondantes détectées !</translation> </message> <message> <location line="+2"/> @@ -621,7 +621,7 @@ <message> <location line="+2"/> <source>Verification messages received out of order!</source> - <translation>Messages de vérification reçus dans le désordre !</translation> + <translation>Messages de vérification reçus dans le désordre !</translation> </message> <message> <location line="+2"/> @@ -665,13 +665,13 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> - <translation>Ces évènements seront <b>montrés</b> dans %1 :</translation> + <source>These events will be <b>shown</b> in %1:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> - <translation>Ces évènements seront <b>montrés</b> dans tous les salons :</translation> + <source>These events will be <b>shown</b> in all rooms:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+15"/> @@ -948,9 +948,9 @@ You can also put your homeserver address there, if your server doesn't support .well-known lookup. Example: @user:server.my If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source> - <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l'identifiant. L'identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ». + <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l'identifiant. L'identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ». Vous pouvez également spécifier l'adresse de votre serveur ici, si votre serveur ne supporte pas l'identification .well-known. -Exemple : @utilisateur :monserveur.example.com +Exemple : @utilisateur :monserveur.example.com Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l'indiquer manuellement.</translation> </message> <message> @@ -988,7 +988,7 @@ Si Nheko n'arrive pas à trouver votre serveur, il vous proposera de l&apos <source>The address that can be used to contact you homeservers client API. Example: https://server.my:8787</source> <translation>L'adresse qui peut être utilisée pour joindre l'API client de votre serveur. -Exemple : https ://monserveur.example.com:8787</translation> +Exemple : https ://monserveur.example.com:8787</translation> </message> <message> <location line="+30"/> @@ -996,20 +996,20 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>CONNEXION</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation>Retour</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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> + <translation>Vous avez entré un identifiant Matrix invalide exemple correct : @moi:monserveur.example.com)</translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Échec de la découverte automatique. Réponse mal formée reçue.</translation> </message> @@ -1029,17 +1029,42 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Réponse mal formée reçue. Vérifiez que le nom de domaine du serveur est valide.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>CONNEXION SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Mot de passe vide</translation> </message> @@ -1059,12 +1084,12 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+1"/> <source>A call is in progress. Log out?</source> - <translation>Un appel est en cours. Se déconnecter ?</translation> + <translation>Un appel est en cours. Se déconnecter ?</translation> </message> <message> <location line="+0"/> <source>Are you sure you want to log out?</source> - <translation>Êtes-vous certain de vouloir vous déconnecter ?</translation> + <translation>Êtes-vous certain de vouloir vous déconnecter ?</translation> </message> </context> <context> @@ -1127,7 +1152,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+13"/> <source>%1 created and configured room: %2</source> - <translation>%1 a créé et configuré le salon : %2</translation> + <translation>%1 a créé et configuré le salon : %2</translation> </message> <message> <location line="+16"/> @@ -1168,7 +1193,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Raccrocher</translation> </message> @@ -1178,7 +1203,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Appeler</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Envoyer un fichier</translation> </message> @@ -1188,7 +1213,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Écrivez un message…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Autocollants</translation> </message> @@ -1203,7 +1228,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Envoyer</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Vous n'avez pas l'autorisation d'envoyer des messages dans ce salon</translation> </message> @@ -1211,7 +1236,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Modifier</translation> </message> @@ -1231,19 +1256,29 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Options</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Copier</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Copier l'adresse du &lien</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Ré&agir</translation> </message> @@ -1298,7 +1333,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Enle&ver le message</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>Enregistrer &sous</translation> </message> @@ -1333,12 +1368,12 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+19"/> <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> + <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> </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> + <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> </message> <message> <location line="+2"/> @@ -1426,7 +1461,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location filename="../qml/voip/PlaceCall.qml" line="+49"/> <source>Place a call to %1?</source> - <translation>Appeler %1 ?</translation> + <translation>Appeler %1 ?</translation> </message> <message> <location line="+16"/> @@ -1459,7 +1494,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location filename="../qml/delegates/Placeholder.qml" line="+12"/> <source>unimplemented event: </source> - <translation>Évènement non implémenté : </translation> + <translation>Évènement non implémenté : </translation> </message> </context> <context> @@ -1649,7 +1684,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>pas de version enregistrée</translation> </message> @@ -1657,7 +1692,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nouvelle étiquette</translation> </message> @@ -1674,7 +1709,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+5"/> <source>Tag room as:</source> - <translation>Étiqueter le salon comme :</translation> + <translation>Étiqueter le salon comme :</translation> </message> <message> <location line="+14"/> @@ -1697,7 +1732,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Créer une nouvelle étiquette…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Message de statut</translation> </message> @@ -1820,12 +1855,12 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Configuration du salon</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n membre</numerusform> @@ -1833,17 +1868,17 @@ Exemple : https ://monserveur.example.com:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>CONFIGURATION</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Notifications</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>En sourdine</translation> </message> @@ -1858,12 +1893,12 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Tous les messages</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Accès au salon</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Tous le monde et les invités</translation> </message> @@ -1888,20 +1923,20 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Restreint par l'appartenance à d'autre salons</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Chiffrement</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Chiffrement bout-à -bout</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> - <translation>Le chiffrement est actuellement expérimental et des comportements inattendus peuvent apparaître.<br>Veuillez noter qu'il n'est pas possible de le désactiver par la suite.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1909,7 +1944,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Paramètres des autocollants & emotes</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Modifier</translation> </message> @@ -1924,7 +1959,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>Évènements cachés</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation>Configurer</translation> </message> @@ -1939,19 +1974,24 @@ Exemple : https ://monserveur.example.com:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Identifiant interne</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Version du salon</translation> </message> <message> <location filename="../../src/ui/RoomSettings.cpp" line="+256"/> <source>Failed to enable encryption: %1</source> - <translation>Échec de l'activation du chiffrement : %1</translation> + <translation>Échec de l'activation du chiffrement : %1</translation> </message> <message> <location line="+249"/> @@ -1971,13 +2011,13 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation>Erreur lors de la lecture du fichier : %1</translation> + <translation>Erreur lors de la lecture du fichier : %1</translation> </message> <message> <location line="+32"/> <location line="+19"/> <source>Failed to upload image: %s</source> - <translation>Échec de l'envoi de l'image : %s</translation> + <translation>Échec de l'envoi de l'image : %s</translation> </message> </context> <context> @@ -2001,24 +2041,24 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> - <translation>Veuillez saisir votre mot de passe pour continuer :</translation> + <translation>Veuillez saisir votre mot de passe pour continuer :</translation> </message> <message> <location line="+10"/> <source>Please enter a valid email address to continue:</source> - <translation>Veuillez saisir un courriel valide pour continuer :</translation> + <translation>Veuillez saisir un courriel valide pour continuer :</translation> </message> <message> <location line="+10"/> <source>Please enter a valid phone number to continue:</source> - <translation>Veuillez saisir un numéro de téléphone valide pour continuer :</translation> + <translation>Veuillez saisir un numéro de téléphone valide pour continuer :</translation> </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> + <translation>Veuillez entrer le jeton qui vous a été envoyé :</translation> </message> <message> <location line="+16"/> @@ -2031,17 +2071,17 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location filename="../qml/voip/ScreenShare.qml" line="+31"/> <source>Share desktop with %1?</source> - <translation>Partager le bureau avec %1  ?</translation> + <translation>Partager le bureau avec %1  ?</translation> </message> <message> <location line="+11"/> <source>Window:</source> - <translation>Fenêtre :</translation> + <translation>Fenêtre :</translation> </message> <message> <location line="+20"/> <source>Frame rate:</source> - <translation>Fréquence d'images :</translation> + <translation>Fréquence d'images :</translation> </message> <message> <location line="+19"/> @@ -2083,14 +2123,14 @@ Exemple : https ://monserveur.example.com:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Échec de la connexion au stockage des secrets</translation> </message> <message> <location line="+1"/> <source>Nheko could not connect to the secure storage to save encryption secrets to. This can have multiple reasons. Check if your D-Bus service is running and you have configured a service like KWallet, Gnome Keyring, KeePassXC or the equivalent for your platform. If you are having trouble, feel free to open an issue here: https://github.com/Nheko-Reborn/nheko/issues</source> - <translation>Nheko n'a pas pu se connecter au stockage sécurisé afin d'y sauvegarder les clés de chiffrement. Cela peut avoir différentes causes. Vérifiez si votre service D-Bus est lancé, et si vous avez configuré un service tel que KWallet ; Gnome Keyring ; KeePassXC ou l'équivalent pour votre système. Si vous n'arrivez pas à résoudre le problème, n'hésitez pas à nous en faire part ici : https ://github.com/Nheko-Reborn/nheko/issues</translation> + <translation>Nheko n'a pas pu se connecter au stockage sécurisé afin d'y sauvegarder les clés de chiffrement. Cela peut avoir différentes causes. Vérifiez si votre service D-Bus est lancé, et si vous avez configuré un service tel que KWallet ; Gnome Keyring ; KeePassXC ou l'équivalent pour votre système. Si vous n'arrivez pas à résoudre le problème, n'hésitez pas à nous en faire part ici : https ://github.com/Nheko-Reborn/nheko/issues</translation> </message> </context> <context> @@ -2098,7 +2138,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location filename="../qml/SelfVerificationCheck.qml" line="+40"/> <source>This is your recovery key. You will need it to restore access to your encrypted messages and verification keys. Keep this safe. Don't share it with anyone and don't lose it! Do not pass go! Do not collect $200!</source> - <translation>Ceci est votre clé de récupération. Vous en aurez besoin afin de restaurer l'accès à vos messages chiffrés et à vos clés de vérification. Gardez cette clé en sûreté. Ne la partagez pas avec qui que ce soit et ne la perdez pas ! Ne passez pas par la case départ et ne recevez pas 20 000 francs !</translation> + <translation>Ceci est votre clé de récupération. Vous en aurez besoin afin de restaurer l'accès à vos messages chiffrés et à vos clés de vérification. Gardez cette clé en sûreté. Ne la partagez pas avec qui que ce soit et ne la perdez pas ! Ne passez pas par la case départ et ne recevez pas 20 000 francs !</translation> </message> <message> <location line="+33"/> @@ -2108,7 +2148,7 @@ Exemple : https ://monserveur.example.com:8787</translation> <message> <location line="+9"/> <source>Failed to setup encryption: %1</source> - <translation>Échec de la configuration du chiffrement : %1</translation> + <translation>Échec de la configuration du chiffrement : %1</translation> </message> <message> <location line="+22"/> @@ -2119,8 +2159,8 @@ Exemple : https ://monserveur.example.com:8787</translation> <location line="+10"/> <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>Bonjour et bienvenue sur le réseau Matrix ! -Il semblerait que ce soit votre première fois ici. Avant de pouvoir chiffrer vos messages de manière sécurisée, nous devons configurer quelques détails. Vous pouvez soit accepter immédiatement, soit ajuster quelques options basiques. Nous essayons également d'expliquer le fonctionnement de certains mécanismes. Vous pouvez sauter ces étapes, mais celles-ci pourraient se montrer utiles par la suite !</translation> + <translation>Bonjour et bienvenue sur le réseau Matrix ! +Il semblerait que ce soit votre première fois ici. Avant de pouvoir chiffrer vos messages de manière sécurisée, nous devons configurer quelques détails. Vous pouvez soit accepter immédiatement, soit ajuster quelques options basiques. Nous essayons également d'expliquer le fonctionnement de certains mécanismes. Vous pouvez sauter ces étapes, mais celles-ci pourraient se montrer utiles par la suite !</translation> </message> <message> <location line="+124"/> @@ -2150,17 +2190,17 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si <message> <location filename="../../src/encryption/SelfVerificationStatus.cpp" line="+43"/> <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> + <translation>Échec de la création des clés pour l'auto-vérification (cross-signing) !</translation> </message> <message> <location line="+16"/> <source>Failed to create keys for online key backup!</source> - <translation>Échec de la création de clés pour la sauvegarde en ligne !</translation> + <translation>Échec de la création de clés pour la sauvegarde en ligne !</translation> </message> <message> <location line="+29"/> <source>Failed to create keys for secure server side secret storage!</source> - <translation>Échec de la création des clés pour le stockage sécurisé côté serveur !</translation> + <translation>Échec de la création des clés pour le stockage sécurisé côté serveur !</translation> </message> <message> <location line="+44"/> @@ -2170,7 +2210,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si <message> <location line="+6"/> <source>Encryption setup failed: %1</source> - <translation>Échec de la configuration du chiffrement : %1</translation> + <translation>Échec de la configuration du chiffrement : %1</translation> </message> <message> <location line="+140"/> @@ -2245,7 +2285,7 @@ Si vous choisissez de vérifier, vous aurez besoin de l'autre appareil. Si <message> <location line="+15"/> <source>Verification successful! Both sides verified their devices!</source> - <translation>Vérification réussie ! Les deux côtés ont vérifié leur appareil !</translation> + <translation>Vérification réussie ! Les deux côtés ont vérifié leur appareil !</translation> </message> <message> <location line="+14"/> @@ -2256,16 +2296,16 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> - <translation>Échec de la suppression du message : %1</translation> + <translation>Échec de la suppression du message : %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> - <translation>Échec du chiffrement de l'évènement, envoi abandonné !</translation> + <translation>Échec du chiffrement de l'évènement, envoi abandonné !</translation> </message> <message> <location line="+170"/> @@ -2434,12 +2474,12 @@ Raison : %4</translation> <translation>%1 a arrêté de toquer.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Vous avez rejoint ce salon.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation>%1 a invité %2.</translation> </message> @@ -2457,7 +2497,7 @@ Raison : %4</translation> <location line="+39"/> <source>%1 left after having already left!</source> <comment>This is a leave event after the user already left and shouldn't happen apart from state resets</comment> - <translation>%1 a quitté le salon après l'avoir déjà quitté !</translation> + <translation>%1 a quitté le salon après l'avoir déjà quitté !</translation> </message> <message> <location line="+7"/> @@ -2473,7 +2513,7 @@ Raison : %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Modifié</translation> </message> @@ -2529,7 +2569,7 @@ Raison : %4</translation> <translation>Pas de salon sélectionné</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Ce salon n'est pas chiffré !</translation> </message> @@ -2549,7 +2589,7 @@ Raison : %4</translation> <translation>Ce salon contient des appareils non vérifiés !</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Montrer ou cacher les messages épinglés</translation> </message> @@ -2743,13 +2783,13 @@ Raison : %4</translation> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation>Erreur lors de la lecture du fichier  : %1</translation> + <translation>Erreur lors de la lecture du fichier  : %1</translation> </message> </context> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Défaut</translation> @@ -3148,25 +3188,29 @@ Le statut est affiché près de la date des messages.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation>Notifier des messages reçus quand la fenêtre du client n'est pas active.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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>Alerte lorsqu'un message est reçu. Typiquement, l'icône de l'application est mise en évidence dans la barre des tâches.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation>Change l'apparence des avatars des utilisateurs dans les discussions. -OFF – carré, ON – cercle.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation>Montre une image générée (identicône) au lieu d'une lettre lorsqu'aucun avatar n'est présent.</translation> </message> @@ -3219,12 +3263,7 @@ be blurred.</source> <translation>La clé utilisée pour déchiffrer les sauvegardes de clé stockées en ligne. Si celle-ci est dans le cache, vous pouvez activer la sauvegarde de vos clés en ligne afin d'en conserver une copie chiffrée sur le serveur en toute sécurité.</translation> </message> <message> - <location line="+4"/> - <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 clé pour vérifier vos propres appareils. Si celle-ci est dans le cache, vérifier l'un de vos appareils le marquera comme vérifié pour tous les autres appareils et utilisateurs qui vous ont vérifié.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation>La clé utilisée pour vérifier d'autres utilisateurs. Si celle-ci est dans le cache, vérifier un utilisateur vérifiera tous ses appareils.</translation> </message> @@ -3267,7 +3306,7 @@ be blurred.</source> <message> <location line="-25"/> <source>Enter the passphrase to decrypt the file:</source> - <translation>Entrez la phrase de passe pour déchiffrer le fichier :</translation> + <translation>Entrez la phrase de passe pour déchiffrer le fichier :</translation> </message> <message> <location line="+8"/> @@ -3278,7 +3317,7 @@ be blurred.</source> <message> <location line="-8"/> <source>Enter passphrase to encrypt your session keys:</source> - <translation>Entrez une phrase de passe pour chiffrer vos clés de session :</translation> + <translation>Entrez une phrase de passe pour chiffrer vos clés de session :</translation> </message> <message> <location line="+15"/> @@ -3592,12 +3631,12 @@ Taille du média : %2 <message> <location line="+5"/> <source>You: %1</source> - <translation>Vous : %1</translation> + <translation>Vous : %1</translation> </message> <message> <location line="+2"/> <source>%1: %2</source> - <translation>%1 : %2</translation> + <translation>%1 : %2</translation> </message> <message> <location line="+6"/> diff --git a/resources/langs/nheko_hu.ts b/resources/langs/nheko_hu.ts index 02f0e09178ea843f23ea5273eed40468f1ea3c78..ef54cef9f838e279e9ca70eab6e396f33b544611 100644 --- a/resources/langs/nheko_hu.ts +++ b/resources/langs/nheko_hu.ts @@ -165,12 +165,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>MeghÃvás megerÅ‘sÃtése</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Biztos, hogy meg akarod hÃvni a következÅ‘ felhasználót: %1 (%2)?</translation> </message> @@ -180,32 +180,12 @@ <translation>Nem sikerült %1 meghÃvása a(z) %2 szobába: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Kirúgás megerÅ‘sÃtése</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Biztosan ki akarod rúgni %1 (%2) felhasználót?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Kirúgott felhasználó: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Kitiltás megerÅ‘sÃtése</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Biztosan ki akarod tiltani %1 (%2) felhasználót?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Nem sikerült kitiltani %1 felhasználót a %2 szobából: %3</translation> </message> @@ -240,7 +220,7 @@ <translation>Biztosan privát csevegést akarsz indÃtani %1 felhasználóval?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>GyorsÃtótár migráció nem sikerült!</translation> </message> @@ -298,10 +278,30 @@ <translation>Nem sikerült elhagyni a szobát: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Nem sikerült kirúgni %1 felhasználót %2 szobából: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -382,7 +382,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Titkos tároló feloldása</translation> </message> @@ -664,12 +664,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -995,20 +995,20 @@ Példa: https://szerver.em:8787</translation> <translation>BEJELENTKEZÉS</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Az automatikus felderÃtés nem sikerült. Helytelen válasz érkezett.</translation> </message> @@ -1028,17 +1028,42 @@ Példa: https://szerver.em:8787</translation> <translation>Helytelen válasz érkezett. EllenÅ‘rizd, hogy a homeszervered domainje helyes.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Egy ismeretlen hiba történt. EllenÅ‘rizd, hogy a homeszervered domainje helyes.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO BEJELENTKEZÉS</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Ãœres jelszó</translation> </message> @@ -1167,7 +1192,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>HÃvás befejezése</translation> </message> @@ -1177,7 +1202,7 @@ Példa: https://szerver.em:8787</translation> <translation>HÃvás kezdeményezése</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Fájl küldése</translation> </message> @@ -1187,7 +1212,7 @@ Példa: https://szerver.em:8787</translation> <translation>Ãrj egy üzenetet…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1202,7 +1227,7 @@ Példa: https://szerver.em:8787</translation> <translation>Küldés</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1210,7 +1235,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Szerkesztés</translation> </message> @@ -1230,19 +1255,29 @@ Példa: https://szerver.em:8787</translation> <translation>Műveletek</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1297,7 +1332,7 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1648,7 +1683,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>nincs tárolva verzió</translation> </message> @@ -1656,7 +1691,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1696,7 +1731,7 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1818,29 +1853,29 @@ Példa: https://szerver.em:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>SzobabeállÃtások</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>BEÃLLÃTÃSOK</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>ÉrtesÃtések</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>NémÃtva</translation> </message> @@ -1855,12 +1890,12 @@ Példa: https://szerver.em:8787</translation> <translation>Az összes üzenet</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Bárki és vendégek</translation> </message> @@ -1885,20 +1920,20 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>TitkosÃtás</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Végponttól végpontig titkosÃtás</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> - <translation>A titkosÃtás jelenleg kÃsérleti stádiumú és váratlan furcsaságok történhetnek.<br>Kérlek, vedd vigyelembe, hogy ha egyszer aktiváltad, nem lehet utána kikapcsolni.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1906,7 +1941,7 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1921,7 +1956,7 @@ Példa: https://szerver.em:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1936,12 +1971,17 @@ Példa: https://szerver.em:8787</translation> <translation>INFÓ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>BelsÅ‘ azonosÃtó</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Szoba verziója</translation> </message> @@ -1998,7 +2038,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2080,7 +2120,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2251,13 +2291,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Az üzenet visszavonása nem sikerült: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <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> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation>%1 visszavonta a kopogását.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Csatlakoztál ehhez a szobához.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Szerkesztve</translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation>Nincs kiválasztva szoba</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Alapértelmezett</translation> @@ -3142,25 +3182,29 @@ Ez az állapot az üzenetek ideje mellett jelenik meg.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">ÉrtesÃtések az érkezett üzenetekrÅ‘l, amikor a fÅ‘ablak éppen nincs fókuszban.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Riasztás megjelenÃtése, ha üzenet érkezett. EttÅ‘l általában animálttá válik az alkalmazásablakok listáján szereplÅ‘ ikon.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">A profilképek megjelenése a csevegésekben. -KI - szögletes, BE - kerek.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3214,12 +3258,7 @@ az idÅ‘vonal homályosÃtva lesz.</translation> <translation type="unfinished">A kulcs, amellyel hozzáférhetsz a kulcsok online biztonsági mentéseihez. Ha gyorsÃtótárazva van, lehetÅ‘séged van biztonsági másolatként, titkosÃtva a szerveren tárolni a titkosÃtási kulcsokat.</translation> </message> <message> - <location line="+4"/> - <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">A kulcs, amellyel hitelesÃtheted a saját eszközeidet. Ha gyorsÃtótárazva van, egy eszköz hitelesÃtése azt hitelesÃtettnek fogja megjelölni az összes többi eszközeidnek és azoknak a felhasználóidnak, akik már hitelesÃtettek téged.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">A mások hitelesÃtésére használt kulcs. Ha gyorsÃtótárazva van, egy felhasználó hitelesÃtésekor hitelesÃtve lesz az összes eszköze.</translation> </message> diff --git a/resources/langs/nheko_id.ts b/resources/langs/nheko_id.ts index 0da999f25b84d54c2cee71fff1e8be589d7bb727..6251a448740d9cdf281d0a1ec28502db96d5acb9 100644 --- a/resources/langs/nheko_id.ts +++ b/resources/langs/nheko_id.ts @@ -165,12 +165,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Konfirmasi undangan</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Apakah Anda ingin menundang %1 (%2)?</translation> </message> @@ -180,32 +180,12 @@ <translation>Gagal mengundang %1 ke %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Konfirmasi pengeluaran</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Apakah Anda ingin mengeluarkan %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Pengguna yang dikeluarkan: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Konfirmasi cekalan</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Apakah Anda ingin mencekal %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Gagal mencekal %1 di %2: %3</translation> </message> @@ -240,7 +220,7 @@ <translation>Apakah Anda ingin memulai chat privat dengan %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migrasi cache gagal!</translation> </message> @@ -298,10 +278,30 @@ <translation>Gagal meninggalkan ruangan: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Gagal mengeluarkan %1 dari %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -382,7 +382,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Dekripsi rahasia</translation> </message> @@ -664,13 +664,13 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> - <translation>Peristiwa ini akan <b>ditampilkan</b> di %1:</translation> + <source>These events will be <b>shown</b> in %1:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> - <translation>Peristiwa ini akan <b>ditampilkan</b> di semua ruangan:</translation> + <source>These events will be <b>shown</b> in all rooms:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+15"/> @@ -995,20 +995,20 @@ Misalnya: https://server.my:8787</translation> <translation>MASUK</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation>Kembali</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation>Anda telah memasukkan ID Matrix yang tidak valid mis. @pengguna:matrix.org</translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Penemuan otomatis gagal. Menerima respons cacat.</translation> </message> @@ -1028,17 +1028,42 @@ Misalnya: https://server.my:8787</translation> <translation>Menerima respons cacat. Pastikan domain homeservernya valid.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Terjadi kesalahan yang tidak diketahui. Pastikan domain homeservernya valid.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>LOGIN SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Kata sandi kosong</translation> </message> @@ -1167,7 +1192,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Tutup panggilan</translation> </message> @@ -1177,7 +1202,7 @@ Misalnya: https://server.my:8787</translation> <translation>Lakukan panggilan</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Kirim sebuah file</translation> </message> @@ -1187,7 +1212,7 @@ Misalnya: https://server.my:8787</translation> <translation>Ketik pesan…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Stiker</translation> </message> @@ -1202,7 +1227,7 @@ Misalnya: https://server.my:8787</translation> <translation>Kirim</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Anda tidak memiliki izin untuk mengirim pesan di ruangan ini</translation> </message> @@ -1210,7 +1235,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Edit</translation> </message> @@ -1230,19 +1255,29 @@ Misalnya: https://server.my:8787</translation> <translation>Opsi</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Salin</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Salin lokasi &tautan</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&aksi</translation> </message> @@ -1297,7 +1332,7 @@ Misalnya: https://server.my:8787</translation> <translation>Hap&us pesan</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Simpan sebagai</translation> </message> @@ -1648,7 +1683,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>tidak ada versi yang disimpan</translation> </message> @@ -1656,7 +1691,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Tanda baru</translation> </message> @@ -1696,7 +1731,7 @@ Misalnya: https://server.my:8787</translation> <translation>Membuat tanda baru…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Pesan Status</translation> </message> @@ -1818,29 +1853,29 @@ Misalnya: https://server.my:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Pengaturan Ruangan</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n anggota</numerusform> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>PENGATURAN</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Notifikasi</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Bisukan</translation> </message> @@ -1855,12 +1890,12 @@ Misalnya: https://server.my:8787</translation> <translation>Semua pesan</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Akses ruangan</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Siapa saja dan tamu</translation> </message> @@ -1885,20 +1920,20 @@ Misalnya: https://server.my:8787</translation> <translation>Dibatasi oleh keanggotaan di ruangan lain</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Enkripsi</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Enkripsi Ujung-ke-Ujung</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> - <translation>Enkripsi saat ini masih eksperimental dan apapun dapat rusak secara tiba-tiba.<br>Mohon dicatat bahwa enkripsi tidak dapat dinonaktifkan setelah ini.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1906,7 +1941,7 @@ Misalnya: https://server.my:8787</translation> <translation>Pengaturan Stiker & Emote</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Ubah</translation> </message> @@ -1921,7 +1956,7 @@ Misalnya: https://server.my:8787</translation> <translation>Peristiwa tersembunyi</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation>Konfigurasi</translation> </message> @@ -1936,12 +1971,17 @@ Misalnya: https://server.my:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>ID Internal</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Versi Ruangan</translation> </message> @@ -1998,7 +2038,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Mohon masukkan kata sandi login Anda untuk melanjutkan:</translation> </message> @@ -2080,7 +2120,7 @@ Misalnya: https://server.my:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Gagal menghubungkan ke penyimpanan rahasia</translation> </message> @@ -2253,13 +2293,13 @@ Jika Anda memilih verifikasi, Anda harus memiliki perangkat lain yang tersedia. <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Reaksi pesan gagal: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Gagal mendekripsikan peristiwa, pengiriman dihentikan!</translation> @@ -2430,12 +2470,12 @@ Alasan: %4</translation> <translation>%1 menolak ketukannya.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Anda bergabung ruangan ini.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation>%1 mengundang %2.</translation> </message> @@ -2469,7 +2509,7 @@ Alasan: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Diedit</translation> </message> @@ -2525,7 +2565,7 @@ Alasan: %4</translation> <translation>Tidak ada ruangan yang dipilih</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Ruangan ini tidak dienkripsi!</translation> </message> @@ -2545,7 +2585,7 @@ Alasan: %4</translation> <translation>Ruangan ini berisi perangkat yang belum diverifikasi!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Tampilkan atau sembunyikan pesan yang dipasangi pin</translation> </message> @@ -2745,7 +2785,7 @@ Alasan: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Default</translation> @@ -3144,25 +3184,29 @@ Status akan ditampilkan di sebelah waktu menerima pesan.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation>Memberitahukan tentang pesan yang diterima ketika kliennya tidak difokuskan.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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>Menampilkan pemberitahuan saat sebuah pesan diterima. Ini biasanya menyebabkan ikon aplikasi di bilah tugas untuk beranimasi.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation>Ubah penampilan avatar pengguna di chat. -MATI - persegi, NYALA - Lingkaran.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation>Tampilkan sebuah identikon daripada sebuah huruf ketika tidak ada avatar yang diatur.</translation> </message> @@ -3216,12 +3260,7 @@ akan diburamkan.</translation> <translation>Kunci untuk mendekripsikan cadangan kunci daring. Jika dicache, Anda dapat mengaktifkan kunci cadangan daring untuk menyimpan kunci enkripsi yang dienkripsi secara aman di servernya.</translation> </message> <message> - <location line="+4"/> - <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 Anda. Jika dicache, memverifikasi salah satu perangkat Anda akan menandainya sebagai terverifikasi untuk semua perangkat Anda yang lain dan untuk pengguna yang telah memverifikasi Anda.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation>Kunci untuk memverifikasi pengguna lain. Jika dicache, memverifikasi sebuah pengguna akan memverifikasi semua perangkat mereka.</translation> </message> diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts index 64f37e2f2a0499544ac12bf0d1c971cb8a7f5437..77bd2125532dd57dad6e7d04a1de55f0396a56e3 100644 --- a/resources/langs/nheko_it.ts +++ b/resources/langs/nheko_it.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Conferma Invito</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Vuoi davvero inviare %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Impossibile invitare %1 a %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Conferma l'allontanamento</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Vuoi davvero allontanare %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Scacciato utente: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Conferma ban</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Vuoi veramente bannare %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Impossibile bannare %1 in %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Sei sicuro di voler avviare una chat privata con %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migrazione della cache fallita!</translation> </message> @@ -299,10 +279,30 @@ <translation>Impossibile lasciare la stanza: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Fallita l'espulsione di %1 da %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Decifra i segreti</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ Esempio: https://server.mio:8787</translation> <translation>ACCEDI</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Ricerca automatica fallita. Ricevuta risposta malformata.</translation> </message> @@ -1029,17 +1029,42 @@ Esempio: https://server.mio:8787</translation> <translation>Ricevuta risposta malformata. Assicurati che il dominio dell'homeserver sia valido.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Avvenuto un errore sconosciuto. Assicurati che il dominio dell'homeserver sia valido.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>ACCESSO SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Password vuota</translation> </message> @@ -1168,7 +1193,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Termina</translation> </message> @@ -1178,7 +1203,7 @@ Esempio: https://server.mio:8787</translation> <translation>Avvia una chiamata</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished">Invia un file</translation> </message> @@ -1188,7 +1213,7 @@ Esempio: https://server.mio:8787</translation> <translation type="unfinished">Scrivi un messaggio…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1203,7 +1228,7 @@ Esempio: https://server.mio:8787</translation> <translation>Invia</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Non hai i permessi per inviare messaggi in questa stanza</translation> </message> @@ -1211,7 +1236,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Modifica</translation> </message> @@ -1231,19 +1256,29 @@ Esempio: https://server.mio:8787</translation> <translation type="unfinished">Opzioni</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1298,7 +1333,7 @@ Esempio: https://server.mio:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1650,7 +1685,7 @@ Verificare %1 adesso?</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>nessuna versione memorizzata</translation> </message> @@ -1658,7 +1693,7 @@ Verificare %1 adesso?</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1698,7 +1733,7 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1821,12 +1856,12 @@ Verificare %1 adesso?</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1834,17 +1869,17 @@ Verificare %1 adesso?</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1859,12 +1894,12 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1889,19 +1924,19 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1910,7 +1945,7 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1925,7 +1960,7 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1940,12 +1975,17 @@ Verificare %1 adesso?</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -2002,7 +2042,7 @@ Verificare %1 adesso?</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2084,7 +2124,7 @@ Verificare %1 adesso?</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2255,13 +2295,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Oscuramento del messaggio fallito: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2432,12 +2472,12 @@ Reason: %4</source> <translation>%1 ha oscurato la sua bussata.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Sei entrato in questa stanza.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2471,7 +2511,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2527,7 +2567,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2547,7 +2587,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2747,7 +2787,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3139,23 +3179,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3207,12 +3252,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index 253f3de3322591abdb1eedb78d6626a463fc48bb..b014020b6bf0da7fe3ccad962bbad7694d68a4a7 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -165,12 +165,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -180,32 +180,12 @@ <translation>%2ã«%1を招待ã§ãã¾ã›ã‚“ã§ã—ãŸ: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>一時的ã«è¿½æ”¾ã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>%2ã§%1を永久追放ã§ãã¾ã›ã‚“ã§ã—ãŸ: %3</translation> </message> @@ -240,7 +220,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -298,10 +278,30 @@ <translation>部屋ã‹ã‚‰å‡ºã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸ: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -382,7 +382,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -991,20 +991,20 @@ Example: https://server.my:8787</source> <translation>ãƒã‚°ã‚¤ãƒ³</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>自動検出ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ä¸æ£ãªå½¢å¼ã®å¿œç”ã‚’å—ä¿¡ã—ã¾ã—ãŸã€‚</translation> </message> @@ -1024,17 +1024,42 @@ Example: https://server.my:8787</source> <translation>ä¸æ£ãªå½¢å¼ã®å¿œç”ã‚’å—ä¿¡ã—ã¾ã—ãŸã€‚ホームサーãƒãƒ¼ã®ãƒ‰ãƒ¡ã‚¤ãƒ³åãŒæœ‰åŠ¹ã§ã‚ã‚‹ã‹ã‚’確èªã—ã¦ä¸‹ã•ã„。</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ホームサーãƒãƒ¼ã®ãƒ‰ãƒ¡ã‚¤ãƒ³åãŒæœ‰åŠ¹ã§ã‚ã‚‹ã‹ã‚’確èªã—ã¦ä¸‹ã•ã„。</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>パスワードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> @@ -1163,7 +1188,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1173,7 +1198,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished">ファイルをé€ä¿¡</translation> </message> @@ -1183,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished">メッセージを書ã...</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1198,7 +1223,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1231,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1226,19 +1251,29 @@ Example: https://server.my:8787</source> <translation type="unfinished">オプション</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1293,7 +1328,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1644,7 +1679,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> @@ -1652,7 +1687,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1692,7 +1727,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1814,29 +1849,29 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1851,12 +1886,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1881,19 +1916,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1902,7 +1937,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1917,7 +1952,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1932,12 +1967,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1994,7 +2034,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2076,7 +2116,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2247,13 +2287,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>メッセージを編集ã§ãã¾ã›ã‚“ã§ã—ãŸ: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2423,12 +2463,12 @@ Reason: %4</source> <translation>%1ãŒãƒŽãƒƒã‚¯ã‚’編集ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2462,7 +2502,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2518,7 +2558,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2538,7 +2578,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2738,7 +2778,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3130,23 +3170,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3198,12 +3243,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ml.ts b/resources/langs/nheko_ml.ts index 87274c5dd2a4aa0db7ceb19f5dd71d4a4339bd5c..e7a04fd59265f6a685406228718d9532a03039dd 100644 --- a/resources/langs/nheko_ml.ts +++ b/resources/langs/nheko_ml.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>à´•àµà´·à´£à´‚ ഉറപàµà´ªà´¾à´•àµà´•àµ</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -181,32 +181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>à´ªàµà´±à´¤àµà´¤à´¾à´•àµà´•àµ½ ഉറപàµà´ªà´¾à´•àµà´•àµà´•</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>ഉപയോകàµà´¤à´¾à´µà´¿à´¨àµ† à´ªàµà´±à´¤àµà´¤à´¾à´•àµà´•à´¿: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>നിരോധനം ഉറപàµà´ªà´¾à´•àµà´•àµ</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -241,7 +221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -299,10 +279,30 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -992,20 +992,20 @@ Example: https://server.my:8787</source> <translation>à´ªàµà´°à´µàµ‡à´¶à´¿à´•àµà´•àµà´•</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1025,17 +1025,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>എസൠഎസൠഓ ലോഗിൻ</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -1164,7 +1189,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1174,7 +1199,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>ഒരൠഫയൽ അയയàµà´•àµà´•àµà´•</translation> </message> @@ -1184,7 +1209,7 @@ Example: https://server.my:8787</source> <translation>ഒരൠസനàµà´¦àµ‡à´¶à´‚ à´Žà´´àµà´¤àµà´•â€¦.</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>à´¸àµà´±àµà´±à´¿à´•àµà´•à´±àµà´•àµ¾</translation> </message> @@ -1199,7 +1224,7 @@ Example: https://server.my:8787</source> <translation>അയകàµà´•àµà´•</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1232,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>തിരàµà´¤àµà´¤àµà´•</translation> </message> @@ -1227,19 +1252,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1329,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1645,7 +1680,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1653,7 +1688,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1693,7 +1728,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1816,12 +1851,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1829,17 +1864,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1854,12 +1889,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1884,19 +1919,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1905,7 +1940,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1920,7 +1955,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1935,12 +1970,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1997,7 +2037,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2079,7 +2119,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2250,13 +2290,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished">നിങàµà´™àµ¾ à´ˆ à´®àµà´±à´¿à´¯à´¿àµ½ ചേർനàµà´¨àµ.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3134,23 +3174,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3202,12 +3247,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 9943d7a7b884b2ae1648ceff42bc6c0911abf226..eeabea6531edbc724f6ee10dcd700dc88ba990a7 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Bevestig uitnodiging</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Weet je zeker dat je %1 (%2) wil uitnodigen?</translation> </message> @@ -181,32 +181,12 @@ <translation>Uitnodigen van %1 naar %2 mislukt: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Bevestig verwijdering</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Weet je zeker dat je %1 (%2) uit de kamer wil verwijderen?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Uit kamer verwijderde gebruiker: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Bevestig verbannen</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Weet je zeker dat je gebruiker %1 (%2) wil verbannen?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Verbannen van %1 uit %2 mislukt: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Weet je zeker dat je een privé chat wil beginnen met %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migreren van de cache is mislukt!</translation> </message> @@ -299,10 +279,30 @@ <translation>Kamer verlaten mislukt: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Kon %1 niet verwijderen uit %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Ontsleutel geheimen</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>INLOGGEN</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Automatische herkenning mislukt. Ongeldig antwoord ontvangen.</translation> </message> @@ -1029,17 +1029,42 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Ongeldig antwoord ontvangen. Zorg dat de thuisserver geldig is.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Een onbekende fout trad op. Zorg dat de thuisserver geldig is.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO INLOGGEN</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Leeg wachtwoord</translation> </message> @@ -1168,7 +1193,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Ophangen</translation> </message> @@ -1178,7 +1203,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Plaats een oproep</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Verstuur een bestand</translation> </message> @@ -1188,7 +1213,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Typ een bericht…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Stickers</translation> </message> @@ -1203,7 +1228,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Verstuur</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Je hebt geen toestemming om berichten te versturen in deze kamer</translation> </message> @@ -1211,7 +1236,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Bewerken</translation> </message> @@ -1231,19 +1256,29 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Opties</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopiëren</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopieer &link</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&ageren</translation> </message> @@ -1298,7 +1333,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>&Verwijder bericht</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>Op&slaan als</translation> </message> @@ -1649,7 +1684,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>geen versie opgeslagen</translation> </message> @@ -1657,7 +1692,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nieuwe markering</translation> </message> @@ -1697,7 +1732,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Maak nieuwe markering…</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Statusbericht</translation> </message> @@ -1820,12 +1855,12 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Kamerinstellingen</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation> <numerusform>%n deelnemer</numerusform> @@ -1833,17 +1868,17 @@ Voorbeeld: https://mijnserver.nl:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>INSTELLINGEN</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Meldingen</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Gedempt</translation> </message> @@ -1858,12 +1893,12 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Alle berichten</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Kamertoegang</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Iedereen (inclusief gasten)</translation> </message> @@ -1888,20 +1923,20 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Beperkt door deelname aan andere kamers</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Versleuteling</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Eind-tot-eind versleuteling</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> - <translation>Versleuteling is momenteel experimenteel en dingen kunnen onverwacht stuk gaan.<br>Let op: versleuteling kan achteraf niet uitgeschakeld worden.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1909,7 +1944,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>Sticker & Emoji instellingen</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Bewerken</translation> </message> @@ -1924,7 +1959,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1939,12 +1974,17 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Interne ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Kamerversie</translation> </message> @@ -2001,7 +2041,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Voer a.u.b. je wachtwoord in om door te gaan:</translation> </message> @@ -2083,7 +2123,7 @@ Voorbeeld: https://mijnserver.nl:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Verbinden met geheimopslag mislukt</translation> </message> @@ -2256,13 +2296,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Bericht intrekken mislukt: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Kon evenement niet versleutelen, versturen geannuleerd!</translation> @@ -2434,12 +2474,12 @@ Reden: %4</translation> <translation>%1 heeft het aankloppen ingetrokken.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Je neemt nu deel aan deze kamer.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2473,7 +2513,7 @@ Reden: %4</translation> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Bewerkt</translation> </message> @@ -2529,7 +2569,7 @@ Reden: %4</translation> <translation>Geen kamer geselecteerd</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Deze kamer is niet versleuteld!</translation> </message> @@ -2549,7 +2589,7 @@ Reden: %4</translation> <translation>Deze kamer bevat ongeverifieerde apparaten!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation>Toon of verberg vastgeprikte berichten</translation> </message> @@ -2749,7 +2789,7 @@ Reden: %4</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Standaard</translation> @@ -3148,25 +3188,29 @@ De status staat naast de tijdsindicatie.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Verstuur een notificatie over ontvangen berichten als het scherm geen focus heeft.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Activeer een melding als een bericht binnen komt. Meestal zorgt dit dat het icoon in de taakbalk op een manier animeert of iets dergelijks.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">Verander het uiterlijk van avatars in de chats. -UIT - vierkant, AAN - cirkel.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished">Laat een identicon zien in plaats van een letter wanneer er geen avatar is ingesteld.</translation> </message> @@ -3220,12 +3264,7 @@ worden geblurt.</translation> <translation type="unfinished">De sleutel om online reservesleutels mee te ontsleutelen. Indien gecached kan je online reservesleutel activeren om je sleutels veilig versleuteld op de server op te slaan.</translation> </message> <message> - <location line="+4"/> - <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">De sleutel om je eigen apparaten mee te verifiëren. Indien gecached zal één van je apparaten verifiëren dat doen voor andere apparaten en gebruikers die jou geverifieerd hebben.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">De sleutel die wordt gebruikt om andere gebruikers te verifiëren. Indien gecached zal het verifiëren van een gebruiker alle apparaten van die gebruiker verifiëren.</translation> </message> @@ -3237,7 +3276,7 @@ worden geblurt.</translation> <message> <location line="+392"/> <source>Select a file</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Selecteer een bestand</translation> </message> <message> <location line="+0"/> diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index dda73bb9199910ae073a7585dd2e7c7871f1c973..a409ca289bf872749283cec1807ae7d269fd6adb 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -167,12 +167,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Potwierdź zaproszenie</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Czy na pewno chcesz zaprosić %1 (%2)?</translation> </message> @@ -182,32 +182,12 @@ <translation>Zaproszenie %1 do %2 nieudane: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Potwierdź kopniaka</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>czy na pewno chcesz wykopać %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Wykopano użytkownika: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Potwierdź zablokowanie</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Czy na pewno chcesz zablokować %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Nie udaÅ‚o siÄ™ zbanować %1 w %2: %3</translation> </message> @@ -242,7 +222,7 @@ <translation>Czy na pewno chcesz rozpocząć prywatny czat z %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Nie udaÅ‚o siÄ™ przenieść pamiÄ™ci podrÄ™cznej!</translation> </message> @@ -300,10 +280,30 @@ <translation>Nie udaÅ‚o siÄ™ opuÅ›cić pokoju: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Nie udaÅ‚o siÄ™ wykopać %1 z %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -384,7 +384,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Odszyfruj sekrety</translation> </message> @@ -666,12 +666,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>ZALOGUJ</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Automatyczne odkrywanie zakoÅ„czone niepowodzeniem. Otrzymano nieprawidÅ‚owÄ… odpowiedź.</translation> </message> @@ -1029,17 +1029,42 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Otrzymano nieprawidÅ‚owÄ… odpowiedź. Upewnij siÄ™, że domena serwera domowego jest prawidÅ‚owa.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>WystÄ…piÅ‚ nieznany bÅ‚Ä…d. Upewnij siÄ™, że domena serwera domowego jest prawidÅ‚owa.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>Logowanie SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Puste hasÅ‚o</translation> </message> @@ -1168,7 +1193,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>RozÅ‚Ä…cz siÄ™</translation> </message> @@ -1178,7 +1203,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>ZadzwoÅ„</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>WyÅ›lij plik</translation> </message> @@ -1188,7 +1213,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Napisz wiadomość…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Naklejki</translation> </message> @@ -1203,7 +1228,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>WyÅ›lij</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Nie masz uprawnieÅ„ do wysyÅ‚ania wiadomoÅ›ci w tym pokoju</translation> </message> @@ -1211,7 +1236,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Edytuj</translation> </message> @@ -1231,19 +1256,29 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Opcje</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Kopiuj</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Kopiuj &adres odnoÅ›nika</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Zar&eaguj</translation> </message> @@ -1298,7 +1333,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>&UsuÅ„ wiadomość</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Zapisz jako</translation> </message> @@ -1650,7 +1685,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>wersja nie zostaÅ‚a zachowana</translation> </message> @@ -1658,7 +1693,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nowy tag</translation> </message> @@ -1698,7 +1733,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Utwórz nowy tag...</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Wiadomość Statusowa</translation> </message> @@ -1822,12 +1857,12 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Ustawienia Pokoju</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1836,17 +1871,17 @@ PrzykÅ‚ad: https://server.my:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>USTAWIENIA</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Powiadomienia</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Wyciszony</translation> </message> @@ -1861,12 +1896,12 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Wszystkie wiadomoÅ›ci</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>DostÄ™p do pokoju</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Każdy oraz goÅ›cie</translation> </message> @@ -1891,21 +1926,20 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Zastrzeżone poprzez czÅ‚onkostwo w innych pokojach</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Szyfrowanie</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Szyfrowanie 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> - <translation>Szyfrowanie w chwili obecnej jest eksperymentalne i może popsuć siÄ™ w dowolnym momencie.<br> - ProszÄ™ pamiÄ™taj, że szyfrowanie nie bÄ™dzie mogÅ‚o zostać później wyÅ‚Ä…czone.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1913,7 +1947,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>Naklejki i Ustawienia Emote</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>ZmieÅ„</translation> </message> @@ -1928,7 +1962,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1943,12 +1977,17 @@ PrzykÅ‚ad: https://server.my:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>WewnÄ™trzne ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Wersja Pokoju</translation> </message> @@ -2005,7 +2044,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2087,7 +2126,7 @@ PrzykÅ‚ad: https://server.my:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>BÅ‚Ä…d poÅ‚Ä…czenia do menadżera sekretów</translation> </message> @@ -2258,13 +2297,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Cenzurowanie wiadomoÅ›ci nie powiodÅ‚o siÄ™: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Szyfrowanie event-u nie powiodÅ‚o siÄ™, wysyÅ‚anie anulowane!</translation> @@ -2436,12 +2475,12 @@ Reason: %4</source> <translation>Użytkownik %1 ocenzurowaÅ‚ wÅ‚asne pukanie.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>DoÅ‚Ä…czyÅ‚eÅ›(-Å‚aÅ›) do tego pokoju.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2475,7 +2514,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Edytowane</translation> </message> @@ -2531,7 +2570,7 @@ Reason: %4</source> <translation>Nie wybrano pokoju</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Ten pokój nie jest szyfrowany!</translation> </message> @@ -2551,7 +2590,7 @@ Reason: %4</source> <translation>Ten pokój zawiera niezweryfikowane urzÄ…dzenia!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2751,7 +2790,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>DomyÅ›lne</translation> @@ -3052,7 +3091,7 @@ Reason: %4</source> <message> <location line="+91"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation type="unfinished">DomyÅ›lne</translation> </message> <message> <location line="+33"/> @@ -3149,25 +3188,29 @@ Status jest wyÅ›wietlany obok znacznika czasu.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Powiadamiaj o odrzymanych wiadomoÅ›ciach gdy klient nie jest obecnie zfokusowany.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Pokazuj alert gdy przychodzi wiadomość. To zwykle sprawia, że ikona aplikacji w tacce systemowej jest animowana.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">ZmieÅ„ wyglÄ…d awatarów w czasie. -OFF - kwadrat, ON - koÅ‚o.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3220,12 +3263,7 @@ be blurred.</source> <translation type="unfinished">Klucz sÅ‚użący do odszyfrowania backup-u kluczy online. JeÅ›li zapisany w cache-u, możesz wÅ‚Ä…czyć backup kluczy online by zapisać w klucze zaszyfrowane bezpiecznie w backup-ie na serwerze.</translation> </message> <message> - <location line="+4"/> - <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">Klucz sÅ‚użący do weryfikacji twoich wÅ‚asnych urzÄ…dzeÅ„. JeÅ›li zapisany w cache-u, weryfikacja jednego z twoich urzÄ…dzeÅ„ sprawi, że bÄ™dzie ono zweryfikowane dla wszystkich twoich pozostaÅ‚ych urzÄ…dzeÅ„ oraz dla tych użytkowników, którzy zweryfikowali Ciebie.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">Klucz używany do weryfikacji innych użytkowników. Gdy zapisany w cache-u, weryfikacja użytkownika dokona weryfikacji wszystkich jego urzÄ…dzeÅ„.</translation> </message> diff --git a/resources/langs/nheko_pt_BR.ts b/resources/langs/nheko_pt_BR.ts index ba1c216ab015208de208b14a5daba747a94d83f0..2b35ed577b6f73b56cdbcdb3540fd51210311211 100644 --- a/resources/langs/nheko_pt_BR.ts +++ b/resources/langs/nheko_pt_BR.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Confirmar convite</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Deseja realmente convidar %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Falha ao convidar %1 para %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Confirmar expulsão</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Deseja realmente expulsar %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Usuário expulso: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Confirmar banimento</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Deseja realmente banir %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Falha ao banir %1 em %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Deseja realmente iniciar uma conversa privada com %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Migração do cache falhou!</translation> </message> @@ -299,10 +279,30 @@ <translation>Falha ao sair da sala: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Falha ao expulsar %1 de %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -992,20 +992,20 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1025,17 +1025,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -1164,7 +1189,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1174,7 +1199,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1184,7 +1209,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1224,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1232,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1227,19 +1252,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1329,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1645,7 +1680,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1653,7 +1688,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1693,7 +1728,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1816,12 +1851,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1829,17 +1864,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1854,12 +1889,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1884,19 +1919,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1905,7 +1940,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1920,7 +1955,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1935,12 +1970,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1997,7 +2037,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2079,7 +2119,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2250,13 +2290,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished">Você entrou nessa sala.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3134,23 +3174,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3202,12 +3247,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts index 6db609cfc664413c9d3d79b16f018208d47996d6..dee1be6c85f19a432186bdba6d9307095653679b 100644 --- a/resources/langs/nheko_pt_PT.ts +++ b/resources/langs/nheko_pt_PT.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Confirmar convite</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Tem a certeza que quer convidar %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Falha ao convidar %1 para %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Confirmar expulsão</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Tem a certeza que quer expulsar %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Utilizador expulso: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Confirmar banimento</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Tem a certeza que quer banir %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Falha ao banir %1 em %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation>Tem a certeza que quer começar uma conversa privada com %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Falha ao migrar a cache!</translation> </message> @@ -299,10 +279,30 @@ <translation>Falha ao sair da sala: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Falha ao expulsar %1 de %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Desencriptar segredos</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ Exemplo: https://servidor.meu:8787</translation> <translation>INCIAR SESSÃO</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Falha na descoberta automática. Reposta mal formatada recebida.</translation> </message> @@ -1029,17 +1029,42 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Resposta mal formada recebida. Certifique-se que o domÃnio do servidor está correto.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Erro desconhecido. Certifique-se que o domÃnio do servidor é válido.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished">ENTRAR COM ISU (SSO)</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Palavra-passe vazia</translation> </message> @@ -1168,7 +1193,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Desligar</translation> </message> @@ -1178,7 +1203,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Iniciar chamada</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Enviar um ficheiro</translation> </message> @@ -1188,7 +1213,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Escreva uma mensagem…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation>Autocolantes</translation> </message> @@ -1203,7 +1228,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Enviar</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>Não tem permissão para enviar mensagens nesta sala</translation> </message> @@ -1211,7 +1236,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Editar</translation> </message> @@ -1231,19 +1256,29 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Opções</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation>&Copiar</translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation>Copiar localização da &ligação</translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation>Re&agir</translation> </message> @@ -1298,7 +1333,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Remo&ver mensagem</translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation>&Guardar como</translation> </message> @@ -1649,7 +1684,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>nenhuma versão guardada</translation> </message> @@ -1657,7 +1692,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation>Nova etiqueta</translation> </message> @@ -1697,7 +1732,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Criar nova etiqueta...</translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation>Mensagem de estado</translation> </message> @@ -1820,12 +1855,12 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>Definições de sala</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1833,17 +1868,17 @@ Exemplo: https://servidor.meu:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>DEFINIÇŎES</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>Notificações</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Silenciada</translation> </message> @@ -1858,12 +1893,12 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Todas as mensagens</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation>Acesso à sala</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Qualquer pessoa e visitantes</translation> </message> @@ -1888,20 +1923,20 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Impedido por participação noutras salas</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Encriptação</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Encriptação ponta-a-ponta</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> - <translation>A encriptação é, de momento, experimental e certas coisas podem partir-se inesperadamente.<br>Por favor, tome nota de que depois não pode ser desativada.</translation> + Please take note that it can't be disabled afterwards.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+16"/> @@ -1909,7 +1944,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation>Definições de autocolantes e emojis</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation>Alterar</translation> </message> @@ -1924,7 +1959,7 @@ Exemplo: https://servidor.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1939,12 +1974,17 @@ Exemplo: https://servidor.meu:8787</translation> <translation>INFO</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>ID interno</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>Versão da sala</translation> </message> @@ -2001,7 +2041,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation>Por favor, insira a sua palavra-passe para continuar:</translation> </message> @@ -2083,7 +2123,7 @@ Exemplo: https://servidor.meu:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation>Falha ao ligar ao armazenamento secreto</translation> </message> @@ -2256,13 +2296,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Falha ao eliminar mensagem: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Falha ao encriptar evento, envio abortado!</translation> @@ -2433,12 +2473,12 @@ Reason: %4</source> <translation>%1 eliminou a sua "batida à porta".</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Entrou na sala.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2472,7 +2512,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Editada</translation> </message> @@ -2528,7 +2568,7 @@ Reason: %4</source> <translation>Nenhuma sala selecionada</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation>Esta sala não é encriptada!</translation> </message> @@ -2548,7 +2588,7 @@ Reason: %4</source> <translation>Esta sala contém dispositivos não verificados!</translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2748,7 +2788,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>Predefinido</translation> @@ -3147,24 +3187,28 @@ Estado exibido ao lado da data.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Notificar sobre mensagens recebidas quando o cliente não está focado.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Mostrar alerta quando é recebida uma mensagem.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">Alterar a aparência de avatares de utilizador nas conversas. -DESLIGADO - quadrados, LIGADO - circulares.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3218,12 +3262,7 @@ será desfocada.</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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">A chave para verificar os seus dispositivos. Se armazenada em cache, verificar um dos seus dispositivos irá marcá-lo como tal para todos os seus outros dispositivos e utilizadores que o tenham verificado.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">A chave para verificar outros utilizadores. Se armazenada em cache, verificar um utilizador irá verificar todos os seus dispositivos.</translation> </message> diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts index 60854a5f4250be36c7bbc258945f9713a866dccb..74092de7651bcaa6895cc89a1ec3375d6aed5cc7 100644 --- a/resources/langs/nheko_ro.ts +++ b/resources/langs/nheko_ro.ts @@ -167,12 +167,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -182,32 +182,12 @@ <translation>Nu s-a putut invita %1 în %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Utilizator eliminat: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Nu s-a putut interzice utilizatorul %1 în %2: %3</translation> </message> @@ -242,7 +222,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Nu s-a putut migra cache-ul!</translation> </message> @@ -300,10 +280,30 @@ <translation>Nu s-a putut părăsi camera: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -384,7 +384,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -666,12 +666,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -997,20 +997,20 @@ Exemplu: https://serverul.meu:8787</translation> <translation>CONECTARE</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autodescoperirea a eÈ™uat. Răspunsul primit este defectuos.</translation> </message> @@ -1030,17 +1030,42 @@ Exemplu: https://serverul.meu:8787</translation> <translation>Răspuns eronat primit. VerificaÈ›i ca domeniul homeserverului să fie valid.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>A apărut o eroare necunoscută. VerificaÈ›i ca domeniul homeserverului să fie valid.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>CONECTARE SSO</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Parolă necompletată</translation> </message> @@ -1169,7 +1194,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1179,7 +1204,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1189,7 +1214,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1204,7 +1229,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1212,7 +1237,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1232,19 +1257,29 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished">OpÈ›iuni</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1299,7 +1334,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1650,7 +1685,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>nicio versiune stocată</translation> </message> @@ -1658,7 +1693,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1698,7 +1733,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1822,12 +1857,12 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1836,17 +1871,17 @@ Exemplu: https://serverul.meu:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1861,12 +1896,12 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1891,19 +1926,19 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1912,7 +1947,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1927,7 +1962,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1942,12 +1977,17 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -2004,7 +2044,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2086,7 +2126,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2257,13 +2297,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Redactare mesaj eÈ™uată: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2435,12 +2475,12 @@ Reason: %4</source> <translation>%1 È™i-a redactat ciocănitul.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Te-ai alăturat camerei.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2474,7 +2514,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2530,7 +2570,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2550,7 +2590,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2750,7 +2790,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3142,23 +3182,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Trimite o notificare despre mesajele primite când clientul nu este în prim plan.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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">Arată o alertă când primiÈ›i un mesaj. Deobicei pictograma aplicaÈ›iei se animează în taskbar.</translation> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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">Arată o alertă când primiÈ›i un mesaj. Deobicei pictograma aplicaÈ›iei se animează în taskbar.</translation> + </message> + <message> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3210,12 +3255,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 697cec2cfc522b9279945de83d946ed7a8f10490..3488a6e229c68d2ab3513b0c5a973db9aca5a116 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -167,12 +167,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Подтвердите приглашение</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Ð’Ñ‹ точно хотите приглаÑить %1 (%2)?</translation> </message> @@ -182,32 +182,12 @@ <translation>Ðе удалоÑÑŒ приглаÑить %1 в %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Подтвердите удаление</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Ð’Ñ‹ точно хотите выгнать %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Выгнанный пользователь: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Подтвердите блокировку</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Ð’Ñ‹ точно хотите заблокировать %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Ðе удалоÑÑŒ заблокировать %1 в %2: %3</translation> </message> @@ -242,7 +222,7 @@ <translation>Ð’Ñ‹ дейÑтвительно хотите начать личную перепиÑку Ñ %1?</translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>ÐœÐ¸Ð³Ñ€Ð°Ñ†Ð¸Ñ ÐºÑша не удалаÑÑŒ!</translation> </message> @@ -300,10 +280,30 @@ <translation>Ðе удалоÑÑŒ покинуть комнату: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation>Ðе удалоÑÑŒ выгнать %1 из %2: %3</translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -384,7 +384,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>РаÑшифровать Ñекреты</translation> </message> @@ -666,12 +666,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -997,20 +997,20 @@ Example: https://server.my:8787</source> <translation>ВОЙТИ</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <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="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Ðвтообноружение не удалоÑÑŒ. Получен поврежденный ответ.</translation> </message> @@ -1030,17 +1030,42 @@ Example: https://server.my:8787</source> <translation>Получен неверный ответ. УбедитеÑÑŒ, что домен homeserver дейÑтвителен.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Произошла неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. УбедитеÑÑŒ, что домен homeserver дейÑтвителен.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO ВХОД</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>ПуÑтой пароль</translation> </message> @@ -1169,7 +1194,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Завершить звонок</translation> </message> @@ -1179,7 +1204,7 @@ Example: https://server.my:8787</source> <translation>Позвонить</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Отправить файл</translation> </message> @@ -1189,7 +1214,7 @@ Example: https://server.my:8787</source> <translation>ÐапиÑать Ñообщение…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1204,7 +1229,7 @@ Example: https://server.my:8787</source> <translation>Отправить</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation>У Ð²Ð°Ñ Ð½ÐµÑ‚ прав Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñообщений в Ñтой комнате</translation> </message> @@ -1212,7 +1237,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation>Редактировать</translation> </message> @@ -1232,19 +1257,29 @@ Example: https://server.my:8787</source> <translation>Опции</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1299,7 +1334,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1650,7 +1685,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>нет Ñохраненной верÑии</translation> </message> @@ -1658,7 +1693,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1698,7 +1733,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1822,12 +1857,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation>ÐаÑтройки комнаты</translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1836,17 +1871,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation>ÐÐЙСТРОЙКИ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation>УведомлениÑ</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation>Заглушен</translation> </message> @@ -1861,12 +1896,12 @@ Example: https://server.my:8787</source> <translation>Ð’Ñе ÑообщениÑ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation>Каждый и гоÑти</translation> </message> @@ -1891,19 +1926,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation>Шифрование</translation> </message> <message> - <location line="+20"/> + <location line="+21"/> <source>End-to-End Encryption</source> <translation>Оконечное шифрование</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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1912,7 +1947,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1927,7 +1962,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1942,12 +1977,17 @@ Example: https://server.my:8787</source> <translation>ИÐФОРМÐЦИЯ</translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation>Внутренний ID</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation>ВерÑÐ¸Ñ ÐšÐ¾Ð¼Ð½Ð°Ñ‚Ñ‹</translation> </message> @@ -2004,7 +2044,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2086,7 +2126,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2257,13 +2297,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Ошибка Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑообщениÑ: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Ðе удалоÑÑŒ зашифровать Ñообщение, отправка отменена!</translation> @@ -2435,12 +2475,12 @@ Reason: %4</source> <translation>%1 отредактировал его "Ñтук".</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Ð’Ñ‹ приÑоединилиÑÑŒ к Ñтой комнате.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2474,7 +2514,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation>Изменено</translation> </message> @@ -2530,7 +2570,7 @@ Reason: %4</source> <translation>Комнаты не выбраны</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2550,7 +2590,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2750,7 +2790,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation>По умолчанию</translation> @@ -3146,24 +3186,29 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Предупреждать о получании Ñообщение, когда приложение не выбрано.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">ПоменÑÑ‚ÑŒ отображение пользовательÑкого аватара в чатах. ВЫКЛ - квадратный, ВКЛ - округлый.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3215,12 +3260,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts index 2d1948ed60c9a522ca9ddfca2b68d50ccd80be9b..3bfa9e01660db23fe8cef67389a7b0e0eba531a8 100644 --- a/resources/langs/nheko_si.ts +++ b/resources/langs/nheko_si.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -181,32 +181,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -241,7 +221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -299,10 +279,30 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -992,20 +992,20 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1025,17 +1025,42 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -1164,7 +1189,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1174,7 +1199,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished"></translation> </message> @@ -1184,7 +1209,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1224,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1207,7 +1232,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1227,19 +1252,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1294,7 +1329,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1645,7 +1680,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1653,7 +1688,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1693,7 +1728,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1816,12 +1851,12 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1829,17 +1864,17 @@ Example: https://server.my:8787</source> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1854,12 +1889,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1884,19 +1919,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1905,7 +1940,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1920,7 +1955,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1935,12 +1970,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1997,7 +2037,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2079,7 +2119,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2250,13 +2290,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2427,12 +2467,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2466,7 +2506,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2522,7 +2562,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2542,7 +2582,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2742,7 +2782,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3134,23 +3174,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3202,12 +3247,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_sv.ts b/resources/langs/nheko_sv.ts index 8e4dbf1d396ae94e3e61f670f0455703855c3946..b394bfc66804273337f2e42c5be6afed7c0c48d4 100644 --- a/resources/langs/nheko_sv.ts +++ b/resources/langs/nheko_sv.ts @@ -166,12 +166,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>Bekräfta inbjudan</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Är du säker pÃ¥ att du vill bjuda in %1 (%2)?</translation> </message> @@ -181,32 +181,12 @@ <translation>Kunde inte bjuda in %1 till %2: %3</translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation>Bekräfta utsparkning</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation>Är du säker pÃ¥ att du vill sparka ut %1 (%2)?</translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>Sparkade ut användare: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation>Bekräfta bannlysning</translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation>Är du säker pÃ¥ att du vill bannlysa %1 (%2)?</translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation>Kunde inte bannlysa %1 i %2: %3</translation> </message> @@ -241,7 +221,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>Cache-migration misslyckades!</translation> </message> @@ -299,10 +279,30 @@ <translation>Kunde inte lämna rum: %1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -383,7 +383,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation>Dekryptera hemliga nycklar</translation> </message> @@ -665,12 +665,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -996,20 +996,20 @@ Exempel: https://server.my:8787</translation> <translation>INLOGGNING</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autouppslag misslyckades. Mottog felkonstruerat svar.</translation> </message> @@ -1029,17 +1029,42 @@ Exempel: https://server.my:8787</translation> <translation>Mottog felkonstruerat svar. Se till att hemserver-domänen är giltig.</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation>SSO INLOGGNING</translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>Tomt lösenord</translation> </message> @@ -1168,7 +1193,7 @@ Exempel: https://server.my:8787</translation> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation>Lägg pÃ¥</translation> </message> @@ -1178,7 +1203,7 @@ Exempel: https://server.my:8787</translation> <translation>Ring upp</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation>Skicka en fil</translation> </message> @@ -1188,7 +1213,7 @@ Exempel: https://server.my:8787</translation> <translation>Skriv ett meddelande…</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1203,7 +1228,7 @@ Exempel: https://server.my:8787</translation> <translation>Skicka</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1211,7 +1236,7 @@ Exempel: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1231,19 +1256,29 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished">Alternativ</translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1298,7 +1333,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1649,7 +1684,7 @@ Exempel: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation>ingen version lagrad</translation> </message> @@ -1657,7 +1692,7 @@ Exempel: https://server.my:8787</translation> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1697,7 +1732,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1820,12 +1855,12 @@ Exempel: https://server.my:8787</translation> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1833,17 +1868,17 @@ Exempel: https://server.my:8787</translation> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1858,12 +1893,12 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1888,19 +1923,19 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1909,7 +1944,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1924,7 +1959,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1939,12 +1974,17 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -2001,7 +2041,7 @@ Exempel: https://server.my:8787</translation> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2083,7 +2123,7 @@ Exempel: https://server.my:8787</translation> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2254,13 +2294,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation>Kunde inte maskera meddelande: %1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation>Kunde inte kryptera event, sändning avbruten!</translation> @@ -2431,12 +2471,12 @@ Reason: %4</source> <translation>%1 maskerade sin knackning.</translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation>Du gick med i detta rum.</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2470,7 +2510,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2526,7 +2566,7 @@ Reason: %4</source> <translation>Inget rum markerat</translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2546,7 +2586,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2746,7 +2786,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3143,25 +3183,29 @@ Status visas bredvid tidsstämpel.</translation> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished">Notifiera om mottagna meddelanden när klienten inte är i fokus.</translation> + <source>Notify about received messages when the client is not currently focused.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <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> + <message> + <location line="-56"/> <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">Visar en notis när ett meddelande mottags. Detta gör vanligtvis att ikonen i aktivitetsfältet animeras pÃ¥ nÃ¥got sätt.</translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> - <translation type="unfinished">Ändra utseendet av användaravatarer i chattar. -AV - Kvadrat, PÃ… - Cirkel.</translation> - </message> - <message> - <location line="+3"/> + <location line="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3214,12 +3258,7 @@ be blurred.</source> <translation type="unfinished">Nyckeln för att dekryptera online-lagrade nyckelbackuper. Om den är lagrad lokalt kan du slÃ¥ pÃ¥ onlinebackup av nycklar för att säkert lagra krypteringsnycklar pÃ¥ servern.</translation> </message> <message> - <location line="+4"/> - <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">Nyckeln för att verifiera dina egna enheter. Om den är sparad lokalt, kommer verifierade enheter markeras som verifierad för alla dina andra enheter, samt för användare som har verifierat dig.</translation> - </message> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished">Nyckeln för att verifiera andra användare. Om den är sparad lokalt, kommer alla enheter tillhörande en användare verifieras när användaren verifieras.</translation> </message> diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index d1f69a8c2d7baf6bbf411822d65a60e4b97d3554..3e189f37c51aa104916a130f16ba05476979a5c6 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -165,12 +165,12 @@ </message> <message> <location line="+44"/> - <location line="+433"/> + <location line="+446"/> <source>Confirm invite</source> <translation>确认邀请</translation> </message> <message> - <location line="-432"/> + <location line="-445"/> <source>Do you really want to invite %1 (%2)?</source> <translation>ä½ çœŸçš„æƒ³è¦é‚€è¯· %1 (%2) å—?</translation> </message> @@ -180,32 +180,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Confirm kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+13"/> + <location line="+34"/> <source>Kicked user: %1</source> <translation>踢出用户: %1</translation> </message> <message> - <location line="+11"/> - <source>Confirm ban</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+10"/> + <location line="+28"/> <source>Failed to ban %1 in %2: %3</source> <translation type="unfinished"></translation> </message> @@ -240,7 +220,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-879"/> + <location line="-892"/> <source>Cache migration failed!</source> <translation>缓å˜è¿ç§»å¤±è´¥ï¼</translation> </message> @@ -298,10 +278,30 @@ <translation>离开èŠå¤©å®¤å¤±è´¥ï¼š%1</translation> </message> <message> - <location line="+68"/> + <location line="+59"/> + <source>Reason for the kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for kicking %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+15"/> + <source>Reason for the ban</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for banning %1 (%2) or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> <message> <location filename="../qml/ChatPage.qml" line="+37"/> <source>No network connection</source> @@ -382,7 +382,7 @@ <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+270"/> + <location filename="../../src/ChatPage.cpp" line="+260"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -664,12 +664,12 @@ </message> <message> <location line="+18"/> - <source>These events will be be <b>shown</b> in %1:</source> + <source>These events will be <b>shown</b> in %1:</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>These events will be be <b>shown</b> in all rooms:</source> + <source>These events will be <b>shown</b> in all rooms:</source> <translation type="unfinished"></translation> </message> <message> @@ -991,20 +991,20 @@ Example: https://server.my:8787</source> <translation>登录</translation> </message> <message> - <location line="+35"/> + <location line="+42"/> <source>Back</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+81"/> + <location filename="../../src/LoginPage.cpp" line="+83"/> <location line="+6"/> <location line="+58"/> - <location line="+81"/> + <location line="+109"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-111"/> + <location line="-139"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -1024,17 +1024,42 @@ Example: https://server.my:8787</source> <translation>收到形å¼é”™è¯¯çš„å“应。请确认æœåŠ¡å™¨åŸŸååˆæ³•ã€‚</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation>å‘生了一个未知错误。请确认æœåŠ¡å™¨åŸŸååˆæ³•ã€‚</translation> </message> <message> - <location filename="../qml/pages/LoginPage.qml" line="-21"/> + <location line="+19"/> + <source>Sign in with Apple</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Continue with Facebook</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Google</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sign in with Twitter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Login using %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/LoginPage.cpp" line="+68"/> + <location line="+58"/> <source>Empty password</source> <translation>空密ç </translation> </message> @@ -1163,7 +1188,7 @@ Example: https://server.my:8787</source> <context> <name>MessageInput</name> <message> - <location filename="../qml/MessageInput.qml" line="+46"/> + <location filename="../qml/MessageInput.qml" line="+48"/> <source>Hang up</source> <translation type="unfinished"></translation> </message> @@ -1173,7 +1198,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Send a file</source> <translation type="unfinished">å‘é€ä¸€ä¸ªæ–‡ä»¶</translation> </message> @@ -1183,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>写一æ¡æ¶ˆæ¯â€¦</translation> </message> <message> - <location line="+265"/> + <location line="+272"/> <source>Stickers</source> <translation type="unfinished"></translation> </message> @@ -1198,7 +1223,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>You don't have permission to send messages in this room</source> <translation type="unfinished"></translation> </message> @@ -1206,7 +1231,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+123"/> + <location filename="../qml/MessageView.qml" line="+124"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -1226,19 +1251,29 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+422"/> - <location line="+126"/> + <location line="+426"/> + <source>Reason for removal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter reason for removal or hit enter for no reason:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <location line="+132"/> <source>&Copy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-119"/> - <location line="+126"/> + <location line="-125"/> + <location line="+132"/> <source>Copy &link location</source> <translation type="unfinished"></translation> </message> <message> - <location line="-118"/> + <location line="-124"/> <source>Re&act</source> <translation type="unfinished"></translation> </message> @@ -1293,7 +1328,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+13"/> <source>&Save as</source> <translation type="unfinished"></translation> </message> @@ -1644,7 +1679,7 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1925"/> + <location filename="../../src/Cache.cpp" line="+1947"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> @@ -1652,7 +1687,7 @@ Example: https://server.my:8787</source> <context> <name>RoomList</name> <message> - <location filename="../qml/RoomList.qml" line="+69"/> + <location filename="../qml/RoomList.qml" line="+68"/> <source>New tag</source> <translation type="unfinished"></translation> </message> @@ -1692,7 +1727,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+299"/> + <location line="+297"/> <source>Status Message</source> <translation type="unfinished"></translation> </message> @@ -1814,29 +1849,29 @@ Example: https://server.my:8787</source> <context> <name>RoomSettings</name> <message> - <location filename="../qml/dialogs/RoomSettings.qml" line="+26"/> + <location filename="../qml/dialogs/RoomSettings.qml" line="+28"/> <source>Room Settings</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+82"/> + <location line="+94"/> <source>%n member(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location line="+55"/> + <location line="+65"/> <source>SETTINGS</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Muted</source> <translation type="unfinished"></translation> </message> @@ -1851,12 +1886,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Room access</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Anyone and guests</source> <translation type="unfinished"></translation> </message> @@ -1881,19 +1916,19 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Encryption</source> <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <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> + Please take note that it can't be disabled afterwards.</source> <translation type="unfinished"></translation> </message> <message> @@ -1902,7 +1937,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Change</source> <translation type="unfinished"></translation> </message> @@ -1917,7 +1952,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Configure</source> <translation type="unfinished"></translation> </message> @@ -1932,12 +1967,17 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+10"/> <source>Internal ID</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+16"/> + <source>Copied to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> <source>Room Version</source> <translation type="unfinished"></translation> </message> @@ -1994,7 +2034,7 @@ Example: https://server.my:8787</source> <context> <name>Root</name> <message> - <location filename="../qml/Root.qml" line="+314"/> + <location filename="../qml/Root.qml" line="+319"/> <source>Please enter your login password to continue:</source> <translation type="unfinished"></translation> </message> @@ -2076,7 +2116,7 @@ Example: https://server.my:8787</source> <context> <name>SecretStorage</name> <message> - <location filename="../../src/Cache.cpp" line="-4278"/> + <location filename="../../src/Cache.cpp" line="-4300"/> <source>Failed to connect to secret storage</source> <translation type="unfinished"></translation> </message> @@ -2247,13 +2287,13 @@ 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="+1250"/> - <location line="+16"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1252"/> + <location line="+17"/> <source>Message redaction failed: %1</source> <translation type="unfinished">åˆ é™¤æ¶ˆæ¯å¤±è´¥ï¼š%1</translation> </message> <message> - <location line="+73"/> + <location line="+74"/> <location line="+5"/> <source>Failed to encrypt event, sending aborted!</source> <translation type="unfinished"></translation> @@ -2423,12 +2463,12 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1068"/> + <location line="-1070"/> <source>You joined this room.</source> <translation type="unfinished">æ‚¨å·²åŠ å…¥æ¤æˆ¿é—´</translation> </message> <message> - <location line="+1017"/> + <location line="+1019"/> <source>%1 invited %2.</source> <translation type="unfinished"></translation> </message> @@ -2462,7 +2502,7 @@ Reason: %4</source> <context> <name>TimelineRow</name> <message> - <location filename="../qml/TimelineRow.qml" line="+202"/> + <location filename="../qml/TimelineRow.qml" line="+207"/> <source>Edited</source> <translation type="unfinished"></translation> </message> @@ -2518,7 +2558,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+131"/> + <location line="+139"/> <source>This room is not encrypted!</source> <translation type="unfinished"></translation> </message> @@ -2538,7 +2578,7 @@ Reason: %4</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <source>Show or hide pinned messages</source> <translation type="unfinished"></translation> </message> @@ -2738,7 +2778,7 @@ Reason: %4</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+442"/> + <location filename="../../src/UserSettingsPage.cpp" line="+456"/> <location filename="../../src/UserSettingsPage.h" line="+219"/> <source>Default</source> <translation type="unfinished"></translation> @@ -3130,23 +3170,28 @@ Status is displayed next to timestamps.</source> </message> <message> <location line="+2"/> - <source>Notify about received message when the client is not currently focused.</source> + <source>Notify about received messages when the client is not currently focused.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <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> + <location line="+6"/> + <source>Change the appearance of user avatars in chats. +OFF - square, ON - circle.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Change the appearance of user avatars in chats. -OFF - square, ON - Circle.</source> + <location line="+52"/> + <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> <message> - <location line="+3"/> + <location line="-56"/> + <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="+7"/> <source>Display an identicon instead of a letter when no avatar is set.</source> <translation type="unfinished"></translation> </message> @@ -3198,12 +3243,7 @@ be blurred.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <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> - <message> - <location line="+5"/> + <location line="+9"/> <source>The key to verify other users. If it is cached, verifying a user will verify all their devices.</source> <translation type="unfinished"></translation> </message> diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml index 1fdff8edca3e117dde6c9db054def0b0c848129e..6894845267a535c76ba089de196fea1741fca7a5 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml @@ -18,6 +18,8 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: row.implicitHeight Layout.minimumHeight: 40 + property bool showAllButtons: width > 450 || (messageInput.length == 0 && !messageInput.inputMethodComposing) + Component { id: placeCallDialog @@ -35,7 +37,7 @@ Rectangle { spacing: 0 ImageButton { - visible: CallManager.callsSupported + visible: CallManager.callsSupported && showAllButtons opacity: CallManager.haveCallInvite ? 0.3 : 1 Layout.alignment: Qt.AlignBottom hoverEnabled: true @@ -61,6 +63,7 @@ Rectangle { } ImageButton { + visible: showAllButtons Layout.alignment: Qt.AlignBottom hoverEnabled: true width: 22 @@ -134,6 +137,7 @@ Rectangle { padding: 0 topPadding: 8 bottomPadding: 8 + leftPadding: inputBar.showAllButtons? 0 : 8 focus: true onTextChanged: { if (room) @@ -387,6 +391,7 @@ Rectangle { ImageButton { id: stickerButton + visible: showAllButtons Layout.alignment: Qt.AlignRight | Qt.AlignBottom Layout.margins: 8 @@ -437,6 +442,7 @@ Rectangle { ToolTip.visible: hovered ToolTip.text: qsTr("Send") onClicked: { + messageInput.append(messageInput.preeditText) room.input.send(); } } diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index a717cb31890e70294a2e07038e9222a54489d534..55860ad6147a8796f5bdf244d8e2853afe5feab6 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -7,6 +7,7 @@ import "./components" import "./delegates" import "./emoji" import "./ui" +import "./dialogs" import Qt.labs.platform 1.1 as Platform import QtQuick 2.15 import QtQuick.Controls 2.15 @@ -585,6 +586,21 @@ Item { open(); } + Component { + id: removeReason + InputDialog { + id: removeReasonDialog + + property string eventId + + title: qsTr("Reason for removal") + prompt: qsTr("Enter reason for removal or hit enter for no reason:") + onAccepted: function(text) { + room.redactEvent(eventId, text); + } + } + } + Platform.MenuItem { visible: messageContextMenu.text enabled: visible @@ -665,7 +681,13 @@ Item { Platform.MenuItem { visible: (room ? room.permissions.canRedact() : false) || messageContextMenu.isSender text: qsTr("Remo&ve message") - onTriggered: room.redactEvent(messageContextMenu.eventId) + onTriggered: function() { + var dialog = removeReason.createObject(timelineRoot); + dialog.eventId = messageContextMenu.eventId; + dialog.show(); + dialog.forceActiveFocus(); + timelineRoot.destroyOnClose(dialog); + } } Platform.MenuItem { diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index 14e6770be76ab6f5ede76071c4f64aa74af4886d..c8c05a3eee825d0d7a3a582236e6769a4049d3e4 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -222,7 +222,8 @@ Pane { } function destroyOnClose(obj) { - obj.closing.connect(() => obj.destroy()); + if (obj.closing != undefined) obj.closing.connect(() => obj.destroy()); + else if (obj.closed != undefined) obj.closed.connect(() => obj.destroy()); } function destroyOnClosed(obj) { diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 77eed1b0f7ecd2abaf9f5ef356d1bf5b96e73044..32149cc84a414bcd8eb866b475eb3f6116adc361 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -134,22 +134,30 @@ Pane { text: roomTopic } - EncryptionIndicator { + AbstractButton { Layout.column: 3 Layout.row: 0 Layout.rowSpan: 2 Layout.preferredHeight: Nheko.avatarSize - Nheko.paddingMedium Layout.preferredWidth: Nheko.avatarSize - Nheko.paddingMedium - sourceSize.height: Layout.preferredHeight * Screen.devicePixelRatio - sourceSize.width: Layout.preferredWidth * Screen.devicePixelRatio - visible: isEncrypted - encrypted: isEncrypted - trust: trustlevel + + contentItem: EncryptionIndicator { + sourceSize.height: parent.Layout.preferredHeight * Screen.devicePixelRatio + sourceSize.width: parent.Layout.preferredWidth * Screen.devicePixelRatio + visible: isEncrypted + encrypted: isEncrypted + trust: trustlevel + enabled: false + } + + background: null + + ToolTip.delay: Nheko.tooltipDelay ToolTip.text: { - if (!encrypted) + if (!isEncrypted) return qsTr("This room is not encrypted!"); - switch (trust) { + switch (trustlevel) { case Crypto.Verified: return qsTr("This room contains only verified devices."); case Crypto.TOFU: @@ -158,6 +166,9 @@ Pane { return qsTr("This room contains unverified devices!"); } } + ToolTip.visible: hovered + + onClicked: TimelineManager.openRoomMembers(room) } ImageButton { diff --git a/resources/qml/components/FlatButton.qml b/resources/qml/components/FlatButton.qml index 72184d2826a1abb7354ed8403c4872f5361aa1fc..2c9ea06115de46c57fd647af9c1f3d02d705dd45 100644 --- a/resources/qml/components/FlatButton.qml +++ b/resources/qml/components/FlatButton.qml @@ -6,6 +6,7 @@ import QtGraphicalEffects 1.12 import QtQuick 2.9 import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.2 import im.nheko 1.0 // FIXME(Nico): Don't use hardcoded colors. @@ -16,6 +17,8 @@ Button { implicitWidth: Math.ceil(control.contentItem.implicitWidth + control.contentItem.implicitHeight) hoverEnabled: true + property string iconImage: "" + DropShadow { anchors.fill: control.background horizontalOffset: 3 @@ -27,16 +30,30 @@ Button { source: control.background } - contentItem: Text { - text: control.text - //font: control.font - font.capitalization: Font.AllUppercase - font.pointSize: Math.ceil(fontMetrics.font.pointSize * 1.5) - //font.capitalization: Font.AllUppercase - color: Nheko.colors.light - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - elide: Text.ElideRight + contentItem: RowLayout { + spacing: 0 + anchors.centerIn: parent + Image { + Layout.leftMargin: Nheko.paddingMedium + Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter + Layout.preferredHeight: fontMetrics.font.pixelSize * 1.5 + Layout.preferredWidth: fontMetrics.font.pixelSize * 1.5 + visible: !!iconImage + source: iconImage + } + + Text { + Layout.alignment: Qt.AlignHCenter + text: control.text + //font: control.font + font.capitalization: Font.AllUppercase + font.pointSize: Math.ceil(fontMetrics.font.pointSize * 1.5) + //font.capitalization: Font.AllUppercase + color: Nheko.colors.light + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + elide: Text.ElideRight + } } background: Rectangle { diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index f26bc5aa862cdf04891e0f25a795ae7e6234cf6d..f57563909eedcc5b8d04928830b7e262fbeaf025 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -65,7 +65,7 @@ Item { TapHandler { acceptedButtons: Qt.LeftButton onSingleTapped: { - let link = reply.child.linkAt(eventPoint.position.x, eventPoint.position.y - userName_.implicitHeight); + let link = reply.child.linkAt != undefined && reply.child.linkAt(eventPoint.position.x, eventPoint.position.y - userName_.implicitHeight); if (link) { Nheko.openLink(link) } else { diff --git a/resources/qml/dialogs/InputDialog.qml b/resources/qml/dialogs/InputDialog.qml index cf1474dc60a5cb712c2f4ab62b16262b4f566226..a674c3fb67a05f434cc5ba16fb89147f80309d8d 100644 --- a/resources/qml/dialogs/InputDialog.qml +++ b/resources/qml/dialogs/InputDialog.qml @@ -21,6 +21,10 @@ ApplicationWindow { width: 350 height: fontMetrics.lineSpacing * 7 + function forceActiveFocus() { + statusInput.forceActiveFocus(); + } + Shortcut { sequence: StandardKey.Cancel onActivated: dbb.rejected() diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml index 442010fddf2caecbc0f006fe2426779aff3eb400..440516108201e8404f2549cd0a8569b2e5357242 100644 --- a/resources/qml/dialogs/RoomSettings.qml +++ b/resources/qml/dialogs/RoomSettings.qml @@ -17,8 +17,10 @@ ApplicationWindow { property var roomSettings - minimumWidth: 450 - minimumHeight: 680 + minimumWidth: 340 + minimumHeight: 450 + width: 450 + height: 680 palette: Nheko.colors color: Nheko.colors.window modality: Qt.NonModal @@ -29,119 +31,134 @@ ApplicationWindow { sequence: StandardKey.Cancel onActivated: roomSettingsDialog.close() } + ScrollHelper { + flickable: flickable + anchors.fill: flickable + } + Flickable { + id: flickable + boundsBehavior: Flickable.StopAtBounds + anchors.fill: parent + clip: true + flickableDirection: Flickable.VerticalFlick + contentWidth: roomSettingsDialog.width + contentHeight: contentLayout1.height + ColumnLayout { + id: contentLayout1 + width: parent.width + spacing: Nheko.paddingMedium - ColumnLayout { - id: contentLayout1 + Avatar { + Layout.topMargin: Nheko.paddingMedium + url: roomSettings.roomAvatarUrl.replace("mxc://", "image://MxcImage/") + roomid: roomSettings.roomId + displayName: roomSettings.roomName + height: 130 + width: 130 + Layout.alignment: Qt.AlignHCenter + onClicked: { + if (roomSettings.canChangeAvatar) + roomSettings.updateAvatar(); - anchors.fill: parent - anchors.margins: Nheko.paddingMedium - spacing: Nheko.paddingMedium - - Avatar { - url: roomSettings.roomAvatarUrl.replace("mxc://", "image://MxcImage/") - roomid: roomSettings.roomId - displayName: roomSettings.roomName - height: 130 - width: 130 - Layout.alignment: Qt.AlignHCenter - onClicked: { - if (roomSettings.canChangeAvatar) - roomSettings.updateAvatar(); + } + } + Spinner { + Layout.alignment: Qt.AlignHCenter + visible: roomSettings.isLoading + foreground: Nheko.colors.mid + running: roomSettings.isLoading } - } - Spinner { - Layout.alignment: Qt.AlignHCenter - visible: roomSettings.isLoading - foreground: Nheko.colors.mid - running: roomSettings.isLoading - } + Text { + id: errorText - Text { - id: errorText + color: "red" + visible: opacity > 0 + opacity: 0 + Layout.alignment: Qt.AlignHCenter + wrapMode: Text.Wrap // somehow still doesn't wrap + Layout.fillWidth: true + } - color: "red" - visible: opacity > 0 - opacity: 0 - Layout.alignment: Qt.AlignHCenter - } + SequentialAnimation { + id: hideErrorAnimation - SequentialAnimation { - id: hideErrorAnimation + running: false - running: false + PauseAnimation { + duration: 4000 + } - PauseAnimation { - duration: 4000 - } + NumberAnimation { + target: errorText + property: 'opacity' + to: 0 + duration: 1000 + } - NumberAnimation { - target: errorText - property: 'opacity' - to: 0 - duration: 1000 } - } - - Connections { - target: roomSettings - function onDisplayError(errorMessage) { - errorText.text = errorMessage; - errorText.opacity = 1; - hideErrorAnimation.restart(); + Connections { + target: roomSettings + function onDisplayError(errorMessage) { + errorText.text = errorMessage; + errorText.opacity = 1; + hideErrorAnimation.restart(); + } } - } + Label { + text: roomSettings.roomName + Layout.alignment: Qt.AlignHCenter + font.pixelSize: fontMetrics.font.pixelSize * 2 + Layout.fillWidth: true + horizontalAlignment: TextEdit.AlignHCenter + color: Nheko.colors.text + wrapMode: Text.Wrap + textFormat: Text.RichText + } - ColumnLayout { - Layout.alignment: Qt.AlignHCenter + Label { + text: qsTr("%n member(s)", "", roomSettings.memberCount) + Layout.alignment: Qt.AlignHCenter + color: Nheko.colors.text - MatrixText { - text: roomSettings.roomName - font.pixelSize: fontMetrics.font.pixelSize * 2 - Layout.fillWidth: true - horizontalAlignment: TextEdit.AlignHCenter - } - - MatrixText { - text: qsTr("%n member(s)", "", roomSettings.memberCount) - Layout.alignment: Qt.AlignHCenter + TapHandler { + onSingleTapped: TimelineManager.openRoomMembers(Rooms.getRoomById(roomSettings.roomId)) + } - TapHandler { - onSingleTapped: TimelineManager.openRoomMembers(Rooms.getRoomById(roomSettings.roomId)) - } + CursorShape { + cursorShape: Qt.PointingHandCursor + anchors.fill: parent + } - CursorShape { - cursorShape: Qt.PointingHandCursor - anchors.fill: parent } + ImageButton { + Layout.alignment: Qt.AlignHCenter + image: ":/icons/icons/ui/edit.svg" + visible: roomSettings.canChangeNameAndTopic + onClicked: roomSettings.openEditModal() } - } - - ImageButton { - Layout.alignment: Qt.AlignHCenter - image: ":/icons/icons/ui/edit.svg" - visible: roomSettings.canChangeNameAndTopic - onClicked: roomSettings.openEditModal() - } - - ScrollView { - Layout.fillHeight: true - Layout.alignment: Qt.AlignHCenter - Layout.fillWidth: true - Layout.leftMargin: Nheko.paddingLarge - Layout.rightMargin: Nheko.paddingLarge - TextArea { + id: roomTopic + property bool cut: implicitHeight > 100 + property bool showMore + clip: true + Layout.maximumHeight: showMore? Number.POSITIVE_INFINITY : 100 + Layout.preferredHeight: implicitHeight + Layout.alignment: Qt.AlignHCenter + Layout.fillWidth: true + Layout.leftMargin: Nheko.paddingLarge + Layout.rightMargin: Nheko.paddingLarge + text: TimelineManager.escapeEmoji(roomSettings.roomTopic) wrapMode: TextEdit.WordWrap textFormat: TextEdit.RichText readOnly: true background: null - selectByMouse: true + selectByMouse: !Settings.mobileMode color: Nheko.colors.text horizontalAlignment: TextEdit.AlignHCenter onLinkActivated: Nheko.openLink(link) @@ -152,171 +169,222 @@ ApplicationWindow { } } - - } - - GridLayout { - columns: 2 - rowSpacing: Nheko.paddingMedium - - MatrixText { - text: qsTr("SETTINGS") - font.bold: true - } - Item { - Layout.fillWidth: true + Layout.alignment: Qt.AlignHCenter + id: showMorePlaceholder + Layout.preferredHeight: showMoreButton.height + Layout.preferredWidth: showMoreButton.width + visible: roomTopic.cut } - MatrixText { - text: qsTr("Notifications") + GridLayout { + columns: 2 + rowSpacing: Nheko.paddingMedium + Layout.margins: Nheko.paddingMedium Layout.fillWidth: true - } - ComboBox { - model: [qsTr("Muted"), qsTr("Mentions only"), qsTr("All messages")] - currentIndex: roomSettings.notifications - onActivated: { - roomSettings.changeNotifications(index); + Label { + text: qsTr("SETTINGS") + font.bold: true + color: Nheko.colors.text } - Layout.fillWidth: true - } - MatrixText { - text: qsTr("Room access") - Layout.fillWidth: true - } + Item { + Layout.fillWidth: true + } - ComboBox { - enabled: roomSettings.canChangeJoinRules - model: { - let opts = [qsTr("Anyone and guests"), qsTr("Anyone"), qsTr("Invited users")]; - if (roomSettings.supportsKnocking) - opts.push(qsTr("By knocking")); + Label { + text: qsTr("Notifications") + Layout.fillWidth: true + color: Nheko.colors.text + } - if (roomSettings.supportsRestricted) - opts.push(qsTr("Restricted by membership in other rooms")); + ComboBox { + model: [qsTr("Muted"), qsTr("Mentions only"), qsTr("All messages")] + currentIndex: roomSettings.notifications + onActivated: { + roomSettings.changeNotifications(index); + } + Layout.fillWidth: true + WheelHandler{} // suppress scrolling changing values + } - return opts; + Label { + text: qsTr("Room access") + Layout.fillWidth: true + color: Nheko.colors.text } - currentIndex: roomSettings.accessJoinRules - onActivated: { - roomSettings.changeAccessRules(index); + + ComboBox { + enabled: roomSettings.canChangeJoinRules + model: { + let opts = [qsTr("Anyone and guests"), qsTr("Anyone"), qsTr("Invited users")]; + if (roomSettings.supportsKnocking) + opts.push(qsTr("By knocking")); + + if (roomSettings.supportsRestricted) + opts.push(qsTr("Restricted by membership in other rooms")); + + return opts; + } + currentIndex: roomSettings.accessJoinRules + onActivated: { + roomSettings.changeAccessRules(index); + } + Layout.fillWidth: true + WheelHandler{} // suppress scrolling changing values } - Layout.fillWidth: true - } - MatrixText { - text: qsTr("Encryption") - } + Label { + text: qsTr("Encryption") + color: Nheko.colors.text + } - ToggleButton { - id: encryptionToggle + ToggleButton { + id: encryptionToggle - checked: roomSettings.isEncryptionEnabled - onCheckedChanged: { - if (roomSettings.isEncryptionEnabled) { - checked = true; - return ; + checked: roomSettings.isEncryptionEnabled + onCheckedChanged: { + if (roomSettings.isEncryptionEnabled) { + checked = true; + return ; + } + confirmEncryptionDialog.open(); } - confirmEncryptionDialog.open(); + Layout.alignment: Qt.AlignRight } - Layout.alignment: Qt.AlignRight - } - Platform.MessageDialog { - id: confirmEncryptionDialog + Platform.MessageDialog { + id: confirmEncryptionDialog - title: qsTr("End-to-End Encryption") - text: qsTr("Encryption is currently experimental and things might break unexpectedly. <br> - Please take note that it can't be disabled afterwards.") - modality: Qt.NonModal - onAccepted: { - if (roomSettings.isEncryptionEnabled) - return ; + title: qsTr("End-to-End Encryption") + text: qsTr("Encryption is currently experimental and things might break unexpectedly. <br> + Please take note that it can't be disabled afterwards.") + modality: Qt.NonModal + onAccepted: { + if (roomSettings.isEncryptionEnabled) + return ; - roomSettings.enableEncryption(); + roomSettings.enableEncryption(); + } + onRejected: { + encryptionToggle.checked = false; + } + buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel } - onRejected: { - encryptionToggle.checked = false; + + Label { + text: qsTr("Sticker & Emote Settings") + color: Nheko.colors.text } - buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel - } - MatrixText { - text: qsTr("Sticker & Emote Settings") - } + Button { + text: qsTr("Change") + ToolTip.text: qsTr("Change what packs are enabled, remove packs or create new ones") + onClicked: TimelineManager.openImagePackSettings(roomSettings.roomId) + Layout.alignment: Qt.AlignRight + } - Button { - text: qsTr("Change") - ToolTip.text: qsTr("Change what packs are enabled, remove packs or create new ones") - onClicked: TimelineManager.openImagePackSettings(roomSettings.roomId) - Layout.alignment: Qt.AlignRight - } + Label { + text: qsTr("Hidden events") + color: Nheko.colors.text + } - MatrixText { - text: qsTr("Hidden events") - } + HiddenEventsDialog { + id: hiddenEventsDialog + roomid: roomSettings.roomId + roomName: roomSettings.roomName + } - HiddenEventsDialog { - id: hiddenEventsDialog - roomid: roomSettings.roomId - roomName: roomSettings.roomName - } + Button { + text: qsTr("Configure") + ToolTip.text: qsTr("Select events to hide in this room") + onClicked: hiddenEventsDialog.show() + Layout.alignment: Qt.AlignRight + } - Button { - text: qsTr("Configure") - ToolTip.text: qsTr("Select events to hide in this room") - onClicked: hiddenEventsDialog.show() - Layout.alignment: Qt.AlignRight - } + Item { + // for adding extra space between sections + Layout.fillWidth: true + } - Item { - // for adding extra space between sections - Layout.fillWidth: true - } + Item { + // for adding extra space between sections + Layout.fillWidth: true + } - Item { - // for adding extra space between sections - Layout.fillWidth: true - } + Label { + text: qsTr("INFO") + font.bold: true + color: Nheko.colors.text + } - MatrixText { - text: qsTr("INFO") - font.bold: true - } + Item { + Layout.fillWidth: true + } - Item { - Layout.fillWidth: true - } + Label { + text: qsTr("Internal ID") + color: Nheko.colors.text + } - MatrixText { - text: qsTr("Internal ID") - } + AbstractButton { // AbstractButton does not allow setting text color + Layout.alignment: Qt.AlignRight + Layout.fillWidth: true + Layout.preferredHeight: idLabel.height + Label { // TextEdit does not trigger onClicked + id: idLabel + text: roomSettings.roomId + font.pixelSize: Math.floor(fontMetrics.font.pixelSize * 0.8) + color: Nheko.colors.text + width: parent.width + horizontalAlignment: Text.AlignRight + wrapMode: Text.WrapAnywhere + ToolTip.text: qsTr("Copied to clipboard") + ToolTip.visible: toolTipTimer.running + } + TextEdit{ // label does not allow selection + id: textEdit + visible: false + text: roomSettings.roomId + } + onClicked: { + textEdit.selectAll() + textEdit.copy() + toolTipTimer.start() + } + Timer { + id: toolTipTimer + } + } - MatrixText { - text: roomSettings.roomId - font.pixelSize: Math.floor(fontMetrics.font.pixelSize * 0.8) - Layout.alignment: Qt.AlignRight - } + Label { + text: qsTr("Room Version") + color: Nheko.colors.text + } - MatrixText { - text: qsTr("Room Version") - } + Label { + text: roomSettings.roomVersion + font.pixelSize: fontMetrics.font.pixelSize + Layout.alignment: Qt.AlignRight + color: Nheko.colors.text + } - MatrixText { - text: roomSettings.roomVersion - font.pixelSize: fontMetrics.font.pixelSize - Layout.alignment: Qt.AlignRight } - } - - DialogButtonBox { - Layout.fillWidth: true - standardButtons: DialogButtonBox.Ok - onAccepted: close() + } + Button { + id: showMoreButton + anchors.horizontalCenter: flickable.horizontalCenter + y: Math.min(showMorePlaceholder.y+contentLayout1.y-flickable.contentY,flickable.height-height) + visible: roomTopic.cut + text: roomTopic.showMore? "show less" : "show more" + onClicked: {roomTopic.showMore = !roomTopic.showMore + console.log(flickable.visibleArea) } - + } + footer: DialogButtonBox { + standardButtons: DialogButtonBox.Ok + onAccepted: close() } } diff --git a/resources/qml/pages/LoginPage.qml b/resources/qml/pages/LoginPage.qml index 4d3a52b3b6bfbd03c63d16181e2990389fe722bc..87234a225e865b2aa8772582eca43c60c032f6f1 100644 --- a/resources/qml/pages/LoginPage.qml +++ b/resources/qml/pages/LoginPage.qml @@ -61,7 +61,7 @@ Item { onEditingFinished: login.mxid = text ToolTip.text: qsTr("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 :.\nYou can also put your homeserver address there, if your server doesn't support .well-known lookup.\nExample: @user:server.my\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.") - Keys.forwardTo: [pwBtn, ssoBtn] + Keys.forwardTo: [pwBtn, ssoRepeater] } @@ -89,7 +89,7 @@ Item { echoMode: TextInput.Password ToolTip.text: qsTr("Your password.") visible: login.passwordSupported - Keys.forwardTo: [pwBtn, ssoBtn] + Keys.forwardTo: [pwBtn, ssoRepeater] } MatrixTextField { @@ -98,7 +98,7 @@ Item { label: qsTr("Device name") placeholderText: login.initialDeviceName() ToolTip.text: qsTr("A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.") - Keys.forwardTo: [pwBtn, ssoBtn] + Keys.forwardTo: [pwBtn, ssoRepeater] } MatrixTextField { @@ -112,7 +112,7 @@ Item { text: login.homeserver onEditingFinished: login.homeserver = text ToolTip.text: qsTr("The address that can be used to contact you homeservers client API.\nExample: https://server.my:8787") - Keys.forwardTo: [pwBtn, ssoBtn] + Keys.forwardTo: [pwBtn, ssoRepeater] } Item { @@ -150,21 +150,28 @@ Item { Keys.onReturnPressed: pwBtn.pwLogin() Keys.enabled: pwBtn.enabled && login.passwordSupported } - FlatButton { - id: ssoBtn - visible: login.ssoSupported - enabled: login.homeserverValid && matrixIdLabel.text == login.mxid && login.homeserver == hsLabel.text - Layout.alignment: Qt.AlignHCenter - text: qsTr("SSO LOGIN") - function ssoLogin() { - login.onLoginButtonClicked(Login.SSO, matrixIdLabel.text, passwordLabel.text, deviceNameLabel.text) + + Repeater { + id: ssoRepeater + + model: login.identityProviders + + delegate: FlatButton { + id: ssoBtn + visible: login.ssoSupported + enabled: login.homeserverValid && matrixIdLabel.text == login.mxid && login.homeserver == hsLabel.text + Layout.alignment: Qt.AlignHCenter + text: modelData.name + iconImage: modelData.avatarUrl.replace("mxc://", "image://MxcImage/") + function ssoLogin() { + login.onLoginButtonClicked(Login.SSO, matrixIdLabel.text, modelData.id, deviceNameLabel.text) + } + onClicked: ssoBtn.ssoLogin() + Keys.onEnterPressed: ssoBtn.ssoLogin() + Keys.onReturnPressed: ssoBtn.ssoLogin() + Keys.enabled: ssoBtn.enabled && !login.passwordSupported } - onClicked: ssoBtn.ssoLogin() - Keys.onEnterPressed: ssoBtn.ssoLogin() - Keys.onReturnPressed: ssoBtn.ssoLogin() - Keys.enabled: ssoBtn.enabled && !login.passwordSupported } - } } diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index cdaf726001fc44fbfab4f89df7983909e0a740d3..3743eae08144249d274026d98d3f6a8bb9f12066 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -785,11 +785,18 @@ ChatPage::kickUser(QString userid, QString reason) { auto room = currentRoom(); - if (QMessageBox::question(nullptr, - tr("Confirm kick"), - tr("Do you really want to kick %1 (%2)?") - .arg(cache::displayName(room, userid), userid)) != QMessageBox::Yes) + bool confirmed; + reason = + QInputDialog::getText(nullptr, + tr("Reason for the kick"), + tr("Enter reason for kicking %1 (%2) or hit enter for no reason:") + .arg(cache::displayName(room, userid), userid), + QLineEdit::Normal, + reason, + &confirmed); + if (!confirmed) { return; + } http::client()->kick_user( room.toStdString(), @@ -809,12 +816,18 @@ ChatPage::banUser(QString userid, QString reason) { auto room = currentRoom(); - if (QMessageBox::question( - nullptr, - tr("Confirm ban"), - tr("Do you really want to ban %1 (%2)?").arg(cache::displayName(room, userid), userid)) != - QMessageBox::Yes) + bool confirmed; + reason = + QInputDialog::getText(nullptr, + tr("Reason for the ban"), + tr("Enter reason for banning %1 (%2) or hit enter for no reason:") + .arg(cache::displayName(room, userid), userid), + QLineEdit::Normal, + reason, + &confirmed); + if (!confirmed) { return; + } http::client()->ban_user( room.toStdString(), diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 6bed446ed84649cf7e28b7b301f191845d8da6f7..6a83376cade17a60ce2dae073edf0822389a0268 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -19,6 +19,7 @@ #include "UserSettingsPage.h" Q_DECLARE_METATYPE(LoginPage::LoginMethod) +Q_DECLARE_METATYPE(SSOProvider) using namespace mtx::identifiers; @@ -28,6 +29,7 @@ LoginPage::LoginPage(QObject *parent) { [[maybe_unused]] static auto ignored = qRegisterMetaType<LoginPage::LoginMethod>("LoginPage::LoginMethod"); + [[maybe_unused]] static auto ignored2 = qRegisterMetaType<SSOProvider>(); connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk, Qt::QueuedConnection); connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError, Qt::QueuedConnection); @@ -161,27 +163,54 @@ LoginPage::checkHomeserverVersion() return; } + nhlog::net()->error("Error requesting versions: {}", *err); + emit versionErrorCb( tr("An unknown error occured. Make sure the homeserver domain is valid.")); return; } - http::client()->get_login( - [this](mtx::responses::LoginFlows flows, mtx::http::RequestErr err) { - if (err || flows.flows.empty()) - emit versionOkCb(true, false); - - bool ssoSupported = false; - bool passwordSupported = false; - for (const auto &flow : flows.flows) { - if (flow.type == mtx::user_interactive::auth_types::sso) { - ssoSupported = true; - } else if (flow.type == mtx::user_interactive::auth_types::password) { - passwordSupported = true; - } - } - emit versionOkCb(passwordSupported, ssoSupported); - }); + http::client()->get_login([this](mtx::responses::LoginFlows flows, + mtx::http::RequestErr err) { + if (err || flows.flows.empty()) + emit versionOkCb(true, false, {}); + + QVariantList idps; + bool ssoSupported = false; + bool passwordSupported = false; + for (const auto &flow : flows.flows) { + if (flow.type == mtx::user_interactive::auth_types::sso) { + ssoSupported = true; + + for (const auto &idp : flow.identity_providers) { + SSOProvider prov; + if (idp.brand == "apple") + prov.name_ = tr("Sign in with Apple"); + else if (idp.brand == "facebook") + prov.name_ = tr("Continue with Facebook"); + else if (idp.brand == "google") + prov.name_ = tr("Sign in with Google"); + else if (idp.brand == "twitter") + prov.name_ = tr("Sign in with Twitter"); + else + prov.name_ = tr("Login using %1").arg(QString::fromStdString(idp.name)); + + prov.avatarUrl_ = QString::fromStdString(idp.icon); + prov.id_ = QString::fromStdString(idp.id); + idps.push_back(QVariant::fromValue(prov)); + } + + if (flow.identity_providers.empty()) { + SSOProvider prov; + prov.name_ = tr("SSO LOGIN"); + idps.push_back(QVariant::fromValue(prov)); + } + } else if (flow.type == mtx::user_interactive::auth_types::password) { + passwordSupported = true; + } + } + emit versionOkCb(passwordSupported, ssoSupported, idps); + }); }); } @@ -198,10 +227,11 @@ LoginPage::versionError(const QString &error) } void -LoginPage::versionOk(bool passwordSupported, bool ssoSupported) +LoginPage::versionOk(bool passwordSupported, bool ssoSupported, QVariantList idps) { passwordSupported_ = passwordSupported; ssoSupported_ = ssoSupported; + identityProviders_ = idps; lookingUpHs_ = false; homeserverValid_ = true; @@ -248,7 +278,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod, if (res.well_known) { http::client()->set_server(res.well_known->homeserver.base_url); - nhlog::net()->info("Login requested to user server: " + + nhlog::net()->info("Login requested to use server: " + res.well_known->homeserver.base_url); } @@ -273,7 +303,7 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod, if (res.well_known) { http::client()->set_server(res.well_known->homeserver.base_url); - nhlog::net()->info("Login requested to user server: " + + nhlog::net()->info("Login requested to use server: " + res.well_known->homeserver.base_url); } @@ -287,8 +317,9 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod, sso->deleteLater(); }); - QDesktopServices::openUrl( - QString::fromStdString(http::client()->login_sso_redirect(sso->url()))); + // password doubles as the idp id for SSO login + QDesktopServices::openUrl(QString::fromStdString( + http::client()->login_sso_redirect(sso->url(), password.toStdString()))); } loggingIn_ = true; diff --git a/src/LoginPage.h b/src/LoginPage.h index 9a1b96530d585f1ab8d2b242d9e2cb75aa400325..47896fda849a0586220a45f775c2d93065c1b838 100644 --- a/src/LoginPage.h +++ b/src/LoginPage.h @@ -7,6 +7,7 @@ #pragma once #include <QObject> +#include <QVariantList> namespace mtx { namespace responses { @@ -14,6 +15,23 @@ struct Login; } } +struct SSOProvider +{ + Q_GADGET + Q_PROPERTY(QString avatarUrl READ avatarUrl CONSTANT) + Q_PROPERTY(QString name READ name CONSTANT) + Q_PROPERTY(QString id READ id CONSTANT) + +public: + [[nodiscard]] QString avatarUrl() const { return avatarUrl_; } + [[nodiscard]] QString name() const { return name_.toHtmlEscaped(); } + [[nodiscard]] QString id() const { return id_; } + + QString avatarUrl_; + QString name_; + QString id_; +}; + class LoginPage : public QObject { Q_OBJECT @@ -30,6 +48,8 @@ class LoginPage : public QObject Q_PROPERTY(bool ssoSupported READ ssoSupported NOTIFY versionLookedUp) Q_PROPERTY(bool homeserverNeeded READ homeserverNeeded NOTIFY versionLookedUp) + Q_PROPERTY(QVariantList identityProviders READ identityProviders NOTIFY versionLookedUp) + public: enum class LoginMethod { @@ -51,6 +71,7 @@ public: bool ssoSupported() const { return ssoSupported_; } bool homeserverNeeded() const { return homeserverNeeded_; } bool homeserverValid() const { return homeserverValid_; } + QVariantList identityProviders() const { return identityProviders_; } QString homeserver() { return homeserver_; } QString mxid() { return mxid_; } @@ -89,7 +110,7 @@ signals: //! Used to trigger the corresponding slot outside of the main thread. void versionErrorCb(const QString &err); - void versionOkCb(bool passwordSupported, bool ssoSupported); + void versionOkCb(bool passwordSupported, bool ssoSupported, QVariantList identityProviders); void loginOk(const mtx::responses::Login &res); @@ -116,7 +137,7 @@ public slots: // Callback for errors produced during server probing void versionError(const QString &error_message); // Callback for successful server probing - void versionOk(bool passwordSupported, bool ssoSupported); + void versionOk(bool passwordSupported, bool ssoSupported, QVariantList identityProviders); private: void checkHomeserverVersion(); @@ -137,6 +158,8 @@ private: QString mxidError_; QString error_; + QVariantList identityProviders_; + bool passwordSupported_ = true; bool ssoSupported_ = false; diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index f3893998f77b1bb1db4ef41410a4d2d62976dee3..73e556f7362a3672021147d3f5ccefde43582c04 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -338,8 +338,7 @@ MainWindow::showChatPage() { auto userid = QString::fromStdString(http::client()->user_id().to_string()); auto device_id = QString::fromStdString(http::client()->device_id()); - auto homeserver = QString::fromStdString(http::client()->server() + ":" + - std::to_string(http::client()->port())); + auto homeserver = QString::fromStdString(http::client()->server_url()); auto token = QString::fromStdString(http::client()->access_token()); userSettings_.data()->setUserId(userid); diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index c7ac790a550de49bc967a993e257ff60d75e6be9..1a24834e56fe80c6a2d6bd0d73f3c884efd937b3 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -79,15 +79,17 @@ UserSettings::load(std::optional<QString> profile) sortByImportance_ = settings.value(QStringLiteral("user/sort_by_unread"), true).toBool(); readReceipts_ = settings.value(QStringLiteral("user/read_receipts"), true).toBool(); theme_ = settings.value(QStringLiteral("user/theme"), defaultTheme_).toString(); - font_ = settings.value(QStringLiteral("user/font_family"), "default").toString(); - avatarCircles_ = settings.value(QStringLiteral("user/avatar_circles"), true).toBool(); - useIdenticon_ = settings.value(QStringLiteral("user/use_identicon"), true).toBool(); - decryptSidebar_ = settings.value(QStringLiteral("user/decrypt_sidebar"), true).toBool(); - privacyScreen_ = settings.value(QStringLiteral("user/privacy_screen"), false).toBool(); + + font_ = settings.value(QStringLiteral("user/font_family"), "").toString(); + + avatarCircles_ = settings.value(QStringLiteral("user/avatar_circles"), true).toBool(); + useIdenticon_ = settings.value(QStringLiteral("user/use_identicon"), true).toBool(); + decryptSidebar_ = settings.value(QStringLiteral("user/decrypt_sidebar"), true).toBool(); + privacyScreen_ = settings.value(QStringLiteral("user/privacy_screen"), false).toBool(); privacyScreenTimeout_ = settings.value(QStringLiteral("user/privacy_screen_timeout"), 0).toInt(); mobileMode_ = settings.value(QStringLiteral("user/mobile_mode"), false).toBool(); - emojiFont_ = settings.value(QStringLiteral("user/emoji_font_family"), "default").toString(); + emojiFont_ = settings.value(QStringLiteral("user/emoji_font_family"), "emoji").toString(); baseFontSize_ = settings.value(QStringLiteral("user/font_size"), QFont().pointSizeF()).toDouble(); auto tempPresence = @@ -419,6 +421,12 @@ UserSettings::setFontSize(double size) if (size == baseFontSize_) return; baseFontSize_ = size; + + const static auto defaultFamily = QFont().defaultFamily(); + QFont f((font_.isEmpty() || font_ == QStringLiteral("default")) ? defaultFamily : font_); + f.setPointSizeF(fontSize()); + QApplication::setFont(f); + emit fontSizeChanged(size); save(); } @@ -429,6 +437,12 @@ UserSettings::setFontFamily(QString family) if (family == font_) return; font_ = family; + + const static auto defaultFamily = QFont().defaultFamily(); + QFont f((family.isEmpty() || family == QStringLiteral("default")) ? defaultFamily : family); + f.setPointSizeF(fontSize()); + QApplication::setFont(f); + emit fontChanged(family); save(); } @@ -440,7 +454,7 @@ UserSettings::setEmojiFontFamily(QString family) return; if (family == tr("Default")) { - emojiFont_ = QStringLiteral("default"); + emojiFont_ = QStringLiteral("emoji"); } else { emojiFont_ = family; } diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 4151356f9dd4dda1fe2a182e384d5608bdfe5a57..1293245c44995ec54164acc3b7bae00a8023402e 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -208,7 +208,7 @@ EventStore::EventStore(std::string room_id, QObject *) size_t index = related_text->content.formatted_body.find(txn_id); if (index != std::string::npos) { related_text->content.formatted_body.replace( - index, event_id.length(), event_id); + index, txn_id.length(), event_id); } } diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 903f137f54269f6169b68296c730b9121425b09c..8e6c723550034673c0f0a3f4ffeec2c5c6d50955 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1240,7 +1240,7 @@ TimelineModel::showReadReceipts(QString id) } void -TimelineModel::redactEvent(const QString &id) +TimelineModel::redactEvent(const QString &id, const QString &reason) { if (!id.isEmpty()) { auto edits = events.edits(id.toStdString()); @@ -1255,7 +1255,8 @@ TimelineModel::redactEvent(const QString &id) } emit dataAtIdChanged(id); - }); + }, + reason.toStdString()); // redact all edits to prevent leaks for (const auto &e : edits) { @@ -1271,7 +1272,8 @@ TimelineModel::redactEvent(const QString &id) } emit dataAtIdChanged(id); - }); + }, + reason.toStdString()); } } } diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index e4e3fa9d2581fedbe02eba230bc55791ac23d8e2..f47203f0d91d92d6bd226c4441e2c3649f6fccac 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -272,7 +272,7 @@ public: Q_INVOKABLE void unpin(const QString &id); Q_INVOKABLE void pin(const QString &id); Q_INVOKABLE void showReadReceipts(QString id); - Q_INVOKABLE void redactEvent(const QString &id); + Q_INVOKABLE void redactEvent(const QString &id, const QString &reason = ""); Q_INVOKABLE int idToIndex(const QString &id) const; Q_INVOKABLE QString indexToId(int index) const; Q_INVOKABLE void openMedia(const QString &eventId);