diff options
106 files changed, 11745 insertions, 6914 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66bde25c..67affd34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,20 +27,21 @@ build-gcc7: - update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10 - update-alternatives --set gcc "/usr/bin/${CC}" - update-alternatives --set g++ "/usr/bin/${CXX}" + - rm -rf ../.hunter && mv .hunter ../.hunter || true script: - export PATH="/usr/lib/ccache:${PATH}" - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - export PATH="/usr/local/bin/:${PATH}" - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true - - mkdir -p .deps/usr .hunter - - mkdir -p build - cmake -GNinja -H. -Bbuild -DCMAKE_INSTALL_PREFIX=.deps/usr - -DHUNTER_ROOT=".hunter" + -DHUNTER_ROOT="../.hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release -DCI_BUILD=ON - cmake --build build + after_script: + - mv ../.hunter .hunter cache: key: "$CI_JOB_NAME" paths: @@ -55,13 +56,14 @@ build-macos: - brew reinstall --force python3 - brew bundle --file=./.ci/macos/Brewfile --force --cleanup - pip3 install dmgbuild + - rm -rf ../.hunter && mv .hunter ../.hunter || true script: - export PATH=/usr/local/opt/qt/bin/:${PATH} - export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 - cmake -GNinja -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=.deps/usr - -DHUNTER_ROOT=".hunter" + -DHUNTER_ROOT="../.hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo -DUSE_BUNDLED_OPENSSL=ON @@ -69,6 +71,7 @@ build-macos: -DCI_BUILD=ON - cmake --build build after_script: + - mv ../.hunter .hunter - ./.ci/macos/deploy.sh - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}.dmg artifacts: @@ -143,7 +146,7 @@ linting: image: alpine:latest tags: [docker] before_script: - - apk update && apk add clang make git python3 py3-pip + - apk update && apk add clang-extra-tools make git python3 py3-pip - export PATH="$PATH:/root/.local/bin" - pip3 install --user reuse script: @@ -164,7 +167,7 @@ appimage-amd64: # update appimage-builder (optional) - pip3 install --upgrade git+https://www.opencode.net/azubieta/appimagecraft.git - - apt-get install -y qt5-default qtdeclarative5-dev qttools5-dev qtscript5-dev qtquickcontrols2-5-dev qtmultimedia5-dev libqt5svg5-dev liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache + - apt-get install -y qt5-default qtdeclarative5-dev qttools5-dev qtscript5-dev qtquickcontrols2-5-dev qtmultimedia5-dev libqt5svg5-dev liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh --skip-license --prefix=/usr/local - /usr/sbin/update-ccache-symlinks script: @@ -174,7 +177,6 @@ appimage-amd64: -DHUNTER_ROOT=".hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DHUNTER_CONFIGURATION_TYPES=Release - -DUSE_BUNDLED_BOOST=ON -DUSE_BUNDLED_SPDLOG=ON -DUSE_BUNDLED_OLM=ON -DUSE_BUNDLED_GTEST=OFF @@ -184,8 +186,10 @@ appimage-amd64: -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_LMDBXX=ON - -DUSE_BUNDLED_TWEENY=ON -DUSE_BUNDLED_QTKEYCHAIN=OFF + -DUSE_BUNDLED_LIBEVENT=OFF + -DUSE_BUNDLED_LIBCURL=OFF + -DUSE_BUNDLED_COEURL=ON - DESTDIR=`pwd`/AppDir ninja -C build install/local - DESTDIR=`pwd`/AppDir ninja -C build _deps/cmark-build/src/install - mkdir -p AppDir/usr/lib/x86_64-linux-gnu AppDir/lib/x86_64-linux-gnu diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index fab81da9..f83ce90a 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -38,8 +38,11 @@ AppDir: - kimageformat-plugins - libbs2b0 - libbz2-1.0 + - libcurl4 - libelf1 - libexpat1 + - libevent-core-2.1-6 + - libevent-pthreads-2.1-6 - libhogweed4 - libjpeg-turbo8 - libkf5archive5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d9d793c..4b023d48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,29 +18,24 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "compile as PIC by default") option(HUNTER_ENABLED "Enable Hunter package manager" OFF) include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.23.288.tar.gz" - SHA1 "6c9b2bc606d86ae31f96a62fc68f0a593024815b" -) + URL "https://github.com/cpp-pm/hunter/archive/v0.23.305.tar.gz" + SHA1 "fc8d7a6dac2fa23681847b3872d88d3839b657b0" + ) -option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED}) -option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." - ${HUNTER_ENABLED}) +option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED}) option(USE_BUNDLED_OLM "Use the bundled version of libolm." ${HUNTER_ENABLED}) -option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." - ${HUNTER_ENABLED}) -option(USE_BUNDLED_CMARK "Use the bundled version of cmark." - ${HUNTER_ENABLED}) -option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json." - ${HUNTER_ENABLED}) -option(USE_BUNDLED_OPENSSL "Use the bundled version of OpenSSL." - OFF) +option(USE_BUNDLED_GTEST "Use the bundled version of Google Test." ${HUNTER_ENABLED}) +option(USE_BUNDLED_CMARK "Use the bundled version of cmark." ${HUNTER_ENABLED}) +option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json." ${HUNTER_ENABLED}) +option(USE_BUNDLED_OPENSSL "Use the bundled version of OpenSSL." OFF) option(USE_BUNDLED_MTXCLIENT "Use the bundled version of the Matrix Client library." ${HUNTER_ENABLED}) -option(USE_BUNDLED_LMDB "Use the bundled version of lmdb." - ${HUNTER_ENABLED}) -option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdb++." - ${HUNTER_ENABLED}) -option(USE_BUNDLED_QTKEYCHAIN "Use the bundled version of Qt5Keychain." +option(USE_BUNDLED_LMDB "Use the bundled version of lmdb." ${HUNTER_ENABLED}) +option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdb++." ${HUNTER_ENABLED}) +option(USE_BUNDLED_QTKEYCHAIN "Use the bundled version of Qt5Keychain." ${HUNTER_ENABLED}) +option(USE_BUNDLED_COEURL "Use a bundled version of the Curl wrapper" ${HUNTER_ENABLED}) +option(USE_BUNDLED_LIBEVENT "Use the bundled version of spdlog." ${HUNTER_ENABLED}) +option(USE_BUNDLED_LIBCURL "Use the bundled version of spdlog." ${HUNTER_ENABLED}) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") @@ -119,6 +114,38 @@ if (BUILD_DOCS) endif (DOXYGEN_FOUND) endif() +# +## coeurl +# +## Need to repeat all libevent deps?!? +if (USE_BUNDLED_LIBEVENT) + hunter_add_package(Libevent) + find_package(Libevent CONFIG REQUIRED) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(libevent_core REQUIRED IMPORTED_TARGET libevent_core) + if (WIN32) + pkg_check_modules(libevent_windows REQUIRED IMPORTED_TARGET libevent_windows) + else() + pkg_check_modules(libevent_pthreads REQUIRED IMPORTED_TARGET + libevent_pthreads) + endif() +endif() + +# curl +if (USE_BUNDLED_LIBCURL) + hunter_add_package(CURL) + find_package(CURL CONFIG REQUIRED) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(libcurl REQUIRED IMPORTED_TARGET libcurl) +endif() + +# spdlog +if(USE_BUNDLED_SPDLOG) + hunter_add_package(spdlog) +endif() +find_package(spdlog 1.0.0 CONFIG REQUIRED) # # LMDB @@ -137,7 +164,7 @@ endif() # # Discover Qt dependencies. # -find_package(Qt5 COMPONENTS Core Widgets LinguistTools Concurrent Svg Multimedia Qml QuickControls2 QuickWidgets REQUIRED) +find_package(Qt5 5.12 COMPONENTS Core Widgets LinguistTools Concurrent Svg Multimedia Qml QuickControls2 QuickWidgets REQUIRED) find_package(Qt5QuickCompiler) find_package(Qt5DBus) @@ -156,7 +183,7 @@ if (USE_BUNDLED_QTKEYCHAIN) set(BUILD_TEST_APPLICATION OFF CACHE INTERNAL "") FetchContent_MakeAvailable(qt5keychain) else() -find_package(Qt5Keychain REQUIRED) + find_package(Qt5Keychain REQUIRED) endif() if (APPLE) @@ -238,7 +265,10 @@ set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION}) message(STATUS "Version: ${PROJECT_VERSION}") cmake_host_system_information(RESULT BUILD_HOST QUERY HOSTNAME) -set(BUILD_USER $ENV{USER}) + +include(CheckSymbolExists) +check_symbol_exists(backtrace_symbols_fd "execinfo.h" HAVE_BACKTRACE_SYMBOLS_FD) + configure_file(cmake/nheko.h config/nheko.h) @@ -261,7 +291,7 @@ set(SRC_FILES # Emoji src/emoji/EmojiModel.cpp - src/emoji/Provider.cpp + src/emoji/Provider.cpp # Timeline @@ -301,8 +331,8 @@ set(SRC_FILES src/ui/ToggleButton.cpp src/ui/UserProfile.cpp - # Generic notification stuff - src/notifications/Manager.cpp + # Generic notification stuff + src/notifications/Manager.cpp src/AvatarProvider.cpp src/BlurhashProvider.cpp @@ -339,13 +369,6 @@ set(SRC_FILES include(FeatureSummary) -if(USE_BUNDLED_BOOST) - hunter_add_package(Boost COMPONENTS iostreams system thread) -endif() -find_package(Boost 1.70 REQUIRED - COMPONENTS iostreams - system - thread) if(USE_BUNDLED_OPENSSL) hunter_add_package(OpenSSL) @@ -356,7 +379,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG 5d2f055ea9403770039ddf66b1900f890cd5cde7 + GIT_TAG 9ecaefe377d4dab688caee186e4a263cb7f105e8 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") @@ -369,7 +392,7 @@ if(USE_BUNDLED_OLM) FetchContent_Declare( Olm GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git - GIT_TAG 3.1.4 + GIT_TAG 3.2.4 ) set(OLM_TESTS OFF CACHE INTERNAL "") FetchContent_MakeAvailable(Olm) @@ -417,10 +440,10 @@ set_package_properties(nlohmann_json PROPERTIES if(USE_BUNDLED_LMDBXX) include(FetchContent) FetchContent_Declare( - lmdbxx - URL "https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h" - DOWNLOAD_NO_EXTRACT TRUE - ) + lmdbxx + URL "https://raw.githubusercontent.com/hoytech/lmdbxx/1.0.0/lmdb++.h" + DOWNLOAD_NO_EXTRACT TRUE + ) if(NOT lmdbxx_POPULATED) FetchContent_Populate(lmdbxx) endif() @@ -458,7 +481,7 @@ endif() # single instance functionality set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication") -add_subdirectory(third_party/SingleApplication-3.2.0-dc8042b/) +add_subdirectory(third_party/SingleApplication-3.3.0/) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -587,6 +610,10 @@ if(WIN32) target_compile_definitions(nheko PRIVATE _WIN32_WINNT=0x0601) else() add_executable (nheko ${OS_BUNDLE} ${NHEKO_DEPS}) + + if (HAVE_BACKTRACE_SYMBOLS_FD AND NOT CMAKE_BUILD_TYPE STREQUAL "Release") + set_target_properties(nheko PROPERTIES ENABLE_EXPORTS ON) + endif() endif() if(APPLE) @@ -604,14 +631,11 @@ target_include_directories(nheko PRIVATE src includes third_party/blurhash third # Fixup bundled keychain include dirs if (USE_BUNDLED_QTKEYCHAIN) -target_include_directories(nheko PRIVATE ${qt5keychain_SOURCE_DIR} ${qt5keychain_BINARY_DIR}) + target_include_directories(nheko PRIVATE ${qt5keychain_SOURCE_DIR} ${qt5keychain_BINARY_DIR}) endif() target_link_libraries(nheko PRIVATE MatrixClient::MatrixClient - Boost::iostreams - Boost::system - Boost::thread cmark::cmark spdlog::spdlog Qt5::Widgets @@ -628,11 +652,11 @@ target_link_libraries(nheko PRIVATE SingleApplication::SingleApplication) if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") -target_precompile_headers(nheko - PRIVATE - <string> - <algorithm> - ) + target_precompile_headers(nheko + PRIVATE + <string> + <algorithm> + ) endif() if (TARGET PkgConfig::GSTREAMER) @@ -644,6 +668,24 @@ if (TARGET PkgConfig::GSTREAMER) endif() endif() +if(USE_BUNDLED_COEURL) + include(FetchContent) + FetchContent_Declare( + coeurl + GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git + GIT_TAG 417821a07cfe4429b08a2efed5e480a498087afd + ) + FetchContent_MakeAvailable(coeurl) + target_link_libraries(nheko PUBLIC coeurl::coeurl) +elseif(coeurl_DIR) + find_package(coeurl CONFIG REQUIRED) + target_link_libraries(nheko PUBLIC coeurl::coeurl) +else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(coeurl REQUIRED IMPORTED_TARGET coeurl) + target_link_libraries(nheko PUBLIC PkgConfig::coeurl) +endif() + if(MSVC) target_link_libraries(nheko PRIVATE ntdll) endif() diff --git a/README.md b/README.md index 87ed7f8b..78f3edfd 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ Help us with translations so as many people as possible will be able to use nhek ### Note regarding End-to-End encryption -Currently the implementation is at best a **proof of concept** and it should only be used for -testing purposes. Most importantly, it is missing device verification, so while your messages -and media are encrypted, nheko doesn't verify who gets the messages. +The current implementation works in most cases, but you may need to bootstrap +your cross-signing keys in a different client. The implementation may also still +have bugs, so don't rely on it for security. Online keybackup isn't supported, +but you can use offline keybackup. Most other cases should be fine though. ## Features @@ -114,6 +115,15 @@ with [homebrew](https://brew.sh/): ```sh brew install --cask nheko ``` + +#### Windows + +with [Chocolatey](https://chocolatey.org/): + +```posh +choco install nheko-reborn +``` + ### FAQ ## @@ -127,10 +137,10 @@ brew install --cask nheko - Qt5 (5.12 or greater). Required for overlapping hover handlers in Qml. - CMake 3.15 or greater. (Lower version may work, but may break boost linking) - [mtxclient](https://github.com/Nheko-Reborn/mtxclient) +- [coeurl](https://nheko.im/nheko-reborn/coeurl) - [LMDB](https://symas.com/lightning-memory-mapped-database/) - [lmdb++](https://github.com/hoytech/lmdbxx) - [cmark](https://github.com/commonmark/cmark) 0.29 or greater. -- Boost 1.70 or greater. - [libolm](https://gitlab.matrix.org/matrix-org/olm) - [spdlog](https://github.com/gabime/spdlog) - [GStreamer](https://gitlab.freedesktop.org/gstreamer) 1.18.0 or greater (optional, needed for VoIP support). @@ -154,7 +164,6 @@ If you experience build issues and you are trying to link `mtxclient` library wi The bundle flags are currently: -- USE_BUNDLED_BOOST - USE_BUNDLED_SPDLOG - USE_BUNDLED_OLM - USE_BUNDLED_GTEST @@ -164,7 +173,9 @@ The bundle flags are currently: - USE_BUNDLED_MTXCLIENT - USE_BUNDLED_LMDB - USE_BUNDLED_LMDBXX -- USE_BUNDLED_TWEENY +- USE_BUNDLED_COEURL +- USE_BUNDLED_LIBCURL +- USE_BUNDLED_LIBEVENT A note on bundled OpenSSL: You need to explicitly enable it and it will not be using your system certificate directory by default, if you enable it. You need to override that at runtime with the SSL_CERT_FILE variable. On Windows it will still be using your system certificates though, since it loads them from the system store instead of the OpenSSL directory. diff --git a/appveyor.yml b/appveyor.yml index 4dc986ca..d54fffba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ environment: cache: - - c:\hunter\ -> appveyor.yml - - build\_deps -> appveyor.yml + - c:\hunter\ -> appveyor.yml, CMakeLists.txt + - build\_deps -> appveyor.yml, CMakeLists.txt build: verbosity: minimal diff --git a/cmake/nheko.h b/cmake/nheko.h index bf1a54fe..ae28aea9 100644 --- a/cmake/nheko.h +++ b/cmake/nheko.h @@ -1,6 +1,7 @@ namespace nheko { constexpr auto version = "${PROJECT_VERSION}"; -constexpr auto build_user = "${BUILD_USER}@${BUILD_HOST}"; constexpr auto build_os = "${CMAKE_HOST_SYSTEM_NAME}"; constexpr auto enable_debug_log = ${SPDLOG_DEBUG_ON}; } + +# cmakedefine01 HAVE_BACKTRACE_SYMBOLS_FD diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index d8ea05dc..bfc25c5c 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -16,7 +16,9 @@ finish-args: - --socket=wayland - --socket=x11 - --talk-name=org.freedesktop.Notifications - - --talk-name=org.kde.StatusNotifierWatcher + - --talk-name=org.freedesktop.secrets + - --talk-name=org.freedesktop.StatusNotifierItem + - --talk-name=org.kde.* cleanup: - /include - /bin/mdb* @@ -35,6 +37,19 @@ modules: - prefix=/app no-autogen: true subdir: libraries/liblmdb + - name: libevent + buildsystem: autotools + config-opts: + - --disable-shared + - --prefix=/app + - --disable-openssl + sources: + - sha256: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb + type: archive + url: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz + make-install-args: + - prefix=/app + no-autogen: true - name: cmark buildsystem: cmake-ninja builddir: true @@ -61,9 +76,9 @@ modules: buildsystem: cmake-ninja name: olm sources: - - commit: 6753595300767dd70150831dbbe6f92d64e75038 + - commit: 64afab93645957846d936a19b8501dbd3f2cc4a1 disable-shallow-clone: true - tag: 3.1.4 + tag: 3.2.4 type: git url: https://gitlab.matrix.org/matrix-org/olm.git - config-opts: @@ -85,16 +100,6 @@ modules: - sha256: d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760 type: archive url: https://github.com/nlohmann/json/archive/v3.7.0.tar.gz - - build-commands: - - ./bootstrap.sh --with-libraries=thread,system,iostreams --prefix=/app - - ./b2 -d0 variant=release link=static threading=multi --layout=system - - ./b2 -d0 install - buildsystem: simple - name: boost - sources: - - sha256: 59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 - type: archive - url: https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2 - buildsystem: meson name: gstreamer sources: @@ -140,6 +145,14 @@ modules: tag: 1.18.3 type: git url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git + - buildsystem: meson + config-opts: + - -Ddefault_library=static + name: coeurl + sources: + - commit: 417821a07cfe4429b08a2efed5e480a498087afd + type: git + url: https://nheko.im/nheko-reborn/coeurl.git - config-opts: - -DBUILD_LIB_TESTS=OFF - -DBUILD_LIB_EXAMPLES=OFF @@ -148,21 +161,11 @@ modules: buildsystem: cmake-ninja name: mtxclient sources: - - commit: 5d2f055ea9403770039ddf66b1900f890cd5cde7 + - commit: 9ecaefe377d4dab688caee186e4a263cb7f105e8 type: git url: https://github.com/Nheko-Reborn/mtxclient.git - config-opts: - -DCMAKE_BUILD_TYPE=Release - - -DTWEENY_BUILD_DOCUMENTATION=OFF - - -DTWEENY_BUILD_EXAMPLES=OFF - buildsystem: cmake-ninja - name: tweeny - sources: - - sha256: 482857256a7235646004682912badb6521d361ed6987c8ebdae7986bf64ce694 - type: archive - url: https://github.com/mobius3/tweeny/archive/43f4130f7e4a67c19d870b60864bc2862c19b81f.tar.gz - - config-opts: - - -DCMAKE_BUILD_TYPE=Release - -DLMDBXX_INCLUDE_DIR=.deps/lmdbxx - -DCOMPILE_QML=ON buildsystem: cmake-ninja diff --git a/resources/icons/ui/user-friends-solid.svg b/resources/icons/ui/user-friends-solid.svg new file mode 100644 index 00000000..1add45ec --- /dev/null +++ b/resources/icons/ui/user-friends-solid.svg @@ -0,0 +1 @@ +<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="user-friends" class="svg-inline--fa fa-user-friends fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M192 256c61.9 0 112-50.1 112-112S253.9 32 192 32 80 82.1 80 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C51.6 288 0 339.6 0 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zM480 256c53 0 96-43 96-96s-43-96-96-96-96 43-96 96 43 96 96 96zm48 32h-3.8c-13.9 4.8-28.6 8-44.2 8s-30.3-3.2-44.2-8H432c-20.4 0-39.2 5.9-55.7 15.4 24.4 26.3 39.7 61.2 39.7 99.8v38.4c0 2.2-.5 4.3-.6 6.4H592c26.5 0 48-21.5 48-48 0-61.9-50.1-112-112-112z"></path></svg> \ No newline at end of file diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts index 4339497a..c544bf6d 100644 --- a/resources/langs/nheko_cs.ts +++ b/resources/langs/nheko_cs.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -779,6 +782,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -808,13 +816,13 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation type="unfinished"></translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation type="unfinished"></translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,73 +1229,111 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> + <location line="+222"/> + <source>Accept</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> + <location line="+10"/> + <source>Profile settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> <translation type="unfinished"></translation> </message> </context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1590,17 +1703,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1621,12 +1739,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1642,85 +1755,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1778,54 +1831,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1864,7 +1869,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1887,8 +1892,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1896,7 +1901,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -2699,22 +2704,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 40cabcbe..58c209a2 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -17,22 +17,22 @@ <message> <location line="+67"/> <source>You are screen sharing</source> - <translation>Du hast deinen Bildschirm freigegeben</translation> + <translation>Du teilst deinen Bildschirm</translation> </message> <message> <location line="+17"/> <source>Hide/Show Picture-in-Picture</source> - <translation>Bild in Bild anzeigen/verstecken</translation> + <translation>Bild-in-Bild Teilen/Verstecken</translation> </message> <message> <location line="+13"/> <source>Unmute Mic</source> - <translation>Stummschaltung aufheben</translation> + <translation>Stummschaltung Aufheben</translation> </message> <message> <location line="+0"/> <source>Mute Mic</source> - <translation>Mikrophon stummschalten</translation> + <translation>Mikrofon stumm schalten</translation> </message> </context> <context> @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Du bist dem Raum beigetreten.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,30 +125,30 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Nutzer konnte nicht eingeladen werden: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Eingeladener Benutzer: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Das Migrieren des Caches auf die aktuelle Version ist fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte melde den Fehler und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du den Cache manuell löschen.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> - <translation>Beitreten bestätigen</translation> + <translation>Beitritt bestätigen</translation> </message> <message> <location line="+1"/> <source>Do you really want to join %1?</source> - <translation>Willst du wirklich %1 betreten?</translation> + <translation>Möchtest du wirklich %1 beitreten?</translation> </message> <message> <location line="+44"/> @@ -164,15 +156,15 @@ <translation>Raum %1 erzeugt.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Einladung bestätigen</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> - <translation>Willst du wirklich %1 (%2) einladen?</translation> + <translation>Nutzer %1 (%2) wirklich einladen?</translation> </message> <message> <location line="+11"/> @@ -187,12 +179,12 @@ <message> <location line="+1"/> <source>Do you really want to kick %1 (%2)?</source> - <translation>Willst du wirklich %1 (%2) kicken?</translation> + <translation>Nutzer %1 (%2) wirklich kicken?</translation> </message> <message> <location line="+16"/> <source>Kicked user: %1</source> - <translation>%1 wurde gekickt.</translation> + <translation>Gekickter Benutzer: %1</translation> </message> <message> <location line="+10"/> @@ -202,7 +194,7 @@ <message> <location line="+1"/> <source>Do you really want to ban %1 (%2)?</source> - <translation>Willst du wirklich %1 (%2) aus dem Raum verbannen?</translation> + <translation>Nutzer %1 (%2) wirklich bannen?</translation> </message> <message> <location line="+11"/> @@ -212,7 +204,7 @@ <message> <location line="+5"/> <source>Banned user: %1</source> - <translation>%1 wurde gebannt.</translation> + <translation>Gebannter Nutzer: %1</translation> </message> <message> <location line="+10"/> @@ -222,7 +214,7 @@ <message> <location line="+1"/> <source>Do you really want to unban %1 (%2)?</source> - <translation>Willst du wirklich den Bann von %1 (%2) zurückziehen?</translation> + <translation>Bann des Nutzers %1 (%2) wirklich aufheben?</translation> </message> <message> <location line="+11"/> @@ -232,22 +224,22 @@ <message> <location line="+5"/> <source>Unbanned user: %1</source> - <translation>Verbannung von %1 wurde aufgehoben.</translation> + <translation>Verbannung aufgehoben: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation>Möchtest du wirklich eine private Konversation mit %1 beginnen?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Migration des Caches fehlgeschlagen!</translation> </message> <message> <location line="+13"/> <source>Incompatible cache version</source> - <translation>Inkompatible Cacheversion</translation> + <translation>Inkompatible Version des Caches</translation> </message> <message> <location line="+1"/> @@ -255,7 +247,7 @@ <translation>Der Cache auf der Festplatte wurde mit einer neueren Nheko - Version angelegt. Bitte aktualisiere Nheko oder entferne den Cache.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation> </message> @@ -265,13 +257,13 @@ <translation>Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Bitte melde dich erneut an: %1</translation> </message> @@ -283,7 +275,7 @@ <message> <location line="+5"/> <source>You joined the room</source> - <translation>Du bist dem Raum beigetreten.</translation> + <translation>Du hast den Raum betreten</translation> </message> <message> <location line="+6"/> @@ -301,55 +293,66 @@ <translation>Konnte den Raum nicht verlassen: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation>Kontte %1 nicht aus %2 entfernen: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> - <translation>Verstecke Räume mit diesem Tag oder aus dieser Community</translation> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation>Verstecke Räume mit diesem Tag oder von dieser Gruppe standardmäßig.</translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation>Alle Räume</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation>Zeige alle Räume ohne Filter.</translation> + </message> + <message> + <location line="+30"/> + <source>Favourites</source> <translation>Favoriten</translation> </message> <message> <location line="+2"/> - <source>Low priority rooms</source> - <translation>Räume niedriger Priorität</translation> + <source>Rooms you have favourited.</source> + <translation>Favorisierte Räume.</translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation>Niedrige Priorität</translation> </message> <message> <location line="+2"/> + <source>Rooms with low priority.</source> + <translation>Räume niediriger Priorität.</translation> + </message> + <message> + <location line="+7"/> <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> <translation>Serverbenachrichtigungen</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tag)</translation> - </message> - <message> - <location line="+3"/> - <source> (community)</source> - <translation> (community)</translation> + <source>Messages from your server or administrator.</source> + <translation>Nachrichten von deinem Server oder Administrator.</translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Geheimnisse entschlüsseln</translation> </message> @@ -501,23 +504,23 @@ <message> <location line="+4"/> <source>Encrypted by a verified device</source> - <translation type="unfinished"></translation> + <translation>Verschlüsselt von einem verifizierten Gerät</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device, but you have trusted that user so far.</source> - <translation type="unfinished"></translation> + <translation>Von einem unverifizierten Gerät verschlüsselt, Sie haben dem Nutzer jedoch früher schon vertraut.</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device</source> - <translation type="unfinished"></translation> + <translation>Von einem unverifizierten Gerät verschlüsselt</translation> </message> </context> <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation> @@ -529,7 +532,7 @@ <translation>-- Verschlüsseltes Event (Schlüssel passt nicht für diesen Nachrichtenindex) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -598,13 +601,13 @@ <message> <location filename="../qml/ForwardCompleter.qml" line="+44"/> <source>Forward Message</source> - <translation type="unfinished"></translation> + <translation>Nachricht weiterleiten</translation> </message> </context> <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Datei auswählen</translation> </message> @@ -614,7 +617,7 @@ <translation>Alle Dateien (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation> </message> @@ -645,10 +648,10 @@ You can also put your homeserver address there, if your server doesn't support .well-known lookup. Example: @user:server.my If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source> - <translation>Dein Anmeldename. Eine mxid sollte mit einem @ anfangen, gefolgt von dem Benutzernamen. Nach dem Benutzernamen sollten ein Doppelpunkt (:) under der Servername folgen. -Nach dem Doppelpunkt kann alternativ die Serveradresse (mit oder ohne Port) angegeben werden, wenn der Server nicht per .well-known auffindbar ist. + <translation>Dein Anmeldename sollte mit einem @ anfangen, gefolgt von deinem Benutzernamen. Nach deinem Benutzernamen sollte ein Doppelpunkt (:) und der Servername folgen. +Nach dem Doppelpunkt kann alternativ die Serveradresse (mit oder ohne Port) angegeben werden, wenn der Server nicht via .well-known auffindbar ist. Beispiel: @benutzer:dein.server -Wenn Nheko deinen Server nicht automatisch erkennen kann, wird es dich nach dem Server fragen.</translation> +Wenn Nheko deinen Server nicht automatisch erkennen kann, bekommst du eine Eingabemaske gezeigt in die du die Serverdaten manuell eintragen kannst.</translation> </message> <message> <location line="+25"/> @@ -668,7 +671,7 @@ Wenn Nheko deinen Server nicht automatisch erkennen kann, wird es dich nach dem <message> <location line="+2"/> <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source> - <translation>Ein Name für dieses Gerät. Dieser wird der anderen Seite gezeigt, wenn das Gerät verifiziert wird. Wenn nichts angeben wurde, wird einer generiert.</translation> + <translation>Ein Name für dieses Gerät, das der anderen Seite gezeigt wird, wenn das Gerät verifiziert wird. Wird nichts angegeben, wird einer generiert.</translation> </message> <message> <location line="+4"/> @@ -695,13 +698,13 @@ Beispiel: https://mein.server:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <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="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation> </message> @@ -711,7 +714,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Automatische Erkennung fehlgeschlagen. Unbekannter Fehler bei Anfrage .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Benötigte Ansprechpunkte nicht auffindbar. Möglicherweise kein Matrixserver.</translation> </message> @@ -726,12 +729,12 @@ Beispiel: https://mein.server:8787</translation> <translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>SSO ANMELDUNG</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Leeres Passwort</translation> </message> @@ -785,10 +788,15 @@ Beispiel: https://mein.server:8787</translation> <message> <location line="+0"/> <source>removed topic</source> - <translation>Raumthema wurde entfernt</translation> + <translation>Thema wurde entfernt</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation>%1 hat dem Raumavatar geändert</translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 hat den Raum erstellt: %2</translation> </message> @@ -858,13 +866,13 @@ Beispiel: https://mein.server:8787</translation> <message> <location line="+11"/> <source>You don't have permission to send messages in this room</source> - <translation type="unfinished"></translation> + <translation>Du darfst hier keine Nachrichten senden</translation> </message> </context> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation>Bearbeiten</translation> </message> @@ -883,6 +891,76 @@ Beispiel: https://mein.server:8787</translation> <source>Options</source> <translation>Optionen</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation>&Kopieren</translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation>Kopiere &Link</translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation>Re&agieren</translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation>Antwo&rten</translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation>&Editieren</translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation>Lesebes&tätigungen</translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation>&Weiterleiten</translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation>Als gelesen &markieren</translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation>Zeige rohen Nachrichteninhalt</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation>Zeige rohen, entschlüsselten Nachrichteninhalt</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation>Na&chricht löschen</translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation>&Speichern als</translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation>In externem Pr&ogramm öffnen</translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation>Link &zu diesem Event kopieren</translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>Unimplementiertes Event: </translation> </message> @@ -1030,7 +1108,7 @@ Beispiel: https://mein.server:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Benutze ein separates profil, wodurch mehrere Accounts und Nhekoinstanzen zur gleichen Zeit verwendet werden können.</translation> </message> @@ -1048,18 +1126,18 @@ Beispiel: https://mein.server:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Benutzername</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Der Benutzername sollte nicht leer sein und nur aus a-z, 0-9, ., _, =, - und / bestehen.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Passwort</translation> </message> @@ -1084,22 +1162,47 @@ Beispiel: https://mein.server:8787</translation> <translation>Ein Server, der Registrierungen zulässt. Weil Matrix ein dezentralisiertes Protokoll ist, musst du erst einen Server ausfindig machen oder einen persönlichen Server aufsetzen.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTRIEREN</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Keine unterstützten Registrierungsmethoden!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Mindestens ein Feld hat invalide Werte. Bitte behebe diese Fehler und versuche es erneut.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation>Automatische Erkennung fehlgeschlagen. Unbekannter Fehler bei Anfrage .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation>Benötigte Ansprechpunkte nicht auffindbar. Möglicherweise kein Matrixserver.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation>Erhaltene Antwort war fehlerhaft. Bitte Homeserverdomain prüfen.</translation> + </message> + <message> + <location line="+5"/> + <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 line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Passwort nicht lang genug (mind. 8 Zeichen)</translation> </message> @@ -1109,7 +1212,7 @@ Beispiel: https://mein.server:8787</translation> <translation>Passwörter stimmen nicht überein</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Ungültiger Servername</translation> </message> @@ -1117,87 +1220,125 @@ Beispiel: https://mein.server:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Schließen</translation> </message> <message> <location line="+13"/> <source>Cancel edit</source> - <translation>Editieren abbrechen</translation> + <translation>Bearbeiten abbrechen</translation> </message> </context> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>keine Version gespeichert</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> + <message> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation>Neuer Tag</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation>Gib den Tag, den du verwenden willst, ein:</translation> + </message> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> + <location line="+7"/> <source>Leave room</source> <translation>Raum verlassen</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> <source>Tag room as:</source> <translation>Tagge den Raum als:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation>Favorit</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation>Niedrige Priorität</translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Serverbenachrichtigungen</translation> + <location line="+2"/> + <source>Server notice</source> + <translation>Serverbenachrichtigung</translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Fügt einen Tag hinzu oder entfernt ihn.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation>Neuen Tag erstellen...</translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Neuer Tag…</translation> + <location line="+222"/> + <source>Accept</source> + <translation>Akzeptieren</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Neuer Tag</translation> + <location line="+21"/> + <source>Decline</source> + <translation>Ablehnen</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation>Statusnachricht</translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Tag:</translation> + <source>Enter your status message:</source> + <translation>Gib deine Statusnachricht ein:</translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Akzeptieren</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation>Profileinstellungen</translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Ablehnen</translation> + <location line="+5"/> + <source>Set status message</source> + <translation>Setze eine Statusnachricht</translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation>Abmelden</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation>Neues Gespräch beginnen</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation>Raum betreten</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation>Erstelle einen neuen Raum</translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation>Raumverzeichnis</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation>Benutzereinstellungen</translation> </message> </context> <context> @@ -1266,7 +1407,7 @@ Beispiel: https://mein.server:8787</translation> <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 aktuell experimentell und kann in verschiedenen Fällen zu Fehlern führen.<br>Verschlüsselung kann nachträglich nicht deaktiviert werden.</translation> + <translation>Verschlüsselung ist derzeit experimentell und könnte unerwartete Probleme verursachen.<br>Bitte beachte, dass dies später nicht mehr deaktiviert werden kann.</translation> </message> <message> <location line="+17"/> @@ -1278,9 +1419,7 @@ Beispiel: https://mein.server:8787</translation> <source>Whether or not the client should respond automatically with the session keys upon request. Use with caution, this is a temporary measure to test the E2E implementation until device verification is completed.</source> - <translation>Ob Nheko automatisch auf Schlüsselanfragen antwortet. Dies ist ein temporärer -Workaround um, solange die Ende-zu-Ende Verschlüsselung unvollständig ist, um -Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</translation> + <translation>Soll der Client automatisch mit den Sitzungsschlüsseln auf Anfragen antworten oder nicht? Bitte mit Vorsicht benutzen, dies ist eine vorübergehende Maßnahme, um die Ende-zu-Ende-Implementierung zu testen, bis die Geräteverifizierung abgeschlossen ist.</translation> </message> <message> <location line="+21"/> @@ -1325,13 +1464,13 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation>Fehler beim Lesen der DateI: %1</translation> + <translation>Fehler beim Lesen der Datei: %1</translation> </message> <message> <location line="+34"/> <location line="+20"/> <source>Failed to upload image: %s</source> - <translation>Hochladen der Bilddatei fehlgeschlagen: %s</translation> + <translation>Hochladen des Bildes fehlgeschlagen: %s</translation> </message> </context> <context> @@ -1349,23 +1488,23 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <message> <location line="+20"/> <source>Frame rate:</source> - <translation>Wiederholungsrate:</translation> + <translation>Bildrate:</translation> </message> <message> <location line="+19"/> <source>Include your camera picture-in-picture</source> - <translation>Eigene Kamera als Bild-im-Bild anzeigen</translation> + <translation>Deine Kamera Bild-in-Bild anzeigen</translation> </message> <message> <location line="+12"/> <source>Request remote camera</source> - <translation>Kamera der Gegenstelle anfragen</translation> + <translation>Entfernte Kamera anfragen</translation> </message> <message> <location line="+1"/> <location line="+9"/> <source>View your callee's camera like a regular video call</source> - <translation>Zeige die Kamera des Angerufen wie in einem normalen Videoanruf an</translation> + <translation>Die Kamera Ihres Gesprächspartners wie bei einem normalen Videoanruf betrachten</translation> </message> <message> <location line="+5"/> @@ -1389,34 +1528,6 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Benutzereinstellungen</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Neuen Raum erstellen</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Raum betreten</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Neues Gespräch beginnen</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Raumverzeichnis</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1442,7 +1553,7 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Erfolgreiche Verifizierung</translation> </message> @@ -1460,7 +1571,7 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Nachricht zurückziehen fehlgeschlagen: %1</translation> </message> @@ -1595,24 +1706,29 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <translation>%1 wurde gebannt.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation>Grund: %1</translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 hat das Anklopfen zurückgezogen.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Du bist dem Raum beigetreten.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> - <translation type="unfinished"></translation> + <translation>%1 hat den eigenen Avatar und Namen geändert zu %2.</translation> </message> <message> <location line="+5"/> <source>%1 has changed their display name to %2.</source> - <translation type="unfinished"></translation> + <translation>%1 hat den eigenen Namen geändert zu %2.</translation> </message> <message> <location line="+31"/> @@ -1626,12 +1742,7 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <translation>%1 hat den Raum verlassen, obwohl er gar nicht mehr am Raum teilnahm!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Grund: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 hat angeklopft.</translation> </message> @@ -1647,85 +1758,25 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Reaktion senden</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Antworten</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation>Bearbeiten</translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Lesebestätigungen</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Als gelesen markieren</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Zeige rohen Nachrichteninhalt</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Zeige rohen, entschlüsselten Nachrichteninhalt</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Nachricht entfernen</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Speichern unter</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation>Öffne in externen Programm</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Kein Raum geöffnet</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation>%1 Teilnehmer</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Kein Raum geöffnet</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation>Zurück zur Raumliste</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Keinen verschlüsselten Chat mit diesem User gefunden. Erstelle einen verschlüsselten 1:1 Chat mit diesem Nutzer und versuche es erneut.</translation> </message> @@ -1783,54 +1834,6 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Abmelden</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Setze eine benutzerdefinierte Statusnachricht</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Benutzerdefinierter Status</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Status:</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation>Profileinstellungen</translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Setze Präsenz automatisch</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>Online</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Nicht verfügbar</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Offline</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1869,9 +1872,9 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <translation>Verifizierung zurückziehen</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> - <translation>Wähle einen Avatar</translation> + <translation>Avatar wählen</translation> </message> <message> <location line="+0"/> @@ -1892,8 +1895,8 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation>Standard</translation> </message> @@ -1901,7 +1904,7 @@ Schlüssel auszutauschen, wenn der normale Weg nicht zu funktionieren scheint.</ <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Ins Benachrichtigungsfeld minimieren</translation> </message> @@ -1993,13 +1996,12 @@ Betrifft nur Nachrichten in verschlüsselten Chats.</translation> <location line="+2"/> <source>When the window loses focus, the timeline will be blurred.</source> - <translation>Verliert das Fenster den Fokus, werden die Nachrichten -verschwommen angezeigt.</translation> + <translation>Die Zeitliste wird unscharf, wenn das Fenster den Fokus verliert.</translation> </message> <message> <location line="+2"/> <source>Privacy screen timeout (in seconds [0 - 3600])</source> - <translation>Zeit bis Blickschutz aktiv wird (in Sekunden [0 - 3600])</translation> + <translation>Sichtschutz-Zeitbegrenzung (in Sekunden [0 - 3600])</translation> </message> <message> <location line="+2"/> @@ -2717,22 +2719,9 @@ Medien-Größe: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Dieser Raum</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Alle Räume</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Unbekannter Nachrichtentyp</translation> </message> diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index c05c7b3e..d5d5f323 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">Διάλεξε ένα αρχείο</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">Όλα τα αρχεία (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Κενός κωδικός</translation> </message> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Όνομα χρήστη</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Κωδικός</translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>ΕΓΓΡΑΦΗ</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Ο κωδικός δεν αποτελείται από αρκετους χαρακτήρες</translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>Οι κωδικοί δεν ταιριίαζουν</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Λανθασμένο όνομα διακομιστή</translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Βγές</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Βγές</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Αποδοχή</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Απόρριψη</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Αποδοχή</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Απόρριψη</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Νέα συνομιλία</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Ελαχιστοποίηση</translation> </message> @@ -2698,22 +2703,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 1fc47995..7d3f8276 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>You joined this room.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Failed to invite user: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Invited user: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation>Confirm join</translation> </message> @@ -164,13 +156,13 @@ <translation>Room %1 created.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Confirm invite</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Do you really want to invite %1 (%2)?</translation> </message> @@ -235,12 +227,12 @@ <translation>Unbanned user: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation>Do you really want to start a private chat with %1?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Cache migration failed!</translation> </message> @@ -255,7 +247,7 @@ <translation>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Failed to restore OLM account. Please login again.</translation> </message> @@ -265,13 +257,13 @@ <translation>Failed to restore save data. Please login again.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Please try to login again: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Failed to leave room: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation>Failed to kick %1 from %2: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> - <translation>Hide rooms with this tag or from this community</translation> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation>Hide rooms with this tag or from this space by default.</translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation>All rooms</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Favourite rooms</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation>Shows all rooms without filtering.</translation> + </message> + <message> + <location line="+30"/> + <source>Favourites</source> + <translation>Favourites</translation> </message> <message> <location line="+2"/> - <source>Low priority rooms</source> - <translation>Low priority rooms</translation> + <source>Rooms you have favourited.</source> + <translation>Rooms you have favourited.</translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation>Low Priority</translation> </message> <message> <location line="+2"/> + <source>Rooms with low priority.</source> + <translation>Rooms with low priority.</translation> + </message> + <message> + <location line="+7"/> <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> <translation>Server Notices</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tag)</translation> - </message> - <message> - <location line="+3"/> - <source> (community)</source> - <translation> (community)</translation> + <source>Messages from your server or administrator.</source> + <translation>Messages from your server or administrator.</translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Decrypt secrets</translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Encrypted Event (No keys found for decryption) --</translation> @@ -529,7 +532,7 @@ <translation>-- Encrypted Event (Key not valid for this index) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Select a file</translation> </message> @@ -614,7 +617,7 @@ <translation>All Files (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Failed to upload media. Please try again.</translation> </message> @@ -695,13 +698,13 @@ Example: https://server.my:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <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="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autodiscovery failed. Received malformed response.</translation> </message> @@ -711,7 +714,7 @@ Example: https://server.my:8787</translation> <translation>Autodiscovery failed. Unknown error while requesting .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>The required endpoints were not found. Possibly not a Matrix server.</translation> </message> @@ -726,12 +729,12 @@ Example: https://server.my:8787</translation> <translation>An unknown error occured. Make sure the homeserver domain is valid.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>SSO LOGIN</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Empty password</translation> </message> @@ -783,6 +786,11 @@ Example: https://server.my:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation>%1 changed the room avatar</translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 created and configured room: %2</translation> </message> @@ -812,13 +820,13 @@ Example: https://server.my:8787</translation> <translation>%1 answered the call.</translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation>removed</translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation>%1 ended the call.</translation> </message> @@ -864,7 +872,7 @@ Example: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation>Edit</translation> </message> @@ -883,6 +891,76 @@ Example: https://server.my:8787</translation> <source>Options</source> <translation>Options</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation>&Copy</translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation>Copy &link location</translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation>Re&act</translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation>Repl&y</translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation>&Edit</translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation>Read receip&ts</translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation>&Forward</translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation>&Mark as read</translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation>View raw message</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation>View decrypted raw message</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation>Remo&ve message</translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation>&Save as</translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation>&Open in external program</translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation>Copy link to eve&nt</translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Example: https://server.my:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>unimplemented event: </translation> </message> @@ -1030,7 +1108,7 @@ Example: https://server.my:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</translation> </message> @@ -1048,18 +1126,18 @@ Example: https://server.my:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Username</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Password</translation> </message> @@ -1084,22 +1162,47 @@ Example: https://server.my:8787</translation> <translation>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTER</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>No supported registration flows!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>One or more fields have invalid inputs. Please correct those issues and try again.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation>Autodiscovery failed. Received malformed response.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation>Autodiscovery failed. Unknown error while requesting .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation>The required endpoints were not found. Possibly not a Matrix server.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation>Received malformed response. Make sure the homeserver domain is valid.</translation> + </message> + <message> + <location line="+5"/> + <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 line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Password is not long enough (min 8 chars)</translation> </message> @@ -1109,7 +1212,7 @@ Example: https://server.my:8787</translation> <translation>Passwords don't match</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Invalid server name</translation> </message> @@ -1117,7 +1220,7 @@ Example: https://server.my:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Close</translation> </message> @@ -1130,74 +1233,112 @@ Example: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>no version stored</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> + <message> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation>New tag</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation>Enter the tag you want to use:</translation> + </message> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> + <location line="+7"/> <source>Leave room</source> <translation>Leave room</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> <source>Tag room as:</source> <translation>Tag room as:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation>Favourite</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>Low Priority</translation> + <location line="+2"/> + <source>Low priority</source> + <translation>Low priority</translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Server Notice</translation> + <location line="+2"/> + <source>Server notice</source> + <translation>Server notice</translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Adds or removes the specified tag.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation>Create new tag...</translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>New tag…</translation> + <location line="+222"/> + <source>Accept</source> + <translation>Accept</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>New Tag</translation> + <location line="+21"/> + <source>Decline</source> + <translation>Decline</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation>Status Message</translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Tag:</translation> + <source>Enter your status message:</source> + <translation>Enter your status message:</translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Accept</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation>Profile settings</translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Decline</translation> + <location line="+5"/> + <source>Set status message</source> + <translation>Set status message</translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation>Logout</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation>Start a new chat</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation>Join a room</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation>Create a new room</translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation>Room directory</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation>User settings</translation> </message> </context> <context> @@ -1389,34 +1530,6 @@ E2E implementation until device verification is completed.</translation> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>User settings</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Create new room</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Join a room</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Start a new chat</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Room directory</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1442,7 +1555,7 @@ E2E implementation until device verification is completed.</translation> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Successful Verification</translation> </message> @@ -1460,7 +1573,7 @@ E2E implementation until device verification is completed.</translation> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Message redaction failed: %1</translation> </message> @@ -1595,17 +1708,22 @@ E2E implementation until device verification is completed.</translation> <translation>%1 was banned.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation>Reason: %1</translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 redacted their knock.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>You joined this room.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation>%1 has changed their avatar and changed their display name to %2.</translation> </message> @@ -1626,12 +1744,7 @@ E2E implementation until device verification is completed.</translation> <translation>%1 left after having already left!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Reason: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 knocked.</translation> </message> @@ -1647,85 +1760,25 @@ E2E implementation until device verification is completed.</translation> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation>Copy</translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation>Copy link location</translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>React</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Reply</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation>Edit</translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Read receipts</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation>Forward</translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Mark as read</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>View raw message</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>View decrypted raw message</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Remove message</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Save as</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation>Open in external program</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>No room open</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation>Copy link to event</translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation>%1 member(s)</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>No room open</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation>Back to room list</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</translation> </message> @@ -1783,54 +1836,6 @@ E2E implementation until device verification is completed.</translation> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Logout</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Set custom status message</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Custom status message</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Status:</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation>User Profile Settings</translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Set presence automatically</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>Online</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Unavailable</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Offline</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1869,7 +1874,7 @@ E2E implementation until device verification is completed.</translation> <translation>Unverify</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Select an avatar</translation> </message> @@ -1892,8 +1897,8 @@ E2E implementation until device verification is completed.</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation>Default</translation> </message> @@ -1901,7 +1906,7 @@ E2E implementation until device verification is completed.</translation> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Minimize to tray</translation> </message> @@ -2717,22 +2722,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>This Room</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>All Rooms</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Unknown Message Type</translation> </message> diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts index b0740534..26a67d49 100644 --- a/resources/langs/nheko_eo.ts +++ b/resources/langs/nheko_eo.ts @@ -6,33 +6,33 @@ <message> <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/> <source>Calling...</source> - <translation type="unfinished"></translation> + <translation>Vokante…</translation> </message> <message> <location line="+10"/> <location line="+10"/> <source>Connecting...</source> - <translation type="unfinished"></translation> + <translation>Konektante…</translation> </message> <message> <location line="+67"/> <source>You are screen sharing</source> - <translation type="unfinished"></translation> + <translation>Vi vidigas vian ekranon</translation> </message> <message> <location line="+17"/> <source>Hide/Show Picture-in-Picture</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Kaŝi/Montri bildon en bildo</translation> </message> <message> <location line="+13"/> <source>Unmute Mic</source> - <translation type="unfinished"></translation> + <translation>Malsilentigi mikrofonon</translation> </message> <message> <location line="+0"/> <source>Mute Mic</source> - <translation type="unfinished"></translation> + <translation>Silentigi mikrofonon</translation> </message> </context> <context> @@ -40,25 +40,17 @@ <message> <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/> <source>Awaiting Confirmation</source> - <translation type="unfinished"></translation> + <translation>Atendante konfirmon</translation> </message> <message> <location line="+12"/> <source>Waiting for other side to complete verification.</source> - <translation type="unfinished"></translation> + <translation>Atendante kontrolon venontan de la alia flanko.</translation> </message> <message> <location line="+12"/> <source>Cancel</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Vi aliĝis ĉi tiun ĉambron.</translation> + <translation>Nuligi</translation> </message> </context> <context> @@ -66,17 +58,17 @@ <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Vidvoko</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Voĉvoko</translation> </message> <message> <location line="+62"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Neniu mikrofono troviĝis.</translation> </message> </context> <context> @@ -84,42 +76,42 @@ <message> <location filename="../qml/voip/CallInviteBar.qml" line="+64"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Vidvoko</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Voĉvoko</translation> </message> <message> <location line="+16"/> <source>Devices</source> - <translation type="unfinished"></translation> + <translation>Aparatoj</translation> </message> <message> <location line="+10"/> <source>Accept</source> - <translation type="unfinished"></translation> + <translation>Akcepti</translation> </message> <message> <location line="+12"/> <source>Unknown microphone: %1</source> - <translation type="unfinished"></translation> + <translation>Nekonata mikrofono: %1</translation> </message> <message> <location line="+8"/> <source>Unknown camera: %1</source> - <translation type="unfinished"></translation> + <translation>Nekonata filmilo: %1</translation> </message> <message> <location line="+13"/> <source>Decline</source> - <translation type="unfinished"></translation> + <translation>Rifuzi</translation> </message> <message> <location line="-28"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Neniu mikrofono troviĝis.</translation> </message> </context> <context> @@ -127,36 +119,36 @@ <message> <location filename="../../src/CallManager.cpp" line="+521"/> <source>Entire screen</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Tuta ekrano</translation> </message> </context> <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis inviti uzanton: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Invitita uzanto: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis migrado de kaŝmemoro al nuna versio. Tio povas havi diversajn kialojn. Bonvolu raporti eraron kaj dume provi malpli novan version. Alternative, vi povas provi forigi la kaŝmemoron permane.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> - <translation type="unfinished"></translation> + <translation>Konfirmu aliĝon</translation> </message> <message> <location line="+1"/> <source>Do you really want to join %1?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas aliĝi al %1?</translation> </message> <message> <location line="+44"/> @@ -165,98 +157,98 @@ <translation>Ĉambro %1 farit.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> - <translation type="unfinished"></translation> + <translation>Konfirmu inviton</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas inviti uzanton %1 (%2)?</translation> </message> <message> <location line="+11"/> <source>Failed to invite %1 to %2: %3</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis inviti uzanton %1 al %2: %3</translation> </message> <message> <location line="+15"/> <source>Confirm kick</source> - <translation type="unfinished"></translation> + <translation>Konfirmu forpelon</translation> </message> <message> <location line="+1"/> <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas forpeli uzanton %1 (%2)?</translation> </message> <message> <location line="+16"/> <source>Kicked user: %1</source> - <translation type="unfinished"></translation> + <translation>Forpelis uzanton: %1</translation> </message> <message> <location line="+10"/> <source>Confirm ban</source> - <translation type="unfinished"></translation> + <translation>Konfirmu forbaron</translation> </message> <message> <location line="+1"/> <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas forbari uzanton %1 (%2)?</translation> </message> <message> <location line="+11"/> <source>Failed to ban %1 in %2: %3</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis forbari uzanton %1 en %2: %3</translation> </message> <message> <location line="+5"/> <source>Banned user: %1</source> - <translation type="unfinished"></translation> + <translation>Forbaris uzanton: %1</translation> </message> <message> <location line="+10"/> <source>Confirm unban</source> - <translation type="unfinished"></translation> + <translation>Konfirmu malforbaron</translation> </message> <message> <location line="+1"/> <source>Do you really want to unban %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas malforbari uzanton %1 (%2)?</translation> </message> <message> <location line="+11"/> <source>Failed to unban %1 in %2: %3</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis malforbari uzanton %1 en %2: %3</translation> </message> <message> <location line="+5"/> <source>Unbanned user: %1</source> - <translation type="unfinished"></translation> + <translation>Malforbaris uzanton: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> - <translation type="unfinished"></translation> + <translation>Ĉu vi certe volas komenci privatan babilon kun %1?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis migrado de kaŝmemoro!</translation> </message> <message> <location line="+13"/> <source>Incompatible cache version</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Neakorda versio de kaŝmemoro</translation> </message> <message> <location line="+1"/> <source>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</source> - <translation type="unfinished"></translation> + <translation>La kaŝmemoro sur via disko estas pli nova ol kiom ĉi tiu versio de Nheko subtenas. Bonvolu ĝisdatigi la programon aŭ vakigi vian kaŝmemoron.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -266,20 +258,20 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis agordi ĉifrajn ŝlosilojn. Respondo de servilo: %1 %2. Bonvolu reprovi poste.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> - <translation type="unfinished"></translation> + <translation>Bonvolu provi resaluti: %1</translation> </message> <message> <location line="+51"/> <source>Failed to join room: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis aliĝi al ĉambro: %1</translation> </message> <message> <location line="+5"/> @@ -289,75 +281,86 @@ <message> <location line="+6"/> <source>Failed to remove invite: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis forigi inviton: %1</translation> </message> <message> <location line="+21"/> <source>Room creation failed: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis krei ĉambron: %1</translation> </message> <message> <location line="+18"/> <source>Failed to leave room: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis eliri el ĉambro: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis forpeli uzanton %1 de %2: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Ĉiuj ĉambroj</translation> + <translation type="unfinished">Ĉiuj ĉambroj</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Preferaj ĉambroj</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> <translation type="unfinished"></translation> </message> <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Malalta prioritato</translation> + </message> + <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> - <translation type="unfinished"></translation> + <translation>Malĉifri sekretojn</translation> </message> <message> <location line="+2"/> <source>Enter your recovery key or passphrase to decrypt your secrets:</source> - <translation type="unfinished"></translation> + <translation>Enigu vian rehavan ŝlosilon aŭ pasfrazon por malĉifri viajn sekretojn:</translation> </message> <message> <location line="+3"/> @@ -367,12 +370,12 @@ <message> <location line="+17"/> <source>Decryption failed</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis malĉifrado</translation> </message> <message> <location line="+1"/> <source>Failed to decrypt secrets with the provided recovery key or passphrase</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis malĉifri sekretojn per la donitaj rehava ŝlosilo aŭ pasfrazo</translation> </message> </context> <context> @@ -380,22 +383,22 @@ <message> <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/> <source>Verification Code</source> - <translation type="unfinished"></translation> + <translation>Kontrolkodo</translation> </message> <message> <location line="+10"/> <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 type="unfinished"></translation> + <translation>Bonvolu kontroli la sekvantajn ciferojn. Vi devus vidi la samajn numerojn ambaŭflanke. Se ili malsamas, bonvolu premi «Ili ne akordas!» por nuligi la kontrolon!</translation> </message> <message> <location line="+31"/> <source>They do not match!</source> - <translation type="unfinished"></translation> + <translation>Ili ne akordas!</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation type="unfinished"></translation> + <translation>Ili akordas!</translation> </message> </context> <context> @@ -403,12 +406,12 @@ <message> <location filename="../../src/ui/RoomSettings.cpp" line="+42"/> <source>Apply</source> - <translation type="unfinished"></translation> + <translation>Apliki</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation>Nuligi</translation> </message> <message> <location line="+10"/> @@ -418,7 +421,7 @@ <message> <location line="+2"/> <source>Topic</source> - <translation type="unfinished"></translation> + <translation>Temo</translation> </message> </context> <context> @@ -426,7 +429,7 @@ <message> <location filename="../qml/emoji/EmojiPicker.qml" line="+59"/> <source>Search</source> - <translation>Trovu</translation> + <translation>Serĉu</translation> </message> <message> <location line="+172"/> @@ -474,22 +477,22 @@ <message> <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/> <source>Verification Code</source> - <translation type="unfinished"></translation> + <translation>Kontrolkodo</translation> </message> <message> <location line="+10"/> <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 type="unfinished"></translation> + <translation>Bonvolu kontroli per la jenaj bildosignoj. Vi devus vidi la samajn bildosignojn ambaŭflanke. Se ili malsamas, bonvolu premi «Ili ne akordas!» por nuligi la kontrolon!</translation> </message> <message> <location line="+376"/> <source>They do not match!</source> - <translation type="unfinished"></translation> + <translation>Ili ne akordas!</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation type="unfinished"></translation> + <translation>Ili akordas!</translation> </message> </context> <context> @@ -497,28 +500,28 @@ <message> <location filename="../qml/EncryptionIndicator.qml" line="+34"/> <source>This message is not encrypted!</source> - <translation type="unfinished"></translation> + <translation>Ĉi tiu mesaĝo ne estas ĉifrita!</translation> </message> <message> <location line="+4"/> <source>Encrypted by a verified device</source> - <translation type="unfinished"></translation> + <translation>Ĉifrita de kontrolita aparato</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device, but you have trusted that user so far.</source> - <translation type="unfinished"></translation> + <translation>Ĉifrita de nekontrolita aparato, sed vi fidis je tiu uzanto ĝis nun.</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device</source> - <translation type="unfinished"></translation> + <translation>Ĉifrita de nekontrolita aparato</translation> </message> </context> <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -530,7 +533,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -565,33 +568,33 @@ <message> <location filename="../qml/device-verification/Failed.qml" line="+11"/> <source>Verification failed</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis kontrolo</translation> </message> <message> <location line="+15"/> <source>Other client does not support our verification protocol.</source> - <translation type="unfinished"></translation> + <translation>Alia kliento ne subtenas nian kontrolan protokolon.</translation> </message> <message> <location line="+4"/> <source>Key mismatch detected!</source> - <translation type="unfinished"></translation> + <translation>Troviĝis malakordo de ŝlosiloj!</translation> </message> <message> <location line="+2"/> <location line="+4"/> <source>Device verification timed out.</source> - <translation type="unfinished"></translation> + <translation>Trafiĝis tempolimo de aparata kontrolo.</translation> </message> <message> <location line="-2"/> <source>Other party canceled the verification.</source> - <translation type="unfinished"></translation> + <translation>Aliulo nuligis la kontrolon.</translation> </message> <message> <location line="+18"/> <source>Close</source> - <translation type="unfinished"></translation> + <translation>Fermi</translation> </message> </context> <context> @@ -605,19 +608,19 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Elektu dosieron</translation> </message> <message> <location line="+0"/> <source>All Files (*)</source> - <translation type="unfinished">Ĉiuj dosieroj (*)</translation> + <translation>Ĉiuj dosieroj (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis alŝuti vidaŭdaĵojn. Bonvolu reprovi.</translation> </message> </context> <context> @@ -625,7 +628,7 @@ <message> <location filename="../../src/InviteeItem.cpp" line="+22"/> <source>Remove</source> - <translation type="unfinished"></translation> + <translation>Forigi</translation> </message> </context> <context> @@ -633,12 +636,12 @@ <message> <location filename="../../src/LoginPage.cpp" line="+81"/> <source>Matrix ID</source> - <translation type="unfinished"></translation> + <translation>Identigilo de Matrikso</translation> </message> <message> <location line="+2"/> <source>e.g @joe:matrix.org</source> - <translation type="unfinished"></translation> + <translation>ekz. @tacuo:matrix.org</translation> </message> <message> <location line="+2"/> @@ -646,17 +649,19 @@ You can also put your homeserver address there, if your server doesn't support .well-known lookup. Example: @user:server.my If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source> - <translation type="unfinished">Via ensaluta nomo.</translation> + <translation type="unfinished">Via saluta nomo. Identigilo de Matrikso devus komenciĝi per @ sekvata de la identigilo de uzanto. Post la identigilo, vi devas meti retnomon post :. Vi ankaŭ povas enmeti adreson de via hejmservilo, se via servilo ne subtenas bone-konatan trovmanieron. +Ekzemplo: @uzanto:servilo.mia +Se Nheko malsukcesas trovi vian hejmservilon, ĝi montros kampon por ĝia permana aldono.</translation> </message> <message> <location line="+25"/> <source>Password</source> - <translation type="unfinished">Pasvorto</translation> + <translation>Pasvorto</translation> </message> <message> <location line="+2"/> <source>Your password.</source> - <translation type="unfinished"></translation> + <translation>Via pasvorto.</translation> </message> <message> <location line="+3"/> @@ -667,42 +672,42 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th <location line="+2"/> <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source> <translatorcomment>Wow, I had to use dictionaries a lot to get this, so there may be a number of mistakes :P</translatorcomment> - <translation>Nomo por ĉi tiu aparato, montrot al aliaj, kiam kontrolant viajn aparatojn. Se neniom provizitis, defaŭlto uzit.</translation> + <translation>Nomo por ĉi tiu aparato, montrota al aliuloj, kiam oni kontrolos viajn aparatojn. Se vi neniun donos, uziĝos nomo implicita.</translation> </message> <message> <location line="+4"/> <source>Homeserver address</source> - <translation type="unfinished"></translation> + <translation>Adreso de hejmservilo</translation> </message> <message> <location line="+1"/> <source>server.my:8787</source> - <translation type="unfinished"></translation> + <translation>servilo.mia:8787</translation> </message> <message> <location line="+1"/> <source>The address that can be used to contact you homeservers client API. Example: https://server.my:8787</source> <translatorcomment>API should be valid for the EO translation of application programming interface.</translatorcomment> - <translation>La adreso tiu uzeblas kontakti la klienta API de via hejmservisto. -Ekzemplo: https://servisto.mia:8787</translation> + <translation>La adreso per kiu kontakteblas la klienta API de via hejmservilo. +Ekzemplo: https://servilo.mia:8787</translation> </message> <message> <location line="+19"/> <source>LOGIN</source> <translatorcomment>Maybe shouldn't be imperative?</translatorcomment> - <translation>ENSALUTU</translation> + <translation>SALUTI</translation> </message> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> - <translation type="unfinished"></translation> + <translation>Vi enigis nevalidan identigilon de Matrikso ekz. @tacuo:matrix.org</translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -712,7 +717,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -727,19 +732,19 @@ Ekzemplo: https://servisto.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> - <translation>SSO ENSALUTU</translation> + <translation>UNUNURA SALUTO</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> - <translation type="unfinished"></translation> + <translation>Malplena pasvorto</translation> </message> <message> <location line="+57"/> <source>SSO login failed</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis ununura saluto</translation> </message> </context> <context> @@ -761,7 +766,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <location filename="../qml/delegates/MessageDelegate.qml" line="+110"/> <location line="+9"/> <source>removed</source> - <translation type="unfinished"></translation> + <translation>forigita</translation> </message> <message> <location line="+9"/> @@ -790,38 +795,43 @@ Ekzemplo: https://servisto.mia:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> <message> <location line="+12"/> <source>%1 placed a voice call.</source> - <translation type="unfinished"></translation> + <translation>%1 metis voĉvokon.</translation> </message> <message> <location line="+2"/> <source>%1 placed a video call.</source> - <translation type="unfinished"></translation> + <translation>%1 metis vidvokon.</translation> </message> <message> <location line="+2"/> <source>%1 placed a call.</source> - <translation type="unfinished"></translation> + <translation>%1 metis vokon.</translation> </message> <message> <location line="+11"/> <source>%1 answered the call.</source> - <translation type="unfinished"></translation> + <translation>%1 respondis la vokon.</translation> </message> <message> <location line="+9"/> <source>%1 ended the call.</source> - <translation type="unfinished"></translation> + <translation>%1 finis la vokon.</translation> </message> <message> <location line="+9"/> <source>Negotiating call...</source> - <translation type="unfinished"></translation> + <translation>Traktante vokon…</translation> </message> </context> <context> @@ -834,7 +844,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+0"/> <source>Place a call</source> - <translation type="unfinished"></translation> + <translation>Voki</translation> </message> <message> <location line="+25"/> @@ -844,45 +854,115 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+50"/> <source>Write a message...</source> - <translation type="unfinished">Skribu mesaĝon...</translation> + <translation>Skribu mesaĝon…</translation> </message> <message> <location line="+214"/> <source>Emoji</source> - <translation type="unfinished"></translation> + <translation>Bildosignoj</translation> </message> <message> <location line="+16"/> <source>Send</source> - <translation>Sendu</translation> + <translation>Sendi</translation> </message> <message> <location line="+11"/> <source>You don't have permission to send messages in this room</source> - <translation type="unfinished"></translation> + <translation>Vi ne rajtas sendi mesaĝojn en ĉi tiu ĉambro</translation> </message> </context> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>Redakti</translation> </message> <message> <location line="+15"/> <source>React</source> - <translation type="unfinished">Reagu</translation> + <translation>Reagi</translation> </message> <message> <location line="+13"/> <source>Reply</source> - <translation type="unfinished">Respondu</translation> + <translation>Respondi</translation> </message> <message> <location line="+11"/> <source>Options</source> - <translation type="unfinished">Ebloj</translation> + <translation>Elektebloj</translation> + </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Vidi krudan mesaĝon</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Vidi malĉifritan krudan mesaĝon</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -890,57 +970,57 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/> <source>Send Verification Request</source> - <translation type="unfinished"></translation> + <translation>Sendi kontrolpeton</translation> </message> <message> <location line="+0"/> <source>Received Verification Request</source> - <translation type="unfinished"></translation> + <translation>Ricevita kontrolpeto</translation> </message> <message> <location line="+15"/> <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source> - <translation type="unfinished"></translation> + <translation>Por vidigi al aliuloj, kiuj viaj aparatoj vere apartenas al vi, vi povas ilin kontroli. Tio ankaŭ funkciigus memagan savkopiadon de ŝlosiloj. Ĉu vi volas kontroli aparaton %1 nun?</translation> </message> <message> <location line="+2"/> <source>To ensure that no malicious user can eavesdrop on your encrypted communications you can verify the other party.</source> - <translation type="unfinished"></translation> + <translation>Por certigi, ke neniu malica uzanto subaŭskultas vian ĉifritan komunikadon, vi povas kontroli la kunparolanton.</translation> </message> <message> <location line="+3"/> <source>%1 has requested to verify their device %2.</source> - <translation type="unfinished"></translation> + <translation>%1 petis kontrolon de sia aparato %2.</translation> </message> <message> <location line="+2"/> <source>%1 using the device %2 has requested to be verified.</source> - <translation type="unfinished"></translation> + <translation>%1 petis kontrolon per la aparato %2.</translation> </message> <message> <location line="+2"/> <source>Your device (%1) has requested to be verified.</source> - <translation type="unfinished"></translation> + <translation>Via aparato (%1) petis kontrolon.</translation> </message> <message> <location line="+10"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation>Nuligi</translation> </message> <message> <location line="+0"/> <source>Deny</source> - <translation type="unfinished"></translation> + <translation>Rifuzi</translation> </message> <message> <location line="+13"/> <source>Start verification</source> - <translation type="unfinished"></translation> + <translation>Komenci kontrolon</translation> </message> <message> <location line="+0"/> <source>Accept</source> - <translation type="unfinished"></translation> + <translation>Akcepti</translation> </message> </context> <context> @@ -950,41 +1030,41 @@ Ekzemplo: https://servisto.mia:8787</translation> <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/> <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/> <source>%1 sent an encrypted message</source> - <translation type="unfinished"></translation> + <translation>%1 sendis ĉifritan mesaĝon</translation> </message> <message> <location line="+4"/> <source>* %1 %2</source> <comment>Format an emote message in a notification, %1 is the sender, %2 the message</comment> - <translation type="unfinished"></translation> + <translation>* %1 %2</translation> </message> <message> <location line="+5"/> <source>%1 replied: %2</source> <comment>Format a reply in a notification. %1 is the sender, %2 the message</comment> - <translation type="unfinished"></translation> + <translation>%1 respondis: %2</translation> </message> <message> <location line="+4"/> <source>%1: %2</source> <comment>Format a normal message in a notification. %1 is the sender, %2 the message</comment> - <translation type="unfinished">%1: %2</translation> + <translation>%1: %2</translation> </message> <message> <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/> <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/> <source>%1 replied with an encrypted message</source> - <translation type="unfinished"></translation> + <translation>%1 respondis per ĉifrita mesaĝo</translation> </message> <message> <location line="+6"/> <source>%1 replied to a message</source> - <translation type="unfinished"></translation> + <translation>%1 respondis al mesaĝo</translation> </message> <message> <location line="+0"/> <source>%1 sent a message</source> - <translation type="unfinished"></translation> + <translation>%1 sendis mesaĝon</translation> </message> </context> <context> @@ -992,82 +1072,82 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location filename="../qml/voip/PlaceCall.qml" line="+48"/> <source>Place a call to %1?</source> - <translation type="unfinished"></translation> + <translation>Ĉu voki al %1?</translation> </message> <message> <location line="+16"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Neniu mikrofono troviĝis.</translation> </message> <message> <location line="+22"/> <source>Voice</source> - <translation type="unfinished"></translation> + <translation>Voĉe</translation> </message> <message> <location line="+13"/> <source>Video</source> - <translation type="unfinished"></translation> + <translation>Vide</translation> </message> <message> <location line="+14"/> <source>Screen</source> - <translation type="unfinished"></translation> + <translation>Ekrane</translation> </message> <message> <location line="+10"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation>Nuligi</translation> </message> </context> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> - <translation type="unfinished"></translation> + <translation>neprogramita okazo: </translation> </message> </context> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> <source>profile</source> - <translation type="unfinished"></translation> + <translation>profilo</translation> </message> <message> <location line="+1"/> <source>profile name</source> - <translation type="unfinished"></translation> + <translation>nomo de profilo</translation> </message> </context> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> - <translation>Uzantnomo</translation> + <translation>Uzantonomo</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> - <translation type="unfinished"></translation> + <translation>La uzantonomo devas ne esti malplena, kaj devas enhavi nur la signojn a–z, 0–9, ., _, =, -, kaj /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Pasvorto</translation> </message> <message> <location line="+3"/> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> - <translation type="unfinished"></translation> + <translation>Bonvolu elekti sekuran pasvorton. Precizaj postuloj por ĝia fortikeco povus dependi de via servilo.</translation> </message> <message> <location line="+4"/> @@ -1077,202 +1157,265 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+4"/> <source>Homeserver</source> - <translation type="unfinished"></translation> + <translation>Hejmservilo</translation> </message> <message> <location line="+2"/> <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source> - <translation type="unfinished"></translation> + <translation>Servilo, kiu permesas registriĝon. Ĉar Matrikso estas federa, vi bezonas unue trovi servilon, kie vi povus registriĝi, aŭ gastigi vian propran.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> - <translation>REGISTRU</translation> + <translation>REGISTRIĜI</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> - <translation type="unfinished"></translation> + <translation>Neniuj subtenataj manieroj de registriĝo!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> + <translation>Unu aŭ pliaj kampoj havas nevalidajn enigojn. Bonvolu korekti la problemojn kaj reprovi.</translation> + </message> + <message> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> - <source>Password is not long enough (min 8 chars)</source> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> <location line="+5"/> - <source>Passwords don't match</source> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> <translation type="unfinished"></translation> </message> <message> + <location line="-94"/> + <source>Password is not long enough (min 8 chars)</source> + <translation>Pasvorto nesufiĉe longas (almenaŭ 8 signoj)</translation> + </message> + <message> <location line="+5"/> + <source>Passwords don't match</source> + <translation>Pasvortoj ne akordas</translation> + </message> + <message> + <location line="+6"/> <source>Invalid server name</source> - <translation type="unfinished"></translation> + <translation>Nevalida nomo de servilo</translation> </message> </context> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> - <translation type="unfinished"></translation> + <translation>Fermi</translation> </message> <message> <location line="+13"/> <source>Cancel edit</source> - <translation type="unfinished"></translation> + <translation>Nuligi redakton</translation> </message> </context> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Eliru ĉambro</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Eliri el ĉambro</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Etikedi ĉambron:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>Preferata</translation> + <translation type="unfinished">Preferata</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Nova etikedo...</translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Akcepti</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Nova etikedo</translation> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Rifuzi</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Etikedo:</translation> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> + <location line="+10"/> + <source>Profile settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> + <location line="+5"/> + <source>Set status message</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Adiaŭi</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Komenci novan babilon</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Aliĝi ĉambron</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Ĉambra dosierujo</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Agordoj de uzanto</translation> + </message> </context> <context> <name>RoomSettings</name> <message> <location filename="../qml/RoomSettings.qml" line="+25"/> <source>Room Settings</source> - <translation type="unfinished"></translation> + <translation>Agordoj de ĉambro</translation> </message> <message> <location line="+79"/> <source>%1 member(s)</source> - <translation type="unfinished"></translation> + <translation>%1 ĉambrano(j)</translation> </message> <message> <location line="+43"/> <source>SETTINGS</source> - <translation type="unfinished"></translation> + <translation>AGORDOJ</translation> </message> <message> <location line="+9"/> <source>Notifications</source> - <translation type="unfinished"></translation> + <translation>Sciigoj</translation> </message> <message> <location line="+5"/> <source>Muted</source> - <translation type="unfinished"></translation> + <translation>Neniuj</translation> </message> <message> <location line="+0"/> <source>Mentions only</source> - <translation type="unfinished"></translation> + <translation>Nur mencioj</translation> </message> <message> <location line="+0"/> <source>All messages</source> - <translation type="unfinished"></translation> + <translation>Ĉiuj mesaĝoj</translation> </message> <message> <location line="+15"/> <source>Anyone and guests</source> - <translation type="unfinished"></translation> + <translation>Ĉiu ajn, inkluzive gastojn</translation> </message> <message> <location line="+0"/> <source>Anyone</source> - <translation type="unfinished"></translation> + <translation>Ĉiu ajn</translation> </message> <message> <location line="+0"/> <source>Invited users</source> - <translation type="unfinished"></translation> + <translation>Invititoj</translation> </message> <message> <location line="+9"/> <source>Encryption</source> - <translation type="unfinished"></translation> + <translation>Ĉifrado</translation> </message> <message> <location line="+20"/> <source>End-to-End Encryption</source> - <translation type="unfinished"></translation> + <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 type="unfinished"></translation> + <translation>Ĉifrado nun estas eksperimenta kaj povus rompiĝi neatendite.<br>Bonvole sciu, ke ne eblas ĝin malŝalti poste.</translation> </message> <message> <location line="+17"/> <source>Respond to key requests</source> - <translation type="unfinished"></translation> + <translation>Respondi al petoj de ŝlosiloj</translation> </message> <message> <location line="+5"/> @@ -1284,32 +1427,32 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+21"/> <source>INFO</source> - <translation type="unfinished"></translation> + <translation>INFORMOJ</translation> </message> <message> <location line="+9"/> <source>Internal ID</source> - <translation type="unfinished"></translation> + <translation>Interna identigilo</translation> </message> <message> <location line="+10"/> <source>Room Version</source> - <translation type="unfinished"></translation> + <translation>Versio de ĉambro</translation> </message> <message> <location line="+13"/> <source>OK</source> - <translation type="unfinished">Bone</translation> + <translation>Bone</translation> </message> <message> <location filename="../../src/ui/RoomSettings.cpp" line="+268"/> <source>Failed to enable encryption: %1</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis ŝalti ĉifradon: %1</translation> </message> <message> <location line="+228"/> <source>Select an avatar</source> - <translation type="unfinished"></translation> + <translation>Elektu bildon de ĉambro</translation> </message> <message> <location line="+0"/> @@ -1319,18 +1462,18 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+12"/> <source>The selected file is not an image</source> - <translation type="unfinished"></translation> + <translation>La elektita dosiero ne estas bildo</translation> </message> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation type="unfinished"></translation> + <translation>Eraris legado de dosiero: %1</translation> </message> <message> <location line="+34"/> <location line="+20"/> <source>Failed to upload image: %s</source> - <translation type="unfinished"></translation> + <translation>Malsukcesis alŝuti bildon: %s</translation> </message> </context> <context> @@ -1338,17 +1481,17 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location filename="../qml/voip/ScreenShare.qml" line="+30"/> <source>Share desktop with %1?</source> - <translation type="unfinished"></translation> + <translation>Ĉu montri la labortablon al %1?</translation> </message> <message> <location line="+11"/> <source>Window:</source> - <translation type="unfinished"></translation> + <translation>Fenestro:</translation> </message> <message> <location line="+20"/> <source>Frame rate:</source> - <translation type="unfinished"></translation> + <translation>Filmerrapido:</translation> </message> <message> <location line="+19"/> @@ -1369,7 +1512,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+5"/> <source>Hide mouse cursor</source> - <translation type="unfinished"></translation> + <translation>Kaŝi musmontrilon</translation> </message> <message> <location line="+20"/> @@ -1384,36 +1527,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+7"/> <source>Cancel</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Uzanta agordoj</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Faru novan ĉambron</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Aliĝu ĉambron</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Komencu novan babilon</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translatorcomment>Is it correct to use the adjective form in this way or should I use Dosierujo de ĉambro? Or da ĉambro?</translatorcomment> - <translation>Ĉambra dosierujo</translation> + <translation>Nuligi</translation> </message> </context> <context> @@ -1437,13 +1551,13 @@ Ekzemplo: https://servisto.mia:8787</translation> <location line="+2"/> <source>Read</source> <translatorcomment>Could this simply be "lega"?</translatorcomment> - <translation>Estas lega</translation> + <translation>Estas legita</translation> </message> </context> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1455,13 +1569,13 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+12"/> <source>Close</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Fermi</translation> </message> </context> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1474,22 +1588,22 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+164"/> <source>Save image</source> - <translation type="unfinished"></translation> + <translation>Konservi bildon</translation> </message> <message> <location line="+2"/> <source>Save video</source> - <translation type="unfinished"></translation> + <translation>Konservi filmon</translation> </message> <message> <location line="+2"/> <source>Save audio</source> - <translation type="unfinished"></translation> + <translation>Konservi sonon</translation> </message> <message> <location line="+2"/> <source>Save file</source> - <translation type="unfinished"></translation> + <translation>Konservi dosieron</translation> </message> <message numerus="yes"> <location line="+228"/> @@ -1503,42 +1617,42 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+68"/> <source>%1 opened the room to the public.</source> - <translation type="unfinished"></translation> + <translation>%1 malfermis la ĉambron al publiko.</translation> </message> <message> <location line="+2"/> <source>%1 made this room require and invitation to join.</source> - <translation type="unfinished"></translation> + <translation>%1 ekpostulis inviton por aliĝoj al la ĉamrbo.</translation> </message> <message> <location line="+23"/> <source>%1 made the room open to guests.</source> - <translation type="unfinished"></translation> + <translation>%1 malfermis la ĉambron al gastoj.</translation> </message> <message> <location line="+2"/> <source>%1 has closed the room to guest access.</source> - <translation type="unfinished"></translation> + <translation>%1 fermis la ĉambron al gastoj.</translation> </message> <message> <location line="+23"/> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source> - <translation type="unfinished"></translation> + <translation>%1 legebligis historion de la ĉambro al ĉiu ajn. Okazoj nun legeblos al nealiĝintoj.</translation> </message> <message> <location line="+4"/> <source>%1 set the room history visible to members from this point on.</source> - <translation type="unfinished"></translation> + <translation>%1 videbligis historion de la ĉambro al ĉiuj ĉambranoj ekde nun.</translation> </message> <message> <location line="+3"/> <source>%1 set the room history visible to members since they were invited.</source> - <translation type="unfinished"></translation> + <translation>%1 videbligis historion de la ĉambro al ĉambranoj ekde ties invito.</translation> </message> <message> <location line="+3"/> <source>%1 set the room history visible to members since they joined the room.</source> - <translation type="unfinished"></translation> + <translation>%1 videbligis historion de la ĉambro al ĉambranoj ekde ties aliĝo.</translation> </message> <message> <location line="+22"/> @@ -1549,13 +1663,13 @@ Ekzemplo: https://servisto.mia:8787</translation> <location line="+33"/> <source>%1 was invited.</source> <translatorcomment>%1 estis invitata.</translatorcomment> - <translation></translation> + <translation>%1 estis invitita.</translation> </message> <message> <location line="+19"/> <source>%1 changed their avatar.</source> <translatorcomment>%1 ŝanĝis sian avataron.</translatorcomment> - <translation></translation> + <translation>%1 ŝanĝis sian profilbildon.</translation> </message> <message> <location line="+2"/> @@ -1580,7 +1694,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+3"/> <source>%1 left the room.</source> - <translation>%1 eliris la ĉambro.</translation> + <translation>%1 eliris el la ĉambro.</translation> </message> <message> <location line="+2"/> @@ -1598,17 +1712,22 @@ Ekzemplo: https://servisto.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Vi aliĝis ĉi tiun ĉambron.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1626,15 +1745,10 @@ Ekzemplo: https://servisto.mia:8787</translation> <location line="+2"/> <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 eliris post ili jam eliris!</translation> - </message> - <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation> Kialo: %1</translation> + <translation>%1 eliris jam elirinte!</translation> </message> <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1644,91 +1758,31 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location filename="../qml/TimelineRow.qml" line="+106"/> <source>Edited</source> - <translation type="unfinished"></translation> + <translation>Redaktita</translation> </message> </context> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Reagu</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Respondu</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation type="unfinished">%1 ĉambrano(j)</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1764,12 +1818,12 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+5"/> <source>Leave room</source> - <translation>Eliru ĉambro</translation> + <translation>Eliri el ĉambro</translation> </message> <message> <location line="+5"/> <source>Settings</source> - <translation type="unfinished">Agordoj</translation> + <translation>Agordoj</translation> </message> </context> <context> @@ -1777,7 +1831,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location filename="../../src/TrayIcon.cpp" line="+112"/> <source>Show</source> - <translation>Montru</translation> + <translation>Montri</translation> </message> <message> <location line="+1"/> @@ -1786,54 +1840,6 @@ Ekzemplo: https://servisto.mia:8787</translation> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Elsalutu</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1872,9 +1878,9 @@ Ekzemplo: https://servisto.mia:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> - <translation type="unfinished"></translation> + <translation>Elektu profilbildon</translation> </message> <message> <location line="+0"/> @@ -1884,19 +1890,19 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+12"/> <source>The selected file is not an image</source> - <translation type="unfinished"></translation> + <translation>La elektita dosiero ne estas bildo</translation> </message> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation type="unfinished"></translation> + <translation>Eraris legado de dosiero: %1</translation> </message> </context> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1904,7 +1910,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -1936,7 +1942,7 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+31"/> <source>CALLS</source> - <translation type="unfinished"></translation> + <translation>VOKOJ</translation> </message> <message> <location line="+46"/> @@ -1946,142 +1952,159 @@ Ekzemplo: https://servisto.mia:8787</translation> <message> <location line="+4"/> <source>REQUEST</source> - <translation type="unfinished"></translation> + <translation>PETI</translation> </message> <message> <location line="+1"/> <source>DOWNLOAD</source> - <translation type="unfinished"></translation> + <translation>ELŜUTI</translation> </message> <message> <location line="+27"/> <source>Keep the application running in the background after closing the client window.</source> - <translation type="unfinished"></translation> + <translation>Daŭrigi la aplikaĵon fone post fermo de la klienta fenestro.</translation> </message> <message> <location line="+3"/> <source>Start the application in the background without showing the client window.</source> - <translation type="unfinished"></translation> + <translation>Ekigi la aplikaĵon fone sen montro de la klienta fenestro.</translation> </message> <message> <location line="+4"/> <source>Change the appearance of user avatars in chats. OFF - square, ON - Circle.</source> - <translation type="unfinished"></translation> + <translation>Ŝanĝas la aspekton de profilbildoj de uzantoj en babilujo. +NE – kvadrataj, JES – rondaj.</translation> </message> <message> <location line="+3"/> <source>Show a column containing groups and tags next to the room list.</source> - <translation type="unfinished"></translation> + <translation>Montras kolumnon kun grupoj kaj etikedoj apud la listo de ĉambroj.</translation> </message> <message> <location line="+1"/> <source>Decrypt messages in sidebar</source> - <translation type="unfinished"></translation> + <translation>Malĉifri mesaĝojn en flanka breto</translation> </message> <message> <location line="+2"/> <source>Decrypt the messages shown in the sidebar. Only affects messages in encrypted chats.</source> - <translation type="unfinished"></translation> + <translation>Malĉifras mesaĝojn montratajn en la flanka breto. +Influas nur sur mesaĝoj en ĉifritaj babiloj.</translation> </message> <message> <location line="+2"/> <source>Privacy Screen</source> - <translation type="unfinished"></translation> + <translation>Privateca ŝirmilo</translation> </message> <message> <location line="+2"/> <source>When the window loses focus, the timeline will be blurred.</source> - <translation type="unfinished"></translation> + <translation>Kiam la fenestro ne estos fokusata, la historio +malklariĝos.</translation> </message> <message> <location line="+2"/> <source>Privacy screen timeout (in seconds [0 - 3600])</source> - <translation type="unfinished"></translation> + <translation>Atendo ĝis privateca ŝirmilo (0–3600 sekundoj)</translation> </message> <message> <location line="+2"/> <source>Set timeout (in seconds) for how long after window loses focus before the screen will be blurred. Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source> - <translation type="unfinished"></translation> + <translation>Tempo de atendo (en sekundoj) ekde senfokusiĝo +de la fenestro, post kiu la enhavo malklariĝos. +Agordu al 0 por malklarigi enhavon tuj post senfokusiĝo. +Maksimuma valoro estas 1 horo (3600 sekundoj).</translation> </message> <message> <location line="+3"/> <source>Show buttons in timeline</source> - <translation type="unfinished"></translation> + <translation>Montri butonojn en historio</translation> </message> <message> <location line="+2"/> <source>Show buttons to quickly reply, react or access additional options next to each message.</source> - <translation type="unfinished"></translation> + <translation>Montras butonojn apud ĉiu mesaĝo, por rapide respondi, reagi, +aŭ meti aliajn elekteblojn.</translation> </message> <message> <location line="+2"/> <source>Limit width of timeline</source> - <translation type="unfinished"></translation> + <translation>Limigi larĝecon de historio</translation> </message> <message> <location line="+2"/> <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source> - <translation type="unfinished"></translation> + <translation>Agordas maksimuman larĝecon por mesaĝoj en la historio (en bilderoj). +Tio povas helpi legeblecon sur larĝaj ekranoj, kiam la fenestro de Nheko grandas.</translation> </message> <message> <location line="+2"/> <source>Typing notifications</source> - <translation type="unfinished"></translation> + <translation>Sciigoj pri tajpado</translation> </message> <message> <location line="+2"/> <source>Show who is typing in a room. This will also enable or disable sending typing notifications to others.</source> - <translation type="unfinished"></translation> + <translation>Montri, kiu tajpas en ĉambro. +Ĉi tio ankaŭ ŝaltos sciigadon pri via tajpado al aliaj.</translation> </message> <message> <location line="+3"/> <source>Sort rooms by unreads</source> - <translation type="unfinished"></translation> + <translation>Ordigi ĉambrojn laŭ nelegiteco</translation> </message> <message> <location line="+2"/> <source>Display rooms with new messages first. If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room. If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source> - <translation type="unfinished"></translation> + <translation>Montras ĉambrojn kun novaj mesaĝoj kiel la unuajn. +Kun ĉi tio malŝaltita, la listo de ĉambroj ordiĝos nur laŭ +tempo de la lasta mesaĝo en ĉambro. +Kun ĉi tio ŝaltita, ĉambroj kun aktivaj sciigoj (eta cirklo +kun nombro skribita ene) estos ordigitaj plej supre. Ĉambroj, +kiujn vi silentigis, ankoraŭ estos ordigitaj laŭ tempo, ĉar vi +probable ne pensas ilin same gravaj kiel la aliaj ĉambroj.</translation> </message> <message> <location line="+7"/> <source>Read receipts</source> - <translation type="unfinished"></translation> + <translation>Kvitancoj</translation> </message> <message> <location line="+2"/> <source>Show if your message was read. Status is displayed next to timestamps.</source> - <translation type="unfinished"></translation> + <translation>Montras, ĉu via mesaĝo estis legita. +Stato estas montrita apud tempindikoj.</translation> </message> <message> <location line="+2"/> <source>Send messages as Markdown</source> - <translation type="unfinished"></translation> + <translation>Sendi mesaĝojn Markdaŭne</translation> </message> <message> <location line="+2"/> <source>Allow using markdown in messages. When disabled, all messages are sent as a plain text.</source> - <translation type="unfinished"></translation> + <translation>Permesas uzon de Markdaŭno en mesaĝoj. +Kun ĉi tio malŝaltita, ĉiuj mesaĝoj sendiĝas en plata teksto.</translation> </message> <message> <location line="+2"/> <source>Desktop notifications</source> - <translation type="unfinished"></translation> + <translation>Labortablaj sciigoj</translation> </message> <message> <location line="+2"/> <source>Notify about received message when the client is not currently focused.</source> - <translation type="unfinished"></translation> + <translation>Sciigi pri ricevitaj mesaĝoj kiam la kliento ne estas fokusata.</translation> </message> <message> <location line="+1"/> @@ -2297,12 +2320,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+54"/> <source>Select a file</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Elektu dosieron</translation> </message> <message> <location line="+0"/> <source>All Files (*)</source> - <translation type="unfinished">Ĉiuj dosieroj (*)</translation> + <translation>Ĉiuj dosieroj (*)</translation> </message> <message> <location line="+236"/> @@ -2372,7 +2395,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+15"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> </context> <context> @@ -2381,7 +2404,7 @@ This usually causes the application icon in the task bar to animate in some fash <location filename="../../src/WelcomePage.cpp" line="+34"/> <source>Welcome to nheko! The desktop client for the Matrix protocol.</source> <translatorcomment>Should "Matrico" be "Matrica"? (I don't think so)</translatorcomment> - <translation>Bonvenon al nheko! La labortabla kliento por la Matrico protokolo.</translation> + <translation>Bonvenon al nheko! La labortabla kliento por la protokolo Matrikso.</translation> </message> <message> <location line="+1"/> @@ -2396,7 +2419,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+5"/> <source>LOGIN</source> - <translation>ENSALUTU</translation> + <translation>SALUTI</translation> </message> </context> <context> @@ -2412,12 +2435,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/> <source>Create room</source> - <translation>Faru ĉambron</translation> + <translation>Fari ĉambron</translation> </message> <message> <location line="+2"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+10"/> @@ -2427,7 +2450,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+3"/> <source>Topic</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Temo</translation> </message> <message> <location line="+3"/> @@ -2460,7 +2483,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+1"/> @@ -2478,7 +2501,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+8"/> @@ -2491,12 +2514,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/> <source>Join</source> - <translation>Aliĝu</translation> + <translation>Aliĝi</translation> </message> <message> <location line="+2"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+7"/> @@ -2509,7 +2532,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+8"/> @@ -2522,12 +2545,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/Logout.cpp" line="+35"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+8"/> <source>Logout. Are you sure?</source> - <translation>Elsalutu. Ĉu vi certas?</translation> + <translation>Adiaŭi. Ĉu vi certas?</translation> </message> </context> <context> @@ -2540,7 +2563,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+93"/> @@ -2555,7 +2578,7 @@ Media size: %2 <message> <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nuligi</translation> </message> <message> <location line="+1"/> @@ -2573,12 +2596,12 @@ Media size: %2 <message> <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/> <source>Read receipts</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Kvitancoj</translation> </message> <message> <location line="+4"/> <source>Close</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Fermi</translation> </message> </context> <context> @@ -2629,22 +2652,22 @@ Media size: %2 <message> <location line="+5"/> <source>You sent a video</source> - <translation>Vi sendis videon</translation> + <translation>Vi sendis filmon</translation> </message> <message> <location line="+3"/> <source>%1 sent a video</source> - <translation>%1 sendis videon</translation> + <translation>%1 sendis filmon</translation> </message> <message> <location line="+5"/> <source>You sent a sticker</source> - <translation>Vi sendis pegatinan</translation> + <translation>Vi sendis glumarkon</translation> </message> <message> <location line="+3"/> <source>%1 sent a sticker</source> - <translation>%1 sendis pegatinan</translation> + <translation>%1 sendis glumarkon</translation> </message> <message> <location line="+5"/> @@ -2674,7 +2697,7 @@ Media size: %2 <message> <location line="+3"/> <source>%1 sent an encrypted message</source> - <translation type="unfinished"></translation> + <translation type="unfinished">%1 sendis ĉifritan mesaĝon</translation> </message> <message> <location line="+5"/> @@ -2708,22 +2731,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Ĉi tiu ĉambro</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Ĉiuj ĉambroj</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_es.ts b/resources/langs/nheko_es.ts index 7e9fc4c6..6318b9c4 100644 --- a/resources/langs/nheko_es.ts +++ b/resources/langs/nheko_es.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Te has unido a esta sala.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>No se pudo invitar al usuario: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Usuario invitado: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> - <translation type="unfinished"></translation> + <translation>La migración de la caché a la versión actual ha fallado. Esto puede deberse a distintos motivos. Por favor, reporte el incidente y mientras tanto intente usar una versión anterior. También puede probar a borrar la caché manualmente.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -161,16 +153,16 @@ <message> <location line="+44"/> <source>Room %1 created.</source> - <translation type="unfinished"></translation> + <translation>Sala %1 creada.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> - <translation type="unfinished"></translation> + <translation>Confirmar invitación</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -182,7 +174,7 @@ <message> <location line="+15"/> <source>Confirm kick</source> - <translation type="unfinished"></translation> + <translation>Confirmar expulsión</translation> </message> <message> <location line="+1"/> @@ -192,7 +184,7 @@ <message> <location line="+16"/> <source>Kicked user: %1</source> - <translation type="unfinished"></translation> + <translation>Se ha expulsado a %1</translation> </message> <message> <location line="+10"/> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -779,6 +782,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -808,13 +816,13 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation type="unfinished"></translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation type="unfinished"></translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Aceptar</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Rechazar</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation type="unfinished">Aceptar</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation type="unfinished">Rechazar</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1599,17 +1712,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished">Te has unido a esta sala.</translation> </message> <message> - <location line="+878"/> + <location line="+885"/> <source>Rejected the knock from %1.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -2698,22 +2703,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts index c95cb1a5..198ec332 100644 --- a/resources/langs/nheko_et.ts +++ b/resources/langs/nheko_et.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Sa liitusid selle jututoaga.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Kutse saatmine kasutajale ei õnnestunud: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Kutsutud kasutaja: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Puhverdatud andmete muutmine sobivaks rakenduse praeguse versiooniga ei õnnestunud. Sellel võib olla erinevaid põhjuseid. Palun saada meile veateade ja seni kasuta vanemat rakenduse versiooni. Aga kui sa soovid proovida, siis kustuta puhverdatud andmed käsitsi.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation>Kinnita liitumine</translation> </message> @@ -164,13 +156,13 @@ <translation>%1 jututuba on loodud.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Kinnita kutse</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Kas sa tõesti soovid saata kutset kasutajale %1 (%2)?</translation> </message> @@ -235,12 +227,12 @@ <translation>Suhtluskeeld eemaldatud: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation>Kas sa kindlasti soovid alustada otsevestlust kasutajaga %1?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Puhvri versiooniuuendus ebaõnnestus!</translation> </message> @@ -255,7 +247,7 @@ <translation>Sinu andmekandjale salvestatud puhvri versioon on uuem, kui käesolev Nheko versioon kasutada oskab. Palun tee Nheko uuendus või kustuta puhverdatud andmed.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>OLM konto taastamine ei õnnestunud. Palun logi uuesti sisse.</translation> </message> @@ -265,13 +257,13 @@ <translation>Salvestatud andmete taastamine ei õnnestunud. Palun logi uuesti sisse.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Krüptovõtmete kasutusele võtmine ei õnnestunud. Koduserveri vastus päringule: %1 %2. Palun proovi hiljem uuesti.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Palun proovi uuesti sisse logida: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Jututoast lahkumine ei õnnestunud: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation>Kasutaja %1 väljamüksamine %2 jututoast ei õnnestunud: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> - <translation>Peida sellest kogukonnast antud sildiga jututoad</translation> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation>Vaikimisi peida selle sildiga jututoad.</translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation>Kõik jututoad</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Eelistatud jututoad</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation>Näita kõiki jututubasid nii, et filter pole kasutusel.</translation> + </message> + <message> + <location line="+30"/> + <source>Favourites</source> + <translation>Lemmikud</translation> </message> <message> <location line="+2"/> - <source>Low priority rooms</source> - <translation>Vähetähtsad jututoad</translation> + <source>Rooms you have favourited.</source> + <translation>Jututoad, mis sa oled märkinud lemmikuteks.</translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation>Vähetähtis</translation> </message> <message> <location line="+2"/> + <source>Rooms with low priority.</source> + <translation>Väheolulised jututoad.</translation> + </message> + <message> + <location line="+7"/> <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> <translation>Serveriteated</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (silt)</translation> - </message> - <message> - <location line="+3"/> - <source> (community)</source> - <translation> (kogukond)</translation> + <source>Messages from your server or administrator.</source> + <translation>Sõnumid sinu serverilt või selle haldajalt.</translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Dekrüpti andmed</translation> </message> @@ -501,23 +504,23 @@ <message> <location line="+4"/> <source>Encrypted by a verified device</source> - <translation type="unfinished"></translation> + <translation>Krüptitud verifitseeritud seadmes</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device, but you have trusted that user so far.</source> - <translation type="unfinished"></translation> + <translation>Krüptitud verifitseerimata seadmes, aga sa oled selle kasutajat seni usaldanud.</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device</source> - <translation type="unfinished"></translation> + <translation>Krüptitud verifitseerimata seadmes</translation> </message> </context> <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Krüptitud sündmus (Dekrüptimisvõtmeid ei leidunud) --</translation> @@ -529,7 +532,7 @@ <translation>-- Krüptitud sündmus (võti pole selle indeksi jaoks sobilik) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -598,13 +601,13 @@ <message> <location filename="../qml/ForwardCompleter.qml" line="+44"/> <source>Forward Message</source> - <translation type="unfinished"></translation> + <translation>Suuna sõnum edasi</translation> </message> </context> <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Vali fail</translation> </message> @@ -614,7 +617,7 @@ <translation>Kõik failid (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Meediafailide üleslaadimine ei õnnestunud. Palun proovi uuesti.</translation> </message> @@ -695,13 +698,13 @@ Näiteks: https://server.minu:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <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="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Koduserveri automaatne tuvastamine ei õnnestunud: päringuvastus oli vigane.</translation> </message> @@ -711,7 +714,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Koduserveri automaatne tuvastamine ei õnnestunud: tundmatu viga .well-known päringu tegemisel.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Protokolli järgi nõutavaid lõpppunkte ei leidunud. Ilmselt pole tegemist Matrix'i serveriga.</translation> </message> @@ -726,12 +729,12 @@ Näiteks: https://server.minu:8787</translation> <translation>Tekkis teadmata viga. Palun kontrolli, et koduserveri domeen on õige.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>ÜHEKORDNE SISSELOGIMINE</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Tühi salasõna</translation> </message> @@ -783,6 +786,11 @@ Näiteks: https://server.minu:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation>%1 muutis jututoa tunnuspilti</translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 lõi ja seadistas jututoa: %2</translation> </message> @@ -812,13 +820,13 @@ Näiteks: https://server.minu:8787</translation> <translation>%1 vastas kõnele.</translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation>eemaldatud</translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation>%1 lõpetas kõne.</translation> </message> @@ -858,13 +866,13 @@ Näiteks: https://server.minu:8787</translation> <message> <location line="+11"/> <source>You don't have permission to send messages in this room</source> - <translation type="unfinished"></translation> + <translation>Sul puuduvad selles jututoas õigused sõnumite saatmiseks</translation> </message> </context> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation>Muuda</translation> </message> @@ -883,6 +891,76 @@ Näiteks: https://server.minu:8787</translation> <source>Options</source> <translation>Valikud</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation>&Kopeeri</translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation>Kopeeri &lingi asukoht</translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation>Re&ageeri</translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation>&Vasta</translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation>&Muuda</translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation>Lugemis&teatised</translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation>&Edasta</translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation>&Märgi loetuks</translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation>Näita sõnumi lähtekoodi</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation>Näita sõnumi dekrüptitud lähtekoodi</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation>Eemal&da sõnum</translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation>&Salvesta kui</translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation>&Ava välise rakendusega</translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation>Kopeeri sündmuse li&nk</translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>implementeerimata sündmus: </translation> </message> @@ -1030,7 +1108,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Loo unikaalne profiil, mis võimaldab sul logida samaaegselt sisse erinevatele kasutajakontodele ning käivitada mitu Nheko programmiakent.</translation> </message> @@ -1048,18 +1126,18 @@ Näiteks: https://server.minu:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Kasutajanimi</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Kasutajanimi ei tohi olla tühi ning võib sisaldada vaid a-z, 0-9, ., _, =, -, / tähemärke.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Salasõna</translation> </message> @@ -1084,22 +1162,47 @@ Näiteks: https://server.minu:8787</translation> <translation>See on server, kus sa oma kasutajakonto registreerid. Kuna Matrix on hajutatud suhtlusvõrk, siis esmalt pead leidma sulle sobiliku koduserveri või panema püsti täitsa oma enda koduserveri.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTREERI</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Selline registreerimise töövoog pole toetatud!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Ühel või enamal andmeväljal on vigane väärtus. Palun paranda vead ja proovi uuesti.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation>Koduserveri automaatne tuvastamine ei õnnestunud: päringuvastus oli vigane.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation>Koduserveri automaatne tuvastamine ei õnnestunud: tundmatu viga .well-known päringu tegemisel.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation>Protokolli järgi nõutavaid lõpppunkte ei leidunud. Ilmselt pole tegemist Matrix'i serveriga.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation>Päringule sain tagasi vigase vastuse. Palun kontrolli, et koduserveri domeen oleks õige.</translation> + </message> + <message> + <location line="+5"/> + <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 line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Salasõna pole piisavalt pikk (vähemalt 8 tähemärki)</translation> </message> @@ -1109,7 +1212,7 @@ Näiteks: https://server.minu:8787</translation> <translation>Salasõnad ei klapi omavahel</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Vigane koduserveri nimi</translation> </message> @@ -1117,7 +1220,7 @@ Näiteks: https://server.minu:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Sulge</translation> </message> @@ -1130,74 +1233,112 @@ Näiteks: https://server.minu:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>salvestatud versiooni ei leidu</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> + <message> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation>Uus silt</translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation>Kirjuta silt, mida soovid kasutada:</translation> + </message> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> + <location line="+7"/> <source>Leave room</source> <translation>Lahku jututoast</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> <source>Tag room as:</source> <translation>Lisa jututoale silt:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation>Lemmik</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation>Vähetähtis</translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation>Serveriteade</translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Lisab või eemaldab selle sildi.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation>Loo uus silt...</translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Uus silt…</translation> + <location line="+222"/> + <source>Accept</source> + <translation>Nõustu</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Uus silt</translation> + <location line="+21"/> + <source>Decline</source> + <translation>Keeldu</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation>Olekuteade</translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Silt:</translation> + <source>Enter your status message:</source> + <translation>Sisesta oma olekuteade:</translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Nõustu</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation>Profiili seadistused</translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Ei nõustu</translation> + <location line="+5"/> + <source>Set status message</source> + <translation>Sisesta olekuteade</translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation>Logi välja</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation>Alusta uut vestlust</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation>Liitu jututoaga</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation>Loo uus jututuba</translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation>Jututubade loend</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation>Kasutaja seadistused</translation> </message> </context> <context> @@ -1389,34 +1530,6 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Kasutaja seadistused</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Loo uus jututuba</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Liitu jututoaga</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Alusta uut vestlust</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Jututubade loend</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1442,7 +1555,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Verifitseerimine õnnestus</translation> </message> @@ -1460,7 +1573,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation> </message> @@ -1595,24 +1708,29 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <translation>Kasutaja %1 sai suhtluskeelu.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation>Põhjus: %1</translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 muutis oma koputust jututoa uksele.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Sa liitusid jututoaga.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> - <translation type="unfinished"></translation> + <translation>%1 muutis oma tunnuspilti ja seadistas uueks kuvatavaks nimeks %2.</translation> </message> <message> <location line="+5"/> <source>%1 has changed their display name to %2.</source> - <translation type="unfinished"></translation> + <translation>%1 seadistas uueks kuvatavaks nimeks %2.</translation> </message> <message> <location line="+31"/> @@ -1626,12 +1744,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <translation>%1 lahkus jututoast peale seda, kui ta juba oli lahkunud!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Põhjus: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 müksati välja.</translation> </message> @@ -1647,85 +1760,25 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Reageeri</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Vasta</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation>Muuda</translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Lugemisteatised</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Märgi loetuks</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Näita sõnumi lähtekoodi</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Näita sõnumi dekrüptitud lähtekoodi</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Eemalda sõnum</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Salvesta kui</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation>Ava välise rakendusega</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Ühtegi jututuba pole avatud</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation>%1 liige(t)</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Ühtegi jututuba pole avatud</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation>Tagasi jututubade loendisse</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Ühtegi krüptitud vestlust selle kasutajaga ei leidunud. Palun loo temaga krüptitud vestlus ja proovi uuesti.</translation> </message> @@ -1783,54 +1836,6 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Logi välja</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Kirjuta kohandatud olekuteade</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Kohandatud olekuteade</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Olek:</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation>Kasutajaprofiili seadistused</translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Määra oma võrguolek automaatselt</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>Võrgus</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Pole kättesaadav</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Pole võrgus</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1869,7 +1874,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <translation>Võta verifitseerimine tagasi</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Vali tunnuspilt</translation> </message> @@ -1892,8 +1897,8 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation>Vaikimisi</translation> </message> @@ -1901,7 +1906,7 @@ testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.< <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Vähenda tegumiribale</translation> </message> @@ -2717,22 +2722,9 @@ Meedia suurus: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>See jututuba</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Kõik jututoad</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Tundmatu sõnumitüüp</translation> </message> diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index d12b1515..9c48e98f 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -17,7 +17,7 @@ <message> <location line="+67"/> <source>You are screen sharing</source> - <translation type="unfinished"></translation> + <translation>Olet jakamassa näyttöä</translation> </message> <message> <location line="+17"/> @@ -54,29 +54,21 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Videopuhelu</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Äänipuhelu</translation> </message> <message> <location line="+62"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Mikrofonia ei löydy.</translation> </message> </context> <context> @@ -84,12 +76,12 @@ <message> <location filename="../qml/voip/CallInviteBar.qml" line="+64"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Videopuhelu</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Äänipuhelu</translation> </message> <message> <location line="+16"/> @@ -104,12 +96,12 @@ <message> <location line="+12"/> <source>Unknown microphone: %1</source> - <translation type="unfinished"></translation> + <translation>Tuntematon mikrofoni: %1</translation> </message> <message> <location line="+8"/> <source>Unknown camera: %1</source> - <translation type="unfinished"></translation> + <translation>Tuntematon kamera: %1</translation> </message> <message> <location line="+13"/> @@ -119,7 +111,7 @@ <message> <location line="-28"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Mikrofonia ei löydy.</translation> </message> </context> <context> @@ -133,30 +125,30 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> - <translation type="unfinished"></translation> + <translation>Kutsuttu käyttäjä: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> - <translation type="unfinished"></translation> + <translation>Vahvista liittyminen</translation> </message> <message> <location line="+1"/> <source>Do you really want to join %1?</source> - <translation type="unfinished"></translation> + <translation>Haluatko todella liittyä huoneeseen %1?</translation> </message> <message> <location line="+44"/> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation> </message> @@ -265,25 +257,25 @@ <translation>Tallennettujen tietojen palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Salausavainten lähetys epäonnistui. Palvelimen vastaus: %1 %2. Ole hyvä ja yritä uudelleen myöhemmin.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation> </message> <message> <location line="+51"/> <source>Failed to join room: %1</source> - <translation type="unfinished"></translation> + <translation>Huoneeseen liittyminen epäonnistui: %1</translation> </message> <message> <location line="+5"/> <source>You joined the room</source> - <translation type="unfinished"></translation> + <translation>Sinä liityit huoneeseen</translation> </message> <message> <location line="+6"/> @@ -301,55 +293,66 @@ <translation>Huoneesta poistuminen epäonnistui: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation>Kaikki huoneet</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Suosikkihuoneet</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Alhaisen prioriteetin huoneet</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tag)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (yhteisö)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -425,22 +428,22 @@ <message> <location filename="../qml/emoji/EmojiPicker.qml" line="+59"/> <source>Search</source> - <translation type="unfinished"></translation> + <translation>Hae</translation> </message> <message> <location line="+172"/> <source>People</source> - <translation type="unfinished"></translation> + <translation>Ihmiset</translation> </message> <message> <location line="+2"/> <source>Nature</source> - <translation type="unfinished"></translation> + <translation>Luonto</translation> </message> <message> <location line="+2"/> <source>Food</source> - <translation type="unfinished"></translation> + <translation>Ruoka</translation> </message> <message> <location line="+2"/> @@ -450,7 +453,7 @@ <message> <location line="+2"/> <source>Travel</source> - <translation type="unfinished"></translation> + <translation>Matkustaminen</translation> </message> <message> <location line="+2"/> @@ -496,7 +499,7 @@ <message> <location filename="../qml/EncryptionIndicator.qml" line="+34"/> <source>This message is not encrypted!</source> - <translation type="unfinished"></translation> + <translation>Tätä viestiä ei ole salattu!</translation> </message> <message> <location line="+4"/> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -598,13 +601,13 @@ <message> <location filename="../qml/ForwardCompleter.qml" line="+44"/> <source>Forward Message</source> - <translation type="unfinished"></translation> + <translation>Välitä viesti</translation> </message> </context> <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Valitse tiedosto</translation> </message> @@ -614,7 +617,7 @@ <translation>Kaikki Tiedostot (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -655,7 +658,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th <message> <location line="+2"/> <source>Your password.</source> - <translation type="unfinished"></translation> + <translation>Salasanasi.</translation> </message> <message> <location line="+3"/> @@ -670,7 +673,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th <message> <location line="+4"/> <source>Homeserver address</source> - <translation type="unfinished"></translation> + <translation>Kotipalvelimen osoite</translation> </message> <message> <location line="+1"/> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation>Palvelimen tietojen hakeminen epäonnistui: tuntematon virhe hakiessa .well-known -tiedostoa.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Vaadittuja päätepisteitä ei löydetty. Mahdollisesti ei Matrix-palvelin.</translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Tyhjä salasana</translation> </message> @@ -761,12 +764,12 @@ Example: https://server.my:8787</source> <message> <location line="+9"/> <source>Encryption enabled</source> - <translation type="unfinished"></translation> + <translation>Salaus on käytössä</translation> </message> <message> <location line="+9"/> <source>room name changed to: %1</source> - <translation type="unfinished"></translation> + <translation>huoneen nimi muutettu: %1</translation> </message> <message> <location line="+0"/> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,23 +868,93 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>Muokkaa</translation> </message> <message> <location line="+15"/> <source>React</source> - <translation type="unfinished"></translation> + <translation>Reagoi</translation> </message> <message> <location line="+13"/> <source>Reply</source> - <translation type="unfinished"></translation> + <translation>Vastaa</translation> </message> <message> <location line="+11"/> <source>Options</source> + <translation>Asetukset</translation> + </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> <translation type="unfinished"></translation> </message> </context> @@ -945,7 +1023,7 @@ Example: https://server.my:8787</source> <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/> <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/> <source>%1 sent an encrypted message</source> - <translation type="unfinished">%1 lähetti salatun viestin</translation> + <translation>%1 lähetti salatun viestin</translation> </message> <message> <location line="+4"/> @@ -957,29 +1035,29 @@ Example: https://server.my:8787</source> <location line="+5"/> <source>%1 replied: %2</source> <comment>Format a reply in a notification. %1 is the sender, %2 the message</comment> - <translation type="unfinished"></translation> + <translation>%1 vastasi: %2</translation> </message> <message> <location line="+4"/> <source>%1: %2</source> <comment>Format a normal message in a notification. %1 is the sender, %2 the message</comment> - <translation type="unfinished">%1: %2</translation> + <translation>%1: %2</translation> </message> <message> <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/> <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/> <source>%1 replied with an encrypted message</source> - <translation type="unfinished"></translation> + <translation>%1 vastasi salatulla viestillä</translation> </message> <message> <location line="+6"/> <source>%1 replied to a message</source> - <translation type="unfinished"></translation> + <translation>%1 vastasi viestiin</translation> </message> <message> <location line="+0"/> <source>%1 sent a message</source> - <translation type="unfinished"></translation> + <translation>%1 lähetti viestin</translation> </message> </context> <context> @@ -992,7 +1070,7 @@ Example: https://server.my:8787</source> <message> <location line="+16"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Mikrofonia ei löydy.</translation> </message> <message> <location line="+22"/> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Käyttäjänimi</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> - <translation type="unfinished"></translation> + <translation>Käyttäjätunnus ei saa olla tyhjä, ja se saa sisältää vain merkkejä a-z, 0-9, ., _, =, - ja /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Salasana</translation> </message> @@ -1072,7 +1150,7 @@ Example: https://server.my:8787</source> <message> <location line="+4"/> <source>Homeserver</source> - <translation type="unfinished"></translation> + <translation>Kotipalvelin</translation> </message> <message> <location line="+2"/> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REKISTERÖIDY</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation>Palvelimen tietojen hakeminen epäonnistui: tuntematon virhe hakiessa .well-known -tiedostoa.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation>Vaadittuja päätepisteitä ei löydetty. Mahdollisesti ei Matrix-palvelin.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation>Vastaanotettiin virheellinen vastaus. Varmista, että kotipalvelimen osoite on pätevä.</translation> + </message> + <message> + <location line="+5"/> + <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 line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Salasana ei ole tarpeeksi pitkä (vähintään 8 merkkiä)</translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>Salasanat eivät täsmää</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Epäkelpo palvelimen nimi</translation> </message> @@ -1113,87 +1216,125 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Sulje</translation> </message> <message> <location line="+13"/> <source>Cancel edit</source> - <translation type="unfinished"></translation> + <translation>Peruuta muokkaus</translation> </message> </context> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>ei tallennettua versiota</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> + <message> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> + </message> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> + <location line="+7"/> <source>Leave room</source> <translation>Poistu huoneesta</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation>Hyväksy</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation>Hylkää</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Hyväksy</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Hylkää</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation>Kirjaudu ulos</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation>Aloita uusi keskustelu</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation>Liity huoneeseen</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation>Huoneluettelo</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation>Käyttäjäasetukset</translation> </message> </context> <context> @@ -1251,12 +1392,12 @@ Example: https://server.my:8787</source> <message> <location line="+9"/> <source>Encryption</source> - <translation type="unfinished"></translation> + <translation>Salaus</translation> </message> <message> <location line="+20"/> <source>End-to-End Encryption</source> - <translation type="unfinished">Päästä-päähän-salaus</translation> + <translation>Päästä-päähän-salaus</translation> </message> <message> <location line="+1"/> @@ -1289,43 +1430,43 @@ Example: https://server.my:8787</source> <message> <location line="+10"/> <source>Room Version</source> - <translation type="unfinished"></translation> + <translation>Huoneen versio</translation> </message> <message> <location line="+13"/> <source>OK</source> - <translation type="unfinished">OK</translation> + <translation>OK</translation> </message> <message> <location filename="../../src/ui/RoomSettings.cpp" line="+268"/> <source>Failed to enable encryption: %1</source> - <translation type="unfinished">Salauksen aktivointi epäonnistui: %1</translation> + <translation>Salauksen aktivointi epäonnistui: %1</translation> </message> <message> <location line="+228"/> <source>Select an avatar</source> - <translation type="unfinished">Valitse profiilikuva</translation> + <translation>Valitse profiilikuva</translation> </message> <message> <location line="+0"/> <source>All Files (*)</source> - <translation type="unfinished">Kaikki Tiedostot (*)</translation> + <translation>Kaikki Tiedostot (*)</translation> </message> <message> <location line="+12"/> <source>The selected file is not an image</source> - <translation type="unfinished">Valittu tiedosto ei ole kuva</translation> + <translation>Valittu tiedosto ei ole kuva</translation> </message> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation type="unfinished">Virhe lukiessa tiedostoa: %1</translation> + <translation>Virhe lukiessa tiedostoa: %1</translation> </message> <message> <location line="+34"/> <location line="+20"/> <source>Failed to upload image: %s</source> - <translation type="unfinished">Kuvan lähetys epäonnistui: %s</translation> + <translation>Kuvan lähetys epäonnistui: %s</translation> </message> </context> <context> @@ -1364,7 +1505,7 @@ Example: https://server.my:8787</source> <message> <location line="+5"/> <source>Hide mouse cursor</source> - <translation type="unfinished"></translation> + <translation>Piilota hiiren kursori</translation> </message> <message> <location line="+20"/> @@ -1379,35 +1520,7 @@ Example: https://server.my:8787</source> <message> <location line="+7"/> <source>Cancel</source> - <translation type="unfinished">Peruuta</translation> - </message> -</context> -<context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Käyttäjäasetukset</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Luo uusi huone</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Liity huoneeseen</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Aloita uusi keskustelu</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Huoneluettelo</translation> + <translation>Peruuta</translation> </message> </context> <context> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Viestin muokkaus epäonnistui: %1</translation> </message> @@ -1472,17 +1585,17 @@ Example: https://server.my:8787</source> <message> <location line="+2"/> <source>Save video</source> - <translation type="unfinished"></translation> + <translation>Tallenna video</translation> </message> <message> <location line="+2"/> <source>Save audio</source> - <translation type="unfinished"></translation> + <translation>Tallenna äänitiedosto</translation> </message> <message> <location line="+2"/> <source>Save file</source> - <translation type="unfinished"></translation> + <translation>Tallenna tiedosto</translation> </message> <message numerus="yes"> <location line="+228"/> @@ -1556,7 +1669,7 @@ Example: https://server.my:8787</source> <message> <location line="+4"/> <source>%1 joined.</source> - <translation type="unfinished"></translation> + <translation>%1 liittyi.</translation> </message> <message> <location line="+9"/> @@ -1571,7 +1684,7 @@ Example: https://server.my:8787</source> <message> <location line="+3"/> <source>%1 left the room.</source> - <translation type="unfinished"></translation> + <translation>%1 poistui huoneesta.</translation> </message> <message> <location line="+2"/> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> - <translation type="unfinished"></translation> + <translation>Sinä liityit tähän huoneeseen.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1635,91 +1748,31 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/TimelineRow.qml" line="+106"/> <source>Edited</source> - <translation type="unfinished"></translation> + <translation>Muokattu</translation> </message> </context> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Lukukuittaukset</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Kirjaudu ulos</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Valitse profiilikuva</translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Pienennä ilmoitusalueelle</translation> </message> @@ -2148,7 +2153,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+4"/> <source>Ringtone</source> - <translation type="unfinished"></translation> + <translation>Soittoääni</translation> </message> <message> <location line="+2"/> @@ -2158,12 +2163,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+1"/> <source>Microphone</source> - <translation type="unfinished"></translation> + <translation>Mikrofoni</translation> </message> <message> <location line="+1"/> <source>Camera</source> - <translation type="unfinished"></translation> + <translation>Kamera</translation> </message> <message> <location line="+1"/> @@ -2700,22 +2705,9 @@ Median koko: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Tämä huone</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Kaikki huoneet</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Tuntematon viestityyppi</translation> </message> diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 240c8b9f..b6345d62 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Vous avez rejoint ce salon.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Échec lors de l'invitation de %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>%1 a été invité(e)</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>La migration du cache vers la version actuelle a échoué. Cela peut arriver pour différentes raisons. Signalez le problème et essayez d'utiliser une ancienne version en attendant. Vous pouvez également supprimer le cache manuellement.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation>Confirmez la participation</translation> </message> @@ -164,13 +156,13 @@ <translation>Salon %1 créé.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Confirmer l'invitation</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation> </message> @@ -235,12 +227,12 @@ <translation>%1 n'est plus banni(e)</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation>Voulez-vous vraimer commencer une discussion privée avec %1 ?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Échec de la migration du cache !</translation> </message> @@ -255,7 +247,7 @@ <translation>Le cache sur votre disque est plus récent que cette version de Nheko ne supporte. Veuillez mettre à jour ou supprimer votre cache.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Échec de la restauration du compte OLM. Veuillez vous reconnecter.</translation> </message> @@ -265,13 +257,13 @@ <translation>Échec de la restauration des données sauvegardées. Veuillez vous reconnecter.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <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> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Veuillez vous reconnecter : %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Impossible de quitter le salon : %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation>Échec de l'expulsion de %1 depuis %2  : %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> - <translation>Cacher les salons portant cette étiquette ou appartenant à cette communauté</translation> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Tous les salons</translation> + <translation type="unfinished">Tous les salons</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Salons favoris</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Salons basse priorité</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> - <translation>Notifications du serveur</translation> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Basse priorité</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (étiquette)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (communauté)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Notifications du serveur</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Déchiffrer les secrets</translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Évènement chiffré (pas de clé trouvée pour le déchiffrement) --</translation> @@ -529,7 +532,7 @@ <translation>-- Événement chiffré (clé invalide pour cet index) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Sélectionnez un fichier</translation> </message> @@ -614,7 +617,7 @@ <translation>Tous les types de fichiers (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Échec de l'envoi du média. Veuillez réessayer.</translation> </message> @@ -695,13 +698,13 @@ Exemple : https ://monserveur.example.com :8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <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 :mon.serveur.fr)</translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Échec de la découverte automatique. Réponse mal formatée reçue.</translation> </message> @@ -711,7 +714,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Échec de la découverte automatique. Erreur inconnue lors de la demande de .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Les chemins requis n'ont pas été trouvés. Possible qu'il ne s'agisse pas d'un serveur Matrix.</translation> </message> @@ -726,12 +729,12 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>CONNEXION SSO</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Mot de passe vide</translation> </message> @@ -789,6 +792,11 @@ Exemple : https ://monserveur.example.com :8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 a créé et configuré le salon : %2</translation> </message> @@ -864,7 +872,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation>Modifier</translation> </message> @@ -883,6 +891,76 @@ Exemple : https ://monserveur.example.com :8787</translation> <source>Options</source> <translation>Options</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Voir le message brut</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Voir le message déchiffré brut</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>Évènement non implémenté : </translation> </message> @@ -1030,7 +1108,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Créer un profil unique, vous permettant de vous connecter simultanément à plusieurs comptes et à lancer plusieurs instances de nheko.</translation> </message> @@ -1048,18 +1126,18 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Nom d'utilisateur</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Le nom d'utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et « . _ = - / ».</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Mot de passe</translation> </message> @@ -1084,22 +1162,47 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Un serveur qui autorise les créations de compte. Matrix étant décentralisé, vous devez tout d'abord trouver un serveur sur lequel vous pouvez vous inscrire, ou bien héberger le vôtre.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>S'ENREGISTRER</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Pas de méthode d'inscription supportée !</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Un ou plusieurs champs ont des entrées invalides. Veuillez les corriger et réessayer.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Échec de la découverte automatique. Réponse mal formatée reçue.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Échec de la découverte automatique. Erreur inconnue lors de la demande de .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Les chemins requis n'ont pas été trouvés. Possible qu'il ne s'agisse pas d'un serveur Matrix.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Réponse mal formée reçue. Vérifiez que le nom de domaine du serveur est valide.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Le mot de passe n'est pas assez long (8 caractères minimum)</translation> </message> @@ -1109,7 +1212,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <translation>Les mots de passe ne sont pas identiques</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Le nom du serveur est invalide</translation> </message> @@ -1117,7 +1220,7 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Fermer</translation> </message> @@ -1130,74 +1233,112 @@ Exemple : https ://monserveur.example.com :8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>pas de version enregistrée</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Quitter le salon</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Quitter le salon</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> - <translation>Étiqueter le salon comme :</translation> + <translation type="unfinished">Étiqueter le salon comme :</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>Favori</translation> + <translation type="unfinished">Favori</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>Basse priorité</translation> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Notification du serveur</translation> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Ajoute ou retire l'étiquette spécifiée.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Nouvelle étiquette…</translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Nouvelle étiquette</translation> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Étiquette :</translation> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Accepter</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Décliner</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Se déconnecter</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Commencer une discussion</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Rejoindre un salon</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Annuaire des salons</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Paramètres utilisateur</translation> </message> </context> <context> @@ -1389,34 +1530,6 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Paramètres utilisateur</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Créer un nouveau salon</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Rejoindre un salon</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Commencer une discussion</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Annuaire des salons</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1442,7 +1555,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Vérification réussie</translation> </message> @@ -1460,7 +1573,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Échec de la suppression du message : %1</translation> </message> @@ -1595,17 +1708,22 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <translation>%1 a été banni.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 ne frappe plus au salon.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Vous avez rejoint ce salon.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1626,12 +1744,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <translation>%1 a quitté le salon après l'avoir déjà quitté !</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Raison : %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 a frappé au salon.</translation> </message> @@ -1647,85 +1760,25 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Réagir</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Réponse</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation>Modifier</translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Accusés de lecture</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Marquer comme lu</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Voir le message brut</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Voir le message déchiffré brut</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Retirer le message</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Enregistrer sous</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation>Ouvrir dans une application externe</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Aucun salon ouvert</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation type="unfinished">%1 membre(s)</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Aucun salon ouvert</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation type="unfinished">Revenir à la liste des salons</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Pas de discussion privée et chiffrée trouvée avec cet utilisateur. Créez-en une et réessayez.</translation> </message> @@ -1783,54 +1836,6 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Se déconnecter</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Choisir un message de statut personnalisé</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Message de statut personnalisé</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Statut :</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation>Paramètres du profil utilisateur</translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Changer la présence automatiquement</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>En ligne</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Non disponible</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Hors ligne</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1869,7 +1874,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <translation>Dé-vérifier</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Sélectionner un avatar</translation> </message> @@ -1892,8 +1897,8 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation>Défaut</translation> </message> @@ -1901,7 +1906,7 @@ tester le chiffrement de bout en bout tant que la vérification des appareils n& <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Réduire à la barre des tâches</translation> </message> @@ -2719,22 +2724,9 @@ Taille du média : %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Ce salon</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Tous les salons</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Type du message inconnu</translation> </message> diff --git a/resources/langs/nheko_hu.ts b/resources/langs/nheko_hu.ts index e602929b..e989a6ce 100644 --- a/resources/langs/nheko_hu.ts +++ b/resources/langs/nheko_hu.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Csatlakoztál ehhez a szobához.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Nem sikerült meghívni a felhasználót: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>A felhasználó meg lett hívva: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>A gyorsítótár átvitele a jelenlegi verzióhoz nem sikerült. Ennek több oka is lehet. Kérlek, írj egy hibajelentést és egyelőre próbálj meg egy régebbi verziót használni! Alternatív megoldásként megprobálhatod eltávolítani a gyorsítótárat kézzel.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation>Csatlakozás megerősítése</translation> </message> @@ -164,13 +156,13 @@ <translation>A %1 nevű szoba létre lett hozva.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Meghívás megerősítése</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <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> @@ -235,12 +227,12 @@ <translation>Kitiltás feloldva a felhasználónak: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation>Biztosan privát csevegést akarsz indítani %1 felhasználóval?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Gyorsítótár migráció nem sikerült!</translation> </message> @@ -255,7 +247,7 @@ <translation>A lemezeden lévő gyorsítótár újabb, mint amit a Nheko jelenlegi verziója támogat. Kérlek, frissítsd vagy töröld a gyorsítótárat!</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Nem sikerült visszaállítani az OLM fiókot. Kérlek, jelentkezz be ismét!</translation> </message> @@ -265,13 +257,13 @@ <translation>Nem sikerült visszaállítani a mentési adatot. Kérlek, jelentkezz be ismét!</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Nem sikerült beállítani a titkosítási kulcsokat. Válasz a szervertől: %1 %2. Kérlek, próbáld újra később!</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Kérlek, próbálj meg bejelentkezni újra: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Nem sikerült elhagyni a szobát: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <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> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> - <translation>Az ilyen címkével ellátott vagy közösséghez tartozó szobák elrejtése</translation> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Az összes szoba</translation> + <translation type="unfinished">Az összes szoba</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Kedvenc szobák</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Alacsony prioritású szobák</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> - <translation>Szerverértesítések</translation> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Alacsony prioritású</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (címke)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (közösség)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Szerverértesítések</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Titkos tároló feloldása</translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Titkosított esemény (Nem találhatók kulcsok a titkosítás feloldásához) --</translation> @@ -529,7 +532,7 @@ <translation>-- Titkosított esemény (a kulcs nem érvényes ehhez az indexhez) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Fájl kiválasztása</translation> </message> @@ -614,7 +617,7 @@ <translation>Minden fájl (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Nem sikerült feltölteni a médiafájlt. Kérlek, próbáld újra!</translation> </message> @@ -695,13 +698,13 @@ Példa: https://szerver.em:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <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="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Az automatikus felderítés nem sikerült. Helytelen válasz érkezett.</translation> </message> @@ -711,7 +714,7 @@ Példa: https://szerver.em:8787</translation> <translation>Az automatikus felderítés nem sikerült. Ismeretlen hiba a .well-known lekérése közben.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Nem találhatók szükséges végpontok. Lehet, hogy nem egy Matrixszerver.</translation> </message> @@ -726,12 +729,12 @@ Példa: https://szerver.em:8787</translation> <translation>Egy ismeretlen hiba történt. Ellenőrizd, hogy a homeszervered domainje helyes.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>SSO BEJELENTKEZÉS</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Üres jelszó</translation> </message> @@ -783,6 +786,11 @@ Példa: https://szerver.em:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 létrehozta és beállította a következő szobát: %2</translation> </message> @@ -812,13 +820,13 @@ Példa: https://szerver.em:8787</translation> <translation>%1 fogadta a hívást.</translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation>eltávolítva</translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation>%1 befejezte a hívást.</translation> </message> @@ -864,7 +872,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation>Szerkesztés</translation> </message> @@ -883,6 +891,76 @@ Példa: https://szerver.em:8787</translation> <source>Options</source> <translation>Műveletek</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Nyers üzenet megtekintése</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Előzőleg titkosított nyers üzenet megtekintése</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>nem implementált esemény: </translation> </message> @@ -1030,7 +1108,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Egy egyedi profil létrehozása, amellyel be tudsz jelentkezni egyszerre több fiókon keresztül és a Nheko több példányát is tudod futtatni.</translation> </message> @@ -1048,18 +1126,18 @@ Példa: https://szerver.em:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Felhasználónév</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>A felhasználónév nem lehet üres és csak a következő karaktereket tartalmazhatja: a-z, 0-9, ., _, =, - és /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Jelszó</translation> </message> @@ -1084,22 +1162,47 @@ Példa: https://szerver.em:8787</translation> <translation>Egy szerver, amelyen engedélyezve vannak a regisztrációk. Mivel a Matrix decentralizált, először találnod kell egy szervert, ahol regisztrálhatsz, vagy be kell állítanod a saját szervered.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISZTRÁCIÓ</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Nem támogatott regisztrációs folyamat!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Egy vagy több mező tartalma nem helyes. Kérlek, javítsd ki azokat a hibákat, és próbáld újra!</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Az automatikus felderítés nem sikerült. Helytelen válasz érkezett.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Az automatikus felderítés nem sikerült. Ismeretlen hiba a .well-known lekérése közben.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Nem találhatók szükséges végpontok. Lehet, hogy nem egy Matrixszerver.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Helytelen válasz érkezett. Ellenőrizd, hogy a homeszervered domainje helyes.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Egy ismeretlen hiba történt. Ellenőrizd, hogy a homeszervered domainje helyes.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>A jelszó nem elég hosszú (legalább 8 karakter)</translation> </message> @@ -1109,7 +1212,7 @@ Példa: https://szerver.em:8787</translation> <translation>A jelszavak nem egyeznek</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Nem megfelelő szervernév</translation> </message> @@ -1117,7 +1220,7 @@ Példa: https://szerver.em:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Bezárás</translation> </message> @@ -1130,74 +1233,112 @@ Példa: https://szerver.em:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>nincs tárolva verzió</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Szoba elhagyása</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Szoba elhagyása</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> - <translation>Szoba megcímkézése:</translation> + <translation type="unfinished">Szoba megcímkézése:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>Kedvenc</translation> + <translation type="unfinished">Kedvenc</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>Alacsony prioritású</translation> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Szerverértesítés</translation> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Hozzáadja vagy eltávolítja az adott címkét.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Új címke…</translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Elfogadás</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Új címke</translation> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Elutasítás</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Címke:</translation> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Elfogadás</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Elutasítás</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Kijelentkezés</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Új csevegés indítása</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Csatlakozás egy szobához</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Szobák jegyzéke</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Felhasználói beállítások</translation> </message> </context> <context> @@ -1389,34 +1530,6 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Felhasználói beállítások</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Új szoba létrehozása</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Csatlakozás egy szobához</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Új csevegés indítása</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Szobák jegyzéke</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1442,7 +1555,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Sikeres hitelesítés</translation> </message> @@ -1460,7 +1573,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Az üzenet visszavonása nem sikerült: %1</translation> </message> @@ -1594,17 +1707,22 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <translation>%1 ki lett tiltva.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 visszavonta a kopogását.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Csatlakoztál ehhez a szobához.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1625,12 +1743,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <translation>%1 távozott, miután már egyszer távozott!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Ok: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 kopogott.</translation> </message> @@ -1646,85 +1759,25 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Reakció</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Válasz</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation>Szerkesztés</translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Olvasási jegyek</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Megjelölés olvasottként</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Nyers üzenet megtekintése</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Előzőleg titkosított nyers üzenet megtekintése</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Üzenet eltávolítása</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Mentés másként</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation>Megnyitás külső programban</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Nincs nyitott szoba</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation type="unfinished">%1 tag</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Nincs nyitott szoba</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation type="unfinished">Vissza a szobák listájára</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Nem található titkosított privát csevegés ezzel a felhasználóval. Hozz létre egy titkosított privát csevegést vele, és próbáld újra!</translation> </message> @@ -1782,54 +1835,6 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Kijelentkezés</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Egyéni állapotüzenet megadása</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Egyéni állapotüzenet</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Állapot:</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation>Felhasználói profil beállításai</translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Elérhetőség megadása automatikusan</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>Bejelentkezve</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Nem elérhető</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Kiejelentkezve</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1868,7 +1873,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <translation>Hitelesítés visszavonása</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Profilkép kiválasztása</translation> </message> @@ -1891,8 +1896,8 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation>Alapértelmezett</translation> </message> @@ -1900,7 +1905,7 @@ végpontig (E2E) titkosítás tesztelésére, amíg be nincs fejezve az eszközh <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Kicsinyítés a tálcára</translation> </message> @@ -2717,22 +2722,9 @@ Média mérete: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Ez a szoba</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Az összes szoba</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Ismeretlen üzenettípus</translation> </message> diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts index 7fe04e1b..b0b8ec48 100644 --- a/resources/langs/nheko_it.ts +++ b/resources/langs/nheko_it.ts @@ -6,33 +6,33 @@ <message> <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/> <source>Calling...</source> - <translation type="unfinished"></translation> + <translation>Chiamata in corso...</translation> </message> <message> <location line="+10"/> <location line="+10"/> <source>Connecting...</source> - <translation type="unfinished"></translation> + <translation>Connessione in corso...</translation> </message> <message> <location line="+67"/> <source>You are screen sharing</source> - <translation type="unfinished"></translation> + <translation>Stai condividendo lo schermo</translation> </message> <message> <location line="+17"/> <source>Hide/Show Picture-in-Picture</source> - <translation type="unfinished"></translation> + <translation>Nascondi/Mostra Picture-in-Picture</translation> </message> <message> <location line="+13"/> <source>Unmute Mic</source> - <translation type="unfinished"></translation> + <translation>Riattiva Microfono</translation> </message> <message> <location line="+0"/> <source>Mute Mic</source> - <translation type="unfinished"></translation> + <translation>Silenzia microfono</translation> </message> </context> <context> @@ -40,12 +40,12 @@ <message> <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/> <source>Awaiting Confirmation</source> - <translation type="unfinished"></translation> + <translation>In attesa di conferma</translation> </message> <message> <location line="+12"/> <source>Waiting for other side to complete verification.</source> - <translation type="unfinished"></translation> + <translation>In attesa della conferma dall'altra parte per la verifica.</translation> </message> <message> <location line="+12"/> @@ -54,29 +54,21 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Sei entrato in questa stanza.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Chiamata video</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Chiamata vocale</translation> </message> <message> <location line="+62"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Nessun microfono trovato.</translation> </message> </context> <context> @@ -84,22 +76,22 @@ <message> <location filename="../qml/voip/CallInviteBar.qml" line="+64"/> <source>Video Call</source> - <translation type="unfinished"></translation> + <translation>Chiamata Video</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished"></translation> + <translation>Chiamata audio</translation> </message> <message> <location line="+16"/> <source>Devices</source> - <translation type="unfinished">Dispositivi</translation> + <translation>Dispositivi</translation> </message> <message> <location line="+10"/> <source>Accept</source> - <translation type="unfinished">Accetta</translation> + <translation>Accetta</translation> </message> <message> <location line="+12"/> @@ -114,12 +106,12 @@ <message> <location line="+13"/> <source>Decline</source> - <translation type="unfinished">Rifiuta</translation> + <translation>Rifiuta</translation> </message> <message> <location line="-28"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation>Nessun microfono trovato.</translation> </message> </context> <context> @@ -127,36 +119,36 @@ <message> <location filename="../../src/CallManager.cpp" line="+521"/> <source>Entire screen</source> - <translation type="unfinished"></translation> + <translation>Schermo completo</translation> </message> </context> <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Impossibile invitare l'utente: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Invitato utente: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Migrazione della cache alla versione corrente fallita. Questo può avere diverse cause. Per favore apri una issue e nel frattempo prova ad usare una versione più vecchia. In alternativa puoi provare a cancellare la cache manualmente.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> - <translation type="unfinished"></translation> + <translation>Conferma collegamento</translation> </message> <message> <location line="+1"/> <source>Do you really want to join %1?</source> - <translation type="unfinished"></translation> + <translation>Vuoi davvero collegarti a %1?</translation> </message> <message> <location line="+44"/> @@ -164,15 +156,15 @@ <translation>Stanza %1 creata.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> - <translation type="unfinished"></translation> + <translation>Conferma Invito</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Vuoi davvero inviare %1 (%2)?</translation> </message> <message> <location line="+11"/> @@ -182,12 +174,12 @@ <message> <location line="+15"/> <source>Confirm kick</source> - <translation type="unfinished"></translation> + <translation>Conferma l'allontanamento</translation> </message> <message> <location line="+1"/> <source>Do you really want to kick %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Vuoi davvero allontanare %1 (%2)?</translation> </message> <message> <location line="+16"/> @@ -197,12 +189,12 @@ <message> <location line="+10"/> <source>Confirm ban</source> - <translation type="unfinished"></translation> + <translation>Conferma ban</translation> </message> <message> <location line="+1"/> <source>Do you really want to ban %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Vuoi veramente bannare %1 (%2)?</translation> </message> <message> <location line="+11"/> @@ -217,12 +209,12 @@ <message> <location line="+10"/> <source>Confirm unban</source> - <translation type="unfinished"></translation> + <translation>Conferma reintegro</translation> </message> <message> <location line="+1"/> <source>Do you really want to unban %1 (%2)?</source> - <translation type="unfinished"></translation> + <translation>Vuoi veramente reintegrare %1 (%2)?</translation> </message> <message> <location line="+11"/> @@ -235,12 +227,12 @@ <translation>Rimosso il ban dall'utente: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> - <translation type="unfinished"></translation> + <translation>Sei sicuro di voler avviare una chat privata con %1?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Migrazione della cache fallita!</translation> </message> @@ -255,7 +247,7 @@ <translation>La cache sul tuo disco è più nuova di quella supportata da questa versione di Nheko. Per favore aggiorna o pulisci la tua cache.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Impossibile ripristinare l'account OLM. Per favore accedi nuovamente.</translation> </message> @@ -265,13 +257,13 @@ <translation>Impossibile ripristinare i dati salvati. Per favore accedi nuovamente.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Impossibile configurare le chiavi crittografiche. Risposta del server: %1 %2. Per favore riprova in seguito.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Per favore prova ad accedere nuovamente: %1</translation> </message> @@ -301,77 +293,88 @@ <translation>Impossibile lasciare la stanza: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> - <translation type="unfinished"></translation> + <translation>Fallita l'espulsione di %1 da %2: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Tutte le stanze</translation> + <translation type="unfinished">Tutte le stanze</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Stanze preferite</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Stanze a bassa priorità</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> <translation type="unfinished"></translation> </message> <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Tag matrix standard per stanze a bassa priorità</translation> + </message> + <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tag)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (comunità)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Notifiche del server</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> - <translation type="unfinished"></translation> + <translation>Decifra i segreti</translation> </message> <message> <location line="+2"/> <source>Enter your recovery key or passphrase to decrypt your secrets:</source> - <translation type="unfinished"></translation> + <translation>Inserisci la chiave di recupero o la parola chiave per decriptare i tuoi segreti:</translation> </message> <message> <location line="+3"/> <source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source> - <translation type="unfinished"></translation> + <translation>Inserisci la tua chiave di recupero o la parola chiave chiamata %1 per decifrare i tuoi segreti:</translation> </message> <message> <location line="+17"/> <source>Decryption failed</source> - <translation type="unfinished"></translation> + <translation>Decrittazione fallita</translation> </message> <message> <location line="+1"/> <source>Failed to decrypt secrets with the provided recovery key or passphrase</source> - <translation type="unfinished"></translation> + <translation>Fallita la decrittazione usando la chiave di recupero o la parola chiave fornita</translation> </message> </context> <context> @@ -379,22 +382,22 @@ <message> <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/> <source>Verification Code</source> - <translation type="unfinished"></translation> + <translation>Codice di verifica</translation> </message> <message> <location line="+10"/> <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 type="unfinished"></translation> + <translation>Verificare i seguenti numeri. Dovresti vedere gli stessi numeri da entrambi i lati. Se differiscono, premi 'Sono diversi!' per annullare la verifica!</translation> </message> <message> <location line="+31"/> <source>They do not match!</source> - <translation type="unfinished"></translation> + <translation>Non corrispondono!</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation type="unfinished"></translation> + <translation>Corrispondono!</translation> </message> </context> <context> @@ -425,47 +428,47 @@ <message> <location filename="../qml/emoji/EmojiPicker.qml" line="+59"/> <source>Search</source> - <translation type="unfinished"></translation> + <translation>Cerca</translation> </message> <message> <location line="+172"/> <source>People</source> - <translation type="unfinished"></translation> + <translation>Membri</translation> </message> <message> <location line="+2"/> <source>Nature</source> - <translation type="unfinished"></translation> + <translation>Natura</translation> </message> <message> <location line="+2"/> <source>Food</source> - <translation type="unfinished"></translation> + <translation>Cibo</translation> </message> <message> <location line="+2"/> <source>Activity</source> - <translation type="unfinished">Attività</translation> + <translation>Attività</translation> </message> <message> <location line="+2"/> <source>Travel</source> - <translation type="unfinished"></translation> + <translation>Viaggi</translation> </message> <message> <location line="+2"/> <source>Objects</source> - <translation type="unfinished">Oggetti</translation> + <translation>Oggetti</translation> </message> <message> <location line="+2"/> <source>Symbols</source> - <translation type="unfinished">Simboli</translation> + <translation>Simboli</translation> </message> <message> <location line="+2"/> <source>Flags</source> - <translation type="unfinished">Bandiere</translation> + <translation>Bandiere</translation> </message> </context> <context> @@ -473,22 +476,22 @@ <message> <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/> <source>Verification Code</source> - <translation type="unfinished"></translation> + <translation>Codice di Verifica</translation> </message> <message> <location line="+10"/> <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 type="unfinished"></translation> + <translation>Prego verificare le seguenti emoji. Dovresti vedere le stesse emoji su ambo i lati. Se sono diverse, premi 'Non Corrispondono!' per annullare la verifica!</translation> </message> <message> <location line="+376"/> <source>They do not match!</source> - <translation type="unfinished"></translation> + <translation>Non corrispondono!</translation> </message> <message> <location line="+13"/> <source>They match!</source> - <translation type="unfinished"></translation> + <translation>Corrispondono!</translation> </message> </context> <context> @@ -496,57 +499,57 @@ <message> <location filename="../qml/EncryptionIndicator.qml" line="+34"/> <source>This message is not encrypted!</source> - <translation>Questo messaggio è in chiaro!</translation> + <translation>Questo messaggio non è crittato!</translation> </message> <message> <location line="+4"/> <source>Encrypted by a verified device</source> - <translation type="unfinished"></translation> + <translation>Criptato da un dispositivo verificato</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device, but you have trusted that user so far.</source> - <translation type="unfinished"></translation> + <translation>Criptato da un dispositivo non verificato ma hai già verificato questo utente.</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device</source> - <translation type="unfinished"></translation> + <translation>Criptato da un dispositivo non verificato</translation> </message> </context> <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> - <translation type="unfinished">-- Evento Criptato (Chiavi per la decriptazione non trovate) --</translation> + <translation>-- Evento Criptato (Nessuna chiave privata per la decriptazione) --</translation> </message> <message> <location line="+7"/> <source>-- Encrypted Event (Key not valid for this index) --</source> <comment>Placeholder, when the message can't be decrypted with this key since it is not valid for this index </comment> - <translation type="unfinished"></translation> + <translation>-- Evento Criptato (Chiave non valida per questo indice) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> - <translation type="unfinished">-- Errore di Decrittazione (impossibile recuperare le chiavi megolm dal DB) --</translation> + <translation>-- Errore di Decrittazione (impossibile recuperare le chiavi megolm dal DB) --</translation> </message> <message> <location line="-49"/> <location line="+62"/> <source>-- Decryption Error (%1) --</source> <comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment> - <translation type="unfinished">-- Errore di Decrittazione (%1) --</translation> + <translation>-- Errore di Decrittazione (%1) --</translation> </message> <message> <location line="-52"/> <source>-- Encrypted Event (Unknown event type) --</source> <comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment> - <translation type="unfinished">-- Evento Criptato (Tipo di evento ignoto) --</translation> + <translation>-- Evento Criptato (Tipo di evento ignoto) --</translation> </message> <message> <location line="+13"/> @@ -564,7 +567,7 @@ <message> <location filename="../qml/device-verification/Failed.qml" line="+11"/> <source>Verification failed</source> - <translation type="unfinished"></translation> + <translation>Verifica fallita</translation> </message> <message> <location line="+15"/> @@ -580,12 +583,12 @@ <location line="+2"/> <location line="+4"/> <source>Device verification timed out.</source> - <translation type="unfinished"></translation> + <translation>Tempo di verifica del dispositivo scaduto.</translation> </message> <message> <location line="-2"/> <source>Other party canceled the verification.</source> - <translation type="unfinished"></translation> + <translation>L'altra parte ha annullato la verifica.</translation> </message> <message> <location line="+18"/> @@ -598,13 +601,13 @@ <message> <location filename="../qml/ForwardCompleter.qml" line="+44"/> <source>Forward Message</source> - <translation type="unfinished"></translation> + <translation>Inoltra Messaggio</translation> </message> </context> <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">Seleziona un file</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">Tutti i File (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished">Impossibile inviare il file multimediale. Per favore riprova.</translation> </message> @@ -658,7 +661,7 @@ Se Nheko non conclude la ricerca del tuo homeserver, ti mostrerà un campo in cu <message> <location line="+2"/> <source>Your password.</source> - <translation type="unfinished"></translation> + <translation>La tua password.</translation> </message> <message> <location line="+3"/> @@ -673,12 +676,12 @@ Se Nheko non conclude la ricerca del tuo homeserver, ti mostrerà un campo in cu <message> <location line="+4"/> <source>Homeserver address</source> - <translation type="unfinished"></translation> + <translation>Indirizzo Homeserver</translation> </message> <message> <location line="+1"/> <source>server.my:8787</source> - <translation type="unfinished"></translation> + <translation>server.my:8787</translation> </message> <message> <location line="+1"/> @@ -695,13 +698,13 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> - <translation type="unfinished"></translation> + <translation>Hai inserito un ID Matrix non valido, es @joe:matrix.org</translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Ricerca automatica fallita. Ricevuta risposta malformata.</translation> </message> @@ -711,7 +714,7 @@ Esempio: https://server.mio:8787</translation> <translation>Ricerca automatica fallita. Errore ignoto durante la richiesta di .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Gli endpoint richiesti non sono stati trovati. Forse non è un server Matrix.</translation> </message> @@ -726,12 +729,12 @@ Esempio: https://server.mio:8787</translation> <translation>Avvenuto un errore sconosciuto. Assicurati che il dominio dell'homeserver sia valido.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>ACCESSO SSO</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Password vuota</translation> </message> @@ -760,7 +763,7 @@ Esempio: https://server.mio:8787</translation> <location filename="../qml/delegates/MessageDelegate.qml" line="+110"/> <location line="+9"/> <source>removed</source> - <translation type="unfinished"></translation> + <translation>rimosso</translation> </message> <message> <location line="+9"/> @@ -789,13 +792,18 @@ Esempio: https://server.mio:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 creato e configurata stanza: %2</translation> </message> <message> <location line="+12"/> <source>%1 placed a voice call.</source> - <translation type="unfinished"></translation> + <translation>%1 ha avviato una chiamata audio.</translation> </message> <message> <location line="+2"/> @@ -810,12 +818,12 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+11"/> <source>%1 answered the call.</source> - <translation type="unfinished"></translation> + <translation>%1 ha risposto alla chiamata.</translation> </message> <message> <location line="+9"/> <source>%1 ended the call.</source> - <translation type="unfinished"></translation> + <translation>%1 ha terminato la chiamata.</translation> </message> <message> <location line="+9"/> @@ -828,12 +836,12 @@ Esempio: https://server.mio:8787</translation> <message> <location filename="../qml/MessageInput.qml" line="+43"/> <source>Hang up</source> - <translation type="unfinished"></translation> + <translation>Termina</translation> </message> <message> <location line="+0"/> <source>Place a call</source> - <translation type="unfinished"></translation> + <translation>Avvia una chiamata</translation> </message> <message> <location line="+25"/> @@ -853,25 +861,25 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+16"/> <source>Send</source> - <translation type="unfinished"></translation> + <translation>Invia</translation> </message> <message> <location line="+11"/> <source>You don't have permission to send messages in this room</source> - <translation type="unfinished"></translation> + <translation>Non hai i permessi per inviare messaggi in questa stanza</translation> </message> </context> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>Modifica</translation> </message> <message> <location line="+15"/> <source>React</source> - <translation type="unfinished"></translation> + <translation>Reagisci</translation> </message> <message> <location line="+13"/> @@ -883,33 +891,104 @@ Esempio: https://server.mio:8787</translation> <source>Options</source> <translation type="unfinished">Opzioni</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Mostra il messaggio grezzo</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Mostra il messaggio grezzo decriptato</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> <message> <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/> <source>Send Verification Request</source> - <translation type="unfinished"></translation> + <translation>Invia richiesta di verifica</translation> </message> <message> <location line="+0"/> <source>Received Verification Request</source> - <translation type="unfinished"></translation> + <translation>Richiesta di verifica ricevuta</translation> </message> <message> <location line="+15"/> <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source> - <translation type="unfinished"></translation> + <translation>Per permettere agli altri utenti di vedere che dispositivi ti appartengono, puoi verificarli. Questo inoltre permette alle chiavi di recupero di funzionare automaticamente. +Verificare %1 adesso?</translation> </message> <message> <location line="+2"/> <source>To ensure that no malicious user can eavesdrop on your encrypted communications you can verify the other party.</source> - <translation type="unfinished"></translation> + <translation>Per assicurati che nessun malintenzionato intercetti le tue telefonate crittate, puoi verificare l'altra parte.</translation> </message> <message> <location line="+3"/> <source>%1 has requested to verify their device %2.</source> - <translation type="unfinished"></translation> + <translation>%1 ha richiesto di verificare il dispositivo %2.</translation> </message> <message> <location line="+2"/> @@ -919,7 +998,7 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+2"/> <source>Your device (%1) has requested to be verified.</source> - <translation type="unfinished"></translation> + <translation>Il tuo dispositivo (%1) ha richiesto di essere verificato.</translation> </message> <message> <location line="+10"/> @@ -929,12 +1008,12 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+0"/> <source>Deny</source> - <translation type="unfinished"></translation> + <translation>Nega</translation> </message> <message> <location line="+13"/> <source>Start verification</source> - <translation type="unfinished"></translation> + <translation>Inizia verifica</translation> </message> <message> <location line="+0"/> @@ -955,13 +1034,13 @@ Esempio: https://server.mio:8787</translation> <location line="+4"/> <source>* %1 %2</source> <comment>Format an emote message in a notification, %1 is the sender, %2 the message</comment> - <translation type="unfinished"></translation> + <translation>* %1 %2</translation> </message> <message> <location line="+5"/> <source>%1 replied: %2</source> <comment>Format a reply in a notification. %1 is the sender, %2 the message</comment> - <translation type="unfinished"></translation> + <translation>Risposta di %1: %2</translation> </message> <message> <location line="+4"/> @@ -973,7 +1052,7 @@ Esempio: https://server.mio:8787</translation> <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/> <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/> <source>%1 replied with an encrypted message</source> - <translation type="unfinished"></translation> + <translation>%1 ha risposto con un messaggio criptato</translation> </message> <message> <location line="+6"/> @@ -996,7 +1075,7 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+16"/> <source>No microphone found.</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nessun microfono trovato.</translation> </message> <message> <location line="+22"/> @@ -1022,15 +1101,15 @@ Esempio: https://server.mio:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> - <translation>event non implementato: </translation> + <translation>evento non implementato: </translation> </message> </context> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1048,18 +1127,18 @@ Esempio: https://server.mio:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Nome utente</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Il nome utente non deve essere vuoto e deve contenere solo i caratteri a-z, 0-9, ., _, =, -, e /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Password</translation> </message> @@ -1084,22 +1163,47 @@ Esempio: https://server.mio:8787</translation> <translation>Un server che consente la registrazione. Siccome matrix è decentralizzata, devi prima trovare un server su cui registrarti o ospitarne uno tuo.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTRATI</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Non ci sono processi di registrazione supportati!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Ricerca automatica fallita. Ricevuta risposta malformata.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Ricerca automatica fallita. Errore ignoto durante la richiesta di .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Gli endpoint richiesti non sono stati trovati. Forse non è un server Matrix.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Ricevuta risposta malformata. Assicurati che il dominio dell'homeserver sia valido.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Avvenuto un errore sconosciuto. Assicurati che il dominio dell'homeserver sia valido.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>La password non è abbastanza lunga (minimo 8 caratteri)</translation> </message> @@ -1109,7 +1213,7 @@ Esempio: https://server.mio:8787</translation> <translation>Le password non corrispondono</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Nome del server non valido</translation> </message> @@ -1117,7 +1221,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Chiudi</translation> </message> @@ -1130,74 +1234,112 @@ Esempio: https://server.mio:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>nessuna versione memorizzata</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Lascia la stanza</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Lascia la stanza</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished">stanza come:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>preferiti</translation> + <translation type="unfinished">preferiti</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>bassa priorità</translation> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>notifiche del server</translation> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation type="unfinished">Aggiungi o rimuovi il tag specificato.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Accetta</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Rifiuta</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Accetta</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Rifiuta</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Disconnettiti</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Inizia una nuova discussione</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Entra in una stanza</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Elenco delle stanze</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Impostazioni utente</translation> </message> </context> <context> @@ -1387,34 +1529,6 @@ Esempio: https://server.mio:8787</translation> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Impostazioni utente</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Crea una nuova stanza</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Entra in una stanza</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Inizia una nuova discussione</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Elenco delle stanze</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1440,7 +1554,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1458,7 +1572,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Oscuramento del messaggio fallito: %1</translation> </message> @@ -1520,12 +1634,12 @@ Esempio: https://server.mio:8787</translation> <message> <location line="+23"/> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source> - <translation>%1 ha reso la cronologia della stanza leggibile da tutti. Gli eventi adesso possono essere letti da persone esterne. </translation> + <translation>%1 ha reso la cronologia della stanza leggibile da tutti. Gli eventi adesso possono essere letti da persone esterne.</translation> </message> <message> <location line="+4"/> <source>%1 set the room history visible to members from this point on.</source> - <translation>%1 ha reso la cronologia della stanza visibile ai membri da questo momento in poi. </translation> + <translation>%1 ha reso la cronologia della stanza visibile ai membri da questo momento in poi.</translation> </message> <message> <location line="+3"/> @@ -1593,17 +1707,22 @@ Esempio: https://server.mio:8787</translation> <translation>%1 è stato bannato.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 ha oscurato la sua bussata.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Sei entrato in questa stanza.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1624,12 +1743,7 @@ Esempio: https://server.mio:8787</translation> <translation>%1 è uscito dopo essere già uscito!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Motivazione: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 ha bussato.</translation> </message> @@ -1645,85 +1759,25 @@ Esempio: https://server.mio:8787</translation> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Risposta</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Leggi le ricevute</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Segna come letto</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Mostra il messaggio grezzo</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Mostra il messaggio grezzo decriptato</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Salva come</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Nessuna stanza aperta</translation> </message> <message> - <location line="+7"/> - <source>Open in external program</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+57"/> - <source>No room open</source> - <translation>Nessuna stanza aperta</translation> - </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1781,54 +1835,6 @@ Esempio: https://server.mio:8787</translation> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Disconnettiti</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1867,7 +1873,7 @@ Esempio: https://server.mio:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished">Scegli un avatar</translation> </message> @@ -1890,8 +1896,8 @@ Esempio: https://server.mio:8787</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1899,7 +1905,7 @@ Esempio: https://server.mio:8787</translation> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Minimizza nella tray</translation> </message> @@ -2449,7 +2455,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/> <source>Open Fallback in Browser</source> - <translation>Apertura di Ripiego nel Browser </translation> + <translation>Apertura di Ripiego nel Browser</translation> </message> <message> <location line="+1"/> @@ -2704,22 +2710,9 @@ Peso media: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Questa Stanza</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Tutte le Stanze</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Tipo di Messaggio sconosciuto</translation> </message> diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index 997ffd1a..c7872ce0 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>ユーザーを招待できませんでした: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>招待されたユーザー: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation>永久追放を解除されたユーザー: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>OLMアカウントを復元できませんでした。もう一度ログインして下さい。</translation> </message> @@ -265,13 +257,13 @@ <translation>セーブデータを復元できませんでした。もう一度ログインして下さい。</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>暗号化鍵を設定できませんでした。サーバーの応答: %1 %2. 後でやり直して下さい。</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>もう一度ログインしてみて下さい: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>部屋から出られませんでした: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>全ての部屋</translation> + <translation type="unfinished">全ての部屋</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>お気に入りの部屋</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>優先度の低い部屋</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (タグ)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (コミュニティー)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">ファイルを選択</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">全てのファイル (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished">メディアをアップロードできませんでした。やり直して下さい。</translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>自動検出できませんでした。不正な形式の応答を受信しました。</translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation>自動検出できませんでした。.well-known要求時の不明なエラー。</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation>不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>パスワードが入力されていません</translation> </message> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished">オプション</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">ソースを見る</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>未実装のイベント: </translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>ユーザー名</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>パスワード</translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>登録</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">自動検出できませんでした。不正な形式の応答を受信しました。</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">自動検出できませんでした。.well-known要求時の不明なエラー。</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">不正な形式の応答を受信しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>パスワード長が不足しています (最小8文字)</translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>パスワードが一致しません</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>無効なサーバー名です</translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished">閉じる</translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>バージョンが保存されていません</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>部屋を出る</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">部屋を出る</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">容認</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">拒否</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>容認</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>拒否</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">ログアウト</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">新しいチャットを開始</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">部屋に参加</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">部屋一覧</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">ユーザー設定</translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>ユーザー設定</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>新しい部屋を作成</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>部屋に参加</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>新しいチャットを開始</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>部屋一覧</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>メッセージを編集できませんでした: %1</translation> </message> @@ -1588,17 +1701,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1がノックを編集しました。</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1619,12 +1737,7 @@ Example: https://server.my:8787</source> <translation type="unfinished">退出済みの%1が退出しました!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1がノックしました。</translation> </message> @@ -1640,85 +1753,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished">返信</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>開封確認</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>既読にする</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>ソースを見る</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>名前を付けて保存</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>部屋が開いていません</translation> </message> <message> - <location line="+7"/> - <source>Open in external program</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+57"/> - <source>No room open</source> - <translation>部屋が開いていません</translation> - </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1776,54 +1829,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>ログアウト</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1862,7 +1867,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished">アバターを選択</translation> </message> @@ -1885,8 +1890,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1894,7 +1899,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>トレイへ最小化</translation> </message> @@ -2699,22 +2704,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>この部屋</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>全ての部屋</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>不明なメッセージ型です</translation> </message> diff --git a/resources/langs/nheko_ml.ts b/resources/langs/nheko_ml.ts index 79bf26ee..0bdf3b63 100644 --- a/resources/langs/nheko_ml.ts +++ b/resources/langs/nheko_ml.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>നിങ്ങൾ ഈ മുറിയിൽ ചേർന്നു.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>ഉപയോക്താവിനെ ക്ഷണിക്കുന്നതിൽ പരാജയപ്പെട്ടു: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>ക്ഷണിച്ച ഉപയോക്താവ്:% 1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation>%1 മുറി സൃഷ്ടിച്ചു</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>ക്ഷണം ഉറപ്പാക്കു</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>എല്ലാ മുറികളും</translation> + <translation type="unfinished">എല്ലാ മുറികളും</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>പ്രിയപ്പെട്ട മുറികൾ</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>കുറഞ്ഞ മുൻഗണനയുള്ള മുറികൾ</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>ഒരു ഫയൽ തിരഞ്ഞെടുക്കുക</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -779,6 +782,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -808,13 +816,13 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation>നീക്കംചെയ്തു</translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation type="unfinished">പാസ്വേഡ്</translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation type="unfinished"></translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished">അടയ്ക്കുക</translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> + <location line="+222"/> + <source>Accept</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">നിരസിക്കുക</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> + <location line="+10"/> + <source>Profile settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation type="unfinished">നിരസിക്കുക</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished">നിങ്ങൾ ഈ മുറിയിൽ ചേർന്നു.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -2698,22 +2703,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>ഈ മുറി</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>എല്ലാ മുറികളും</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 09270b29..3f2a147f 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Je bent lid geworden van deze kamer.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Gebruiker uitnodigen mislukt: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Gebruiker uitgenodigd: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation>Kamer %1 gecreëerd.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">Kies een bestand</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">Alle bestanden (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Leeg wachtwoord</translation> </message> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Gebruikersnaam</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Wachtwoord</translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTREREN</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Het wachtwoord is niet lang genoeg (minimaal 8 tekens)</translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>De wachtwoorden komen niet overeen</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Ongeldige servernaam</translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Kamer verlaten</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Kamer verlaten</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Accepteren</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Afwijzen</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Accepteren</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Afwijzen</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Kamer betreden</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Nieuwe kamer creëren</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Kamer betreden</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished">Je bent lid geworden van deze kamer.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished">Leesbevestigingen</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Minimaliseren naar systeemvak</translation> </message> @@ -2700,22 +2705,9 @@ Mediagrootte: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index cc542093..6abcd147 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Dołączyłeś(-łaś) do tego pokoju.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Nie udało się zaprosić użytkownika: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Czy na pewno chcesz zaprosić %1 (%2)?</translation> </message> @@ -235,12 +227,12 @@ <translation>Odblokowano użytkownika: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Nie udało się przenieść pamięci podręcznej!</translation> </message> @@ -255,7 +247,7 @@ <translation>Pamięć podręczna na Twoim dysku jest nowsza niż wersja obsługiwana przez Nheko. Zaktualizuj lub wyczyść pamięć podręczną.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation> </message> @@ -265,13 +257,13 @@ <translation>Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Nie udało się ustawić kluczy szyfrujących. Odpowiedź serwera: %1 %2. Spróbuj ponownie później.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Spróbuj zalogować się ponownie: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Nie udało się opuścić pokoju: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Wszystkie pokoje</translation> + <translation type="unfinished">Wszystkie pokoje</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Ulubione pokoje</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Pokoje o niskim priorytecie</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> - <translation>Ogłoszenia serwera</translation> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tag)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (społeczność)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Ogłoszenia serwera</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Zdarzenie szyfrowania (Nie znaleziono kluczy deszyfrujących)</translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">Wybierz plik</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">Wszystkie pliki (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -693,13 +696,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Automatyczne odkrywanie zakończone niepowodzeniem. Otrzymano nieprawidłową odpowiedź.</translation> </message> @@ -709,7 +712,7 @@ Example: https://server.my:8787</source> <translation>Automatyczne odkrywanie zakończone niepowodzeniem. Napotkano nieznany błąd. .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Nie odnaleziono wymaganych punktów końcowych. To może nie być serwer Matriksa.</translation> </message> @@ -724,12 +727,12 @@ Example: https://server.my:8787</source> <translation>Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>Logowanie SSO</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Puste hasło</translation> </message> @@ -787,6 +790,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 utworzył i skonfigurował pokój: %2</translation> </message> @@ -862,7 +870,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -881,6 +889,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1020,7 +1098,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>Niezaimplementowane wydarzenie: </translation> </message> @@ -1028,7 +1106,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Stwórz unikalny profil, który pozwoli Ci na zalogowanie się do kilku kont jednocześnie i uruchomienie wielu instancji Nheko.</translation> </message> @@ -1046,18 +1124,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Nazwa użytkownika</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Nazwa użytkownika nie może być pusta i może zawierać wyłącznie znaki a-z, 0-9, ., _, =, -, i /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Hasło</translation> </message> @@ -1082,22 +1160,47 @@ Example: https://server.my:8787</source> <translation>Serwer, który pozwala na rejestrację. Ponieważ Matrix jest zdecentralizowany, musisz najpierw znaleźć serwer który pozwala na rejestrację bądź hostować swój własny.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>ZAREJESTRUJ</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Nie wspierana procedura rejestracji!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Automatyczne odkrywanie zakończone niepowodzeniem. Otrzymano nieprawidłową odpowiedź.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Automatyczne odkrywanie zakończone niepowodzeniem. Napotkano nieznany błąd. .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Nie odnaleziono wymaganych punktów końcowych. To może nie być serwer Matriksa.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Otrzymano nieprawidłową odpowiedź. Upewnij się, że domena serwera domowego jest prawidłowa.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Hasło jest zbyt krótkie (min. 8 znaków)</translation> </message> @@ -1107,7 +1210,7 @@ Example: https://server.my:8787</source> <translation>Hasła nie pasują do siebie</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Nieprawidłowa nazwa serwera</translation> </message> @@ -1115,7 +1218,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Zamknij</translation> </message> @@ -1128,74 +1231,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Opuść pokój</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Opuść pokój</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Akceptuj</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Odrzuć</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Akceptuj</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Odrzuć</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Wyloguj</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Utwórz nowy czat</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Dołącz do pokoju</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Katalog pokojów</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Ustawienia użytkownika</translation> </message> </context> <context> @@ -1385,34 +1526,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Ustawienia użytkownika</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Utwórz nowy pokój</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Dołącz do pokoju</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Utwórz nowy czat</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Katalog pokojów</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1438,7 +1551,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1456,7 +1569,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation> </message> @@ -1592,17 +1705,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished">Dołączyłeś(-łaś) do tego pokoju.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1623,12 +1741,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1644,85 +1757,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Potwierdzenia przeczytania</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1780,54 +1833,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Wyloguj</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1866,7 +1871,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished">Wybierz awatar</translation> </message> @@ -1889,8 +1894,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1898,7 +1903,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Zminimalizuj do paska zadań</translation> </message> @@ -2703,22 +2708,9 @@ Rozmiar multimediów: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_pt_BR.ts b/resources/langs/nheko_pt_BR.ts new file mode 100644 index 00000000..fa0ea193 --- /dev/null +++ b/resources/langs/nheko_pt_BR.ts @@ -0,0 +1,2713 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="pt_BR"> +<context> + <name>ActiveCallBar</name> + <message> + <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/> + <source>Calling...</source> + <translation>Ligando...</translation> + </message> + <message> + <location line="+10"/> + <location line="+10"/> + <source>Connecting...</source> + <translation>Conectando...</translation> + </message> + <message> + <location line="+67"/> + <source>You are screen sharing</source> + <translation>Você está compartilhando sua tela</translation> + </message> + <message> + <location line="+17"/> + <source>Hide/Show Picture-in-Picture</source> + <translation>Esconder/Mostrar Picture-in-Picture</translation> + </message> + <message> + <location line="+13"/> + <source>Unmute Mic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Mute Mic</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AwaitingVerificationConfirmation</name> + <message> + <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/> + <source>Awaiting Confirmation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Waiting for other side to complete verification.</source> + <translation>Esperando o outro lado completar a verificação.</translation> + </message> + <message> + <location line="+12"/> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> +</context> +<context> + <name>CallInvite</name> + <message> + <location filename="../qml/voip/CallInvite.qml" line="+70"/> + <source>Video Call</source> + <translation>Chamada de Vídeo</translation> + </message> + <message> + <location line="+0"/> + <source>Voice Call</source> + <translation>Chamada de Voz</translation> + </message> + <message> + <location line="+62"/> + <source>No microphone found.</source> + <translation>Nenhum microfone encontrado.</translation> + </message> +</context> +<context> + <name>CallInviteBar</name> + <message> + <location filename="../qml/voip/CallInviteBar.qml" line="+64"/> + <source>Video Call</source> + <translation>Chamada de Vídeo</translation> + </message> + <message> + <location line="+0"/> + <source>Voice Call</source> + <translation>Chamada de Voz</translation> + </message> + <message> + <location line="+16"/> + <source>Devices</source> + <translation>Dispositivos</translation> + </message> + <message> + <location line="+10"/> + <source>Accept</source> + <translation>Aceitar</translation> + </message> + <message> + <location line="+12"/> + <source>Unknown microphone: %1</source> + <translation>Microfone desconhecido: %1</translation> + </message> + <message> + <location line="+8"/> + <source>Unknown camera: %1</source> + <translation>Câmera desconhecida: %1</translation> + </message> + <message> + <location line="+13"/> + <source>Decline</source> + <translation>Rejeitar</translation> + </message> + <message> + <location line="-28"/> + <source>No microphone found.</source> + <translation>Nenhum microfone encontrado.</translation> + </message> +</context> +<context> + <name>CallManager</name> + <message> + <location filename="../../src/CallManager.cpp" line="+521"/> + <source>Entire screen</source> + <translation>Tela Inteira</translation> + </message> +</context> +<context> + <name>ChatPage</name> + <message> + <location filename="../../src/ChatPage.cpp" line="+133"/> + <source>Failed to invite user: %1</source> + <translation>Falha ao convidar usuário: %1</translation> + </message> + <message> + <location line="+4"/> + <location line="+665"/> + <source>Invited user: %1</source> + <translation>Usuário convidado: %1</translation> + </message> + <message> + <location line="-456"/> + <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+360"/> + <source>Confirm join</source> + <translation>Confirmar entrada</translation> + </message> + <message> + <location line="+1"/> + <source>Do you really want to join %1?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+44"/> + <source>Room %1 created.</source> + <translation>Sala %1 criada.</translation> + </message> + <message> + <location line="+34"/> + <location line="+280"/> + <source>Confirm invite</source> + <translation>Confirmar convite</translation> + </message> + <message> + <location line="-279"/> + <source>Do you really want to invite %1 (%2)?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Failed to invite %1 to %2: %3</source> + <translation>Falha ao convidar %1 para %2: %3</translation> + </message> + <message> + <location line="+15"/> + <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 type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Kicked user: %1</source> + <translation>Usuário expulso: %1</translation> + </message> + <message> + <location line="+10"/> + <source>Confirm ban</source> + <translation>Confirmar banimento</translation> + </message> + <message> + <location line="+1"/> + <source>Do you really want to ban %1 (%2)?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Failed to ban %1 in %2: %3</source> + <translation>Falha ao banir %1 em %2: %3</translation> + </message> + <message> + <location line="+5"/> + <source>Banned user: %1</source> + <translation>Usuário banido: %1</translation> + </message> + <message> + <location line="+10"/> + <source>Confirm unban</source> + <translation>Confirmar desbanimento</translation> + </message> + <message> + <location line="+1"/> + <source>Do you really want to unban %1 (%2)?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Failed to unban %1 in %2: %3</source> + <translation>Falha ao desbanir %1 em %2: %3</translation> + </message> + <message> + <location line="+5"/> + <source>Unbanned user: %1</source> + <translation>Usuário desbanido: %1</translation> + </message> + <message> + <location line="+183"/> + <source>Do you really want to start a private chat with %1?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-721"/> + <source>Cache migration failed!</source> + <translation>Migração do cache falhou!</translation> + </message> + <message> + <location line="+13"/> + <source>Incompatible cache version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+48"/> + <source>Failed to restore OLM account. Please login again.</source> + <translation>Falha ao restaurar conta OLM. Por favor faça login novamente.</translation> + </message> + <message> + <location line="+4"/> + <source>Failed to restore save data. Please login again.</source> + <translation>Falha ao restaurar dados salvos. Por favor faça login novamente.</translation> + </message> + <message> + <location line="+101"/> + <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <location line="+117"/> + <source>Please try to login again: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+51"/> + <source>Failed to join room: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You joined the room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Failed to remove invite: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+21"/> + <source>Room creation failed: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Failed to leave room: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+60"/> + <source>Failed to kick %1 from %2: %3</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CommunitiesList</name> + <message> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CommunitiesModel</name> + <message> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> + <source>All rooms</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>CrossSigningSecrets</name> + <message> + <location filename="../../src/ChatPage.cpp" line="+183"/> + <source>Decrypt secrets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Enter your recovery key or passphrase to decrypt your secrets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> + <source>Decryption failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Failed to decrypt secrets with the provided recovery key or passphrase</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>DigitVerification</name> + <message> + <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/> + <source>Verification Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <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 type="unfinished"></translation> + </message> + <message> + <location line="+31"/> + <source>They do not match!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>They match!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EditModal</name> + <message> + <location filename="../../src/ui/RoomSettings.cpp" line="+42"/> + <source>Apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+10"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Topic</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EmojiPicker</name> + <message> + <location filename="../qml/emoji/EmojiPicker.qml" line="+59"/> + <source>Search</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+172"/> + <source>People</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Nature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Food</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Activity</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Travel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Objects</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Symbols</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Flags</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EmojiVerification</name> + <message> + <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/> + <source>Verification Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <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 type="unfinished"></translation> + </message> + <message> + <location line="+376"/> + <source>They do not match!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>They match!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EncryptionIndicator</name> + <message> + <location filename="../qml/EncryptionIndicator.qml" line="+34"/> + <source>This message is not encrypted!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Encrypted by a verified device</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Encrypted by an unverified device, but you have trusted that user so far.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Encrypted by an unverified device</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>EventStore</name> + <message> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> + <source>-- Encrypted Event (No keys found for decryption) --</source> + <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>-- Encrypted Event (Key not valid for this index) --</source> + <comment>Placeholder, when the message can't be decrypted with this key since it is not valid for this index </comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+63"/> + <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> + <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-49"/> + <location line="+62"/> + <source>-- Decryption Error (%1) --</source> + <comment>Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-52"/> + <source>-- Encrypted Event (Unknown event type) --</source> + <comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>-- Replay attack! This message index was reused! --</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>-- Message by unverified device! --</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Failed</name> + <message> + <location filename="../qml/device-verification/Failed.qml" line="+11"/> + <source>Verification failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Other client does not support our verification protocol.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Key mismatch detected!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <location line="+4"/> + <source>Device verification timed out.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-2"/> + <source>Other party canceled the verification.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ForwardCompleter</name> + <message> + <location filename="../qml/ForwardCompleter.qml" line="+44"/> + <source>Forward Message</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InputBar</name> + <message> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> + <source>Select a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+417"/> + <source>Failed to upload media. Please try again.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InviteeItem</name> + <message> + <location filename="../../src/InviteeItem.cpp" line="+22"/> + <source>Remove</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LoginPage</name> + <message> + <location filename="../../src/LoginPage.cpp" line="+81"/> + <source>Matrix ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>e.g @joe:matrix.org</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+25"/> + <source>Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Your password.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Device name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Homeserver address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>server.my:8787</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The address that can be used to contact you homeservers client API. +Example: https://server.my:8787</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> + <source>LOGIN</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+84"/> + <location line="+11"/> + <location line="+157"/> + <location line="+11"/> + <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-131"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-168"/> + <source>SSO LOGIN</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+264"/> + <source>Empty password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+57"/> + <source>SSO login failed</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MemberList</name> + <message> + <location filename="../../src/dialogs/MemberList.cpp" line="+94"/> + <source>Room members</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MessageDelegate</name> + <message> + <location filename="../qml/delegates/MessageDelegate.qml" line="+128"/> + <source>Encryption enabled</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>room name changed to: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>removed room name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>topic changed to: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>removed topic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>%1 created and configured room: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>%1 placed a voice call.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 placed a video call.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 placed a call.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Negotiating call...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-18"/> + <source>%1 answered the call.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-80"/> + <location line="+9"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+80"/> + <source>%1 ended the call.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MessageInput</name> + <message> + <location filename="../qml/MessageInput.qml" line="+43"/> + <source>Hang up</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Place a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+25"/> + <source>Send a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+50"/> + <source>Write a message...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Emoji</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>You don't have permission to send messages in this room</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MessageView</name> + <message> + <location filename="../qml/MessageView.qml" line="+83"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>React</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Reply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>NewVerificationRequest</name> + <message> + <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/> + <source>Send Verification Request</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Received Verification Request</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>To ensure that no malicious user can eavesdrop on your encrypted communications you can verify the other party.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 has requested to verify their device %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 using the device %2 has requested to be verified.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Your device (%1) has requested to be verified.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+0"/> + <source>Deny</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Start verification</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Accept</source> + <translation type="unfinished">Aceitar</translation> + </message> +</context> +<context> + <name>NotificationsManager</name> + <message> + <location filename="../../src/notifications/Manager.cpp" line="+22"/> + <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/> + <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/> + <source>%1 sent an encrypted message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>* %1 %2</source> + <comment>Format an emote message in a notification, %1 is the sender, %2 the message</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>%1 replied: %2</source> + <comment>Format a reply in a notification. %1 is the sender, %2 the message</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1: %2</source> + <comment>Format a normal message in a notification. %1 is the sender, %2 the message</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/> + <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/> + <source>%1 replied with an encrypted message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>%1 replied to a message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>%1 sent a message</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PlaceCall</name> + <message> + <location filename="../qml/voip/PlaceCall.qml" line="+48"/> + <source>Place a call to %1?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>No microphone found.</source> + <translation type="unfinished">Nenhum microfone encontrado.</translation> + </message> + <message> + <location line="+22"/> + <source>Voice</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Video</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Screen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> +</context> +<context> + <name>Placeholder</name> + <message> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> + <source>unimplemented event: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QCoreApplication</name> + <message> + <location filename="../../src/main.cpp" line="+200"/> + <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>profile name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RegisterPage</name> + <message> + <location filename="../../src/RegisterPage.cpp" line="+78"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <location line="+305"/> + <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-301"/> + <source>Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Password confirmation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Homeserver</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <source>REGISTER</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> + <source>No supported registration flows!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+213"/> + <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> + <source>Password is not long enough (min 8 chars)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Passwords don't match</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Invalid server name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ReplyPopup</name> + <message> + <location filename="../qml/ReplyPopup.qml" line="+47"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Cancel edit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RoomInfo</name> + <message> + <location filename="../../src/Cache.cpp" line="+4009"/> + <source>no version stored</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RoomList</name> + <message> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Tag room as:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Favourite</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Aceitar</translation> + </message> + <message> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Rejeitar</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>RoomSettings</name> + <message> + <location filename="../qml/RoomSettings.qml" line="+25"/> + <source>Room Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>%1 member(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+43"/> + <source>SETTINGS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Notifications</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Muted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Mentions only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>All messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Anyone and guests</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Anyone</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Invited users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Encryption</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <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> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> + <source>Respond to key requests</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Whether or not the client should respond automatically with the session keys + upon request. Use with caution, this is a temporary measure to test the + E2E implementation until device verification is completed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+21"/> + <source>INFO</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Internal ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>Room Version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/RoomSettings.cpp" line="+268"/> + <source>Failed to enable encryption: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+228"/> + <source>Select an avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>The selected file is not an image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Error while reading file: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <location line="+20"/> + <source>Failed to upload image: %s</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ScreenShare</name> + <message> + <location filename="../qml/voip/ScreenShare.qml" line="+30"/> + <source>Share desktop with %1?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Window:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>Frame rate:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> + <source>Include your camera picture-in-picture</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Request remote camera</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <location line="+9"/> + <source>View your callee's camera like a regular video call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Hide mouse cursor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>Share</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> + <source>Preview</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> +</context> +<context> + <name>StatusIndicator</name> + <message> + <location filename="../qml/StatusIndicator.qml" line="+21"/> + <source>Failed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Sent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Received</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Read</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Success</name> + <message> + <location filename="../qml/device-verification/Success.qml" line="+11"/> + <source>Successful Verification</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Verification successful! Both sides verified their devices!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TimelineModel</name> + <message> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> + <source>Message redaction failed: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> + <location line="+5"/> + <source>Failed to encrypt event, sending aborted!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+164"/> + <source>Save image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Save video</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Save audio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Save file</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location line="+228"/> + <source>%1 and %2 are typing.</source> + <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location line="+68"/> + <source>%1 opened the room to the public.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 made this room require and invitation to join.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+23"/> + <source>%1 made the room open to guests.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 has closed the room to guest access.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+23"/> + <source>%1 made the room history world readable. Events may be now read by non-joined people.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1 set the room history visible to members from this point on.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 set the room history visible to members since they were invited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 set the room history visible to members since they joined the room.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+22"/> + <source>%1 has changed the room's permissions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+33"/> + <source>%1 was invited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+19"/> + <source>%1 changed their avatar.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 changed some profile info.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1 joined.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>%1 rejected their invite.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Revoked the invite to %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 left the room.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Kicked %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Unbanned %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>%1 was banned.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> + <source>%1 redacted their knock.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-883"/> + <source>You joined this room.</source> + <translation type="unfinished">Você entrou nessa sala.</translation> + </message> + <message> + <location line="+849"/> + <source>%1 has changed their avatar and changed their display name to %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>%1 has changed their display name to %2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+31"/> + <source>Rejected the knock from %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <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 type="unfinished"></translation> + </message> + <message> + <location line="+10"/> + <source>%1 knocked.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TimelineRow</name> + <message> + <location filename="../qml/TimelineRow.qml" line="+106"/> + <source>Edited</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TimelineView</name> + <message> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+127"/> + <source>%1 member(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Back to room list</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TimelineViewManager</name> + <message> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> + <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TopBar</name> + <message> + <location filename="../qml/TopBar.qml" line="+51"/> + <source>Back to room list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <location line="+10"/> + <source>No room selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+24"/> + <source>Room options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Invite users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Members</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Settings</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>TrayIcon</name> + <message> + <location filename="../../src/TrayIcon.cpp" line="+112"/> + <source>Show</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Quit</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>UserProfile</name> + <message> + <location filename="../qml/UserProfile.qml" line="+24"/> + <source>Global User Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Room User Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+114"/> + <location line="+107"/> + <source>Verify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-54"/> + <source>Ban the user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-17"/> + <source>Start a private chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Kick the user</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+63"/> + <source>Unverify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> + <source>Select an avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>The selected file is not an image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Error while reading file: %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>UserSettings</name> + <message> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>UserSettingsPage</name> + <message> + <location line="+524"/> + <source>Minimize to tray</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Start in tray</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Group's sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-3"/> + <source>Circular Avatars</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-210"/> + <source>profile: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+96"/> + <source>Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+31"/> + <source>CALLS</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Cross Signing Keys</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>REQUEST</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>DOWNLOAD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Keep the application running in the background after closing the client window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Start the application in the background without showing the client window.</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"/> + <source>Show a column containing groups and tags next to the room list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Decrypt messages in sidebar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Decrypt the messages shown in the sidebar. +Only affects messages in encrypted chats.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Privacy Screen</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>When the window loses focus, the timeline will +be blurred.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Privacy screen timeout (in seconds [0 - 3600])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set timeout (in seconds) for how long after window loses +focus before the screen will be blurred. +Set to 0 to blur immediately after focus loss. Max value of 1 hour (3600 seconds)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Show buttons in timeline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Show buttons to quickly reply, react or access additional options next to each message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Limit width of timeline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set the max width of messages in the timeline (in pixels). This can help readability on wide screen, when Nheko is maximised</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Typing notifications</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Show who is typing in a room. +This will also enable or disable sending typing notifications to others.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Sort rooms by unreads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Display rooms with new messages first. +If this is off, the list of rooms will only be sorted by the timestamp of the last message in a room. +If this is on, rooms which have active notifications (the small circle with a number in it) will be sorted on top. Rooms, that you have muted, will still be sorted by timestamp, since you don't seem to consider them as important as the other rooms.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Read receipts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Show if your message was read. +Status is displayed next to timestamps.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Send messages as Markdown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Allow using markdown in messages. +When disabled, all messages are sent as a plain text.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Desktop notifications</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Notify about received message when the client is not currently focused.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Alert on notification</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"></translation> + </message> + <message> + <location line="+2"/> + <source>Highlight message on hover</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Change the background color of messages when you hover over them.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Large Emoji in timeline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Make font size larger if messages with only a few emojis are displayed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+56"/> + <source>Share keys with verified users and devices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+406"/> + <source>CACHED</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>NOT CACHED</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-460"/> + <source>Scale factor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Change the scale factor of the whole user interface.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Font size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Font Family</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Theme</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Ringtone</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set the notification sound to play when a call invite arrives</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Microphone</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Camera</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Camera resolution</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Camera frame rate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+14"/> + <source>Allow fallback call assist server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Will use turn.matrix.org as assist when your home server does not offer one.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Device ID</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Device Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-164"/> + <source>Session Keys</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>IMPORT</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>EXPORT</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-34"/> + <source>ENCRYPTION</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-115"/> + <source>GENERAL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> + <source>INTERFACE</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+194"/> + <source>Touchscreen mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Will prevent text selection in the timeline to make touch scrolling easier.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Emoji Font Family</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+40"/> + <source>Automatically replies to key requests from other users, if they are verified.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Master signing key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Your most important key. You don't need to have it cached, since not caching it makes it less likely it can be stolen and it is only needed to rotate your other signing keys.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>User signing key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <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> + <message> + <location line="+3"/> + <source>Self signing key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <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"/> + <source>Backup key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>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.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+54"/> + <source>Select a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+236"/> + <source>Open Sessions File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <location line="+18"/> + <location line="+9"/> + <location line="+19"/> + <location line="+11"/> + <location line="+18"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-66"/> + <location line="+28"/> + <source>File Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-27"/> + <source>Enter the passphrase to decrypt the file:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <location line="+28"/> + <source>The password cannot be empty</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-8"/> + <source>Enter passphrase to encrypt your session keys:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>File to save the exported session keys</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Waiting</name> + <message> + <location filename="../qml/device-verification/Waiting.qml" line="+11"/> + <source>Waiting for other party…</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Waiting for other side to accept the verification request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Waiting for other side to continue the verification process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Waiting for other side to complete the verification process.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> +</context> +<context> + <name>WelcomePage</name> + <message> + <location filename="../../src/WelcomePage.cpp" line="+34"/> + <source>Welcome to nheko! The desktop client for the Matrix protocol.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enjoy your stay!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+23"/> + <source>REGISTER</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>LOGIN</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>descriptiveTime</name> + <message> + <location filename="../../src/Utils.cpp" line="+207"/> + <source>Yesterday</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::CreateRoom</name> + <message> + <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/> + <source>Create room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+10"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Topic</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Alias</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Room Visibility</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Room Preset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Direct Chat</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::FallbackAuth</name> + <message> + <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/> + <source>Open Fallback in Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+1"/> + <source>Confirm</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Open the fallback, follow the steps and confirm after completing them.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::InviteUsers</name> + <message> + <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+8"/> + <source>User ID to invite</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::JoinRoom</name> + <message> + <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/> + <source>Join</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+7"/> + <source>Room ID or alias</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::LeaveRoom</name> + <message> + <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+8"/> + <source>Are you sure you want to leave?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::Logout</name> + <message> + <location filename="../../src/dialogs/Logout.cpp" line="+35"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+8"/> + <source>Logout. Are you sure?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::PreviewUploadOverlay</name> + <message> + <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/> + <source>Upload</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+93"/> + <source>Media type: %1 +Media size: %2 +</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::ReCaptcha</name> + <message> + <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location line="+1"/> + <source>Confirm</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Solve the reCAPTCHA and press the confirm button</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::ReadReceipts</name> + <message> + <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/> + <source>Read receipts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>dialogs::ReceiptItem</name> + <message> + <location line="-46"/> + <source>Today %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Yesterday %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>message-description sent:</name> + <message> + <location filename="../../src/Utils.h" line="+124"/> + <source>You sent an audio clip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent an audio clip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You sent an image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent an image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You sent a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent a file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You sent a video</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent a video</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You sent a sticker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent a sticker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You sent a notification</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent a notification</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1: %2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>You sent an encrypted message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 sent an encrypted message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You placed a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 placed a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You answered a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 answered a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>You ended a call</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>%1 ended a call</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>utils</name> + <message> + <location line="+4"/> + <source>Unknown Message Type</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts index 5b041107..81343f97 100644 --- a/resources/langs/nheko_pt_PT.ts +++ b/resources/langs/nheko_pt_PT.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -779,6 +782,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -808,13 +816,13 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation type="unfinished"></translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation type="unfinished"></translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation type="unfinished"></translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,73 +1229,111 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> + <location line="+222"/> + <source>Accept</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> + <location line="+10"/> + <source>Profile settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> <translation type="unfinished"></translation> </message> </context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -2698,22 +2703,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts index 7c35ba42..c21bb069 100644 --- a/resources/langs/nheko_ro.ts +++ b/resources/langs/nheko_ro.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Te-ai alăturat camerei.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Nu s-a putut invita utilizatorul: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Utilizator invitat: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Nu s-a putut muta cache-ul pe versiunea curentă. Acest lucru poate avea diferite cauze. Vă rugăm să deschideți un issue și încercați să folosiți o versiune mai veche între timp. O altă opțiune ar fi să încercați să ștergeți cache-ul manual.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation>Camera %1 a fost creată.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation>Utilizator dezinterzis: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Nu s-a putut migra cache-ul!</translation> </message> @@ -255,7 +247,7 @@ <translation>Cache-ul de pe disc este mai nou decât versiunea pe care Nheko o suportă. Vă rugăm actualizați sau ștergeți cache-ul.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Nu s-a putut restabili contul OLM. Vă rugăm să vă reconectați.</translation> </message> @@ -265,13 +257,13 @@ <translation>Nu s-au putut restabili datele salvate. Vă rugăm să vă reconectați.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Nu s-au putut stabili cheile. Răspunsul serverului: %1 %2. Vă rugăm încercați mai târziu.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Vă rugăm să vă reconectați: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Nu s-a putut părăsi camera: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Toate camerele</translation> + <translation type="unfinished">Toate camerele</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Camere favorite</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Camere cu prioritate scăzută</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (etichetă)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (comunitate)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">Toate fișierele (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -695,13 +698,13 @@ Exemplu: https://serverul.meu:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autodescoperirea a eșuat. Răspunsul primit este defectuos.</translation> </message> @@ -711,7 +714,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation>Autodescoperirea a eșuat. Eroare necunoscută la solicitarea .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Punctele finale necesare nu au fost găsite. Posibil a nu fi un server Matrix.</translation> </message> @@ -726,12 +729,12 @@ Exemplu: https://serverul.meu:8787</translation> <translation>A apărut o eroare necunoscută. Verificați ca domeniul homeserverului să fie valid.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>CONECTARE SSO</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Parolă necompletată</translation> </message> @@ -789,6 +792,11 @@ Exemplu: https://serverul.meu:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 a creat și configurat camera: %2</translation> </message> @@ -864,7 +872,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -883,6 +891,76 @@ Exemplu: https://serverul.meu:8787</translation> <source>Options</source> <translation type="unfinished">Opțiuni</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Vedeți mesajul brut</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Vedeți mesajul brut decriptat</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>eveniment neimplementat: </translation> </message> @@ -1030,7 +1108,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1048,18 +1126,18 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Nume de utilizator</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Numele de utilizator nu poate fi gol, și trebuie să conțină doar caracterele a-z, 0-9, ., =, - și /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Parolă</translation> </message> @@ -1084,22 +1162,47 @@ Exemplu: https://serverul.meu:8787</translation> <translation>Un server care permite înregistrarea. Deoarece Matrix este decentralizat, trebuie să găsiți un server pe care să vă înregistrați sau să vă găzduiți propriul server.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>ÎNREGISTRARE</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Fluxuri de înregistrare nesuportate!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Autodescoperirea a eșuat. Răspunsul primit este defectuos.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Autodescoperirea a eșuat. Eroare necunoscută la solicitarea .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Punctele finale necesare nu au fost găsite. Posibil a nu fi un server Matrix.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Răspuns eronat primit. Verificați ca domeniul homeserverului să fie valid.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">A apărut o eroare necunoscută. Verificați ca domeniul homeserverului să fie valid.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Parola nu este destul de lungă (minim 8 caractere)</translation> </message> @@ -1109,7 +1212,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation>Parolele nu se potrivesc</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Nume server invalid</translation> </message> @@ -1117,7 +1220,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished">Închide</translation> </message> @@ -1130,74 +1233,112 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>nicio versiune stocată</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Părăsește camera</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Părăsește camera</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Acceptare</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Refuzare</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Acceptare</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Refuzare</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Deconectare</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Începe o nouă conversație</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Alătură-te unei camere</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Registru de camere</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Setări utilizator</translation> </message> </context> <context> @@ -1387,34 +1528,6 @@ Exemplu: https://serverul.meu:8787</translation> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Setări utilizator</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Crează cameră nouă</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Alătură-te unei camere</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Începe o nouă conversație</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Registru de camere</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1440,7 +1553,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1458,7 +1571,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Redactare mesaj eșuată: %1</translation> </message> @@ -1594,17 +1707,22 @@ Exemplu: https://serverul.meu:8787</translation> <translation>%1 a fost interzis(ă).</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 și-a redactat ciocănitul.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Te-ai alăturat camerei.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1625,12 +1743,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation>%1 a părăsit camera după ce a părăsit-o deja înainte!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Motiv: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 a ciocănit.</translation> </message> @@ -1646,85 +1759,25 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Răspuns</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Confirmări de citire</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Marcați ca citit</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Vedeți mesajul brut</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Vedeți mesajul brut decriptat</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Salvare ca</translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Nicio cameră deschisă</translation> </message> <message> - <location line="+7"/> - <source>Open in external program</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> - <message> - <location line="+57"/> - <source>No room open</source> - <translation>Nicio cameră deschisă</translation> - </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1782,54 +1835,6 @@ Exemplu: https://serverul.meu:8787</translation> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Deconectare</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1868,7 +1873,7 @@ Exemplu: https://serverul.meu:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished">Selectează un avatar</translation> </message> @@ -1891,8 +1896,8 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1900,7 +1905,7 @@ Exemplu: https://serverul.meu:8787</translation> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Minimizează în bara de notificări</translation> </message> @@ -2705,22 +2710,9 @@ Dimensiune media: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Această cameră</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Toate camerele</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Tip mesaj necunoscut</translation> </message> diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 3ff6088c..6f2b19af 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -17,12 +17,12 @@ <message> <location line="+67"/> <source>You are screen sharing</source> - <translation type="unfinished"></translation> + <translation>Вы демонстрируете экран</translation> </message> <message> <location line="+17"/> <source>Hide/Show Picture-in-Picture</source> - <translation type="unfinished"></translation> + <translation>Убрать/Показать Картинку-в-Картинке</translation> </message> <message> <location line="+13"/> @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Вы присоединились к этой комнате.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -84,42 +76,42 @@ <message> <location filename="../qml/voip/CallInviteBar.qml" line="+64"/> <source>Video Call</source> - <translation type="unfinished">Видео Звонок</translation> + <translation>Видео Звонок</translation> </message> <message> <location line="+0"/> <source>Voice Call</source> - <translation type="unfinished">Голосовой Звонок</translation> + <translation>Голосовой Звонок</translation> </message> <message> <location line="+16"/> <source>Devices</source> - <translation type="unfinished">Устройства</translation> + <translation>Устройства</translation> </message> <message> <location line="+10"/> <source>Accept</source> - <translation type="unfinished">Принять</translation> + <translation>Принять</translation> </message> <message> <location line="+12"/> <source>Unknown microphone: %1</source> - <translation type="unfinished"></translation> + <translation>Неизвестный микрофон: %1</translation> </message> <message> <location line="+8"/> <source>Unknown camera: %1</source> - <translation type="unfinished"></translation> + <translation>Неизвестная камера: %1</translation> </message> <message> <location line="+13"/> <source>Decline</source> - <translation type="unfinished">Отказаться</translation> + <translation>Отказаться</translation> </message> <message> <location line="-28"/> <source>No microphone found.</source> - <translation type="unfinished">Микрофон не найден.</translation> + <translation>Микрофон не найден.</translation> </message> </context> <context> @@ -127,36 +119,36 @@ <message> <location filename="../../src/CallManager.cpp" line="+521"/> <source>Entire screen</source> - <translation type="unfinished"></translation> + <translation>Весь экран</translation> </message> </context> <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Не удалось пригласить пользователя: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Приглашенный пользователь: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Миграция кэша для текущей версии не удалась. Это может происходить по разным причинам. Пожалуйста сообщите о проблеме и попробуйте временно использовать старую версию. Так-же вы можете попробовать удалить кэш самостоятельно.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> - <translation type="unfinished"></translation> + <translation>Подтвердить вход</translation> </message> <message> <location line="+1"/> <source>Do you really want to join %1?</source> - <translation type="unfinished"></translation> + <translation>Вы действительно хотите присоединиться?</translation> </message> <message> <location line="+44"/> @@ -164,13 +156,13 @@ <translation>Комната %1 создана.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Подтвердите приглашение</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation>Вы точно хотите пригласить %1 (%2)?</translation> </message> @@ -235,12 +227,12 @@ <translation>Разблокированный пользователь: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> - <translation type="unfinished"></translation> + <translation>Вы действительно хотите начать личную переписку с %1?</translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Миграция кэша не удалась!</translation> </message> @@ -255,7 +247,7 @@ <translation>Ваш кэш новее, чем эта версия Nheko поддерживает. Пожалуйста обновитесь или отчистите ваш кэш.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation> </message> @@ -265,13 +257,13 @@ <translation>Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Повторите попытку входа: %1</translation> </message> @@ -301,77 +293,88 @@ <translation>Не удалось покинуть комнату: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> - <translation type="unfinished"></translation> + <translation>Не удалось выгнать %1 из %2: %3</translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Все комнаты</translation> + <translation type="unfinished">Все комнаты</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Избранные комнаты</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Комнаты с низким приоритетом</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> - <translation>Серверные Оповещения</translation> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Низкий Приоритет</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (тег)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (сообщество)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Серверные Оповещения</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> - <translation type="unfinished"></translation> + <translation>Расшифровать секреты</translation> </message> <message> <location line="+2"/> <source>Enter your recovery key or passphrase to decrypt your secrets:</source> - <translation type="unfinished"></translation> + <translation>Введите свой ключ восстановления или пароль для расшифровки секретов: </translation> </message> <message> <location line="+3"/> <source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source> - <translation type="unfinished"></translation> + <translation>Введите свой ключ восстановления или пароль названный %1 для расшифровки Ваших секретов:</translation> </message> <message> <location line="+17"/> <source>Decryption failed</source> - <translation type="unfinished"></translation> + <translation>Расшифровка не удалась</translation> </message> <message> <location line="+1"/> <source>Failed to decrypt secrets with the provided recovery key or passphrase</source> - <translation type="unfinished"></translation> + <translation>Не удалось расшифровать секреты с помощью предоставленного ключа восстановления или пароля.</translation> </message> </context> <context> @@ -501,39 +504,39 @@ <message> <location line="+4"/> <source>Encrypted by a verified device</source> - <translation type="unfinished"></translation> + <translation>Зашифровано верефицированым устройством</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device, but you have trusted that user so far.</source> - <translation type="unfinished"></translation> + <translation>Зашифрованно неверефицированым устройством, но Вы все еще доверяете этому пользователю.</translation> </message> <message> <location line="+2"/> <source>Encrypted by an unverified device</source> - <translation type="unfinished"></translation> + <translation>Зашифровано неверифицированым устройства</translation> </message> </context> <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> - <translation>-- Зашифрованное событие (Нет найдено ключей для дешифрования) --</translation> + <translation>-- Зашифрованное событие (Не найдено ключей для дешифрования) --</translation> </message> <message> <location line="+7"/> <source>-- Encrypted Event (Key not valid for this index) --</source> <comment>Placeholder, when the message can't be decrypted with this key since it is not valid for this index </comment> - <translation type="unfinished"></translation> + <translation>-- Зашифрованное событие(Не найдено ключей для дешифрования) --</translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> - <translation>-- Ошибка дешифрования (Не удалось получить megolm-ключи для бд) --</translation> + <translation>-- Ошибка дешифрования (Не удалось получить megolm-ключи из бд) --</translation> </message> <message> <location line="-49"/> @@ -598,13 +601,13 @@ <message> <location filename="../qml/ForwardCompleter.qml" line="+44"/> <source>Forward Message</source> - <translation type="unfinished"></translation> + <translation>Переслать Сообщение</translation> </message> </context> <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Выберите файл</translation> </message> @@ -614,7 +617,7 @@ <translation>Все файлы (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Не удалось загрузить медиа. Пожалуйста попробуйте ещё раз</translation> </message> @@ -658,7 +661,7 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th <message> <location line="+2"/> <source>Your password.</source> - <translation type="unfinished"></translation> + <translation>Ваш пароль.</translation> </message> <message> <location line="+3"/> @@ -673,12 +676,12 @@ If Nheko fails to discover your homeserver, it will show you a field to enter th <message> <location line="+4"/> <source>Homeserver address</source> - <translation type="unfinished"></translation> + <translation>Адрес домашнего сервера</translation> </message> <message> <location line="+1"/> <source>server.my:8787</source> - <translation type="unfinished"></translation> + <translation>server.my:8787</translation> </message> <message> <location line="+1"/> @@ -695,13 +698,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> - <translation type="unfinished"></translation> + <translation>Вы ввели не правильный Matrix ID, @joe:matrix.org</translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Автообноружение не удалось. Получен поврежденный ответ.</translation> </message> @@ -711,7 +714,7 @@ Example: https://server.my:8787</source> <translation>Автообноружение не удалось. Не известаня ошибка во время запроса .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Необходимые конечные точки не найдены. Возможно, это не сервер Matrix.</translation> </message> @@ -726,12 +729,12 @@ Example: https://server.my:8787</source> <translation>Произошла неизвестная ошибка. Убедитесь, что домен homeserver действителен.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>SSO ВХОД</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Пустой пароль</translation> </message> @@ -789,6 +792,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 создал и настроил комнату: %2</translation> </message> @@ -858,30 +866,100 @@ Example: https://server.my:8787</source> <message> <location line="+11"/> <source>You don't have permission to send messages in this room</source> - <translation type="unfinished"></translation> + <translation>У вас нет прав для отправления сообщений в этой комнате</translation> </message> </context> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> - <translation type="unfinished"></translation> + <translation>Редактировать</translation> </message> <message> <location line="+15"/> <source>React</source> - <translation type="unfinished">Отреагировать</translation> + <translation>Реакция</translation> </message> <message> <location line="+13"/> <source>Reply</source> - <translation type="unfinished">Ответить</translation> + <translation>Ответить</translation> </message> <message> <location line="+11"/> <source>Options</source> - <translation type="unfinished">Опции</translation> + <translation>Опции</translation> + </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Просмотреть сырое сообщение</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Просмототреть дешифрованое сырое сообщение</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -889,12 +967,12 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/> <source>Send Verification Request</source> - <translation type="unfinished"></translation> + <translation>Отправить Запрос Верификации</translation> </message> <message> <location line="+0"/> <source>Received Verification Request</source> - <translation type="unfinished"></translation> + <translation>Получен Запрос Верификации</translation> </message> <message> <location line="+15"/> @@ -949,7 +1027,7 @@ Example: https://server.my:8787</source> <location filename="../../src/notifications/ManagerMac.cpp" line="+44"/> <location filename="../../src/notifications/ManagerWin.cpp" line="+78"/> <source>%1 sent an encrypted message</source> - <translation type="unfinished">%1 отправил зашифрованное сообщение</translation> + <translation>%1 отправил зашифрованное сообщение</translation> </message> <message> <location line="+4"/> @@ -973,17 +1051,17 @@ Example: https://server.my:8787</source> <location filename="../../src/notifications/ManagerMac.cpp" line="-1"/> <location filename="../../src/notifications/ManagerWin.cpp" line="-1"/> <source>%1 replied with an encrypted message</source> - <translation type="unfinished"></translation> + <translation>%1 ответил зашифрованным сообщением</translation> </message> <message> <location line="+6"/> <source>%1 replied to a message</source> - <translation type="unfinished"></translation> + <translation>%1 ответил на сообщение</translation> </message> <message> <location line="+0"/> <source>%1 sent a message</source> - <translation type="unfinished"></translation> + <translation>%1 отправил сообщениe</translation> </message> </context> <context> @@ -991,38 +1069,38 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/voip/PlaceCall.qml" line="+48"/> <source>Place a call to %1?</source> - <translation type="unfinished"></translation> + <translation>Позвонить %1?</translation> </message> <message> <location line="+16"/> <source>No microphone found.</source> - <translation type="unfinished">Микрофон не найден.</translation> + <translation>Микрофон не найден.</translation> </message> <message> <location line="+22"/> <source>Voice</source> - <translation type="unfinished"></translation> + <translation>Голос</translation> </message> <message> <location line="+13"/> <source>Video</source> - <translation type="unfinished"></translation> + <translation>Видео</translation> </message> <message> <location line="+14"/> <source>Screen</source> - <translation type="unfinished"></translation> + <translation>Экран</translation> </message> <message> <location line="+10"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation>Отмена</translation> </message> </context> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>не реализованное событие</translation> </message> @@ -1030,7 +1108,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Создать уникальный профиль, который позволяет вести несколько аккаунтов и запускать множество сущностей nheko. </translation> </message> @@ -1048,18 +1126,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Имя пользователя</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Имя пользователя не должно быть пустым и должно содержать только символы a-z, 0-9, ., _, =, -, и /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Пароль</translation> </message> @@ -1084,22 +1162,47 @@ Example: https://server.my:8787</source> <translation>Сервер разрешающий регистрацию.Поскольку matrix децентрализованный, нужно выбрать сервер где вы можете зарегистрироваться или поднимите свой сервер.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>РЕГИСТРАЦИЯ</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Нет поддреживаемых регистрационных потоков</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Одно или более полей имеют некорректный ввод. Пожалуйста устраните ошибки и попробуйте снова.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Автообноружение не удалось. Получен поврежденный ответ.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Автообноружение не удалось. Не известаня ошибка во время запроса .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Необходимые конечные точки не найдены. Возможно, это не сервер Matrix.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Получен неверный ответ. Убедитесь, что домен homeserver действителен.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Произошла неизвестная ошибка. Убедитесь, что домен homeserver действителен.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Слишком короткий пароль (минимум 8 символов)</translation> </message> @@ -1109,7 +1212,7 @@ Example: https://server.my:8787</source> <translation>Пароли не совпадают</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Неверное имя сервера</translation> </message> @@ -1117,87 +1220,125 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> <location line="+13"/> <source>Cancel edit</source> - <translation type="unfinished"></translation> + <translation>Отменить редактирование</translation> </message> </context> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>нет сохраненной версии</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Покинуть комнату</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Покинуть комнату</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> - <translation>Тэгировать комнату как:</translation> + <translation type="unfinished">Тэгировать комнату как:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>Важные</translation> + <translation type="unfinished">Важные</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>Низкий Приоритет</translation> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Серверное Объявление</translation> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Добавить или удалить выбранные тэг.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Добавить новый тег для комнаты</translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Принять</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Новый Тэг</translation> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">Отказаться</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Тэг:</translation> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Принять</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Отказаться</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Выйти</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Начать новый чат</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Присоединиться к комнате</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Каталог комнат</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Пользовательские настройки</translation> </message> </context> <context> @@ -1205,62 +1346,62 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/RoomSettings.qml" line="+25"/> <source>Room Settings</source> - <translation type="unfinished"></translation> + <translation>Настройки комнаты</translation> </message> <message> <location line="+79"/> <source>%1 member(s)</source> - <translation type="unfinished"></translation> + <translation>%1 участник(ов)</translation> </message> <message> <location line="+43"/> <source>SETTINGS</source> - <translation type="unfinished"></translation> + <translation>НАЙСТРОЙКИ</translation> </message> <message> <location line="+9"/> <source>Notifications</source> - <translation type="unfinished"></translation> + <translation>Уведомления</translation> </message> <message> <location line="+5"/> <source>Muted</source> - <translation type="unfinished"></translation> + <translation>Заглушен</translation> </message> <message> <location line="+0"/> <source>Mentions only</source> - <translation type="unfinished"></translation> + <translation>Упоминания только</translation> </message> <message> <location line="+0"/> <source>All messages</source> - <translation type="unfinished"></translation> + <translation>Все сообщения</translation> </message> <message> <location line="+15"/> <source>Anyone and guests</source> - <translation type="unfinished"></translation> + <translation>Каждый и гости</translation> </message> <message> <location line="+0"/> <source>Anyone</source> - <translation type="unfinished"></translation> + <translation>Каждый</translation> </message> <message> <location line="+0"/> <source>Invited users</source> - <translation type="unfinished"></translation> + <translation>Приглашённые пользователи</translation> </message> <message> <location line="+9"/> <source>Encryption</source> - <translation type="unfinished"></translation> + <translation>Шифрование</translation> </message> <message> <location line="+20"/> <source>End-to-End Encryption</source> - <translation type="unfinished">Сквозное шифрование</translation> + <translation>Оконечное шифрование</translation> </message> <message> <location line="+1"/> @@ -1271,7 +1412,7 @@ Example: https://server.my:8787</source> <message> <location line="+17"/> <source>Respond to key requests</source> - <translation type="unfinished"></translation> + <translation>Отвечать на запрос ключей</translation> </message> <message> <location line="+5"/> @@ -1283,53 +1424,53 @@ Example: https://server.my:8787</source> <message> <location line="+21"/> <source>INFO</source> - <translation type="unfinished"></translation> + <translation>ИНФОРМАЦИЯ</translation> </message> <message> <location line="+9"/> <source>Internal ID</source> - <translation type="unfinished"></translation> + <translation>Внутренний ID</translation> </message> <message> <location line="+10"/> <source>Room Version</source> - <translation type="unfinished"></translation> + <translation>Версия Комнаты</translation> </message> <message> <location line="+13"/> <source>OK</source> - <translation type="unfinished">ОК</translation> + <translation>ОК</translation> </message> <message> <location filename="../../src/ui/RoomSettings.cpp" line="+268"/> <source>Failed to enable encryption: %1</source> - <translation type="unfinished">Не удалось включить шифрование: %1</translation> + <translation>Не удалось включить шифрование: %1</translation> </message> <message> <location line="+228"/> <source>Select an avatar</source> - <translation type="unfinished">Выберите аватар</translation> + <translation>Выберите аватар</translation> </message> <message> <location line="+0"/> <source>All Files (*)</source> - <translation type="unfinished">Все файлы (*)</translation> + <translation>Все файлы (*)</translation> </message> <message> <location line="+12"/> <source>The selected file is not an image</source> - <translation type="unfinished">Выбранный файл не является картинкой</translation> + <translation>Выбранный файл не является картинкой</translation> </message> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation type="unfinished">Ошибка во время прочтения файла: %1</translation> + <translation>Ошибка во время прочтения файла: %1</translation> </message> <message> <location line="+34"/> <location line="+20"/> <source>Failed to upload image: %s</source> - <translation type="unfinished">Не удалось загрузить изображение: %s</translation> + <translation>Не удалось загрузить изображение: %s</translation> </message> </context> <context> @@ -1337,27 +1478,27 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/voip/ScreenShare.qml" line="+30"/> <source>Share desktop with %1?</source> - <translation type="unfinished"></translation> + <translation>Поделиться экраном с %1?</translation> </message> <message> <location line="+11"/> <source>Window:</source> - <translation type="unfinished"></translation> + <translation>Окно:</translation> </message> <message> <location line="+20"/> <source>Frame rate:</source> - <translation type="unfinished"></translation> + <translation>Частота кадров:</translation> </message> <message> <location line="+19"/> <source>Include your camera picture-in-picture</source> - <translation type="unfinished"></translation> + <translation>Включить Вашу камеру в режиме картинка-в-картинке</translation> </message> <message> <location line="+12"/> <source>Request remote camera</source> - <translation type="unfinished"></translation> + <translation>Запросить удалённую камеру</translation> </message> <message> <location line="+1"/> @@ -1368,50 +1509,22 @@ Example: https://server.my:8787</source> <message> <location line="+5"/> <source>Hide mouse cursor</source> - <translation type="unfinished"></translation> + <translation>Спрятать курсор мыши</translation> </message> <message> <location line="+20"/> <source>Share</source> - <translation type="unfinished"></translation> + <translation>Поделиться</translation> </message> <message> <location line="+19"/> <source>Preview</source> - <translation type="unfinished"></translation> + <translation>Предпросмотр</translation> </message> <message> <location line="+7"/> <source>Cancel</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Пользовательские настройки</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Создать новую комнату</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Присоединиться к комнате</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Начать новый чат</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Каталог комнат</translation> + <translation>Отмена</translation> </message> </context> <context> @@ -1440,7 +1553,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Верификация прошла успешно</translation> </message> @@ -1458,7 +1571,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Ошибка редактирования сообщения: %1</translation> </message> @@ -1594,17 +1707,22 @@ Example: https://server.my:8787</source> <translation>%1 был заблокирован.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 отредактировал его "стук".</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Вы присоединились к этой комнате.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1625,12 +1743,7 @@ Example: https://server.my:8787</source> <translation>%1 покинул чат, после того, как уже его покинул.</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Причина: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 постучался.</translation> </message> @@ -1640,91 +1753,31 @@ Example: https://server.my:8787</source> <message> <location filename="../qml/TimelineRow.qml" line="+106"/> <source>Edited</source> - <translation type="unfinished"></translation> + <translation>Изменено</translation> </message> </context> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Отреагировать</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Ответить</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Посмотреть получателей</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Пометить как прочианное</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Просмотреть сырое сообщение</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Просмототреть дешифрованое сырое сообщение</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Убрать сообщение</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Сохранить как</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation type="unfinished"></translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Комната не выбрана</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> - <translation type="unfinished"></translation> + <location line="+127"/> + <source>%1 member(s)</source> + <translation type="unfinished">%1 участник(ов)</translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Комната не выбрана</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation type="unfinished">Вернуться к списку комнат</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Не найдено личного чата с этим пользователем. Создайте зашифрованный личный чат с этим пользователем и попытайтесь еще раз.</translation> </message> @@ -1782,64 +1835,16 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Выйти</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Установить статус</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Статус</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Статус: </translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Установить 'presence'автоматически</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>В сети</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Не доступен</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Не в сети</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> <source>Global User Profile</source> - <translation type="unfinished"></translation> + <translation>Глобальный Пользовательский Профиль</translation> </message> <message> <location line="+0"/> <source>Room User Profile</source> - <translation type="unfinished"></translation> + <translation>Поользовательский Профиль в Комнате</translation> </message> <message> <location line="+114"/> @@ -1865,42 +1870,42 @@ Example: https://server.my:8787</source> <message> <location line="+63"/> <source>Unverify</source> - <translation type="unfinished"></translation> + <translation>Отменить Верификацию</translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> - <translation type="unfinished">Выберите аватар</translation> + <translation>Выберите аватар</translation> </message> <message> <location line="+0"/> <source>All Files (*)</source> - <translation type="unfinished">Все файлы (*)</translation> + <translation>Все файлы (*)</translation> </message> <message> <location line="+12"/> <source>The selected file is not an image</source> - <translation type="unfinished">Выбранный файл не является картинкой</translation> + <translation>Выбранный файл не является картинкой</translation> </message> <message> <location line="+5"/> <source>Error while reading file: %1</source> - <translation type="unfinished">Ошибка во время прочтения файла: %1</translation> + <translation>Ошибка во время прочтения файла: %1</translation> </message> </context> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>По умолчанию</translation> </message> </context> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Сворачивать в системную панель</translation> </message> @@ -1927,7 +1932,7 @@ Example: https://server.my:8787</source> <message> <location line="+96"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation>По умолчанию</translation> </message> <message> <location line="+31"/> @@ -1942,12 +1947,12 @@ Example: https://server.my:8787</source> <message> <location line="+4"/> <source>REQUEST</source> - <translation type="unfinished"></translation> + <translation>ЗАПРОС</translation> </message> <message> <location line="+1"/> <source>DOWNLOAD</source> - <translation type="unfinished"></translation> + <translation>СКАЧАТЬ</translation> </message> <message> <location line="+27"/> @@ -1984,7 +1989,7 @@ Only affects messages in encrypted chats.</source> <message> <location line="+2"/> <source>Privacy Screen</source> - <translation type="unfinished"></translation> + <translation>Приватное Окно</translation> </message> <message> <location line="+2"/> @@ -2123,12 +2128,12 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+406"/> <source>CACHED</source> - <translation type="unfinished"></translation> + <translation>Закешировано</translation> </message> <message> <location line="+6"/> <source>NOT CACHED</source> - <translation type="unfinished"></translation> + <translation>НЕ ЗАКЕШИРОВАНО</translation> </message> <message> <location line="-460"/> @@ -2288,7 +2293,7 @@ This usually causes the application icon in the task bar to animate in some fash <message> <location line="+3"/> <source>Backup key</source> - <translation type="unfinished"></translation> + <translation>Ключ восстановления</translation> </message> <message> <location line="+2"/> @@ -2711,22 +2716,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Эта Комната</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Все Комнаты</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Неизвестный Тип Сообщения</translation> </message> diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts index c9b094c3..a80adb1b 100644 --- a/resources/langs/nheko_si.ts +++ b/resources/langs/nheko_si.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation type="unfinished"></translation> </message> @@ -255,7 +247,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation type="unfinished"></translation> </message> @@ -265,13 +257,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation type="unfinished"></translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation type="unfinished"></translation> </message> @@ -301,55 +293,66 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished"></translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation type="unfinished"></translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation type="unfinished"></translation> </message> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation type="unfinished"></translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation type="unfinished"></translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation type="unfinished"></translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,73 +1229,111 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> + <location line="+222"/> + <source>Accept</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> + <location line="+10"/> + <source>Profile settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> <translation type="unfinished"></translation> </message> </context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished"></translation> </message> @@ -1589,17 +1702,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1620,12 +1738,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1641,85 +1754,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1777,54 +1830,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1863,7 +1868,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished"></translation> </message> @@ -1886,8 +1891,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1895,7 +1900,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation type="unfinished"></translation> </message> @@ -2698,22 +2703,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/langs/nheko_sv.ts b/resources/langs/nheko_sv.ts index 84410098..8069dcea 100644 --- a/resources/langs/nheko_sv.ts +++ b/resources/langs/nheko_sv.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>Du gick med i detta rum.</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>Kunde inte bjuda in användare: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>Bjöd in användare: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>Kunde inte migrera cachen till den nuvarande versionen. Detta kan bero på flera anledningar, vänligen rapportera problemet och prova en äldre version under tiden. Du kan också försöka att manuellt radera cachen.</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation>Rum %1 skapat.</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation>Bekräfta inbjudan</translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <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> @@ -235,12 +227,12 @@ <translation>Hävde bannlysningen av användare: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>Cache-migration misslyckades!</translation> </message> @@ -255,7 +247,7 @@ <translation>Cachen på ditt lagringsmedia är nyare än vad denna version av Nheko stödjer. Vänligen uppdatera eller rensa din cache.</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>Kunde inte återställa OLM-konto. Vänligen logga in på nytt.</translation> </message> @@ -265,13 +257,13 @@ <translation>Kunde inte återställa sparad data. Vänligen logga in på nytt.</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>Kunde inte sätta upp krypteringsnycklar. Svar från servern: %1 %2. Vänligen försök igen senare.</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>Vänligen försök logga in på nytt: %1</translation> </message> @@ -301,55 +293,66 @@ <translation>Kunde inte lämna rum: %1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> - <translation>Alla rum</translation> + <translation type="unfinished">Alla rum</translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>Favoritrum</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> - <translation>Lågprioritetsrum</translation> + <location line="+30"/> + <source>Favourites</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> - <translation>Servernotiser</translation> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> + <translation type="unfinished">Låg prioritet</translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> - <translation> (tagg)</translation> + <source>Rooms with low priority.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> - <translation> (community)</translation> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished">Servernotiser</translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation>Dekryptera hemliga nycklar</translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation>-- Krypterat Event (Inga nycklar kunde hittas för dekryptering) --</translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation>Välj en fil</translation> </message> @@ -614,7 +617,7 @@ <translation>Alla Filer (*)</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation>Kunde inte ladda upp media. Vänligen försök igen.</translation> </message> @@ -695,13 +698,13 @@ Exempel: https://server.my:8787</translation> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation>Autouppslag misslyckades. Mottog felkonstruerat svar.</translation> </message> @@ -711,7 +714,7 @@ Exempel: https://server.my:8787</translation> <translation>Autouppslag misslyckades. Okänt fel uppstod vid begäran av .well-known.</translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>Kunde inte hitta de nödvändiga ändpunkterna. Möjligtvis inte en Matrix-server.</translation> </message> @@ -726,12 +729,12 @@ Exempel: https://server.my:8787</translation> <translation>Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation>SSO INLOGGNING</translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>Tomt lösenord</translation> </message> @@ -783,6 +786,11 @@ Exempel: https://server.my:8787</translation> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation>%1 skapade och konfigurerade rum: %2</translation> </message> @@ -812,13 +820,13 @@ Exempel: https://server.my:8787</translation> <translation>%1 besvarade samtalet.</translation> </message> <message> - <location line="-72"/> + <location line="-80"/> <location line="+9"/> <source>removed</source> <translation>borttagen</translation> </message> <message> - <location line="+72"/> + <location line="+80"/> <source>%1 ended the call.</source> <translation>%1 avslutade samtalet.</translation> </message> @@ -864,7 +872,7 @@ Exempel: https://server.my:8787</translation> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -883,6 +891,76 @@ Exempel: https://server.my:8787</translation> <source>Options</source> <translation type="unfinished">Alternativ</translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished">Visa meddelandekälla</translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished">Visa dekrypterad meddelandekälla</translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1022,7 +1100,7 @@ Exempel: https://server.my:8787</translation> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation>ej implementerat event: </translation> </message> @@ -1030,7 +1108,7 @@ Exempel: https://server.my:8787</translation> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation>Skapa en unik profil, vilket tillåter dig att logga in på flera konton samtidigt och starta flera instanser av Nheko.</translation> </message> @@ -1048,18 +1126,18 @@ Exempel: https://server.my:8787</translation> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>Användarnamn</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation>Användarnamnet kan inte vara tomt, och måste enbart innehålla tecknen a-z, 0-9, ., _, =, -, och /.</translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>Lösenord</translation> </message> @@ -1084,22 +1162,47 @@ Exempel: https://server.my:8787</translation> <translation>En server som tillåter registrering. Eftersom matrix är decentraliserat behöver du först hitta en server du kan registrera dig på, eller upprätta en på egen hand.</translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>REGISTRERA</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation>Inga stödda registreringsflöden!</translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation>Ett eller flera fält har ogiltigt innehåll. Vänligen korrigera problemen och försök igen.</translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished">Autouppslag misslyckades. Mottog felkonstruerat svar.</translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished">Autouppslag misslyckades. Okänt fel uppstod vid begäran av .well-known.</translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">Kunde inte hitta de nödvändiga ändpunkterna. Möjligtvis inte en Matrix-server.</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Mottog felkonstruerat svar. Se till att hemserver-domänen är giltig.</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>Lösenordet är inte långt nog (minst 8 tecken)</translation> </message> @@ -1109,7 +1212,7 @@ Exempel: https://server.my:8787</translation> <translation>Lösenorden stämmer inte överens</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>Ogiltigt servernamn</translation> </message> @@ -1117,7 +1220,7 @@ Exempel: https://server.my:8787</translation> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation>Stäng</translation> </message> @@ -1130,74 +1233,112 @@ Exempel: https://server.my:8787</translation> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation>ingen version lagrad</translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>Lämna rum</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">Lämna rum</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> - <translation>Tagga rum som:</translation> + <translation type="unfinished">Tagga rum som:</translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> - <translation>Favorit</translation> + <translation type="unfinished">Favorit</translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> - <translation>Låg prioritet</translation> + <location line="+2"/> + <source>Low priority</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> - <translation>Servernotis</translation> + <location line="+2"/> + <source>Server notice</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> - <translation>Lägger till eller tar bort den angivna taggen.</translation> + <location line="+13"/> + <source>Create new tag...</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation>Ny tagg…</translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">Godkänn</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> - <translation>Ny tagg</translation> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> - <translation>Tagg:</translation> + <source>Enter your status message:</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>Godkänn</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>Avvisa</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">Logga ut</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">Starta en ny chatt</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">Gå med i ett rum</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">Rumkatalog</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">Användarinställningar</translation> </message> </context> <context> @@ -1387,34 +1528,6 @@ Exempel: https://server.my:8787</translation> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>Användarinställningar</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>Skapa nytt rum</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>Gå med i ett rum</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>Starta en ny chatt</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>Rumkatalog</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1440,7 +1553,7 @@ Exempel: https://server.my:8787</translation> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation>Lyckad verifikation</translation> </message> @@ -1458,7 +1571,7 @@ Exempel: https://server.my:8787</translation> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation>Kunde inte maskera meddelande: %1</translation> </message> @@ -1593,17 +1706,22 @@ Exempel: https://server.my:8787</translation> <translation>%1 blev bannlyst.</translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation>%1 maskerade sin knackning.</translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation>Du gick med i detta rum.</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1624,12 +1742,7 @@ Exempel: https://server.my:8787</translation> <translation>%1 lämnade efter att redan ha lämnat!</translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation>Anledning: %1</translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation>%1 knackade.</translation> </message> @@ -1645,85 +1758,25 @@ Exempel: https://server.my:8787</translation> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation>Reagera</translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation>Svara</translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>Läskvitton</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation>Markera som läst</translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation>Visa meddelandekälla</translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation>Visa dekrypterad meddelandekälla</translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation>Ta bort meddelande</translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation>Spara som</translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> - <translation type="unfinished"></translation> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> + <translation>Inget rum öppet</translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> - <translation>Inget rum öppet</translation> + <location line="+46"/> + <source>Back to room list</source> + <translation type="unfinished">Tillbaka till rumlista</translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation>Ingen krypterad privat chatt med denna användare kunde hittas. Skapa en krypterad privat chatt med användaren och försök igen.</translation> </message> @@ -1781,54 +1834,6 @@ Exempel: https://server.my:8787</translation> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>Logga ut</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation>Sätt statusmeddelande</translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation>Statusmeddelande</translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation>Status:</translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation>Sätt närvaro automatiskt</translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation>Online</translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation>Otillgänglig</translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation>Offline</translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1867,7 +1872,7 @@ Exempel: https://server.my:8787</translation> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation>Välj en avatar</translation> </message> @@ -1890,8 +1895,8 @@ Exempel: https://server.my:8787</translation> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1899,7 +1904,7 @@ Exempel: https://server.my:8787</translation> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>Minimera till systemtråg</translation> </message> @@ -2712,22 +2717,9 @@ Mediastorlek: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation>Detta Rum</translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation>Alla Rum</translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation>Okänd meddelandetyp</translation> </message> diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index a5d20b67..d468dfaa 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -54,14 +54,6 @@ </message> </context> <context> - <name>Cache</name> - <message> - <location filename="../../src/Cache.cpp" line="+2016"/> - <source>You joined this room.</source> - <translation>您已加入此房间</translation> - </message> -</context> -<context> <name>CallInvite</name> <message> <location filename="../qml/voip/CallInvite.qml" line="+70"/> @@ -133,23 +125,23 @@ <context> <name>ChatPage</name> <message> - <location filename="../../src/ChatPage.cpp" line="+204"/> + <location filename="../../src/ChatPage.cpp" line="+133"/> <source>Failed to invite user: %1</source> <translation>邀请用户失败: %1</translation> </message> <message> <location line="+4"/> - <location line="+809"/> + <location line="+665"/> <source>Invited user: %1</source> <translation>邀请已发送: %1</translation> </message> <message> - <location line="-509"/> + <location line="-456"/> <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source> <translation>无法迁移缓存到目前版本，可能有多种原因引发此类问题。您可以新建一个议题并继续使用之前版本，或者您可以尝试手动删除缓存。</translation> </message> <message> - <location line="+412"/> + <location line="+360"/> <source>Confirm join</source> <translation type="unfinished"></translation> </message> @@ -164,13 +156,13 @@ <translation>房间“%1”已创建</translation> </message> <message> - <location line="+35"/> - <location line="+324"/> + <location line="+34"/> + <location line="+280"/> <source>Confirm invite</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-279"/> <source>Do you really want to invite %1 (%2)?</source> <translation type="unfinished"></translation> </message> @@ -235,12 +227,12 @@ <translation>解禁用户: %1</translation> </message> <message> - <location line="+227"/> + <location line="+183"/> <source>Do you really want to start a private chat with %1?</source> <translation type="unfinished"></translation> </message> <message> - <location line="-818"/> + <location line="-721"/> <source>Cache migration failed!</source> <translation>缓存迁移失败！</translation> </message> @@ -255,7 +247,7 @@ <translation>本地缓存版本比现用的Nheko版本新。请升级Nheko或手动清除缓存。</translation> </message> <message> - <location line="+50"/> + <location line="+48"/> <source>Failed to restore OLM account. Please login again.</source> <translation>恢复 OLM 账户失败。请重新登录。</translation> </message> @@ -265,13 +257,13 @@ <translation>恢复保存的数据失败。请重新登录。</translation> </message> <message> - <location line="+145"/> + <location line="+101"/> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <translation>设置密钥失败。服务器返回信息: %1 %2。请稍后再试。</translation> </message> <message> <location line="+34"/> - <location line="+123"/> + <location line="+117"/> <source>Please try to login again: %1</source> <translation>请尝试再次登录：%1</translation> </message> @@ -301,55 +293,66 @@ <translation>离开聊天室失败：%1</translation> </message> <message> - <location line="+61"/> + <location line="+60"/> <source>Failed to kick %1 from %2: %3</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>CommunitiesListItem</name> + <name>CommunitiesList</name> <message> - <location filename="../../src/CommunitiesListItem.cpp" line="+30"/> - <source>Hide rooms with this tag or from this community</source> + <location filename="../qml/CommunitiesList.qml" line="+44"/> + <source>Hide rooms with this tag or from this space by default.</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>CommunitiesModel</name> <message> - <location line="+153"/> + <location filename="../../src/timeline/CommunitiesModel.cpp" line="+37"/> <source>All rooms</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>Favourite rooms</source> - <translation>收藏的聊天室</translation> + <location line="+2"/> + <source>Shows all rooms without filtering.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Low priority rooms</source> + <location line="+30"/> + <source>Favourites</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <source>Server Notices</source> - <comment>Tag translation for m.server_notice</comment> + <source>Rooms you have favourited.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Low Priority</source> <translation type="unfinished"></translation> </message> <message> <location line="+2"/> - <location line="+2"/> - <source> (tag)</source> + <source>Rooms with low priority.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source> (community)</source> + <location line="+7"/> + <source>Server Notices</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Messages from your server or administrator.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>CrossSigningSecrets</name> <message> - <location filename="../../src/ChatPage.cpp" line="+228"/> + <location filename="../../src/ChatPage.cpp" line="+183"/> <source>Decrypt secrets</source> <translation type="unfinished"></translation> </message> @@ -517,7 +520,7 @@ <context> <name>EventStore</name> <message> - <location filename="../../src/timeline/EventStore.cpp" line="+616"/> + <location filename="../../src/timeline/EventStore.cpp" line="+663"/> <source>-- Encrypted Event (No keys found for decryption) --</source> <comment>Placeholder, when the message was not decrypted yet or can't be decrypted.</comment> <translation type="unfinished"></translation> @@ -529,7 +532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+35"/> <location line="+63"/> <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source> <comment>Placeholder, when the message can't be decrypted, because the DB access failed.</comment> @@ -604,7 +607,7 @@ <context> <name>InputBar</name> <message> - <location filename="../../src/timeline/InputBar.cpp" line="+232"/> + <location filename="../../src/timeline/InputBar.cpp" line="+233"/> <source>Select a file</source> <translation type="unfinished">选择一个文件</translation> </message> @@ -614,7 +617,7 @@ <translation type="unfinished">所有文件（*）</translation> </message> <message> - <location line="+418"/> + <location line="+417"/> <source>Failed to upload media. Please try again.</source> <translation type="unfinished"></translation> </message> @@ -691,13 +694,13 @@ Example: https://server.my:8787</source> <message> <location line="+84"/> <location line="+11"/> - <location line="+160"/> + <location line="+157"/> <location line="+11"/> <source>You have entered an invalid Matrix ID e.g @joe:matrix.org</source> <translation type="unfinished"></translation> </message> <message> - <location line="-132"/> + <location line="-131"/> <source>Autodiscovery failed. Received malformed response.</source> <translation type="unfinished"></translation> </message> @@ -707,7 +710,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+24"/> <source>The required endpoints were not found. Possibly not a Matrix server.</source> <translation>没找到要求的终端。可能不是一个 Matrix 服务器。</translation> </message> @@ -722,12 +725,12 @@ Example: https://server.my:8787</source> <translation>发生了一个未知错误。请确认服务器域名合法。</translation> </message> <message> - <location line="-171"/> + <location line="-168"/> <source>SSO LOGIN</source> <translation type="unfinished"></translation> </message> <message> - <location line="+267"/> + <location line="+264"/> <source>Empty password</source> <translation>空密码</translation> </message> @@ -785,6 +788,11 @@ Example: https://server.my:8787</source> </message> <message> <location line="+9"/> + <source>%1 changed the room avatar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>%1 created and configured room: %2</source> <translation type="unfinished"></translation> </message> @@ -860,7 +868,7 @@ Example: https://server.my:8787</source> <context> <name>MessageView</name> <message> - <location filename="../qml/MessageView.qml" line="+82"/> + <location filename="../qml/MessageView.qml" line="+83"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -879,6 +887,76 @@ Example: https://server.my:8787</source> <source>Options</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+329"/> + <source>&Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy &link location</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Re&act</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>Repl&y</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Read receip&ts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>&Forward</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>&Mark as read</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>View raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> + <source>View decrypted raw message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Remo&ve message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Save as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>&Open in external program</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Copy link to eve&nt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>NewVerificationRequest</name> @@ -1018,7 +1096,7 @@ Example: https://server.my:8787</source> <context> <name>Placeholder</name> <message> - <location filename="../qml/delegates/Placeholder.qml" line="+8"/> + <location filename="../qml/delegates/Placeholder.qml" line="+9"/> <source>unimplemented event: </source> <translation type="unfinished"></translation> </message> @@ -1026,7 +1104,7 @@ Example: https://server.my:8787</source> <context> <name>QCoreApplication</name> <message> - <location filename="../../src/main.cpp" line="+167"/> + <location filename="../../src/main.cpp" line="+200"/> <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source> <translation type="unfinished"></translation> </message> @@ -1044,18 +1122,18 @@ Example: https://server.my:8787</source> <context> <name>RegisterPage</name> <message> - <location filename="../../src/RegisterPage.cpp" line="+77"/> + <location filename="../../src/RegisterPage.cpp" line="+78"/> <source>Username</source> <translation>用户名</translation> </message> <message> <location line="+2"/> - <location line="+287"/> + <location line="+305"/> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-283"/> + <location line="-301"/> <source>Password</source> <translation>密码</translation> </message> @@ -1080,22 +1158,47 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+35"/> <source>REGISTER</source> <translation>注册</translation> </message> <message> - <location line="+62"/> + <location line="+73"/> <source>No supported registration flows!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+210"/> + <location line="+213"/> <source>One or more fields have invalid inputs. Please correct those issues and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-26"/> + <location line="+23"/> + <source>Autodiscovery failed. Received malformed response.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Autodiscovery failed. Unknown error when requesting .well-known.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>The required endpoints were not found. Possibly not a Matrix server.</source> + <translation type="unfinished">没找到要求的终端。可能不是一个 Matrix 服务器。</translation> + </message> + <message> + <location line="+6"/> + <source>Received malformed response. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">收到形式错误的响应。请确认服务器域名合法。</translation> + </message> + <message> + <location line="+5"/> + <source>An unknown error occured. Make sure the homeserver domain is valid.</source> + <translation type="unfinished">发生了一个未知错误。请确认服务器域名合法。</translation> + </message> + <message> + <location line="-94"/> <source>Password is not long enough (min 8 chars)</source> <translation>密码不够长（至少8个字符）</translation> </message> @@ -1105,7 +1208,7 @@ Example: https://server.my:8787</source> <translation>密码不匹配</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Invalid server name</source> <translation>无效的服务器名</translation> </message> @@ -1113,7 +1216,7 @@ Example: https://server.my:8787</source> <context> <name>ReplyPopup</name> <message> - <location filename="../qml/ReplyPopup.qml" line="+49"/> + <location filename="../qml/ReplyPopup.qml" line="+47"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -1126,74 +1229,112 @@ Example: https://server.my:8787</source> <context> <name>RoomInfo</name> <message> - <location filename="../../src/Cache.cpp" line="+1813"/> + <location filename="../../src/Cache.cpp" line="+4009"/> <source>no version stored</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>RoomInfoListItem</name> + <name>RoomList</name> <message> - <location filename="../../src/RoomInfoListItem.cpp" line="+89"/> - <source>Leave room</source> - <translation>离开聊天室</translation> + <location filename="../qml/RoomList.qml" line="+56"/> + <source>New tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Enter the tag you want to use:</source> + <translation type="unfinished"></translation> </message> <message> <location line="+7"/> + <source>Leave room</source> + <translation type="unfinished">离开聊天室</translation> + </message> + <message> + <location line="+5"/> <source>Tag room as:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+14"/> <source>Favourite</source> - <comment>Standard matrix tag for favourites</comment> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Low Priority</source> - <comment>Standard matrix tag for low priority rooms</comment> + <location line="+2"/> + <source>Low priority</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Server Notice</source> - <comment>Standard matrix tag for server notices</comment> + <location line="+2"/> + <source>Server notice</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Adds or removes the specified tag.</source> - <comment>WhatsThis hint for tag menu actions</comment> + <location line="+13"/> + <source>Create new tag...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> - <source>New tag...</source> - <comment>Add a new tag to the room</comment> - <translation type="unfinished"></translation> + <location line="+222"/> + <source>Accept</source> + <translation type="unfinished">接受</translation> </message> <message> - <location line="+4"/> - <source>New Tag</source> - <comment>Tag name prompt title</comment> + <location line="+21"/> + <source>Decline</source> + <translation type="unfinished">拒绝</translation> + </message> + <message> + <location line="+68"/> + <source>Status Message</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Tag:</source> - <comment>Tag name prompt</comment> + <source>Enter your status message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+169"/> - <source>Accept</source> - <translation>接受</translation> + <location line="+10"/> + <source>Profile settings</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Decline</source> - <translation>拒绝</translation> + <location line="+5"/> + <source>Set status message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+79"/> + <source>Logout</source> + <translation type="unfinished">登出</translation> + </message> + <message> + <location line="+46"/> + <source>Start a new chat</source> + <translation type="unfinished">开始新的聊天</translation> + </message> + <message> + <location line="+8"/> + <source>Join a room</source> + <translation type="unfinished">加入聊天室</translation> + </message> + <message> + <location line="+5"/> + <source>Create a new room</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> + <source>Room directory</source> + <translation type="unfinished">聊天室目录</translation> + </message> + <message> + <location line="+12"/> + <source>User settings</source> + <translation type="unfinished">用户设置</translation> </message> </context> <context> @@ -1383,34 +1524,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>SideBarActions</name> - <message> - <location filename="../../src/SideBarActions.cpp" line="+44"/> - <source>User settings</source> - <translation>用户设置</translation> - </message> - <message> - <location line="+7"/> - <source>Create new room</source> - <translation>创建新的聊天室</translation> - </message> - <message> - <location line="+1"/> - <source>Join a room</source> - <translation>加入聊天室</translation> - </message> - <message> - <location line="+16"/> - <source>Start a new chat</source> - <translation>开始新的聊天</translation> - </message> - <message> - <location line="+15"/> - <source>Room directory</source> - <translation>聊天室目录</translation> - </message> -</context> -<context> <name>StatusIndicator</name> <message> <location filename="../qml/StatusIndicator.qml" line="+21"/> @@ -1436,7 +1549,7 @@ Example: https://server.my:8787</source> <context> <name>Success</name> <message> - <location filename="../qml/device-verification/Success.qml" line="+10"/> + <location filename="../qml/device-verification/Success.qml" line="+11"/> <source>Successful Verification</source> <translation type="unfinished"></translation> </message> @@ -1454,7 +1567,7 @@ Example: https://server.my:8787</source> <context> <name>TimelineModel</name> <message> - <location filename="../../src/timeline/TimelineModel.cpp" line="+1044"/> + <location filename="../../src/timeline/TimelineModel.cpp" line="+1095"/> <source>Message redaction failed: %1</source> <translation type="unfinished">删除消息失败：%1</translation> </message> @@ -1588,17 +1701,22 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="-11"/> + <location line="+9"/> + <source>Reason: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-20"/> <source>%1 redacted their knock.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-876"/> + <location line="-883"/> <source>You joined this room.</source> <translation type="unfinished">您已加入此房间</translation> </message> <message> - <location line="+842"/> + <location line="+849"/> <source>%1 has changed their avatar and changed their display name to %2.</source> <translation type="unfinished"></translation> </message> @@ -1619,12 +1737,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> - <source> Reason: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-5"/> + <location line="+10"/> <source>%1 knocked.</source> <translation type="unfinished"></translation> </message> @@ -1640,85 +1753,25 @@ Example: https://server.my:8787</source> <context> <name>TimelineView</name> <message> - <location filename="../qml/TimelineView.qml" line="+125"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Copy link location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>React</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>Reply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Read receipts</source> - <translation>阅读回执</translation> - </message> - <message> - <location line="+6"/> - <source>Forward</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+9"/> - <source>Mark as read</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>View raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>View decrypted raw message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Remove message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Save as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Open in external program</source> + <location filename="../qml/TimelineView.qml" line="+27"/> + <source>No room open</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Copy link to event</source> + <location line="+127"/> + <source>%1 member(s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> - <source>No room open</source> + <location line="+46"/> + <source>Back to room list</source> <translation type="unfinished"></translation> </message> </context> <context> <name>TimelineViewManager</name> <message> - <location filename="../../src/timeline/TimelineViewManager.cpp" line="+570"/> + <location filename="../../src/timeline/TimelineViewManager.cpp" line="+461"/> <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source> <translation type="unfinished"></translation> </message> @@ -1776,54 +1829,6 @@ Example: https://server.my:8787</source> </message> </context> <context> - <name>UserInfoWidget</name> - <message> - <location filename="../../src/UserInfoWidget.cpp" line="+82"/> - <source>Logout</source> - <translation>登出</translation> - </message> - <message> - <location line="+20"/> - <source>Set custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Custom status message</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Status:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> - <source>User Profile Settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set presence automatically</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Online</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Unavailable</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> - <source>Offline</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>UserProfile</name> <message> <location filename="../qml/UserProfile.qml" line="+24"/> @@ -1862,7 +1867,7 @@ Example: https://server.my:8787</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/UserProfile.cpp" line="+301"/> + <location filename="../../src/ui/UserProfile.cpp" line="+307"/> <source>Select an avatar</source> <translation type="unfinished">选择一个头像</translation> </message> @@ -1885,8 +1890,8 @@ Example: https://server.my:8787</source> <context> <name>UserSettings</name> <message> - <location filename="../../src/UserSettingsPage.cpp" line="+340"/> - <location filename="../../src/UserSettingsPage.h" line="+186"/> + <location filename="../../src/UserSettingsPage.cpp" line="+362"/> + <location filename="../../src/UserSettingsPage.h" line="+194"/> <source>Default</source> <translation type="unfinished"></translation> </message> @@ -1894,7 +1899,7 @@ Example: https://server.my:8787</source> <context> <name>UserSettingsPage</name> <message> - <location line="+553"/> + <location line="+524"/> <source>Minimize to tray</source> <translation>最小化至托盘</translation> </message> @@ -2699,22 +2704,9 @@ Media size: %2 </message> </context> <context> - <name>popups::UserMentions</name> - <message> - <location filename="../../src/popups/UserMentions.cpp" line="+68"/> - <source>This Room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>All Rooms</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>utils</name> <message> - <location filename="../../src/Utils.h" line="+4"/> + <location line="+4"/> <source>Unknown Message Type</source> <translation type="unfinished"></translation> </message> diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml index 84c22da1..6c12952a 100644 --- a/resources/qml/Avatar.qml +++ b/resources/qml/Avatar.qml @@ -14,6 +14,7 @@ Rectangle { property alias url: img.source property string userid property string displayName + property alias textColor: label.color signal clicked(var mouse) @@ -26,6 +27,8 @@ Rectangle { } Label { + id: label + anchors.fill: parent text: TimelineManager.escapeEmoji(displayName ? String.fromCodePoint(displayName.codePointAt(0)) : "") textFormat: Text.RichText diff --git a/resources/qml/ChatPage.qml b/resources/qml/ChatPage.qml index 0f884d75..7f6758df 100644 --- a/resources/qml/ChatPage.qml +++ b/resources/qml/ChatPage.qml @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import "components" import im.nheko 1.0 @@ -17,19 +17,30 @@ Rectangle { id: adaptiveView anchors.fill: parent - singlePageMode: width < communityListC.maximumWidth + roomListC.maximumWidth + timlineViewC.minimumWidth + singlePageMode: communityListC.preferredWidth + roomListC.preferredWidth + timlineViewC.minimumWidth > width pageIndex: Rooms.currentRoom ? 2 : 1 AdaptiveLayoutElement { id: communityListC - minimumWidth: Nheko.avatarSize * 2 + Nheko.paddingSmall * 2 - collapsedWidth: Nheko.avatarSize + Nheko.paddingSmall * 2 - preferredWidth: Nheko.avatarSize + Nheko.paddingSmall * 2 - maximumWidth: Nheko.avatarSize * 7 + Nheko.paddingSmall * 2 + visible: Settings.groupView + minimumWidth: communitiesList.avatarSize * 4 + Nheko.paddingMedium * 2 + collapsedWidth: communitiesList.avatarSize + 2 * Nheko.paddingMedium + preferredWidth: Settings.communityListWidth >= minimumWidth ? Settings.communityListWidth : collapsedWidth + maximumWidth: communitiesList.avatarSize * 10 + 2 * Nheko.paddingMedium - Rectangle { - color: Nheko.theme.sidebarBackground + CommunitiesList { + id: communitiesList + + collapsed: parent.collapsed + } + + Binding { + target: Settings + property: 'communityListWidth' + value: communityListC.preferredWidth + when: !adaptiveView.singlePageMode + delayed: true } } @@ -37,9 +48,9 @@ Rectangle { AdaptiveLayoutElement { id: roomListC - minimumWidth: Nheko.avatarSize * 5 + Nheko.paddingSmall * 2 - preferredWidth: Nheko.avatarSize * 5 + Nheko.paddingSmall * 2 - maximumWidth: Nheko.avatarSize * 10 + Nheko.paddingSmall * 2 + minimumWidth: roomlist.avatarSize * 4 + Nheko.paddingSmall * 2 + preferredWidth: Settings.roomListWidth >= minimumWidth ? Settings.roomListWidth : roomlist.avatarSize * 5 + Nheko.paddingSmall * 2 + maximumWidth: roomlist.avatarSize * 10 + Nheko.paddingSmall * 2 collapsedWidth: roomlist.avatarSize + 2 * Nheko.paddingMedium RoomList { @@ -48,12 +59,20 @@ Rectangle { collapsed: parent.collapsed } + Binding { + target: Settings + property: 'roomListWidth' + value: roomListC.preferredWidth + when: !adaptiveView.singlePageMode + delayed: true + } + } AdaptiveLayoutElement { id: timlineViewC - minimumWidth: 400 + minimumWidth: fontMetrics.averageCharacterWidth * 40 + Nheko.avatarSize + 2 * Nheko.paddingMedium TimelineView { id: timeline @@ -70,7 +89,7 @@ Rectangle { anchors.fill: parent visible: Settings.privacyScreen screenTimeout: Settings.privacyScreenTimeout - timelineRoot: timeline + timelineRoot: adaptiveView } } diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml new file mode 100644 index 00000000..491913be --- /dev/null +++ b/resources/qml/CommunitiesList.qml @@ -0,0 +1,160 @@ +// SPDX-FileCopyrightText: 2021 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + +import "./dialogs" +import Qt.labs.platform 1.1 as Platform +import QtQml 2.12 +import QtQuick 2.12 +import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.3 +import im.nheko 1.0 + +Page { + //leftPadding: Nheko.paddingSmall + //rightPadding: Nheko.paddingSmall + property int avatarSize: Math.ceil(fontMetrics.lineSpacing * 1.6) + property bool collapsed: false + + ListView { + id: communitiesList + + anchors.left: parent.left + anchors.right: parent.right + height: parent.height + model: Communities + + ScrollHelper { + flickable: parent + anchors.fill: parent + enabled: !Settings.mobileMode + } + + Platform.Menu { + id: communityContextMenu + + property string tagId + + function show(id_, tags_) { + tagId = id_; + open(); + } + + Platform.MenuItem { + text: qsTr("Hide rooms with this tag or from this space by default.") + onTriggered: Communities.toggleTagId(communityContextMenu.tagId) + } + + } + + delegate: Rectangle { + id: communityItem + + property color background: Nheko.colors.window + property color importantText: Nheko.colors.text + property color unimportantText: Nheko.colors.buttonText + property color bubbleBackground: Nheko.colors.highlight + property color bubbleText: Nheko.colors.highlightedText + + color: background + height: avatarSize + 2 * Nheko.paddingMedium + width: ListView.view.width + state: "normal" + ToolTip.visible: hovered.hovered && collapsed + ToolTip.text: model.tooltip + states: [ + State { + name: "highlight" + when: (hovered.hovered || model.hidden) && !(Communities.currentTagId == model.id) + + PropertyChanges { + target: communityItem + background: Nheko.colors.dark + importantText: Nheko.colors.brightText + unimportantText: Nheko.colors.brightText + bubbleBackground: Nheko.colors.highlight + bubbleText: Nheko.colors.highlightedText + } + + }, + State { + name: "selected" + when: Communities.currentTagId == model.id + + PropertyChanges { + target: communityItem + background: Nheko.colors.highlight + importantText: Nheko.colors.highlightedText + unimportantText: Nheko.colors.highlightedText + bubbleBackground: Nheko.colors.highlightedText + bubbleText: Nheko.colors.highlight + } + + } + ] + + TapHandler { + margin: -Nheko.paddingSmall + acceptedButtons: Qt.RightButton + onSingleTapped: communityContextMenu.show(model.id) + gesturePolicy: TapHandler.ReleaseWithinBounds + } + + TapHandler { + margin: -Nheko.paddingSmall + onSingleTapped: Communities.setCurrentTagId(model.id) + onLongPressed: communityContextMenu.show(model.id) + } + + HoverHandler { + id: hovered + + margin: -Nheko.paddingSmall + } + + RowLayout { + spacing: Nheko.paddingMedium + anchors.fill: parent + anchors.margins: Nheko.paddingMedium + + Avatar { + id: avatar + + enabled: false + Layout.alignment: Qt.AlignVCenter + height: avatarSize + width: avatarSize + url: { + if (model.avatarUrl.startsWith("mxc://")) + return model.avatarUrl.replace("mxc://", "image://MxcImage/"); + else + return "image://colorimage/" + model.avatarUrl + "?" + communityItem.unimportantText; + } + displayName: model.displayName + color: communityItem.background + } + + ElidedLabel { + visible: !collapsed + Layout.alignment: Qt.AlignVCenter + color: communityItem.importantText + elideWidth: parent.width - avatar.width - Nheko.paddingMedium + fullText: model.displayName + textFormat: Text.PlainText + } + + Item { + Layout.fillWidth: true + } + + } + + } + + } + + background: Rectangle { + color: Nheko.theme.sidebarBackground + } + +} diff --git a/resources/qml/ElidedLabel.qml b/resources/qml/ElidedLabel.qml index 1f4aeeea..bc90e479 100644 --- a/resources/qml/ElidedLabel.qml +++ b/resources/qml/ElidedLabel.qml @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.9 -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.5 import im.nheko 1.0 Label { diff --git a/resources/qml/ImageButton.qml b/resources/qml/ImageButton.qml index 60954bfd..b5d9c152 100644 --- a/resources/qml/ImageButton.qml +++ b/resources/qml/ImageButton.qml @@ -26,6 +26,7 @@ AbstractButton { // Workaround, can't get icon.source working for now... anchors.fill: parent source: image != "" ? ("image://colorimage/" + image + "?" + ((button.hovered && changeColorOnHover) ? highlightColor : buttonTextColor)) : "" + fillMode: Image.PreserveAspectFit } CursorShape { diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml index 167899a5..65d66315 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml @@ -12,7 +12,8 @@ TextEdit { focus: false wrapMode: Text.Wrap selectByMouse: !Settings.mobileMode - enabled: selectByMouse + // this always has to be enabled, otherwise you can't click links anymore! + //enabled: selectByMouse color: Nheko.colors.text onLinkActivated: Nheko.openLink(link) ToolTip.visible: hoveredLink diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index a3a80b93..16c92ebf 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -449,14 +449,14 @@ ScrollView { Platform.MenuItem { visible: messageContextMenu.text enabled: visible - text: qsTr("Copy") + text: qsTr("&Copy") onTriggered: Clipboard.text = messageContextMenu.text } Platform.MenuItem { visible: messageContextMenu.link enabled: visible - text: qsTr("Copy link location") + text: qsTr("Copy &link location") onTriggered: Clipboard.text = messageContextMenu.link } @@ -464,7 +464,7 @@ ScrollView { id: reactionOption visible: room ? room.permissions.canSend(MtxEvent.Reaction) : false - text: qsTr("React") + text: qsTr("Re&act") onTriggered: emojiPopup.show(null, function(emoji) { room.input.reaction(messageContextMenu.eventId, emoji); }) @@ -472,25 +472,25 @@ ScrollView { Platform.MenuItem { visible: room ? room.permissions.canSend(MtxEvent.TextMessage) : false - text: qsTr("Reply") + text: qsTr("Repl&y") onTriggered: room.replyAction(messageContextMenu.eventId) } Platform.MenuItem { visible: messageContextMenu.isEditable && (room ? room.permissions.canSend(MtxEvent.TextMessage) : false) enabled: visible - text: qsTr("Edit") + text: qsTr("&Edit") onTriggered: room.editAction(messageContextMenu.eventId) } Platform.MenuItem { - text: qsTr("Read receipts") + text: qsTr("Read receip&ts") onTriggered: room.readReceiptsAction(messageContextMenu.eventId) } Platform.MenuItem { visible: messageContextMenu.eventType == MtxEvent.ImageMessage || messageContextMenu.eventType == MtxEvent.VideoMessage || messageContextMenu.eventType == MtxEvent.AudioMessage || messageContextMenu.eventType == MtxEvent.FileMessage || messageContextMenu.eventType == MtxEvent.Sticker || messageContextMenu.eventType == MtxEvent.TextMessage || messageContextMenu.eventType == MtxEvent.LocationMessage || messageContextMenu.eventType == MtxEvent.EmoteMessage || messageContextMenu.eventType == MtxEvent.NoticeMessage - text: qsTr("Forward") + text: qsTr("&Forward") onTriggered: { var forwardMess = forwardCompleterComponent.createObject(timelineRoot); forwardMess.setMessageEventId(messageContextMenu.eventId); @@ -499,7 +499,7 @@ ScrollView { } Platform.MenuItem { - text: qsTr("Mark as read") + text: qsTr("&Mark as read") } Platform.MenuItem { @@ -517,28 +517,28 @@ ScrollView { Platform.MenuItem { visible: (room ? room.permissions.canRedact() : false) || messageContextMenu.isSender - text: qsTr("Remove message") + text: qsTr("Remo&ve message") onTriggered: room.redactEvent(messageContextMenu.eventId) } Platform.MenuItem { visible: messageContextMenu.eventType == MtxEvent.ImageMessage || messageContextMenu.eventType == MtxEvent.VideoMessage || messageContextMenu.eventType == MtxEvent.AudioMessage || messageContextMenu.eventType == MtxEvent.FileMessage || messageContextMenu.eventType == MtxEvent.Sticker enabled: visible - text: qsTr("Save as") + text: qsTr("&Save as") onTriggered: room.saveMedia(messageContextMenu.eventId) } Platform.MenuItem { visible: messageContextMenu.eventType == MtxEvent.ImageMessage || messageContextMenu.eventType == MtxEvent.VideoMessage || messageContextMenu.eventType == MtxEvent.AudioMessage || messageContextMenu.eventType == MtxEvent.FileMessage || messageContextMenu.eventType == MtxEvent.Sticker enabled: visible - text: qsTr("Open in external program") + text: qsTr("&Open in external program") onTriggered: room.openMedia(messageContextMenu.eventId) } Platform.MenuItem { visible: messageContextMenu.eventId enabled: visible - text: qsTr("Copy link to event") + text: qsTr("Copy link to eve&nt") onTriggered: room.copyLinkToEvent(messageContextMenu.eventId) } diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index a6637467..c4a8bcfb 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -4,9 +4,9 @@ import "./dialogs" import Qt.labs.platform 1.1 as Platform -import QtQml 2.13 -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQml 2.12 +import QtQuick 2.12 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import im.nheko 1.0 @@ -32,8 +32,8 @@ Page { Connections { onActiveTimelineChanged: { - roomlist.positionViewAtIndex(Rooms.roomidToIndex(TimelineManager.timeline.roomId()), ListView.Contain); - console.log("Test" + TimelineManager.timeline.roomId() + " " + Rooms.roomidToIndex(TimelineManager.timeline.roomId)); + roomlist.positionViewAtIndex(Rooms.roomidToIndex(Rooms.currentRoom.roomId()), ListView.Contain); + console.log("Test" + Rooms.currentRoom.roomId() + " " + Rooms.roomidToIndex(Rooms.currentRoom.roomId())); } target: TimelineManager } @@ -70,7 +70,7 @@ Page { } Instantiator { - model: Communities.tags + model: Communities.tagsWithDefault onObjectAdded: roomContextMenu.insertItem(index + 2, object) onObjectRemoved: roomContextMenu.removeItem(object) @@ -121,7 +121,7 @@ Page { states: [ State { name: "highlight" - when: hovered.hovered && !(TimelineManager.timeline && model.roomId == TimelineManager.timeline.roomId()) + when: hovered.hovered && !(Rooms.currentRoom && model.roomId == Rooms.currentRoom.roomId()) PropertyChanges { target: roomItem @@ -255,6 +255,8 @@ Page { Label { id: timestamp + visible: !model.isInvite && !model.isSpace + width: visible ? 0 : undefined Layout.alignment: Qt.AlignRight | Qt.AlignBottom font.pixelSize: fontMetrics.font.pixelSize * 0.9 color: roomItem.unimportantText @@ -266,12 +268,11 @@ Page { RowLayout { Layout.fillWidth: true spacing: 0 - visible: !model.isInvite + visible: !model.isInvite && !model.isSpace height: visible ? 0 : undefined ElidedLabel { color: roomItem.unimportantText - font.weight: Font.Thin font.pixelSize: fontMetrics.font.pixelSize * 0.9 elideWidth: textContent.width - (notificationBubble.visible ? notificationBubble.width : 0) - Nheko.paddingSmall fullText: model.lastMessage @@ -447,6 +448,8 @@ Page { RowLayout { id: userInfoGrid + property var profile: Nheko.currentUser + spacing: Nheko.paddingMedium anchors.fill: parent anchors.margins: Nheko.paddingMedium @@ -457,9 +460,9 @@ Page { Layout.alignment: Qt.AlignVCenter Layout.preferredWidth: fontMetrics.lineSpacing * 2 Layout.preferredHeight: fontMetrics.lineSpacing * 2 - url: Nheko.currentUser.avatarUrl.replace("mxc://", "image://MxcImage/") - displayName: Nheko.currentUser.displayName - userid: Nheko.currentUser.userid + url: (userInfoGrid.profile ? userInfoGrid.profile.avatarUrl : "").replace("mxc://", "image://MxcImage/") + displayName: userInfoGrid.profile ? userInfoGrid.profile.displayName : "" + userid: userInfoGrid.profile ? userInfoGrid.profile.userid : "" } ColumnLayout { @@ -476,17 +479,16 @@ Page { Layout.alignment: Qt.AlignBottom font.pointSize: fontMetrics.font.pointSize * 1.1 font.weight: Font.DemiBold - fullText: Nheko.currentUser.displayName + fullText: userInfoGrid.profile ? userInfoGrid.profile.displayName : "" elideWidth: col.width } ElidedLabel { Layout.alignment: Qt.AlignTop color: Nheko.colors.buttonText - font.weight: Font.Thin font.pointSize: fontMetrics.font.pointSize * 0.9 elideWidth: col.width - fullText: Nheko.currentUser.userid + fullText: userInfoGrid.profile ? userInfoGrid.profile.userid : "" } } @@ -541,7 +543,7 @@ Page { anchors.margins: Nheko.paddingMedium ImageButton { - Layout.alignment: Qt.AlignBottom | Qt.AlignLeft + Layout.fillWidth: true hoverEnabled: true width: 22 height: 22 @@ -570,7 +572,7 @@ Page { ImageButton { visible: !collapsed - Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter + Layout.fillWidth: true hoverEnabled: true width: 22 height: 22 @@ -582,7 +584,7 @@ Page { ImageButton { visible: !collapsed - Layout.alignment: Qt.AlignBottom | Qt.AlignRight + Layout.fillWidth: true hoverEnabled: true width: 22 height: 22 diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index 078281d4..5316e20d 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -9,7 +9,7 @@ import "./voip" import Qt.labs.platform 1.1 as Platform import QtGraphicalEffects 1.0 import QtQuick 2.9 -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 import im.nheko 1.0 diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 5e5eccab..0209054d 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -11,7 +11,7 @@ import "./ui" import Qt.labs.platform 1.1 as Platform import QtGraphicalEffects 1.0 import QtQuick 2.9 -import QtQuick.Controls 2.13 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 import im.nheko 1.0 @@ -44,7 +44,8 @@ Item { ColumnLayout { id: timelineLayout - visible: room != null + visible: room != null && !room.isSpace + enabled: visible anchors.fill: parent spacing: 0 @@ -130,6 +131,79 @@ Item { } + ColumnLayout { + visible: room != null && room.isSpace + enabled: visible + anchors.fill: parent + anchors.margins: Nheko.paddingLarge + spacing: Nheko.paddingLarge + + Avatar { + url: room ? room.roomAvatarUrl.replace("mxc://", "image://MxcImage/") : "" + displayName: room ? room.roomName : "" + height: 130 + width: 130 + Layout.alignment: Qt.AlignHCenter + enabled: false + } + + MatrixText { + text: room ? room.roomName : "" + font.pixelSize: 24 + Layout.alignment: Qt.AlignHCenter + } + + MatrixText { + text: qsTr("%1 member(s)").arg(room ? room.roomMemberCount : 0) + Layout.alignment: Qt.AlignHCenter + } + + ScrollView { + Layout.alignment: Qt.AlignHCenter + width: timelineView.width - Nheko.paddingLarge * 2 + + TextArea { + text: TimelineManager.escapeEmoji(room ? room.roomTopic : "") + wrapMode: TextEdit.WordWrap + textFormat: TextEdit.RichText + readOnly: true + background: null + selectByMouse: true + color: Nheko.colors.text + horizontalAlignment: TextEdit.AlignHCenter + onLinkActivated: Nheko.openLink(link) + + CursorShape { + anchors.fill: parent + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + } + + } + + } + + Item { + Layout.fillHeight: true + } + + } + + ImageButton { + id: backToRoomsButton + + anchors.top: parent.top + anchors.left: parent.left + anchors.margins: Nheko.paddingMedium + width: Nheko.avatarSize + height: Nheko.avatarSize + visible: room != null && room.isSpace && showBackButton + enabled: visible + image: ":/icons/icons/ui/angle-pointing-to-left.png" + ToolTip.visible: hovered + ToolTip.text: qsTr("Back to room list") + onClicked: Rooms.resetCurrentRoom() + } + NhekoDropArea { anchors.fill: parent roomid: room ? room.roomId() : "" diff --git a/resources/qml/components/AdaptiveLayout.qml b/resources/qml/components/AdaptiveLayout.qml index eea85e38..357a7831 100644 --- a/resources/qml/components/AdaptiveLayout.qml +++ b/resources/qml/components/AdaptiveLayout.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick 2.12 +import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.12 import im.nheko 1.0 Container { @@ -87,6 +87,13 @@ Container { x: parent.preferredWidth z: 3 + CursorShape { + height: parent.height + width: container.splitterGrabMargin * 2 + x: -container.splitterGrabMargin + cursorShape: Qt.SizeHorCursor + } + DragHandler { id: dragHandler @@ -96,9 +103,9 @@ Container { xAxis.minimum: splitter.minimumWidth - 1 xAxis.maximum: splitter.maximumWidth margin: container.splitterGrabMargin - dragThreshold: 0 + //dragThreshold: 0 grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType - cursorShape: Qt.SizeHorCursor + //cursorShape: Qt.SizeHorCursor onActiveChanged: { if (!active) splitter.parent.preferredWidth = splitter.x; @@ -107,9 +114,10 @@ Container { } HoverHandler { + //cursorShape: Qt.SizeHorCursor + enabled: !container.singlePageMode margin: container.splitterGrabMargin - cursorShape: Qt.SizeHorCursor } } diff --git a/resources/qml/components/AdaptiveLayoutElement.qml b/resources/qml/components/AdaptiveLayoutElement.qml index 411f6c64..a4aec72e 100644 --- a/resources/qml/components/AdaptiveLayoutElement.qml +++ b/resources/qml/components/AdaptiveLayoutElement.qml @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 +import QtQuick 2.12 +import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.12 Item { property int minimumWidth: 100 diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index 9e076a7a..1befcec3 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -149,6 +149,15 @@ Item { } DelegateChoice { + roleValue: MtxEvent.Avatar + + NoticeMessage { + text: qsTr("%1 changed the room avatar").arg(model.data.userName) + } + + } + + DelegateChoice { roleValue: MtxEvent.RoomCreate NoticeMessage { diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index b8c33539..b5090529 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -60,6 +60,7 @@ Item { MessageDelegate { id: reply + enabled: false width: parent.width isReply: true } diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml index b858a1a1..70cfafaf 100644 --- a/resources/qml/device-verification/Success.qml +++ b/resources/qml/device-verification/Success.qml @@ -5,6 +5,7 @@ import QtQuick 2.3 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.10 +import im.nheko 1.0 Pane { property string title: qsTr("Successful Verification") diff --git a/resources/qml/dialogs/InputDialog.qml b/resources/qml/dialogs/InputDialog.qml index 0cd6be1c..134b78a3 100644 --- a/resources/qml/dialogs/InputDialog.qml +++ b/resources/qml/dialogs/InputDialog.qml @@ -3,8 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later import ".." -import QtQuick 2.13 -import QtQuick.Controls 2.13 +import QtQuick 2.12 +import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import im.nheko 1.0 diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml index efcdc2cf..6f10a230 100644 --- a/resources/qml/emoji/EmojiPicker.qml +++ b/resources/qml/emoji/EmojiPicker.qml @@ -35,244 +35,268 @@ Menu { modal: true focus: true closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside - height: columnView.implicitHeight + 4 - width: columnView.implicitWidth - - ColumnLayout { - id: columnView - - spacing: 0 - anchors.leftMargin: 3 - anchors.rightMargin: 3 - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.topMargin: 2 - - // Search field - TextField { - id: emojiSearch - - //width: gridView.width - 6 - Layout.topMargin: 3 - Layout.preferredWidth: 7 * 52 + 20 - 6 - placeholderText: qsTr("Search") - selectByMouse: true - rightPadding: clearSearch.width - onTextChanged: searchTimer.restart() - onVisibleChanged: { - if (visible) - forceActiveFocus(); + //height: columnView.implicitHeight + 4 + //width: columnView.implicitWidth + width: 7 * 52 + 20 + + Rectangle { + color: Nheko.colors.window + height: columnView.implicitHeight + 4 + width: 7 * 52 + 20 + + ColumnLayout { + id: columnView + + spacing: 0 + anchors.leftMargin: 3 + anchors.rightMargin: 3 + anchors.bottom: parent.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.topMargin: 2 + + // Search field + TextField { + id: emojiSearch + + Layout.topMargin: 3 + Layout.preferredWidth: 7 * 52 + 20 - 6 + palette: Nheko.colors + background: null + placeholderTextColor: Nheko.colors.buttonText + color: Nheko.colors.text + placeholderText: qsTr("Search") + selectByMouse: true + rightPadding: clearSearch.width + onTextChanged: searchTimer.restart() + onVisibleChanged: { + if (visible) + forceActiveFocus(); - } + } - Timer { - id: searchTimer + Timer { + id: searchTimer - interval: 350 // tweak as needed? - onTriggered: { - emojiPopup.model.searchString = emojiSearch.text; - emojiPopup.model.category = Emoji.Category.Search; + interval: 350 // tweak as needed? + onTriggered: { + emojiPopup.model.searchString = emojiSearch.text; + emojiPopup.model.category = Emoji.Category.Search; + } } - } - ToolButton { - id: clearSearch + ToolButton { + id: clearSearch - visible: emojiSearch.text !== '' - icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) - focusPolicy: Qt.NoFocus - onClicked: emojiSearch.clear() + visible: emojiSearch.text !== '' + icon.source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) + focusPolicy: Qt.NoFocus + onClicked: emojiSearch.clear() + hoverEnabled: true + background: null - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - } - // clear the default hover effects. + anchors { + verticalCenter: parent.verticalCenter + right: parent.right + } + // clear the default hover effects. + + Image { + height: parent.height - 2 * Nheko.paddingSmall + width: height + source: "image://colorimage/:/icons/icons/ui/round-remove-button.png?" + (clearSearch.hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) + + anchors { + verticalCenter: parent.verticalCenter + right: parent.right + margins: Nheko.paddingSmall + } + + } - background: Item { } } - } + // emoji grid + GridView { + id: gridView - // emoji grid - GridView { - id: gridView - - Layout.preferredHeight: cellHeight * 5 - Layout.preferredWidth: 7 * 52 + 20 - Layout.leftMargin: 4 - cellWidth: 52 - cellHeight: 52 - boundsBehavior: Flickable.StopAtBounds - clip: true - currentIndex: -1 // prevent sorting from stealing focus - - // Individual emoji - delegate: AbstractButton { - width: 48 - height: 48 - hoverEnabled: true - ToolTip.text: model.shortName - ToolTip.visible: hovered - // TODO: maybe add favorites at some point? - onClicked: { - console.debug("Picked " + model.unicode); - emojiPopup.close(); - callback(model.unicode); - } + Layout.preferredHeight: cellHeight * 5 + Layout.preferredWidth: 7 * 52 + 20 + Layout.leftMargin: 4 + cellWidth: 52 + cellHeight: 52 + boundsBehavior: Flickable.StopAtBounds + clip: true + currentIndex: -1 // prevent sorting from stealing focus - // give the emoji a little oomf - DropShadow { - width: parent.width - height: parent.height - horizontalOffset: 3 - verticalOffset: 3 - radius: 8 - samples: 17 - color: "#80000000" - source: parent.contentItem - } + // Individual emoji + delegate: AbstractButton { + width: 48 + height: 48 + hoverEnabled: true + ToolTip.text: model.shortName + ToolTip.visible: hovered + // TODO: maybe add favorites at some point? + onClicked: { + console.debug("Picked " + model.unicode); + emojiPopup.close(); + callback(model.unicode); + } + + // give the emoji a little oomf + DropShadow { + width: parent.width + height: parent.height + horizontalOffset: 3 + verticalOffset: 3 + radius: 8 + samples: 17 + color: "#80000000" + source: parent.contentItem + } + + contentItem: Text { + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + font.family: Settings.emojiFont + font.pixelSize: 36 + text: model.unicode + color: Nheko.colors.text + } + + background: Rectangle { + anchors.fill: parent + color: hovered ? Nheko.colors.highlight : 'transparent' + radius: 5 + } - contentItem: Text { - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.family: Settings.emojiFont - font.pixelSize: 36 - text: model.unicode } - background: Rectangle { - anchors.fill: parent - color: hovered ? Nheko.colors.highlight : 'transparent' - radius: 5 + ScrollBar.vertical: ScrollBar { + id: emojiScroll } } - ScrollBar.vertical: ScrollBar { - id: emojiScroll + // Separator + Rectangle { + visible: emojiSearch.text === '' + Layout.fillWidth: true + Layout.preferredHeight: 1 + color: emojiPopup.Nheko.theme.separator } - } + // Category picker row + RowLayout { + visible: emojiSearch.text === '' + Layout.bottomMargin: 0 + Layout.preferredHeight: 42 + implicitHeight: 42 + Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom + + // Display the normal categories + Repeater { + + model: ListModel { + // TODO: Would like to get 'simple' icons for the categories + ListElement { + image: ":/icons/icons/emoji-categories/people.png" + category: Emoji.Category.People + } - // Separator - Rectangle { - visible: emojiSearch.text === '' - Layout.fillWidth: true - Layout.preferredHeight: 1 - color: emojiPopup.Nheko.colors.alternateBase - } + ListElement { + image: ":/icons/icons/emoji-categories/nature.png" + category: Emoji.Category.Nature + } - // Category picker row - RowLayout { - visible: emojiSearch.text === '' - Layout.bottomMargin: 0 - Layout.preferredHeight: 42 - implicitHeight: 42 - Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom - - // Display the normal categories - Repeater { - - model: ListModel { - // TODO: Would like to get 'simple' icons for the categories - ListElement { - image: ":/icons/icons/emoji-categories/people.png" - category: Emoji.Category.People - } + ListElement { + image: ":/icons/icons/emoji-categories/foods.png" + category: Emoji.Category.Food + } - ListElement { - image: ":/icons/icons/emoji-categories/nature.png" - category: Emoji.Category.Nature - } + ListElement { + image: ":/icons/icons/emoji-categories/activity.png" + category: Emoji.Category.Activity + } - ListElement { - image: ":/icons/icons/emoji-categories/foods.png" - category: Emoji.Category.Food - } + ListElement { + image: ":/icons/icons/emoji-categories/travel.png" + category: Emoji.Category.Travel + } - ListElement { - image: ":/icons/icons/emoji-categories/activity.png" - category: Emoji.Category.Activity - } + ListElement { + image: ":/icons/icons/emoji-categories/objects.png" + category: Emoji.Category.Objects + } - ListElement { - image: ":/icons/icons/emoji-categories/travel.png" - category: Emoji.Category.Travel - } + ListElement { + image: ":/icons/icons/emoji-categories/symbols.png" + category: Emoji.Category.Symbols + } - ListElement { - image: ":/icons/icons/emoji-categories/objects.png" - category: Emoji.Category.Objects - } + ListElement { + image: ":/icons/icons/emoji-categories/flags.png" + category: Emoji.Category.Flags + } - ListElement { - image: ":/icons/icons/emoji-categories/symbols.png" - category: Emoji.Category.Symbols } - ListElement { - image: ":/icons/icons/emoji-categories/flags.png" - category: Emoji.Category.Flags - } + delegate: AbstractButton { + Layout.preferredWidth: 36 + Layout.preferredHeight: 36 + hoverEnabled: true + ToolTip.text: { + switch (model.category) { + case Emoji.Category.People: + return qsTr('People'); + case Emoji.Category.Nature: + return qsTr('Nature'); + case Emoji.Category.Food: + return qsTr('Food'); + case Emoji.Category.Activity: + return qsTr('Activity'); + case Emoji.Category.Travel: + return qsTr('Travel'); + case Emoji.Category.Objects: + return qsTr('Objects'); + case Emoji.Category.Symbols: + return qsTr('Symbols'); + case Emoji.Category.Flags: + return qsTr('Flags'); + } + } + ToolTip.visible: hovered + onClicked: { + //emojiPopup.model.category = model.category; + gridView.positionViewAtIndex(emojiPopup.model.sourceModel.categoryToIndex(model.category), GridView.Beginning); + } - } + MouseArea { + id: mouseArea - delegate: AbstractButton { - Layout.preferredWidth: 36 - Layout.preferredHeight: 36 - hoverEnabled: true - ToolTip.text: { - switch (model.category) { - case Emoji.Category.People: - return qsTr('People'); - case Emoji.Category.Nature: - return qsTr('Nature'); - case Emoji.Category.Food: - return qsTr('Food'); - case Emoji.Category.Activity: - return qsTr('Activity'); - case Emoji.Category.Travel: - return qsTr('Travel'); - case Emoji.Category.Objects: - return qsTr('Objects'); - case Emoji.Category.Symbols: - return qsTr('Symbols'); - case Emoji.Category.Flags: - return qsTr('Flags'); + anchors.fill: parent + onPressed: mouse.accepted = false + cursorShape: Qt.PointingHandCursor } - } - ToolTip.visible: hovered - onClicked: { - //emojiPopup.model.category = model.category; - gridView.positionViewAtIndex(emojiPopup.model.sourceModel.categoryToIndex(model.category), GridView.Beginning); - } - - MouseArea { - id: mouseArea - anchors.fill: parent - onPressed: mouse.accepted = false - cursorShape: Qt.PointingHandCursor - } + contentItem: Image { + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter + fillMode: Image.Pad + sourceSize.width: 32 + sourceSize.height: 32 + source: "image://colorimage/" + model.image + "?" + (hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) + } - contentItem: Image { - horizontalAlignment: Image.AlignHCenter - verticalAlignment: Image.AlignVCenter - fillMode: Image.Pad - sourceSize.width: 32 - sourceSize.height: 32 - source: "image://colorimage/" + model.image + "?" + (hovered ? Nheko.colors.highlight : Nheko.colors.buttonText) - } + background: Rectangle { + anchors.fill: parent + color: emojiPopup.model.category === model.category ? Qt.hsla(highlightHue, highlightSat, highlightLight, 0.2) : 'transparent' + radius: 5 + border.color: emojiPopup.model.category === model.category ? Nheko.colors.highlight : 'transparent' + } - background: Rectangle { - anchors.fill: parent - color: emojiPopup.model.category === model.category ? Qt.hsla(highlightHue, highlightSat, highlightLight, 0.2) : 'transparent' - radius: 5 - border.color: emojiPopup.model.category === model.category ? Nheko.colors.highlight : 'transparent' } } diff --git a/resources/res.qrc b/resources/res.qrc index 8f24d33b..913de9d5 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -125,6 +125,7 @@ <file>qml/Root.qml</file> <file>qml/ChatPage.qml</file> + <file>qml/CommunitiesList.qml</file> <file>qml/RoomList.qml</file> <file>qml/TimelineView.qml</file> <file>qml/Avatar.qml</file> diff --git a/src/Cache.cpp b/src/Cache.cpp index 4a99dd59..8146e2cc 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -55,6 +55,10 @@ constexpr auto BATCH_SIZE = 100; //! Format: room_id -> RoomInfo constexpr auto ROOMS_DB("rooms"); constexpr auto INVITES_DB("invites"); +//! maps each room to its parent space (id->id) +constexpr auto SPACES_PARENTS_DB("space_parents"); +//! maps each space to its current children (id->id) +constexpr auto SPACES_CHILDREN_DB("space_children"); //! Information that must be kept between sync requests. constexpr auto SYNC_STATE_DB("sync_state"); //! Read receipts per room/event. @@ -237,12 +241,14 @@ Cache::setup() env_.open(cacheDirectory_.toStdString().c_str()); } - auto txn = lmdb::txn::begin(env_); - syncStateDb_ = lmdb::dbi::open(txn, SYNC_STATE_DB, MDB_CREATE); - roomsDb_ = lmdb::dbi::open(txn, ROOMS_DB, MDB_CREATE); - invitesDb_ = lmdb::dbi::open(txn, INVITES_DB, MDB_CREATE); - readReceiptsDb_ = lmdb::dbi::open(txn, READ_RECEIPTS_DB, MDB_CREATE); - notificationsDb_ = lmdb::dbi::open(txn, NOTIFICATIONS_DB, MDB_CREATE); + auto txn = lmdb::txn::begin(env_); + syncStateDb_ = lmdb::dbi::open(txn, SYNC_STATE_DB, MDB_CREATE); + roomsDb_ = lmdb::dbi::open(txn, ROOMS_DB, MDB_CREATE); + spacesChildrenDb_ = lmdb::dbi::open(txn, SPACES_CHILDREN_DB, MDB_CREATE | MDB_DUPSORT); + spacesParentsDb_ = lmdb::dbi::open(txn, SPACES_PARENTS_DB, MDB_CREATE | MDB_DUPSORT); + invitesDb_ = lmdb::dbi::open(txn, INVITES_DB, MDB_CREATE); + readReceiptsDb_ = lmdb::dbi::open(txn, READ_RECEIPTS_DB, MDB_CREATE); + notificationsDb_ = lmdb::dbi::open(txn, NOTIFICATIONS_DB, MDB_CREATE); // Device management devicesDb_ = lmdb::dbi::open(txn, DEVICES_DB, MDB_CREATE); @@ -899,7 +905,9 @@ Cache::runMigrations() std::reverse(oldMessages.events.begin(), oldMessages.events.end()); // save messages using the new method - saveTimelineMessages(txn, room_id, oldMessages); + auto eventsDb = getEventsDb(txn, room_id); + saveTimelineMessages( + txn, eventsDb, room_id, oldMessages); } // delete old messages db @@ -1194,24 +1202,73 @@ Cache::saveState(const mtx::responses::Sync &res) auto userKeyCacheDb = getUserKeysDb(txn); + std::set<std::string> spaces_with_updates; + std::set<std::string> rooms_with_space_updates; + // Save joined rooms for (const auto &room : res.rooms.join) { auto statesdb = getStatesDb(txn, room.first); auto stateskeydb = getStatesKeyDb(txn, room.first); auto membersdb = getMembersDb(txn, room.first); - - saveStateEvents( - txn, statesdb, stateskeydb, membersdb, room.first, room.second.state.events); - saveStateEvents( - txn, statesdb, stateskeydb, membersdb, room.first, room.second.timeline.events); - - saveTimelineMessages(txn, room.first, room.second.timeline); + auto eventsDb = getEventsDb(txn, room.first); + + saveStateEvents(txn, + statesdb, + stateskeydb, + membersdb, + eventsDb, + room.first, + room.second.state.events); + saveStateEvents(txn, + statesdb, + stateskeydb, + membersdb, + eventsDb, + room.first, + room.second.timeline.events); + + saveTimelineMessages(txn, eventsDb, room.first, room.second.timeline); RoomInfo updatedInfo; updatedInfo.name = getRoomName(txn, statesdb, membersdb).toStdString(); updatedInfo.topic = getRoomTopic(txn, statesdb).toStdString(); updatedInfo.avatar_url = getRoomAvatarUrl(txn, statesdb, membersdb).toStdString(); updatedInfo.version = getRoomVersion(txn, statesdb).toStdString(); + updatedInfo.is_space = getRoomIsSpace(txn, statesdb); + + if (updatedInfo.is_space) { + bool space_updates = false; + for (const auto &e : room.second.state.events) + if (std::holds_alternative<StateEvent<state::space::Child>>(e) || + std::holds_alternative<StateEvent<state::PowerLevels>>(e)) + space_updates = true; + for (const auto &e : room.second.timeline.events) + if (std::holds_alternative<StateEvent<state::space::Child>>(e) || + std::holds_alternative<StateEvent<state::PowerLevels>>(e)) + space_updates = true; + + if (space_updates) + spaces_with_updates.insert(room.first); + } + + { + bool room_has_space_update = false; + for (const auto &e : room.second.state.events) { + if (auto se = std::get_if<StateEvent<state::space::Parent>>(&e)) { + spaces_with_updates.insert(se->state_key); + room_has_space_update = true; + } + } + for (const auto &e : room.second.timeline.events) { + if (auto se = std::get_if<StateEvent<state::space::Parent>>(&e)) { + spaces_with_updates.insert(se->state_key); + room_has_space_update = true; + } + } + + if (room_has_space_update) + rooms_with_space_updates.insert(room.first); + } bool has_new_tags = false; // Process the account_data associated with this room @@ -1291,6 +1348,8 @@ Cache::saveState(const mtx::responses::Sync &res) removeLeftRooms(txn, res.rooms.leave); + updateSpaces(txn, spaces_with_updates, std::move(rooms_with_space_updates)); + txn.commit(); std::map<QString, bool> readStatus; @@ -1339,6 +1398,7 @@ Cache::saveInvites(lmdb::txn &txn, const std::map<std::string, mtx::responses::I updatedInfo.topic = getInviteRoomTopic(txn, statesdb).toStdString(); updatedInfo.avatar_url = getInviteRoomAvatarUrl(txn, statesdb, membersdb).toStdString(); + updatedInfo.is_space = getInviteRoomIsSpace(txn, statesdb); updatedInfo.is_invite = true; invitesDb_.put(txn, room.first, json(updatedInfo).dump()); @@ -1427,27 +1487,6 @@ Cache::roomsWithStateUpdates(const mtx::responses::Sync &res) return rooms; } -std::vector<std::string> -Cache::roomsWithTagUpdates(const mtx::responses::Sync &res) -{ - using namespace mtx::events; - - std::vector<std::string> rooms; - for (const auto &room : res.rooms.join) { - bool hasUpdates = false; - for (const auto &evt : room.second.account_data.events) { - if (std::holds_alternative<AccountDataEvent<account_data::Tags>>(evt)) { - hasUpdates = true; - } - } - - if (hasUpdates) - rooms.emplace_back(room.first); - } - - return rooms; -} - RoomInfo Cache::singleRoomInfo(const std::string &room_id) { @@ -1681,6 +1720,27 @@ Cache::storeEvent(const std::string &room_id, txn.commit(); } +void +Cache::replaceEvent(const std::string &room_id, + const std::string &event_id, + const mtx::events::collections::TimelineEvent &event) +{ + auto txn = lmdb::txn::begin(env_); + auto eventsDb = getEventsDb(txn, room_id); + auto relationsDb = getRelationsDb(txn, room_id); + auto event_json = mtx::accessors::serialize_event(event.data).dump(); + + { + eventsDb.del(txn, event_id); + eventsDb.put(txn, event_id, event_json); + for (auto relation : mtx::accessors::relations(event.data).relations) { + relationsDb.put(txn, relation.event_id, event_id); + } + } + + txn.commit(); +} + std::vector<std::string> Cache::relatedEvents(const std::string &room_id, const std::string &event_id) { @@ -1712,6 +1772,13 @@ Cache::relatedEvents(const std::string &room_id, const std::string &event_id) return related_ids; } +size_t +Cache::memberCount(const std::string &room_id) +{ + auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); + return getMembersDb(txn, room_id).size(txn); +} + QMap<QString, RoomInfo> Cache::roomInfo(bool withInvites) { @@ -1727,8 +1794,6 @@ Cache::roomInfo(bool withInvites) while (roomsCursor.get(room_id, room_data, MDB_NEXT)) { RoomInfo tmp = json::parse(std::move(room_data)); tmp.member_count = getMembersDb(txn, std::string(room_id)).size(txn); - tmp.msgInfo = getLastMessageInfo(txn, std::string(room_id)); - result.insert(QString::fromStdString(std::string(room_id)), std::move(tmp)); } roomsCursor.close(); @@ -1955,96 +2020,6 @@ Cache::getTimelineEventId(const std::string &room_id, uint64_t index) return std::string(val); } -DescInfo -Cache::getLastMessageInfo(lmdb::txn &txn, const std::string &room_id) -{ - lmdb::dbi orderDb; - try { - orderDb = getOrderToMessageDb(txn, room_id); - } catch (lmdb::runtime_error &e) { - nhlog::db()->error("Can't open db for room '{}', probably doesn't exist yet. ({})", - room_id, - e.what()); - return {}; - } - - lmdb::dbi eventsDb; - try { - eventsDb = getEventsDb(txn, room_id); - } catch (lmdb::runtime_error &e) { - nhlog::db()->error("Can't open db for room '{}', probably doesn't exist yet. ({})", - room_id, - e.what()); - return {}; - } - - lmdb::dbi membersdb; - try { - membersdb = getMembersDb(txn, room_id); - } catch (lmdb::runtime_error &e) { - nhlog::db()->error("Can't open db for room '{}', probably doesn't exist yet. ({})", - room_id, - e.what()); - return {}; - } - - if (orderDb.size(txn) == 0) - return DescInfo{}; - - const auto local_user = utils::localUser(); - - DescInfo fallbackDesc{}; - - std::string_view indexVal, event_id; - - auto cursor = lmdb::cursor::open(txn, orderDb); - bool first = true; - while (cursor.get(indexVal, event_id, first ? MDB_LAST : MDB_PREV)) { - first = false; - - std::string_view event; - bool success = eventsDb.get(txn, event_id, event); - if (!success) - continue; - - auto obj = json::parse(event); - - if (fallbackDesc.event_id.isEmpty() && obj["type"] == "m.room.member" && - obj["state_key"] == local_user.toStdString() && - obj["content"]["membership"] == "join") { - uint64_t ts = obj["origin_server_ts"]; - auto time = QDateTime::fromMSecsSinceEpoch(ts); - fallbackDesc = DescInfo{QString::fromStdString(obj["event_id"]), - local_user, - tr("You joined this room."), - utils::descriptiveTime(time), - ts, - time}; - } - - if (!(obj["type"] == "m.room.message" || obj["type"] == "m.sticker" || - obj["type"] == "m.call.invite" || obj["type"] == "m.call.answer" || - obj["type"] == "m.call.hangup" || obj["type"] == "m.room.encrypted")) - continue; - - mtx::events::collections::TimelineEvent te; - mtx::events::collections::from_json(obj, te); - - std::string_view info; - MemberInfo m; - if (membersdb.get(txn, obj["sender"].get<std::string>(), info)) { - m = json::parse(std::string_view(info.data(), info.size())); - } - - cursor.close(); - return utils::getMessageDescription( - te.data, local_user, QString::fromStdString(m.name)); - } - cursor.close(); - - return fallbackDesc; -} - QHash<QString, RoomInfo> Cache::invites() { @@ -2316,6 +2291,29 @@ Cache::getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb) return QString("1"); } +bool +Cache::getRoomIsSpace(lmdb::txn &txn, lmdb::dbi &statesdb) +{ + using namespace mtx::events; + using namespace mtx::events::state; + + std::string_view event; + bool res = statesdb.get(txn, to_string(mtx::events::EventType::RoomCreate), event); + + if (res) { + try { + StateEvent<Create> msg = json::parse(event); + + return msg.content.type == mtx::events::state::room_type::space; + } catch (const json::exception &e) { + nhlog::db()->warn("failed to parse m.room.create event: {}", e.what()); + } + } + + nhlog::db()->warn("m.room.create event is missing room version, assuming version \"1\""); + return false; +} + std::optional<mtx::events::state::CanonicalAlias> Cache::getRoomAliases(const std::string &roomid) { @@ -2443,6 +2441,27 @@ Cache::getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &db) return QString(); } +bool +Cache::getInviteRoomIsSpace(lmdb::txn &txn, lmdb::dbi &db) +{ + using namespace mtx::events; + using namespace mtx::events::state; + + std::string_view event; + bool res = db.get(txn, to_string(mtx::events::EventType::RoomCreate), event); + + if (res) { + try { + StrippedEvent<Create> msg = json::parse(event); + return msg.content.type == mtx::events::state::room_type::space; + } catch (const json::exception &e) { + nhlog::db()->warn("failed to parse m.room.topic event: {}", e.what()); + } + } + + return false; +} + std::vector<std::string> Cache::joinedRooms() { @@ -2479,47 +2498,12 @@ Cache::getMember(const std::string &room_id, const std::string &user_id) return m; } } catch (std::exception &e) { - nhlog::db()->warn("Failed to read member ({}): {}", user_id, e.what()); + nhlog::db()->warn( + "Failed to read member ({}) in room ({}): {}", user_id, room_id, e.what()); } return std::nullopt; } -std::vector<RoomSearchResult> -Cache::searchRooms(const std::string &query, std::uint8_t max_items) -{ - std::multimap<int, std::pair<std::string, RoomInfo>> items; - - auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); - auto cursor = lmdb::cursor::open(txn, roomsDb_); - - std::string_view room_id, room_data; - while (cursor.get(room_id, room_data, MDB_NEXT)) { - RoomInfo tmp = json::parse(room_data); - - const int score = utils::levenshtein_distance( - query, QString::fromStdString(tmp.name).toLower().toStdString()); - items.emplace(score, std::make_pair(room_id, tmp)); - } - - cursor.close(); - - auto end = items.begin(); - - if (items.size() >= max_items) - std::advance(end, max_items); - else if (items.size() > 0) - std::advance(end, items.size()); - - std::vector<RoomSearchResult> results; - for (auto it = items.begin(); it != end; it++) { - results.push_back(RoomSearchResult{it->second.first, it->second.second}); - } - - txn.commit(); - - return results; -} - std::vector<RoomMember> Cache::getMembers(const std::string &room_id, std::size_t startIndex, std::size_t len) { @@ -2578,11 +2562,12 @@ void Cache::savePendingMessage(const std::string &room_id, const mtx::events::collections::TimelineEvent &message) { - auto txn = lmdb::txn::begin(env_); + auto txn = lmdb::txn::begin(env_); + auto eventsDb = getEventsDb(txn, room_id); mtx::responses::Timeline timeline; timeline.events.push_back(message.data); - saveTimelineMessages(txn, room_id, timeline); + saveTimelineMessages(txn, eventsDb, room_id, timeline); auto pending = getPendingMessagesDb(txn, room_id); @@ -2650,13 +2635,13 @@ Cache::removePendingStatus(const std::string &room_id, const std::string &txn_id void Cache::saveTimelineMessages(lmdb::txn &txn, + lmdb::dbi &eventsDb, const std::string &room_id, const mtx::responses::Timeline &res) { if (res.events.empty()) return; - auto eventsDb = getEventsDb(txn, room_id); auto relationsDb = getRelationsDb(txn, room_id); auto orderDb = getEventOrderDb(txn, room_id); @@ -3181,6 +3166,147 @@ Cache::deleteOldData() noexcept } } +void +Cache::updateSpaces(lmdb::txn &txn, + const std::set<std::string> &spaces_with_updates, + std::set<std::string> rooms_with_updates) +{ + if (spaces_with_updates.empty() && rooms_with_updates.empty()) + return; + + for (const auto &space : spaces_with_updates) { + // delete old entries + { + auto cursor = lmdb::cursor::open(txn, spacesChildrenDb_); + bool first = true; + std::string_view sp = space, space_child = ""; + + if (cursor.get(sp, space_child, MDB_SET)) { + while (cursor.get( + sp, space_child, first ? MDB_FIRST_DUP : MDB_NEXT_DUP)) { + first = false; + spacesParentsDb_.del(txn, space_child, space); + } + } + cursor.close(); + spacesChildrenDb_.del(txn, space); + } + + for (const auto &event : + getStateEventsWithType<mtx::events::state::space::Child>(txn, space)) { + if (event.content.via.has_value() && event.state_key.size() > 3 && + event.state_key.at(0) == '!') { + spacesChildrenDb_.put(txn, space, event.state_key); + spacesParentsDb_.put(txn, event.state_key, space); + } + } + } + + const auto space_event_type = to_string(mtx::events::EventType::RoomPowerLevels); + + for (const auto &room : rooms_with_updates) { + for (const auto &event : + getStateEventsWithType<mtx::events::state::space::Parent>(txn, room)) { + if (event.content.via.has_value() && event.state_key.size() > 3 && + event.state_key.at(0) == '!') { + const std::string &space = event.state_key; + + auto pls = + getStateEvent<mtx::events::state::PowerLevels>(txn, space); + + if (!pls) + continue; + + if (pls->content.user_level(event.sender) >= + pls->content.state_level(space_event_type)) { + spacesChildrenDb_.put(txn, space, room); + spacesParentsDb_.put(txn, room, space); + } + } + } + } +} + +QMap<QString, std::optional<RoomInfo>> +Cache::spaces() +{ + auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); + + QMap<QString, std::optional<RoomInfo>> ret; + { + auto cursor = lmdb::cursor::open(txn, spacesChildrenDb_); + bool first = true; + std::string_view space_id, space_child; + while (cursor.get(space_id, space_child, first ? MDB_FIRST : MDB_NEXT)) { + first = false; + + if (!space_child.empty()) { + std::string_view room_data; + if (roomsDb_.get(txn, space_id, room_data)) { + RoomInfo tmp = json::parse(std::move(room_data)); + ret.insert( + QString::fromUtf8(space_id.data(), space_id.size()), tmp); + } else { + ret.insert( + QString::fromUtf8(space_id.data(), space_id.size()), + std::nullopt); + } + } + } + cursor.close(); + } + + return ret; +} + +std::vector<std::string> +Cache::getParentRoomIds(const std::string &room_id) +{ + auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); + + std::vector<std::string> roomids; + { + auto cursor = lmdb::cursor::open(txn, spacesParentsDb_); + bool first = true; + std::string_view sp = room_id, space_parent; + if (cursor.get(sp, space_parent, MDB_SET)) { + while (cursor.get(sp, space_parent, first ? MDB_FIRST_DUP : MDB_NEXT_DUP)) { + first = false; + + if (!space_parent.empty()) + roomids.emplace_back(space_parent); + } + } + cursor.close(); + } + + return roomids; +} + +std::vector<std::string> +Cache::getChildRoomIds(const std::string &room_id) +{ + auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); + + std::vector<std::string> roomids; + { + auto cursor = lmdb::cursor::open(txn, spacesChildrenDb_); + bool first = true; + std::string_view sp = room_id, space_child; + if (cursor.get(sp, space_child, MDB_SET)) { + while (cursor.get(sp, space_child, first ? MDB_FIRST_DUP : MDB_NEXT_DUP)) { + first = false; + + if (!space_child.empty()) + roomids.emplace_back(space_child); + } + } + cursor.close(); + } + + return roomids; +} + std::optional<mtx::events::collections::RoomAccountDataEvents> Cache::getAccountData(lmdb::txn &txn, mtx::events::EventType type, const std::string &room_id) { @@ -3451,6 +3577,10 @@ Cache::updateUserKeys(const std::string &sync_token, const mtx::responses::Query if (!updateToWrite.master_keys.keys.empty() && update.master_keys.keys != updateToWrite.master_keys.keys) { + nhlog::db()->debug("Master key of {} changed:\nold: {}\nnew: {}", + user, + updateToWrite.master_keys.keys.size(), + update.master_keys.keys.size()); updateToWrite.master_key_changed = true; } @@ -3458,25 +3588,31 @@ Cache::updateUserKeys(const std::string &sync_token, const mtx::responses::Query updateToWrite.self_signing_keys = update.self_signing_keys; updateToWrite.user_signing_keys = update.user_signing_keys; - // If we have keys for the device already, only update the signatures. + auto oldDeviceKeys = std::move(updateToWrite.device_keys); + updateToWrite.device_keys.clear(); + + // Don't insert keys, which we have seen once already for (const auto &[device_id, device_keys] : update.device_keys) { - if (updateToWrite.device_keys.count(device_id) && - updateToWrite.device_keys.at(device_id).keys == - device_keys.keys) { - updateToWrite.device_keys.at(device_id).signatures = - device_keys.signatures; + if (oldDeviceKeys.count(device_id) && + oldDeviceKeys.at(device_id).keys == device_keys.keys) { + // this is safe, since the keys are the same + updateToWrite.device_keys[device_id] = device_keys; } else { bool keyReused = false; for (const auto &[key_id, key] : device_keys.keys) { (void)key_id; if (updateToWrite.seen_device_keys.count(key)) { + nhlog::crypto()->warn( + "Key '{}' reused by ({}: {})", + key, + user, + device_id); keyReused = true; break; } } - if (!updateToWrite.device_keys.count(device_id) && - !keyReused) + if (!keyReused && !oldDeviceKeys.count(device_id)) updateToWrite.device_keys[device_id] = device_keys; } @@ -3858,6 +3994,7 @@ to_json(json &j, const RoomInfo &info) j["avatar_url"] = info.avatar_url; j["version"] = info.version; j["is_invite"] = info.is_invite; + j["is_space"] = info.is_space; j["join_rule"] = info.join_rule; j["guest_access"] = info.guest_access; @@ -3877,6 +4014,7 @@ from_json(const json &j, RoomInfo &info) info.version = j.value( "version", QCoreApplication::translate("RoomInfo", "no version stored").toStdString()); info.is_invite = j.at("is_invite"); + info.is_space = j.value("is_space", false); info.join_rule = j.at("join_rule"); info.guest_access = j.at("guest_access"); @@ -4132,12 +4270,6 @@ getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb) return instance_->getRoomAvatarUrl(txn, statesdb, membersdb); } -QString -getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb) -{ - return instance_->getRoomVersion(txn, statesdb); -} - std::vector<RoomMember> getMembers(const std::string &room_id, std::size_t startIndex, std::size_t len) { @@ -4279,11 +4411,7 @@ roomsWithStateUpdates(const mtx::responses::Sync &res) { return instance_->roomsWithStateUpdates(res); } -std::vector<std::string> -roomsWithTagUpdates(const mtx::responses::Sync &res) -{ - return instance_->roomsWithTagUpdates(res); -} + std::map<QString, RoomInfo> getRoomInfo(const std::vector<std::string> &rooms) { @@ -4303,12 +4431,6 @@ calculateRoomReadStatus() instance_->calculateRoomReadStatus(); } -std::vector<RoomSearchResult> -searchRooms(const std::string &query, std::uint8_t max_items) -{ - return instance_->searchRooms(query, max_items); -} - void markSentNotification(const std::string &event_id) { diff --git a/src/Cache.h b/src/Cache.h index 74ec9695..b0520f6b 100644 --- a/src/Cache.h +++ b/src/Cache.h @@ -79,9 +79,6 @@ getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); //! Retrieve the room avatar's url if any. QString getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); -//! Retrieve the version of the room if any. -QString -getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb); //! Retrieve member info from a room. std::vector<RoomMember> @@ -166,9 +163,6 @@ calculateRoomReadStatus(const std::string &room_id); void calculateRoomReadStatus(); -std::vector<RoomSearchResult> -searchRooms(const std::string &query, std::uint8_t max_items = 5); - void markSentNotification(const std::string &event_id); //! Removes an event from the sent notifications. diff --git a/src/CacheStructs.h b/src/CacheStructs.h index f7d6f0e2..28c70055 100644 --- a/src/CacheStructs.h +++ b/src/CacheStructs.h @@ -76,13 +76,13 @@ struct RoomInfo std::string version; //! Whether or not the room is an invite. bool is_invite = false; + //! Wheter or not the room is a space + bool is_space = false; //! Total number of members in the room. size_t member_count = 0; //! Who can access to the room. mtx::events::state::JoinRule join_rule = mtx::events::state::JoinRule::Public; bool guest_access = false; - //! Metadata describing the last message in the timeline. - DescInfo msgInfo; //! The list of tags associated with this room std::vector<std::string> tags; }; diff --git a/src/Cache_p.h b/src/Cache_p.h index f2911622..c76cc717 100644 --- a/src/Cache_p.h +++ b/src/Cache_p.h @@ -72,6 +72,7 @@ public: std::optional<mtx::events::state::CanonicalAlias> getRoomAliases(const std::string &roomid); QHash<QString, RoomInfo> invites(); std::optional<RoomInfo> invite(std::string_view roomid); + QMap<QString, std::optional<RoomInfo>> spaces(); //! Calculate & return the name of the room. QString getRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); @@ -84,6 +85,8 @@ public: QString getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); //! Retrieve the version of the room if any. QString getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb); + //! Retrieve if the room is a space + bool getRoomIsSpace(lmdb::txn &txn, lmdb::dbi &statesdb); //! Get a specific state event template<typename T> @@ -98,6 +101,7 @@ public: std::vector<RoomMember> getMembers(const std::string &room_id, std::size_t startIndex = 0, std::size_t len = 30); + size_t memberCount(const std::string &room_id); void saveState(const mtx::responses::Sync &res); bool isInitialized(); @@ -146,7 +150,6 @@ public: RoomInfo singleRoomInfo(const std::string &room_id); std::vector<std::string> roomsWithStateUpdates(const mtx::responses::Sync &res); - std::vector<std::string> roomsWithTagUpdates(const mtx::responses::Sync &res); std::map<QString, RoomInfo> getRoomInfo(const std::vector<std::string> &rooms); //! Calculates which the read status of a room. @@ -154,9 +157,6 @@ public: bool calculateRoomReadStatus(const std::string &room_id); void calculateRoomReadStatus(); - std::vector<RoomSearchResult> searchRooms(const std::string &query, - std::uint8_t max_items = 5); - void markSentNotification(const std::string &event_id); //! Removes an event from the sent notifications. void removeReadNotification(const std::string &event_id); @@ -184,6 +184,9 @@ public: void storeEvent(const std::string &room_id, const std::string &event_id, const mtx::events::collections::TimelineEvent &event); + void replaceEvent(const std::string &room_id, + const std::string &event_id, + const mtx::events::collections::TimelineEvent &event); std::vector<std::string> relatedEvents(const std::string &room_id, const std::string &event_id); @@ -219,6 +222,8 @@ public: void deleteOldData() noexcept; //! Retrieve all saved room ids. std::vector<std::string> getRoomIds(lmdb::txn &txn); + std::vector<std::string> getParentRoomIds(const std::string &room_id); + std::vector<std::string> getChildRoomIds(const std::string &room_id); //! Mark a room that uses e2e encryption. void setEncryptedRoom(lmdb::txn &txn, const std::string &room_id); @@ -324,12 +329,13 @@ private: QString getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); QString getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); QString getInviteRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); + bool getInviteRoomIsSpace(lmdb::txn &txn, lmdb::dbi &db); std::optional<MemberInfo> getMember(const std::string &room_id, const std::string &user_id); std::string getLastEventId(lmdb::txn &txn, const std::string &room_id); - DescInfo getLastMessageInfo(lmdb::txn &txn, const std::string &room_id); void saveTimelineMessages(lmdb::txn &txn, + lmdb::dbi &eventsDb, const std::string &room_id, const mtx::responses::Timeline &res); @@ -348,11 +354,12 @@ private: lmdb::dbi &statesdb, lmdb::dbi &stateskeydb, lmdb::dbi &membersdb, + lmdb::dbi &eventsDb, const std::string &room_id, const std::vector<T> &events) { for (const auto &e : events) - saveStateEvent(txn, statesdb, stateskeydb, membersdb, room_id, e); + saveStateEvent(txn, statesdb, stateskeydb, membersdb, eventsDb, room_id, e); } template<class T> @@ -360,6 +367,7 @@ private: lmdb::dbi &statesdb, lmdb::dbi &stateskeydb, lmdb::dbi &membersdb, + lmdb::dbi &eventsDb, const std::string &room_id, const T &event) { @@ -396,8 +404,10 @@ private: } std::visit( - [&txn, &statesdb, &stateskeydb](auto e) { - if constexpr (isStateEvent(e)) + [&txn, &statesdb, &stateskeydb, &eventsDb](auto e) { + if constexpr (isStateEvent(e)) { + eventsDb.put(txn, e.event_id, json(e).dump()); + if (e.type != EventType::Unsupported) { if (e.state_key.empty()) statesdb.put( @@ -412,6 +422,7 @@ private: }) .dump()); } + } }, event); } @@ -427,20 +438,22 @@ private: if (room_id.empty()) return std::nullopt; + const auto typeStr = to_string(type); std::string_view value; if (state_key.empty()) { auto db = getStatesDb(txn, room_id); - if (!db.get(txn, to_string(type), value)) { + if (!db.get(txn, typeStr, value)) { return std::nullopt; } } else { - auto db = getStatesKeyDb(txn, room_id); - std::string d = json::object({{"key", state_key}}).dump(); - std::string_view data = d; + auto db = getStatesKeyDb(txn, room_id); + std::string d = json::object({{"key", state_key}}).dump(); + std::string_view data = d; + std::string_view typeStrV = typeStr; auto cursor = lmdb::cursor::open(txn, db); - if (!cursor.get(state_key, data, MDB_GET_BOTH)) + if (!cursor.get(typeStrV, data, MDB_GET_BOTH)) return std::nullopt; try { @@ -460,6 +473,47 @@ private: } } + template<typename T> + std::vector<mtx::events::StateEvent<T>> getStateEventsWithType(lmdb::txn &txn, + const std::string &room_id) + + { + constexpr auto type = mtx::events::state_content_to_type<T>; + static_assert(type != mtx::events::EventType::Unsupported, + "Not a supported type in state events."); + + if (room_id.empty()) + return {}; + + std::vector<mtx::events::StateEvent<T>> events; + + { + auto db = getStatesKeyDb(txn, room_id); + auto eventsDb = getEventsDb(txn, room_id); + const auto typeStr = to_string(type); + std::string_view typeStrV = typeStr; + std::string_view data; + std::string_view value; + + auto cursor = lmdb::cursor::open(txn, db); + bool first = true; + if (cursor.get(typeStrV, data, MDB_SET)) { + while (cursor.get( + typeStrV, data, first ? MDB_FIRST_DUP : MDB_NEXT_DUP)) { + first = false; + + if (eventsDb.get(txn, + json::parse(data)["id"].get<std::string>(), + value)) + events.push_back( + json::parse(value) + .get<mtx::events::StateEvent<T>>()); + } + } + } + + return events; + } void saveInvites(lmdb::txn &txn, const std::map<std::string, mtx::responses::InvitedRoom> &rooms); @@ -479,6 +533,10 @@ private: } } + void updateSpaces(lmdb::txn &txn, + const std::set<std::string> &spaces_with_updates, + std::set<std::string> rooms_with_updates); + lmdb::dbi getPendingReceiptsDb(lmdb::txn &txn) { return lmdb::dbi::open(txn, "pending_receipts", MDB_CREATE); @@ -545,8 +603,8 @@ private: lmdb::dbi getStatesKeyDb(lmdb::txn &txn, const std::string &room_id) { - auto db = - lmdb::dbi::open(txn, std::string(room_id + "/state_by_key").c_str(), MDB_CREATE); + auto db = lmdb::dbi::open( + txn, std::string(room_id + "/state_by_key").c_str(), MDB_CREATE | MDB_DUPSORT); lmdb::dbi_set_dupsort(txn, db, compare_state_key); return db; } @@ -608,6 +666,7 @@ private: lmdb::env env_; lmdb::dbi syncStateDb_; lmdb::dbi roomsDb_; + lmdb::dbi spacesChildrenDb_, spacesParentsDb_; lmdb::dbi invitesDb_; lmdb::dbi readReceiptsDb_; lmdb::dbi notificationsDb_; diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 0f16f205..6003eb85 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -550,7 +550,7 @@ ChatPage::startInitialSync() nhlog::net()->error("initial sync error: {} {} {} {}", err->parse_error, status_code, - err->error_code.message(), + err->error_code, err_code); // non http related errors @@ -674,10 +674,10 @@ ChatPage::trySync() return; } - nhlog::net()->error("initial sync error: {} {} {} {}", + nhlog::net()->error("sync error: {} {} {} {}", err->parse_error, status_code, - err->error_code.message(), + err->error_code, err_code); emit tryDelayedSyncCb(); return; diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index c914d66f..f53d81ba 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -263,9 +263,7 @@ LoginPage::onMatrixIdEntered() http::client()->well_known([this](const mtx::responses::WellKnown &res, mtx::http::RequestErr err) { if (err) { - using namespace boost::beast::http; - - if (err->status_code == status::not_found) { + if (err->status_code == 404) { nhlog::net()->info("Autodiscovery: No .well-known."); checkHomeserverVersion(); return; @@ -282,8 +280,9 @@ LoginPage::onMatrixIdEntered() emit versionErrorCb(tr("Autodiscovery failed. Unknown error when " "requesting .well-known.")); nhlog::net()->error("Autodiscovery failed. Unknown error when " - "requesting .well-known. {}", - err->error_code.message()); + "requesting .well-known. {} {}", + err->status_code, + err->error_code); return; } @@ -301,9 +300,7 @@ LoginPage::checkHomeserverVersion() http::client()->versions( [this](const mtx::responses::Versions &, mtx::http::RequestErr err) { if (err) { - using namespace boost::beast::http; - - if (err->status_code == status::not_found) { + if (err->status_code == 404) { emit versionErrorCb(tr("The required endpoints were not found. " "Possibly not a Matrix server.")); return; diff --git a/src/Olm.cpp b/src/Olm.cpp index d08c1b3e..ff4c883b 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -206,8 +206,11 @@ handle_olm_message(const OlmMessage &msg) for (const auto &cipher : msg.ciphertext) { // We skip messages not meant for the current device. - if (cipher.first != my_key) + if (cipher.first != my_key) { + nhlog::crypto()->debug( + "Skipping message for {} since we are {}.", cipher.first, my_key); continue; + } const auto type = cipher.second.type; nhlog::crypto()->info("type: {}", type == 0 ? "OLM_PRE_KEY" : "OLM_MESSAGE"); @@ -661,8 +664,10 @@ try_olm_decryption(const std::string &sender_key, const mtx::events::msg::OlmCip for (const auto &id : session_ids) { auto session = cache::getOlmSession(sender_key, id); - if (!session) + if (!session) { + nhlog::crypto()->warn("Unknown olm session: {}:{}", sender_key, id); continue; + } mtx::crypto::BinaryBuf text; diff --git a/src/Olm.h b/src/Olm.h index d356cb55..8479f4f2 100644 --- a/src/Olm.h +++ b/src/Olm.h @@ -4,8 +4,6 @@ #pragma once -#include <boost/optional.hpp> - #include <memory> #include <mtx/events.hpp> #include <mtx/events/encrypted.hpp> diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 5c5545ec..1588d07d 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -11,6 +11,7 @@ #include <QtMath> #include <mtx/responses/register.hpp> +#include <mtx/responses/well-known.hpp> #include "Config.h" #include "Logging.h" @@ -108,6 +109,10 @@ RegisterPage::RegisterPage(QWidget *parent) error_password_confirmation_label_->setWordWrap(true); error_password_confirmation_label_->hide(); + error_server_label_ = new QLabel(this); + error_server_label_->setWordWrap(true); + error_server_label_->hide(); + form_layout_->addWidget(username_input_, Qt::AlignHCenter); form_layout_->addWidget(error_username_label_, Qt::AlignHCenter); form_layout_->addWidget(password_input_, Qt::AlignHCenter); @@ -115,6 +120,7 @@ RegisterPage::RegisterPage(QWidget *parent) form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter); form_layout_->addWidget(error_password_confirmation_label_, Qt::AlignHCenter); form_layout_->addWidget(server_input_, Qt::AlignHCenter); + form_layout_->addWidget(error_server_label_, Qt::AlignHCenter); button_layout_ = new QHBoxLayout(); button_layout_->setSpacing(0); @@ -140,6 +146,17 @@ RegisterPage::RegisterPage(QWidget *parent) top_layout_->addWidget(error_label_, 0, Qt::AlignHCenter); top_layout_->addStretch(1); + connect( + this, + &RegisterPage::versionErrorCb, + this, + [this](const QString &msg) { + error_server_label_->show(); + server_input_->setValid(false); + showError(error_server_label_, msg); + }, + Qt::QueuedConnection); + connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked())); connect(register_button_, SIGNAL(clicked()), this, SLOT(onRegisterButtonClicked())); @@ -272,7 +289,7 @@ RegisterPage::RegisterPage(QWidget *parent) } // The server requires registration flows. - if (err->status_code == boost::beast::http::status::unauthorized) { + if (err->status_code == 401) { if (err->matrix_error.unauthorized.flows.empty()) { nhlog::net()->warn( "failed to retrieve registration flows: ({}) " @@ -351,10 +368,12 @@ RegisterPage::checkFields() error_username_label_->setText(""); error_password_label_->setText(""); error_password_confirmation_label_->setText(""); + error_server_label_->setText(""); error_username_label_->hide(); error_password_label_->hide(); error_password_confirmation_label_->hide(); + error_server_label_->hide(); password_confirmation_->setValid(true); server_input_->setValid(true); @@ -379,7 +398,8 @@ RegisterPage::checkFields() all_fields_good = false; } else if (server_input_->isModified() && (!server_input_->hasAcceptableInput() || server_input_->text().isEmpty())) { - showError(tr("Invalid server name")); + error_server_label_->show(); + showError(error_server_label_, tr("Invalid server name")); server_input_->setValid(false); all_fields_good = false; } @@ -406,45 +426,38 @@ RegisterPage::onRegisterButtonClicked() http::client()->set_server(server); http::client()->verify_certificates( !UserSettings::instance()->disableCertificateValidation()); - http::client()->registration( - username, - password, - [this, username, password](const mtx::responses::Register &res, - mtx::http::RequestErr err) { - if (!err) { - http::client()->set_user(res.user_id); - http::client()->set_access_token(res.access_token); - emit registerOk(); - return; - } + http::client()->well_known( + [this, username, password](const mtx::responses::WellKnown &res, + mtx::http::RequestErr err) { + if (err) { + if (err->status_code == 404) { + nhlog::net()->info("Autodiscovery: No .well-known."); + checkVersionAndRegister(username, password); + return; + } - // The server requires registration flows. - if (err->status_code == boost::beast::http::status::unauthorized) { - if (err->matrix_error.unauthorized.flows.empty()) { - nhlog::net()->warn( - "failed to retrieve registration flows1: ({}) " - "{}", - static_cast<int>(err->status_code), - err->matrix_error.error); - emit errorOccurred(); - emit registerErrorCb( - QString::fromStdString(err->matrix_error.error)); + if (!err->parse_error.empty()) { + emit versionErrorCb(tr( + "Autodiscovery failed. Received malformed response.")); + nhlog::net()->error( + "Autodiscovery failed. Received malformed response."); return; } - emit registrationFlow( - username, password, err->matrix_error.unauthorized); + emit versionErrorCb(tr("Autodiscovery failed. Unknown error when " + "requesting .well-known.")); + nhlog::net()->error("Autodiscovery failed. Unknown error when " + "requesting .well-known. {} {}", + err->status_code, + err->error_code); return; } - nhlog::net()->error( - "failed to register: status_code ({}), matrix_error({})", - static_cast<int>(err->status_code), - err->matrix_error.error); - - emit registerErrorCb(QString::fromStdString(err->matrix_error.error)); - emit errorOccurred(); + nhlog::net()->info("Autodiscovery: Discovered '" + + res.homeserver.base_url + "'"); + http::client()->set_server(res.homeserver.base_url); + checkVersionAndRegister(username, password); }); emit registering(); @@ -452,6 +465,72 @@ RegisterPage::onRegisterButtonClicked() } void +RegisterPage::checkVersionAndRegister(const std::string &username, const std::string &password) +{ + http::client()->versions( + [this, username, password](const mtx::responses::Versions &, mtx::http::RequestErr err) { + if (err) { + if (err->status_code == 404) { + emit versionErrorCb(tr("The required endpoints were not found. " + "Possibly not a Matrix server.")); + return; + } + + if (!err->parse_error.empty()) { + emit versionErrorCb(tr("Received malformed response. Make sure " + "the homeserver domain is valid.")); + return; + } + + emit versionErrorCb(tr( + "An unknown error occured. Make sure the homeserver domain is valid.")); + return; + } + + http::client()->registration( + username, + password, + [this, username, password](const mtx::responses::Register &res, + mtx::http::RequestErr err) { + if (!err) { + http::client()->set_user(res.user_id); + http::client()->set_access_token(res.access_token); + + emit registerOk(); + return; + } + + // The server requires registration flows. + if (err->status_code == 401) { + if (err->matrix_error.unauthorized.flows.empty()) { + nhlog::net()->warn( + "failed to retrieve registration flows1: ({}) " + "{}", + static_cast<int>(err->status_code), + err->matrix_error.error); + emit errorOccurred(); + emit registerErrorCb( + QString::fromStdString(err->matrix_error.error)); + return; + } + + emit registrationFlow( + username, password, err->matrix_error.unauthorized); + return; + } + + nhlog::net()->error( + "failed to register: status_code ({}), matrix_error({})", + static_cast<int>(err->status_code), + err->matrix_error.error); + + emit registerErrorCb(QString::fromStdString(err->matrix_error.error)); + emit errorOccurred(); + }); + }); +} + +void RegisterPage::paintEvent(QPaintEvent *) { QStyleOption opt; diff --git a/src/RegisterPage.h b/src/RegisterPage.h index 2f05d04c..0e4a45d0 100644 --- a/src/RegisterPage.h +++ b/src/RegisterPage.h @@ -31,6 +31,10 @@ protected: signals: void backButtonClicked(); void errorOccurred(); + + //! Used to trigger the corresponding slot outside of the main thread. + void versionErrorCb(const QString &err); + void registering(); void registerOk(); void registerErrorCb(const QString &msg); @@ -52,6 +56,7 @@ private: bool checkOneField(QLabel *label, const TextField *t_field, const QString &msg); bool checkFields(); void showError(QLabel *label, const QString &msg); + void checkVersionAndRegister(const std::string &username, const std::string &password); QVBoxLayout *top_layout_; QHBoxLayout *back_layout_; @@ -63,6 +68,7 @@ private: QLabel *error_username_label_; QLabel *error_password_label_; QLabel *error_password_confirmation_label_; + QLabel *error_server_label_; FlatButton *back_button_; RaisedButton *register_button_; diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 99560678..740b8979 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -64,10 +64,14 @@ void UserSettings::load(std::optional<QString> profile) { QSettings settings; - tray_ = settings.value("user/window/tray", false).toBool(); + tray_ = settings.value("user/window/tray", false).toBool(); + startInTray_ = settings.value("user/window/start_in_tray", false).toBool(); + + roomListWidth_ = settings.value("user/sidebar/room_list_width", -1).toInt(); + communityListWidth_ = settings.value("user/sidebar/community_list_width", -1).toInt(); + hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool(); hasAlertOnNotification_ = settings.value("user/alert_on_notification", false).toBool(); - startInTray_ = settings.value("user/window/start_in_tray", false).toBool(); groupView_ = settings.value("user/group_view", true).toBool(); hiddenTags_ = settings.value("user/hidden_tags", QStringList{}).toStringList(); buttonsInTimeline_ = settings.value("user/timeline/buttons", true).toBool(); @@ -175,10 +179,11 @@ UserSettings::setMobileMode(bool state) void UserSettings::setGroupView(bool state) { - if (groupView_ != state) - emit groupViewStateChanged(state); + if (groupView_ == state) + return; groupView_ = state; + emit groupViewStateChanged(state); save(); } @@ -248,6 +253,24 @@ UserSettings::setTimelineMaxWidth(int state) emit timelineMaxWidthChanged(state); save(); } +void +UserSettings::setCommunityListWidth(int state) +{ + if (state == communityListWidth_) + return; + communityListWidth_ = state; + emit communityListWidthChanged(state); + save(); +} +void +UserSettings::setRoomListWidth(int state) +{ + if (state == roomListWidth_) + return; + roomListWidth_ = state; + emit roomListWidthChanged(state); + save(); +} void UserSettings::setDesktopNotifications(bool state) @@ -571,6 +594,11 @@ UserSettings::save() settings.setValue("start_in_tray", startInTray_); settings.endGroup(); // window + settings.beginGroup("sidebar"); + settings.setValue("community_list_width", communityListWidth_); + settings.setValue("room_list_width", roomListWidth_); + settings.endGroup(); // window + settings.beginGroup("timeline"); settings.setValue("buttons", buttonsInTimeline_); settings.setValue("message_hover_highlight", messageHoverHighlight_); @@ -586,6 +614,7 @@ UserSettings::save() settings.setValue("mobile_mode", mobileMode_); settings.setValue("font_size", baseFontSize_); settings.setValue("typing_notifications", typingNotifications_); + settings.setValue("sort_by_unread", sortByImportance_); settings.setValue("minor_events", sortByImportance_); settings.setValue("read_receipts", readReceipts_); settings.setValue("group_view", groupView_); diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index 3ad0293b..acb08569 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -61,6 +61,10 @@ class UserSettings : public QObject NOTIFY privacyScreenTimeoutChanged) Q_PROPERTY(int timelineMaxWidth READ timelineMaxWidth WRITE setTimelineMaxWidth NOTIFY timelineMaxWidthChanged) + Q_PROPERTY( + int roomListWidth READ roomListWidth WRITE setRoomListWidth NOTIFY roomListWidthChanged) + Q_PROPERTY(int communityListWidth READ communityListWidth WRITE setCommunityListWidth NOTIFY + communityListWidthChanged) Q_PROPERTY(bool mobileMode READ mobileMode WRITE setMobileMode NOTIFY mobileModeChanged) Q_PROPERTY(double fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged) Q_PROPERTY(QString font READ font WRITE setFontFamily NOTIFY fontChanged) @@ -129,6 +133,8 @@ public: void setSortByImportance(bool state); void setButtonsInTimeline(bool state); void setTimelineMaxWidth(int state); + void setCommunityListWidth(int state); + void setRoomListWidth(int state); void setDesktopNotifications(bool state); void setAlertOnNotification(bool state); void setAvatarCircles(bool state); @@ -178,6 +184,8 @@ public: return hasDesktopNotifications() || hasAlertOnNotification(); } int timelineMaxWidth() const { return timelineMaxWidth_; } + int communityListWidth() const { return communityListWidth_; } + int roomListWidth() const { return roomListWidth_; } double fontSize() const { return baseFontSize_; } QString font() const { return font_; } QString emojiFont() const @@ -227,6 +235,8 @@ signals: void privacyScreenChanged(bool state); void privacyScreenTimeoutChanged(int state); void timelineMaxWidthChanged(int state); + void roomListWidthChanged(int state); + void communityListWidthChanged(int state); void mobileModeChanged(bool mode); void fontSizeChanged(double state); void fontChanged(QString state); @@ -276,6 +286,8 @@ private: bool shareKeysWithTrustedUsers_; bool mobileMode_; int timelineMaxWidth_; + int roomListWidth_; + int communityListWidth_; double baseFontSize_; QString font_; QString emojiFont_; diff --git a/src/Utils.cpp b/src/Utils.cpp index c110aa18..562b94fd 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -679,11 +679,10 @@ utils::hashQString(const QString &input) return hash; } -QString -utils::generateContrastingHexColor(const QString &input, const QString &background) +QColor +utils::generateContrastingHexColor(const QString &input, const QColor &backgroundCol) { - const QColor backgroundCol(background); - const qreal backgroundLum = luminance(background); + const qreal backgroundLum = luminance(backgroundCol); // Create a color for the input auto hash = hashQString(input); diff --git a/src/Utils.h b/src/Utils.h index e976cf81..1d48e2c7 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -301,8 +301,8 @@ hashQString(const QString &input); //! Generate a color (matching #RRGGBB) that has an acceptable contrast to background that is based //! on the input string. -QString -generateContrastingHexColor(const QString &input, const QString &background); +QColor +generateContrastingHexColor(const QString &input, const QColor &background); //! Given two luminance values, compute the contrast ratio between them. qreal diff --git a/src/WebRTCSession.cpp b/src/WebRTCSession.cpp index 880a14a2..72330435 100644 --- a/src/WebRTCSession.cpp +++ b/src/WebRTCSession.cpp @@ -41,8 +41,7 @@ using webrtc::CallType; using webrtc::State; WebRTCSession::WebRTCSession() - : QObject() - , devices_(CallDevices::instance()) + : devices_(CallDevices::instance()) { qRegisterMetaType<webrtc::CallType>(); qmlRegisterUncreatableMetaObject( diff --git a/src/main.cpp b/src/main.cpp index fe1a9ee3..29e93d49 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,15 +40,48 @@ QQmlDebuggingEnabler enabler; #endif -#if defined(Q_OS_LINUX) -#include <boost/stacktrace.hpp> +#if HAVE_BACKTRACE_SYMBOLS_FD #include <csignal> +#include <execinfo.h> +#include <fcntl.h> +#include <unistd.h> void stacktraceHandler(int signum) { std::signal(signum, SIG_DFL); - boost::stacktrace::safe_dump_to("./nheko-backtrace.dump"); + + // boost::stacktrace::safe_dump_to("./nheko-backtrace.dump"); + + // see + // https://stackoverflow.com/questions/77005/how-to-automatically-generate-a-stacktrace-when-my-program-crashes/77336#77336 + void *array[50]; + size_t size; + + // get void*'s for all entries on the stack + size = backtrace(array, 50); + + // print out all the frames to stderr + fprintf(stderr, "Error: signal %d:\n", signum); + backtrace_symbols_fd(array, size, STDERR_FILENO); + + int file = ::open("/tmp/nheko-crash.dump", + O_CREAT | O_WRONLY | O_TRUNC +#if defined(S_IWUSR) && defined(S_IRUSR) + , + S_IWUSR | S_IRUSR +#elif defined(S_IWRITE) && defined(S_IREAD) + , + S_IWRITE | S_IREAD +#endif + ); + if (file != -1) { + constexpr char header[] = "Error: signal\n"; + [[maybe_unused]] auto ret = write(file, header, std::size(header) - 1); + backtrace_symbols_fd(array, size, file); + close(file); + } + std::raise(SIGABRT); } diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp index cedaacce..97bfa76d 100644 --- a/src/timeline/CommunitiesModel.cpp +++ b/src/timeline/CommunitiesModel.cpp @@ -21,6 +21,8 @@ CommunitiesModel::roleNames() const {DisplayName, "displayName"}, {Tooltip, "tooltip"}, {ChildrenHidden, "childrenHidden"}, + {Hidden, "hidden"}, + {Id, "id"}, }; } @@ -37,11 +39,28 @@ CommunitiesModel::data(const QModelIndex &index, int role) const return tr("Shows all rooms without filtering."); case CommunitiesModel::Roles::ChildrenHidden: return false; + case CommunitiesModel::Roles::Hidden: + return false; case CommunitiesModel::Roles::Id: return ""; } - } else if (index.row() - 1 < tags_.size()) { - auto tag = tags_.at(index.row() - 1); + } else if (index.row() - 1 < spaceOrder_.size()) { + auto id = spaceOrder_.at(index.row() - 1); + switch (role) { + case CommunitiesModel::Roles::AvatarUrl: + return QString::fromStdString(spaces_.at(id).avatar_url); + case CommunitiesModel::Roles::DisplayName: + case CommunitiesModel::Roles::Tooltip: + return QString::fromStdString(spaces_.at(id).name); + case CommunitiesModel::Roles::ChildrenHidden: + return true; + case CommunitiesModel::Roles::Hidden: + return hiddentTagIds_.contains("space:" + id); + case CommunitiesModel::Roles::Id: + return "space:" + id; + } + } else if (index.row() - 1 < tags_.size() + spaceOrder_.size()) { + auto tag = tags_.at(index.row() - 1 - spaceOrder_.size()); if (tag == "m.favourite") { switch (role) { case CommunitiesModel::Roles::AvatarUrl: @@ -54,7 +73,7 @@ CommunitiesModel::data(const QModelIndex &index, int role) const } else if (tag == "m.lowpriority") { switch (role) { case CommunitiesModel::Roles::AvatarUrl: - return QString(":/icons/icons/ui/star.png"); + return QString(":/icons/icons/ui/lowprio.png"); case CommunitiesModel::Roles::DisplayName: return tr("Low Priority"); case CommunitiesModel::Roles::Tooltip: @@ -74,15 +93,16 @@ CommunitiesModel::data(const QModelIndex &index, int role) const case CommunitiesModel::Roles::AvatarUrl: return QString(":/icons/icons/ui/tag.png"); case CommunitiesModel::Roles::DisplayName: - return tag.right(2); case CommunitiesModel::Roles::Tooltip: - return tag.right(2); + return tag.mid(2); } } switch (role) { + case CommunitiesModel::Roles::Hidden: + return hiddentTagIds_.contains("tag:" + tag); case CommunitiesModel::Roles::ChildrenHidden: - return UserSettings::instance()->hiddenTags().contains("tag:" + tag); + return true; case CommunitiesModel::Roles::Id: return "tag:" + tag; } @@ -93,22 +113,35 @@ CommunitiesModel::data(const QModelIndex &index, int role) const void CommunitiesModel::initializeSidebar() { + beginResetModel(); + tags_.clear(); + spaceOrder_.clear(); + spaces_.clear(); + std::set<std::string> ts; - for (const auto &e : cache::roomInfo()) { - for (const auto &t : e.tags) { - if (t.find("u.") == 0 || t.find("m." == 0)) { - ts.insert(t); + std::vector<RoomInfo> tempSpaces; + auto infos = cache::roomInfo(); + for (auto it = infos.begin(); it != infos.end(); it++) { + if (it.value().is_space) { + spaceOrder_.push_back(it.key()); + spaces_[it.key()] = it.value(); + } else { + for (const auto &t : it.value().tags) { + if (t.find("u.") == 0 || t.find("m." == 0)) { + ts.insert(t); + } } } } - beginResetModel(); - tags_.clear(); for (const auto &t : ts) tags_.push_back(QString::fromStdString(t)); + + hiddentTagIds_ = UserSettings::instance()->hiddenTags(); endResetModel(); emit tagsChanged(); + emit hiddenTagsChanged(); } void @@ -117,6 +150,7 @@ CommunitiesModel::clear() beginResetModel(); tags_.clear(); endResetModel(); + resetCurrentTagId(); emit tagsChanged(); } @@ -133,6 +167,25 @@ CommunitiesModel::sync(const mtx::responses::Rooms &rooms) mtx::events::AccountDataEvent<mtx::events::account_data::Tags>>(e)) { tagsUpdated = true; } + for (const auto &e : room.state.events) + if (std::holds_alternative< + mtx::events::StateEvent<mtx::events::state::space::Child>>(e) || + std::holds_alternative< + mtx::events::StateEvent<mtx::events::state::space::Parent>>(e)) { + tagsUpdated = true; + } + for (const auto &e : room.timeline.events) + if (std::holds_alternative< + mtx::events::StateEvent<mtx::events::state::space::Child>>(e) || + std::holds_alternative< + mtx::events::StateEvent<mtx::events::state::space::Parent>>(e)) { + tagsUpdated = true; + } + } + for (const auto &[roomid, room] : rooms.leave) { + (void)room; + if (spaceOrder_.contains(QString::fromStdString(roomid))) + tagsUpdated = true; } if (tagsUpdated) @@ -143,16 +196,51 @@ void CommunitiesModel::setCurrentTagId(QString tagId) { if (tagId.startsWith("tag:")) { - auto tag = tagId.remove(0, 4); + auto tag = tagId.mid(4); for (const auto &t : tags_) { if (t == tag) { this->currentTagId_ = tagId; - emit currentTagIdChanged(); + emit currentTagIdChanged(currentTagId_); + return; + } + } + } else if (tagId.startsWith("space:")) { + auto tag = tagId.mid(6); + for (const auto &t : spaceOrder_) { + if (t == tag) { + this->currentTagId_ = tagId; + emit currentTagIdChanged(currentTagId_); return; } } } this->currentTagId_ = ""; - emit currentTagIdChanged(); + emit currentTagIdChanged(currentTagId_); +} + +void +CommunitiesModel::toggleTagId(QString tagId) +{ + if (hiddentTagIds_.contains(tagId)) { + hiddentTagIds_.removeOne(tagId); + UserSettings::instance()->setHiddenTags(hiddentTagIds_); + } else { + hiddentTagIds_.push_back(tagId); + UserSettings::instance()->setHiddenTags(hiddentTagIds_); + } + + if (tagId.startsWith("tag:")) { + auto idx = tags_.indexOf(tagId.mid(4)); + if (idx != -1) + emit dataChanged(index(idx + 1 + spaceOrder_.size()), + index(idx + 1 + spaceOrder_.size()), + {Hidden}); + } else if (tagId.startsWith("space:")) { + auto idx = spaceOrder_.indexOf(tagId.mid(6)); + if (idx != -1) + emit dataChanged(index(idx + 1), index(idx + 1), {Hidden}); + } + + emit hiddenTagsChanged(); } diff --git a/src/timeline/CommunitiesModel.h b/src/timeline/CommunitiesModel.h index 3f6a2a4c..677581dc 100644 --- a/src/timeline/CommunitiesModel.h +++ b/src/timeline/CommunitiesModel.h @@ -11,12 +11,15 @@ #include <mtx/responses/sync.hpp> +#include "CacheStructs.h" + class CommunitiesModel : public QAbstractListModel { Q_OBJECT Q_PROPERTY(QString currentTagId READ currentTagId WRITE setCurrentTagId NOTIFY currentTagIdChanged RESET resetCurrentTagId) Q_PROPERTY(QStringList tags READ tags NOTIFY tagsChanged) + Q_PROPERTY(QStringList tagsWithDefault READ tagsWithDefault NOTIFY tagsChanged) public: enum Roles @@ -25,6 +28,7 @@ public: DisplayName, Tooltip, ChildrenHidden, + Hidden, Id, }; @@ -33,7 +37,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override { (void)parent; - return 1 + tags_.size(); + return 1 + tags_.size() + spaceOrder_.size(); } QVariant data(const QModelIndex &index, int role) const override; @@ -46,15 +50,29 @@ public slots: void resetCurrentTagId() { currentTagId_.clear(); - emit currentTagIdChanged(); + emit currentTagIdChanged(currentTagId_); } QStringList tags() const { return tags_; } + QStringList tagsWithDefault() const + { + QStringList tagsWD = tags_; + tagsWD.prepend("m.lowpriority"); + tagsWD.prepend("m.favourite"); + tagsWD.removeOne("m.server_notice"); + tagsWD.removeDuplicates(); + return tagsWD; + } + void toggleTagId(QString tagId); signals: - void currentTagIdChanged(); + void currentTagIdChanged(QString tagId); + void hiddenTagsChanged(); void tagsChanged(); private: QStringList tags_; QString currentTagId_; + QStringList hiddentTagIds_; + QStringList spaceOrder_; + std::map<QString, RoomInfo> spaces_; }; diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 4a9f0fff..9a91ff79 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -185,6 +185,48 @@ EventStore::EventStore(std::string room_id, QObject *) [this](std::string txn_id, std::string event_id) { nhlog::ui()->debug("sent {}", txn_id); + // Replace the event_id in pending edits/replies/redactions with the actual + // event_id of this event. This allows one to edit and reply to events that are + // currently pending. + + // FIXME (introduced by balsoft): this doesn't work for encrypted events, but + // allegedly it's hard to fix so I'll leave my first contribution at that + for (auto related_event_id : cache::client()->relatedEvents(room_id_, txn_id)) { + if (cache::client()->getEvent(room_id_, related_event_id)) { + auto related_event = + cache::client()->getEvent(room_id_, related_event_id).value(); + auto relations = mtx::accessors::relations(related_event.data); + + // Replace the blockquote in fallback reply + auto related_text = + std::get_if<mtx::events::RoomEvent<mtx::events::msg::Text>>( + &related_event.data); + if (related_text && relations.reply_to() == txn_id) { + 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); + } + } + + for (mtx::common::Relation &rel : relations.relations) { + if (rel.event_id == txn_id) + rel.event_id = event_id; + } + + mtx::accessors::set_relations(related_event.data, relations); + + cache::client()->replaceEvent( + room_id_, related_event_id, related_event); + + auto idx = idToIndex(related_event_id); + + events_by_id_.remove({room_id_, related_event_id}); + events_.remove({room_id_, toInternalIdx(*idx)}); + } + } + http::client()->read_event( room_id_, event_id, [this, event_id](mtx::http::RequestErr err) { if (err) { @@ -193,6 +235,11 @@ EventStore::EventStore(std::string room_id, QObject *) } }); + auto idx = idToIndex(event_id); + + if (idx) + emit dataChanged(*idx, *idx); + cache::client()->removePendingStatus(room_id_, txn_id); this->current_txn = ""; this->current_txn_error_count = 0; @@ -628,6 +675,9 @@ EventStore::decryptEvent(const IdIndex &idx, index.room_id, index.session_id, e.sender); + // we may not want to request keys during initial sync and such + if (suppressKeyRequests) + break; // TODO: Check if this actually works and look in key backup auto copy = e; copy.room_id = room_id_; @@ -769,6 +819,18 @@ EventStore::decryptEvent(const IdIndex &idx, return asCacheEntry(std::move(decryptionResult.event.value())); } +void +EventStore::enableKeyRequests(bool suppressKeyRequests_) +{ + if (!suppressKeyRequests_) { + for (const auto &key : decryptedEvents_.keys()) + if (key.room == this->room_id_) + decryptedEvents_.remove(key); + suppressKeyRequests = false; + } else + suppressKeyRequests = true; +} + mtx::events::collections::TimelineEvents * EventStore::get(std::string id, std::string_view related_to, bool decrypt, bool resolve_edits) { diff --git a/src/timeline/EventStore.h b/src/timeline/EventStore.h index d9bb86cb..7c404102 100644 --- a/src/timeline/EventStore.h +++ b/src/timeline/EventStore.h @@ -115,6 +115,7 @@ public slots: void addPending(mtx::events::collections::TimelineEvents event); void receivedSessionKey(const std::string &session_id); void clearTimeline(); + void enableKeyRequests(bool suppressKeyRequests_); private: std::vector<mtx::events::collections::TimelineEvents> edits(const std::string &event_id); @@ -142,4 +143,5 @@ private: std::string current_txn; int current_txn_error_count = 0; bool noMoreMessages = false; + bool suppressKeyRequests = true; }; diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index c309daab..b0747a7c 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -296,7 +296,7 @@ InputBar::message(QString msg, MarkdownOverride useMarkdown, bool rainbowify) firstLine = false; body = QString("> <%1> %2\n").arg(related.quoted_user).arg(line); } else { - body = QString("%1\n> %2\n").arg(body).arg(line); + body += QString("> %1\n").arg(line); } } diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 4dd44b30..87940948 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -33,6 +33,27 @@ RoomlistModel::RoomlistModel(TimelineViewManager *parent) &RoomlistModel::totalUnreadMessageCountUpdated, ChatPage::instance(), &ChatPage::unreadMessages); + + connect( + this, + &RoomlistModel::fetchedPreview, + this, + [this](QString roomid, RoomInfo info) { + if (this->previewedRooms.contains(roomid)) { + this->previewedRooms.insert(roomid, std::move(info)); + auto idx = this->roomidToIndex(roomid); + emit dataChanged(index(idx), + index(idx), + { + Roles::RoomName, + Roles::AvatarUrl, + Roles::IsSpace, + Roles::IsPreviewFetched, + Qt::DisplayRole, + }); + } + }, + Qt::QueuedConnection); } QHash<int, QByteArray> @@ -51,6 +72,7 @@ RoomlistModel::roleNames() const {IsInvite, "isInvite"}, {IsSpace, "isSpace"}, {Tags, "tags"}, + {ParentSpaces, "parentSpaces"}, }; } @@ -60,6 +82,16 @@ RoomlistModel::data(const QModelIndex &index, int role) const if (index.row() >= 0 && static_cast<size_t>(index.row()) < roomids.size()) { auto roomid = roomids.at(index.row()); + if (role == Roles::ParentSpaces) { + auto parents = cache::client()->getParentRoomIds(roomid.toStdString()); + QStringList list; + for (const auto &t : parents) + list.push_back(QString::fromStdString(t)); + return list; + } else if (role == Roles::RoomId) { + return roomid; + } + if (models.contains(roomid)) { auto room = models.value(roomid); switch (role) { @@ -67,8 +99,6 @@ RoomlistModel::data(const QModelIndex &index, int role) const return room->roomAvatarUrl(); case Roles::RoomName: return room->plainRoomName(); - case Roles::RoomId: - return room->roomId(); case Roles::LastMessage: return room->lastMessage().body; case Roles::Time: @@ -84,7 +114,10 @@ RoomlistModel::data(const QModelIndex &index, int role) const case Roles::NotificationCount: return room->notificationCount(); case Roles::IsInvite: + return false; case Roles::IsSpace: + return room->isSpace(); + case Roles::IsPreview: return false; case Roles::Tags: { auto info = cache::singleRoomInfo(roomid.toStdString()); @@ -103,14 +136,12 @@ RoomlistModel::data(const QModelIndex &index, int role) const return QString::fromStdString(room.avatar_url); case Roles::RoomName: return QString::fromStdString(room.name); - case Roles::RoomId: - return roomid; case Roles::LastMessage: - return room.msgInfo.body; + return QString(); case Roles::Time: - return room.msgInfo.descriptiveTime; + return QString(); case Roles::Timestamp: - return QVariant(static_cast<quint64>(room.msgInfo.timestamp)); + return QVariant(static_cast<quint64>(0)); case Roles::HasUnreadMessages: case Roles::HasLoudNotification: return false; @@ -120,13 +151,77 @@ RoomlistModel::data(const QModelIndex &index, int role) const return true; case Roles::IsSpace: return false; + case Roles::IsPreview: + return false; + case Roles::Tags: + return QStringList(); + default: + return {}; + } + } else if (previewedRooms.contains(roomid) && + previewedRooms.value(roomid).has_value()) { + auto room = previewedRooms.value(roomid).value(); + switch (role) { + case Roles::AvatarUrl: + return QString::fromStdString(room.avatar_url); + case Roles::RoomName: + return QString::fromStdString(room.name); + case Roles::LastMessage: + return tr("Previewing this room"); + case Roles::Time: + return QString(); + case Roles::Timestamp: + return QVariant(static_cast<quint64>(0)); + case Roles::HasUnreadMessages: + case Roles::HasLoudNotification: + return false; + case Roles::NotificationCount: + return 0; + case Roles::IsInvite: + return false; + case Roles::IsSpace: + return room.is_space; + case Roles::IsPreview: + return true; + case Roles::IsPreviewFetched: + return true; case Roles::Tags: return QStringList(); default: return {}; } } else { - return {}; + if (role == Roles::IsPreview) + return true; + else if (role == Roles::IsPreviewFetched) + return false; + + fetchPreview(roomid); + switch (role) { + case Roles::AvatarUrl: + return QString(); + case Roles::RoomName: + return tr("No preview available"); + case Roles::LastMessage: + return QString(); + case Roles::Time: + return QString(); + case Roles::Timestamp: + return QVariant(static_cast<quint64>(0)); + case Roles::HasUnreadMessages: + case Roles::HasLoudNotification: + return false; + case Roles::NotificationCount: + return 0; + case Roles::IsInvite: + return false; + case Roles::IsSpace: + return false; + case Roles::Tags: + return QStringList(); + default: + return {}; + } } } else { return {}; @@ -230,26 +325,112 @@ RoomlistModel::addRoom(const QString &room_id, bool suppressInsertNotification) newRoom->updateLastMessage(); - bool wasInvite = invites.contains(room_id); - if (!suppressInsertNotification && !wasInvite) - beginInsertRows(QModelIndex(), (int)roomids.size(), (int)roomids.size()); + std::vector<QString> previewsToAdd; + if (newRoom->isSpace()) { + auto childs = cache::client()->getChildRoomIds(room_id.toStdString()); + for (const auto &c : childs) { + auto id = QString::fromStdString(c); + if (!(models.contains(id) || invites.contains(id) || + previewedRooms.contains(id))) { + previewsToAdd.push_back(std::move(id)); + } + } + } - models.insert(room_id, std::move(newRoom)); + bool wasInvite = invites.contains(room_id); + bool wasPreview = previewedRooms.contains(room_id); + if (!suppressInsertNotification && + ((!wasInvite && !wasPreview) || !previewedRooms.empty())) + // if the old room was already in the list, don't add it. Also add all + // previews at the same time. + beginInsertRows(QModelIndex(), + (int)roomids.size(), + (int)(roomids.size() + previewsToAdd.size() - + ((wasInvite || wasPreview) ? 0 : 1))); + models.insert(room_id, std::move(newRoom)); if (wasInvite) { auto idx = roomidToIndex(room_id); invites.remove(room_id); emit dataChanged(index(idx), index(idx)); + } else if (wasPreview) { + auto idx = roomidToIndex(room_id); + previewedRooms.remove(room_id); + emit dataChanged(index(idx), index(idx)); } else { roomids.push_back(room_id); } + for (auto p : previewsToAdd) { + previewedRooms.insert(p, std::nullopt); + roomids.push_back(std::move(p)); + } + if (!suppressInsertNotification && !wasInvite) endInsertRows(); } } void +RoomlistModel::fetchPreview(QString roomid_) const +{ + std::string roomid = roomid_.toStdString(); + http::client()->get_state_event<mtx::events::state::Create>( + roomid, + "", + [this, roomid](const mtx::events::state::Create &c, mtx::http::RequestErr err) { + bool is_space = false; + if (!err) { + is_space = c.type == mtx::events::state::room_type::space; + } + + http::client()->get_state_event<mtx::events::state::Avatar>( + roomid, + "", + [this, roomid, is_space](const mtx::events::state::Avatar &a, + mtx::http::RequestErr) { + auto avatar_url = a.url; + + http::client()->get_state_event<mtx::events::state::Topic>( + roomid, + "", + [this, roomid, avatar_url, is_space]( + const mtx::events::state::Topic &t, mtx::http::RequestErr) { + auto topic = t.topic; + http::client()->get_state_event<mtx::events::state::Name>( + roomid, + "", + [this, roomid, topic, avatar_url, is_space]( + const mtx::events::state::Name &n, + mtx::http::RequestErr err) { + if (err) { + nhlog::net()->warn( + "Failed to fetch name event to " + "create preview for {}", + roomid); + } + + // don't even add a preview, if we got not a single + // response + if (n.name.empty() && avatar_url.empty() && + topic.empty()) + return; + + RoomInfo info{}; + info.name = n.name; + info.is_space = is_space; + info.avatar_url = avatar_url; + info.topic = topic; + + const_cast<RoomlistModel *>(this)->fetchedPreview( + QString::fromStdString(roomid), info); + }); + }); + }); + }); +} + +void RoomlistModel::sync(const mtx::responses::Rooms &rooms) { for (const auto &[room_id, room] : rooms.join) { @@ -324,6 +505,7 @@ RoomlistModel::initializeRooms() models.clear(); roomids.clear(); invites.clear(); + currentRoom_ = nullptr; invites = cache::client()->invites(); for (const auto &id : invites.keys()) @@ -407,11 +589,15 @@ RoomlistModel::setCurrentRoom(QString roomid) namespace { enum NotificationImportance : short { - ImportanceDisabled = -1, + ImportanceDisabled = -3, + NoPreview = -2, + Preview = -1, AllEventsRead = 0, NewMessage = 1, NewMentions = 2, - Invite = 3 + Invite = 3, + SubSpace = 4, + CurrentSpace = 5, }; } @@ -421,7 +607,18 @@ FilteredRoomlistModel::calculateImportance(const QModelIndex &idx) const // Returns the degree of importance of the unread messages in the room. // If sorting by importance is disabled in settings, this only ever // returns ImportanceDisabled or Invite - if (sourceModel()->data(idx, RoomlistModel::IsInvite).toBool()) { + if (sourceModel()->data(idx, RoomlistModel::IsSpace).toBool()) { + if (filterType == FilterBy::Space && + filterStr == sourceModel()->data(idx, RoomlistModel::RoomId).toString()) + return CurrentSpace; + else + return SubSpace; + } else if (sourceModel()->data(idx, RoomlistModel::IsPreview).toBool()) { + if (sourceModel()->data(idx, RoomlistModel::IsPreviewFetched).toBool()) + return Preview; + else + return NoPreview; + } else if (sourceModel()->data(idx, RoomlistModel::IsInvite).toBool()) { return Invite; } else if (!this->sortByImportance) { return ImportanceDisabled; @@ -433,6 +630,7 @@ FilteredRoomlistModel::calculateImportance(const QModelIndex &idx) const return AllEventsRead; } } + bool FilteredRoomlistModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { @@ -486,6 +684,140 @@ FilteredRoomlistModel::FilteredRoomlistModel(RoomlistModel *model, QObject *pare } void +FilteredRoomlistModel::updateHiddenTagsAndSpaces() +{ + hiddenTags.clear(); + hiddenSpaces.clear(); + for (const auto &t : UserSettings::instance()->hiddenTags()) { + if (t.startsWith("tag:")) + hiddenTags.push_back(t.mid(4)); + else if (t.startsWith("space:")) + hiddenSpaces.push_back(t.mid(6)); + } + + invalidateFilter(); +} + +bool +FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) const +{ + if (filterType == FilterBy::Nothing) { + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsPreview) + .toBool()) { + return false; + } + + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsSpace) + .toBool()) { + return false; + } + + if (!hiddenTags.empty()) { + auto tags = + sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::Tags) + .toStringList(); + + for (const auto &t : tags) + if (hiddenTags.contains(t)) + return false; + } + + if (!hiddenSpaces.empty()) { + auto parents = + sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::ParentSpaces) + .toStringList(); + for (const auto &t : parents) + if (hiddenSpaces.contains(t)) + return false; + } + + return true; + } else if (filterType == FilterBy::Tag) { + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsPreview) + .toBool()) { + return false; + } + + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsSpace) + .toBool()) { + return false; + } + + auto tags = sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::Tags) + .toStringList(); + + if (!tags.contains(filterStr)) + return false; + + if (!hiddenTags.empty()) { + for (const auto &t : tags) + if (t != filterStr && hiddenTags.contains(t)) + return false; + } + + if (!hiddenSpaces.empty()) { + auto parents = + sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::ParentSpaces) + .toStringList(); + for (const auto &t : parents) + if (hiddenSpaces.contains(t)) + return false; + } + + return true; + } else if (filterType == FilterBy::Space) { + if (filterStr == sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::RoomId) + .toString()) + return true; + + auto parents = + sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::ParentSpaces) + .toStringList(); + + if (!parents.contains(filterStr)) + return false; + + if (!hiddenTags.empty()) { + auto tags = + sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::Tags) + .toStringList(); + + for (const auto &t : tags) + if (hiddenTags.contains(t)) + return false; + } + + if (!hiddenSpaces.empty()) { + for (const auto &t : parents) + if (hiddenSpaces.contains(t)) + return false; + } + + if (sourceModel() + ->data(sourceModel()->index(sourceRow, 0), RoomlistModel::IsSpace) + .toBool() && + !parents.contains(filterStr)) { + return false; + } + + return true; + } else { + return true; + } +} + +void FilteredRoomlistModel::toggleTag(QString roomid, QString tag, bool on) { if (on) { @@ -532,7 +864,7 @@ FilteredRoomlistModel::previousRoom() if (r) { int idx = roomidToIndex(r->roomId()); idx--; - if (idx > 0) { + if (idx >= 0) { setCurrentRoom( data(index(idx, 0), RoomlistModel::Roles::RoomId).toString()); } diff --git a/src/timeline/RoomlistModel.h b/src/timeline/RoomlistModel.h index 7ee0419f..2005c35e 100644 --- a/src/timeline/RoomlistModel.h +++ b/src/timeline/RoomlistModel.h @@ -37,7 +37,10 @@ public: NotificationCount, IsInvite, IsSpace, + IsPreview, + IsPreviewFetched, Tags, + ParentSpaces, }; RoomlistModel(TimelineViewManager *parent = nullptr); @@ -86,15 +89,18 @@ private slots: signals: void totalUnreadMessageCountUpdated(int unreadMessages); void currentRoomChanged(); + void fetchedPreview(QString roomid, RoomInfo info); private: void addRoom(const QString &room_id, bool suppressInsertNotification = false); + void fetchPreview(QString roomid) const; TimelineViewManager *manager = nullptr; std::vector<QString> roomids; QHash<QString, RoomInfo> invites; QHash<QString, QSharedPointer<TimelineModel>> models; std::map<QString, bool> roomReadStatus; + QHash<QString, std::optional<RoomInfo>> previewedRooms; QSharedPointer<TimelineModel> currentRoom_; @@ -109,6 +115,7 @@ class FilteredRoomlistModel : public QSortFilterProxyModel public: FilteredRoomlistModel(RoomlistModel *model, QObject *parent = nullptr); bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; + bool filterAcceptsRow(int sourceRow, const QModelIndex &) const override; public slots: int roomidToIndex(QString roomid) @@ -128,6 +135,24 @@ public slots: void nextRoom(); void previousRoom(); + void updateFilterTag(QString tagId) + { + if (tagId.startsWith("tag:")) { + filterType = FilterBy::Tag; + filterStr = tagId.mid(4); + } else if (tagId.startsWith("space:")) { + filterType = FilterBy::Space; + filterStr = tagId.mid(6); + } else { + filterType = FilterBy::Nothing; + filterStr.clear(); + } + + invalidateFilter(); + } + + void updateHiddenTagsAndSpaces(); + signals: void currentRoomChanged(); @@ -135,4 +160,14 @@ private: short int calculateImportance(const QModelIndex &idx) const; RoomlistModel *roomlistmodel; bool sortByImportance = true; + + enum class FilterBy + { + Tag, + Space, + Nothing, + }; + QString filterStr = ""; + FilterBy filterType = FilterBy::Nothing; + QStringList hiddenTags, hiddenSpaces; }; diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index f29f929e..caa40353 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -320,6 +320,10 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj { lastMessage_.timestamp = 0; + if (auto create = + cache::client()->getStateEvent<mtx::events::state::Create>(room_id.toStdString())) + this->isSpace_ = create->content.type == mtx::events::state::room_type::space; + connect( this, &TimelineModel::redactionFailed, @@ -376,6 +380,27 @@ TimelineModel::TimelineModel(TimelineViewManager *manager, QString room_id, QObj this->updateFlowEventId(event_id); }); + // When a message is sent, check if the current edit/reply relates to that message, + // and update the event_id so that it points to the sent message and not the pending one. + connect(&events, + &EventStore::messageSent, + this, + [this](std::string txn_id, std::string event_id) { + if (edit_.toStdString() == txn_id) { + edit_ = QString::fromStdString(event_id); + emit editChanged(edit_); + } + if (reply_.toStdString() == txn_id) { + reply_ = QString::fromStdString(event_id); + emit replyChanged(reply_); + } + }); + + connect(manager_, + &TimelineViewManager::initialSyncChanged, + &events, + &EventStore::enableKeyRequests); + showEventTimer.callOnTimeout(this, &TimelineModel::scrollTimerEvent); } @@ -507,6 +532,10 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r const static QRegularExpression matchImgUri( "(<img [^>]*)src=\"mxc://([^\"]*)\"([^>]*>)"); formattedBody_.replace(matchImgUri, "\\1 src=\"image://mxcImage/\\2\"\\3"); + // Same regex but for single quotes around the src + const static QRegularExpression matchImgUri2( + "(<img [^>]*)src=\'mxc://([^\']*)\'([^>]*>)"); + formattedBody_.replace(matchImgUri2, "\\1 src=\"image://mxcImage/\\2\"\\3"); const static QRegularExpression matchEmoticonHeight( "(<img data-mx-emoticon [^>]*)height=\"([^\"]*)\"([^>]*>)"); formattedBody_.replace(matchEmoticonHeight, @@ -568,10 +597,8 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r case IsEdited: return QVariant(relations(event).replaces().has_value()); case IsEditable: - return QVariant(!is_state_event(event) && - mtx::accessors::sender(event) == - http::client()->user_id().to_string() && - !event_id(event).empty() && event_id(event).front() == '$'); + return QVariant(!is_state_event(event) && mtx::accessors::sender(event) == + http::client()->user_id().to_string()); case IsEncrypted: { auto id = event_id(event); auto encrypted_event = events.get(id, "", false); @@ -757,6 +784,7 @@ TimelineModel::syncState(const mtx::responses::State &s) } else if (std::holds_alternative<StateEvent<state::Member>>(e)) { emit roomAvatarUrlChanged(); emit roomNameChanged(); + emit roomMemberCountChanged(); } } } @@ -813,6 +841,7 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline) } else if (std::holds_alternative<StateEvent<state::Member>>(e)) { emit roomAvatarUrlChanged(); emit roomNameChanged(); + emit roomMemberCountChanged(); } } updateLastMessage(); @@ -1787,7 +1816,8 @@ TimelineModel::formatMemberEvent(QString id) } if (event->content.reason != "") { - rendered += tr(" Reason: %1").arg(QString::fromStdString(event->content.reason)); + rendered += + " " + tr("Reason: %1").arg(QString::fromStdString(event->content.reason)); } return rendered; @@ -1796,9 +1826,6 @@ TimelineModel::formatMemberEvent(QString id) void TimelineModel::setEdit(QString newEdit) { - if (edit_.startsWith('m')) - return; - if (newEdit.isEmpty()) { resetEdit(); return; @@ -1921,3 +1948,9 @@ TimelineModel::roomTopic() const return utils::replaceEmoji(utils::linkifyMessage( QString::fromStdString(info[room_id_].topic).toHtmlEscaped())); } + +int +TimelineModel::roomMemberCount() const +{ + return (int)cache::client()->memberCount(room_id_.toStdString()); +} diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 3ebbe120..3392d474 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -161,6 +161,8 @@ class TimelineModel : public QAbstractListModel Q_PROPERTY(QString roomName READ roomName NOTIFY roomNameChanged) Q_PROPERTY(QString roomAvatarUrl READ roomAvatarUrl NOTIFY roomAvatarUrlChanged) Q_PROPERTY(QString roomTopic READ roomTopic NOTIFY roomTopicChanged) + Q_PROPERTY(int roomMemberCount READ roomMemberCount NOTIFY roomMemberCountChanged) + Q_PROPERTY(bool isSpace READ isSpace CONSTANT) Q_PROPERTY(InputBar *input READ input CONSTANT) Q_PROPERTY(Permissions *permissions READ permissions NOTIFY permissionsChanged) @@ -262,6 +264,8 @@ public: RelatedInfo relatedInfo(QString id); DescInfo lastMessage() const { return lastMessage_; } + bool isSpace() const { return isSpace_; } + int roomMemberCount() const; public slots: void setCurrentIndex(int index); @@ -348,6 +352,7 @@ signals: void roomNameChanged(); void roomTopicChanged(); void roomAvatarUrlChanged(); + void roomMemberCountChanged(); void permissionsChanged(); void forwardToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); @@ -366,9 +371,6 @@ private: QString room_id_; - bool decryptDescription = true; - bool m_paginationInProgress = false; - QString currentId, currentReadId; QString reply_, edit_; QString textBeforeEdit, replyBeforeEdit; @@ -388,6 +390,10 @@ private: friend struct SendMessageVisitor; int notification_count = 0, highlight_count = 0; + + bool decryptDescription = true; + bool m_paginationInProgress = false; + bool isSpace_ = false; }; template<class T> diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index faf56b85..a45294d1 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -107,8 +107,7 @@ QColor TimelineViewManager::userColor(QString id, QColor background) { if (!userColors.contains(id)) - userColors.insert( - id, QColor(utils::generateContrastingHexColor(id, background.name()))); + userColors.insert(id, QColor(utils::generateContrastingHexColor(id, background))); return userColors.value(id); } @@ -195,7 +194,17 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par }); qmlRegisterSingletonType<RoomlistModel>( "im.nheko", 1, 0, "Rooms", [](QQmlEngine *, QJSEngine *) -> QObject * { - return new FilteredRoomlistModel(self->rooms_); + auto ptr = new FilteredRoomlistModel(self->rooms_); + + connect(self->communities_, + &CommunitiesModel::currentTagIdChanged, + ptr, + &FilteredRoomlistModel::updateFilterTag); + connect(self->communities_, + &CommunitiesModel::hiddenTagsChanged, + ptr, + &FilteredRoomlistModel::updateHiddenTagsAndSpaces); + return ptr; }); qmlRegisterSingletonType<RoomlistModel>( "im.nheko", 1, 0, "Communities", [](QQmlEngine *, QJSEngine *) -> QObject * { @@ -386,18 +395,17 @@ TimelineViewManager::openImageOverlayInternal(QString eventId, QImage img) imgDialog->showFullScreen(); auto room = rooms_->currentRoom(); - connect( - imgDialog, &dialogs::ImageOverlay::saving, room, [this, eventId, imgDialog, room]() { - // hide the overlay while presenting the save dialog for better - // cross platform support. - imgDialog->hide(); - - if (!room->saveMedia(eventId)) { - imgDialog->show(); - } else { - imgDialog->close(); - } - }); + connect(imgDialog, &dialogs::ImageOverlay::saving, room, [eventId, imgDialog, room]() { + // hide the overlay while presenting the save dialog for better + // cross platform support. + imgDialog->hide(); + + if (!room->saveMedia(eventId)) { + imgDialog->show(); + } else { + imgDialog->close(); + } + }); } void diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index 0bc8759e..f78ef09b 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -181,7 +181,7 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent) roomid_.toStdString(), [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr &err) { if (err) { - if (err->status_code == boost::beast::http::status::not_found) + if (err->status_code == 404) http::client()->get_pushrules( "global", "room", diff --git a/src/ui/Theme.cpp b/src/ui/Theme.cpp index 26119393..732a0443 100644 --- a/src/ui/Theme.cpp +++ b/src/ui/Theme.cpp @@ -47,7 +47,7 @@ Theme::paletteFromTheme(std::string_view theme) darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color()); darkActive.setColor(QPalette::ToolTipText, darkActive.text().color()); darkActive.setColor(QPalette::Link, QColor("#38a3d8")); - darkActive.setColor(QPalette::ButtonText, "#727274"); + darkActive.setColor(QPalette::ButtonText, "#828284"); return darkActive; } else { return original; diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index da130242..3d9c4b6a 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -39,7 +39,8 @@ UserProfile::UserProfile(QString roomid, getGlobalProfileData(); } - if (!cache::client() || !cache::client()->isDatabaseReady()) + if (!cache::client() || !cache::client()->isDatabaseReady() || + !ChatPage::instance()->timelineManager()) return; connect(cache::client(), @@ -127,10 +128,7 @@ UserProfile::displayName() QString UserProfile::avatarUrl() { - return (isGlobalUserProfile() && globalAvatarUrl != "") - ? globalAvatarUrl - : cache::avatarUrl(roomid_, userid_); - ; + return isGlobalUserProfile() ? globalAvatarUrl : cache::avatarUrl(roomid_, userid_); } bool diff --git a/third_party/SingleApplication-3.3.0/.github/FUNDING.yml b/third_party/SingleApplication-3.3.0/.github/FUNDING.yml new file mode 100644 index 00000000..3ca4d97a --- /dev/null +++ b/third_party/SingleApplication-3.3.0/.github/FUNDING.yml @@ -0,0 +1 @@ +github: itay-grudev diff --git a/third_party/SingleApplication-3.3.0/.github/workflows/build-cmake.yml b/third_party/SingleApplication-3.3.0/.github/workflows/build-cmake.yml new file mode 100644 index 00000000..6344b504 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/.github/workflows/build-cmake.yml @@ -0,0 +1,56 @@ +name: "CI: Build Test" + +on: [push, pull_request] + +jobs: + build: + + strategy: + matrix: + qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0] + platform: [ubuntu-20.04, windows-latest, macos-latest] + include: + - qt_version: 6.0.0 + additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 + - platform: ubuntu-20.04 + CXXFLAGS: -Wall -Wextra -pedantic -Werror + - platform: macos-latest + CXXFLAGS: -Wall -Wextra -pedantic -Werror + - platform: windows-latest + CXXFLAGS: /W4 /WX + + runs-on: ${{ matrix.platform }} + env: + CXXFLAGS: ${{ matrix.CXXFLAGS }} + + steps: + - uses: actions/checkout@v2.3.4 + + - name: Install Qt + uses: jurplel/install-qt-action@v2.11.1 + with: + version: ${{ matrix.qt_version }} + + - name: cmake + run: cmake . ${{ matrix.additional_arguments }} + + - name: cmake build + run: cmake --build . + + - name: Build example - basic (cmake) + working-directory: examples/basic/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . + + - name: Build example - calculator (cmake) + working-directory: examples/calculator/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . + + - name: Build example - sending_arguments (cmake) + working-directory: examples/sending_arguments/ + run: | + cmake . ${{ matrix.additional_arguments }} + cmake --build . diff --git a/third_party/SingleApplication-3.2.0-dc8042b/.gitignore b/third_party/SingleApplication-3.3.0/.gitignore index 35533fe8..35533fe8 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/.gitignore +++ b/third_party/SingleApplication-3.3.0/.gitignore diff --git a/third_party/SingleApplication-3.2.0-dc8042b/CHANGELOG.md b/third_party/SingleApplication-3.3.0/CHANGELOG.md index e2ba290e..51669b90 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/CHANGELOG.md +++ b/third_party/SingleApplication-3.3.0/CHANGELOG.md @@ -3,6 +3,12 @@ Changelog If by accident I have forgotten to credit someone in the CHANGELOG, email me and I will fix it. + +__3.3.0__ +--------- + +* Fixed message fragmentation issue causing crashes and incorrectly and inconsistently received messages. - _Nils Jeisecke_ + __3.2.0__ --------- diff --git a/third_party/SingleApplication-3.2.0-dc8042b/CMakeLists.txt b/third_party/SingleApplication-3.3.0/CMakeLists.txt index ae1b1439..ae1b1439 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/CMakeLists.txt +++ b/third_party/SingleApplication-3.3.0/CMakeLists.txt diff --git a/third_party/SingleApplication-3.2.0-dc8042b/LICENSE b/third_party/SingleApplication-3.3.0/LICENSE index a82e5a68..a82e5a68 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/LICENSE +++ b/third_party/SingleApplication-3.3.0/LICENSE diff --git a/third_party/SingleApplication-3.2.0-dc8042b/README.md b/third_party/SingleApplication-3.3.0/README.md index 457ab339..457ab339 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/README.md +++ b/third_party/SingleApplication-3.3.0/README.md diff --git a/third_party/SingleApplication-3.2.0-dc8042b/SingleApplication b/third_party/SingleApplication-3.3.0/SingleApplication index 8ead1a42..8ead1a42 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/SingleApplication +++ b/third_party/SingleApplication-3.3.0/SingleApplication diff --git a/third_party/SingleApplication-3.2.0-dc8042b/Windows.md b/third_party/SingleApplication-3.3.0/Windows.md index 13c52da0..13c52da0 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/Windows.md +++ b/third_party/SingleApplication-3.3.0/Windows.md diff --git a/third_party/SingleApplication-3.3.0/examples/basic/CMakeLists.txt b/third_party/SingleApplication-3.3.0/examples/basic/CMakeLists.txt new file mode 100644 index 00000000..c1429230 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/basic/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(basic LANGUAGES CXX) + +# SingleApplication base class +set(QAPPLICATION_CLASS QCoreApplication) +add_subdirectory(../.. SingleApplication) + +add_executable(basic main.cpp) + +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) + diff --git a/third_party/SingleApplication-3.3.0/examples/basic/basic.pro b/third_party/SingleApplication-3.3.0/examples/basic/basic.pro new file mode 100755 index 00000000..b7af16cf --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/basic/basic.pro @@ -0,0 +1,5 @@ +# Single Application implementation +include(../../singleapplication.pri) +DEFINES += QAPPLICATION_CLASS=QCoreApplication + +SOURCES += main.cpp diff --git a/third_party/SingleApplication-3.3.0/examples/basic/main.cpp b/third_party/SingleApplication-3.3.0/examples/basic/main.cpp new file mode 100755 index 00000000..b2092c6d --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/basic/main.cpp @@ -0,0 +1,10 @@ +#include <singleapplication.h> + +int main(int argc, char *argv[]) +{ + SingleApplication app( argc, argv ); + + qWarning() << "Started a new instance"; + + return app.exec(); +} diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt b/third_party/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt new file mode 100644 index 00000000..82305f04 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(calculator LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +# SingleApplication base class +set(QAPPLICATION_CLASS QApplication) +add_subdirectory(../.. SingleApplication) + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED) + +add_executable(${PROJECT_NAME} + button.h + calculator.h + button.cpp + calculator.cpp + main.cpp +) + +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/button.cpp b/third_party/SingleApplication-3.3.0/examples/calculator/button.cpp new file mode 100644 index 00000000..d6cca0a0 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/button.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtWidgets> + +#include "button.h" + +//! [0] +Button::Button(const QString &text, QWidget *parent) + : QToolButton(parent) +{ + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + setText(text); +} +//! [0] + +//! [1] +QSize Button::sizeHint() const +//! [1] //! [2] +{ + QSize size = QToolButton::sizeHint(); + size.rheight() += 20; + size.rwidth() = qMax(size.width(), size.height()); + return size; +} +//! [2] diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/button.h b/third_party/SingleApplication-3.3.0/examples/calculator/button.h new file mode 100644 index 00000000..2c014c7b --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/button.h @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef BUTTON_H +#define BUTTON_H + +#include <QToolButton> + +//! [0] +class Button : public QToolButton +{ + Q_OBJECT + +public: + explicit Button(const QString &text, QWidget *parent = 0); + + QSize sizeHint() const Q_DECL_OVERRIDE; +}; +//! [0] + +#endif diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/calculator.cpp b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.cpp new file mode 100644 index 00000000..3d34c2a7 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.cpp @@ -0,0 +1,406 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtWidgets> + +#include <cmath> + +#include "button.h" +#include "calculator.h" + +//! [0] +Calculator::Calculator(QWidget *parent) + : QWidget(parent) +{ + sumInMemory = 0.0; + sumSoFar = 0.0; + factorSoFar = 0.0; + waitingForOperand = true; +//! [0] + +//! [1] + display = new QLineEdit("0"); +//! [1] //! [2] + display->setReadOnly(true); + display->setAlignment(Qt::AlignRight); + display->setMaxLength(15); + + QFont font = display->font(); + font.setPointSize(font.pointSize() + 8); + display->setFont(font); +//! [2] + +//! [4] + for (int i = 0; i < NumDigitButtons; ++i) { + digitButtons[i] = createButton(QString::number(i), SLOT(digitClicked())); + } + + Button *pointButton = createButton(".", SLOT(pointClicked())); + Button *changeSignButton = createButton("\302\261", SLOT(changeSignClicked())); + + Button *backspaceButton = createButton("Backspace", SLOT(backspaceClicked())); + Button *clearButton = createButton("Clear", SLOT(clear())); + Button *clearAllButton = createButton("Clear All", SLOT(clearAll())); + + Button *clearMemoryButton = createButton("MC", SLOT(clearMemory())); + Button *readMemoryButton = createButton("MR", SLOT(readMemory())); + Button *setMemoryButton = createButton("MS", SLOT(setMemory())); + Button *addToMemoryButton = createButton("M+", SLOT(addToMemory())); + + Button *divisionButton = createButton("\303\267", SLOT(multiplicativeOperatorClicked())); + Button *timesButton = createButton("\303\227", SLOT(multiplicativeOperatorClicked())); + Button *minusButton = createButton("-", SLOT(additiveOperatorClicked())); + Button *plusButton = createButton("+", SLOT(additiveOperatorClicked())); + + Button *squareRootButton = createButton("Sqrt", SLOT(unaryOperatorClicked())); + Button *powerButton = createButton("x\302\262", SLOT(unaryOperatorClicked())); + Button *reciprocalButton = createButton("1/x", SLOT(unaryOperatorClicked())); + Button *equalButton = createButton("=", SLOT(equalClicked())); +//! [4] + +//! [5] + QGridLayout *mainLayout = new QGridLayout; +//! [5] //! [6] + mainLayout->setSizeConstraint(QLayout::SetFixedSize); + mainLayout->addWidget(display, 0, 0, 1, 6); + mainLayout->addWidget(backspaceButton, 1, 0, 1, 2); + mainLayout->addWidget(clearButton, 1, 2, 1, 2); + mainLayout->addWidget(clearAllButton, 1, 4, 1, 2); + + mainLayout->addWidget(clearMemoryButton, 2, 0); + mainLayout->addWidget(readMemoryButton, 3, 0); + mainLayout->addWidget(setMemoryButton, 4, 0); + mainLayout->addWidget(addToMemoryButton, 5, 0); + + for (int i = 1; i < NumDigitButtons; ++i) { + int row = ((9 - i) / 3) + 2; + int column = ((i - 1) % 3) + 1; + mainLayout->addWidget(digitButtons[i], row, column); + } + + mainLayout->addWidget(digitButtons[0], 5, 1); + mainLayout->addWidget(pointButton, 5, 2); + mainLayout->addWidget(changeSignButton, 5, 3); + + mainLayout->addWidget(divisionButton, 2, 4); + mainLayout->addWidget(timesButton, 3, 4); + mainLayout->addWidget(minusButton, 4, 4); + mainLayout->addWidget(plusButton, 5, 4); + + mainLayout->addWidget(squareRootButton, 2, 5); + mainLayout->addWidget(powerButton, 3, 5); + mainLayout->addWidget(reciprocalButton, 4, 5); + mainLayout->addWidget(equalButton, 5, 5); + setLayout(mainLayout); + + setWindowTitle("Calculator"); +} +//! [6] + +//! [7] +void Calculator::digitClicked() +{ + Button *clickedButton = qobject_cast<Button *>(sender()); + int digitValue = clickedButton->text().toInt(); + if (display->text() == "0" && digitValue == 0.0) + return; + + if (waitingForOperand) { + display->clear(); + waitingForOperand = false; + } + display->setText(display->text() + QString::number(digitValue)); +} +//! [7] + +//! [8] +void Calculator::unaryOperatorClicked() +//! [8] //! [9] +{ + Button *clickedButton = qobject_cast<Button *>(sender()); + QString clickedOperator = clickedButton->text(); + double operand = display->text().toDouble(); + double result = 0.0; + + if (clickedOperator == "Sqrt") { + if (operand < 0.0) { + abortOperation(); + return; + } + result = std::sqrt(operand); + } else if (clickedOperator == "x\302\262") { + result = std::pow(operand, 2.0); + } else if (clickedOperator == "1/x") { + if (operand == 0.0) { + abortOperation(); + return; + } + result = 1.0 / operand; + } + display->setText(QString::number(result)); + waitingForOperand = true; +} +//! [9] + +//! [10] +void Calculator::additiveOperatorClicked() +//! [10] //! [11] +{ + Button *clickedButton = qobject_cast<Button *>(sender()); + QString clickedOperator = clickedButton->text(); + double operand = display->text().toDouble(); + +//! [11] //! [12] + if (!pendingMultiplicativeOperator.isEmpty()) { +//! [12] //! [13] + if (!calculate(operand, pendingMultiplicativeOperator)) { + abortOperation(); + return; + } + display->setText(QString::number(factorSoFar)); + operand = factorSoFar; + factorSoFar = 0.0; + pendingMultiplicativeOperator.clear(); + } + +//! [13] //! [14] + if (!pendingAdditiveOperator.isEmpty()) { +//! [14] //! [15] + if (!calculate(operand, pendingAdditiveOperator)) { + abortOperation(); + return; + } + display->setText(QString::number(sumSoFar)); + } else { + sumSoFar = operand; + } + +//! [15] //! [16] + pendingAdditiveOperator = clickedOperator; +//! [16] //! [17] + waitingForOperand = true; +} +//! [17] + +//! [18] +void Calculator::multiplicativeOperatorClicked() +{ + Button *clickedButton = qobject_cast<Button *>(sender()); + QString clickedOperator = clickedButton->text(); + double operand = display->text().toDouble(); + + if (!pendingMultiplicativeOperator.isEmpty()) { + if (!calculate(operand, pendingMultiplicativeOperator)) { + abortOperation(); + return; + } + display->setText(QString::number(factorSoFar)); + } else { + factorSoFar = operand; + } + + pendingMultiplicativeOperator = clickedOperator; + waitingForOperand = true; +} +//! [18] + +//! [20] +void Calculator::equalClicked() +{ + double operand = display->text().toDouble(); + + if (!pendingMultiplicativeOperator.isEmpty()) { + if (!calculate(operand, pendingMultiplicativeOperator)) { + abortOperation(); + return; + } + operand = factorSoFar; + factorSoFar = 0.0; + pendingMultiplicativeOperator.clear(); + } + if (!pendingAdditiveOperator.isEmpty()) { + if (!calculate(operand, pendingAdditiveOperator)) { + abortOperation(); + return; + } + pendingAdditiveOperator.clear(); + } else { + sumSoFar = operand; + } + + display->setText(QString::number(sumSoFar)); + sumSoFar = 0.0; + waitingForOperand = true; +} +//! [20] + +//! [22] +void Calculator::pointClicked() +{ + if (waitingForOperand) + display->setText("0"); + if (!display->text().contains('.')) + display->setText(display->text() + "."); + waitingForOperand = false; +} +//! [22] + +//! [24] +void Calculator::changeSignClicked() +{ + QString text = display->text(); + double value = text.toDouble(); + + if (value > 0.0) { + text.prepend("-"); + } else if (value < 0.0) { + text.remove(0, 1); + } + display->setText(text); +} +//! [24] + +//! [26] +void Calculator::backspaceClicked() +{ + if (waitingForOperand) + return; + + QString text = display->text(); + text.chop(1); + if (text.isEmpty()) { + text = "0"; + waitingForOperand = true; + } + display->setText(text); +} +//! [26] + +//! [28] +void Calculator::clear() +{ + if (waitingForOperand) + return; + + display->setText("0"); + waitingForOperand = true; +} +//! [28] + +//! [30] +void Calculator::clearAll() +{ + sumSoFar = 0.0; + factorSoFar = 0.0; + pendingAdditiveOperator.clear(); + pendingMultiplicativeOperator.clear(); + display->setText("0"); + waitingForOperand = true; +} +//! [30] + +//! [32] +void Calculator::clearMemory() +{ + sumInMemory = 0.0; +} + +void Calculator::readMemory() +{ + display->setText(QString::number(sumInMemory)); + waitingForOperand = true; +} + +void Calculator::setMemory() +{ + equalClicked(); + sumInMemory = display->text().toDouble(); +} + +void Calculator::addToMemory() +{ + equalClicked(); + sumInMemory += display->text().toDouble(); +} +//! [32] +//! [34] +Button *Calculator::createButton(const QString &text, const char *member) +{ + Button *button = new Button(text); + connect(button, SIGNAL(clicked()), this, member); + return button; +} +//! [34] + +//! [36] +void Calculator::abortOperation() +{ + clearAll(); + display->setText("####"); +} +//! [36] + +//! [38] +bool Calculator::calculate(double rightOperand, const QString &pendingOperator) +{ + if (pendingOperator == "+") { + sumSoFar += rightOperand; + } else if (pendingOperator == "-") { + sumSoFar -= rightOperand; + } else if (pendingOperator == "\303\227") { + factorSoFar *= rightOperand; + } else if (pendingOperator == "\303\267") { + if (rightOperand == 0.0) + return false; + factorSoFar /= rightOperand; + } + return true; +} +//! [38] diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/calculator.h b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.h new file mode 100644 index 00000000..250a2f3e --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.h @@ -0,0 +1,117 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef CALCULATOR_H +#define CALCULATOR_H + +#include <QWidget> + +QT_BEGIN_NAMESPACE +class QLineEdit; +QT_END_NAMESPACE +class Button; + +//! [0] +class Calculator : public QWidget +{ + Q_OBJECT + +public: + Calculator(QWidget *parent = 0); + +private slots: + void digitClicked(); + void unaryOperatorClicked(); + void additiveOperatorClicked(); + void multiplicativeOperatorClicked(); + void equalClicked(); + void pointClicked(); + void changeSignClicked(); + void backspaceClicked(); + void clear(); + void clearAll(); + void clearMemory(); + void readMemory(); + void setMemory(); + void addToMemory(); +//! [0] + +//! [1] +private: +//! [1] //! [2] + Button *createButton(const QString &text, const char *member); + void abortOperation(); + bool calculate(double rightOperand, const QString &pendingOperator); +//! [2] + +//! [3] + double sumInMemory; +//! [3] //! [4] + double sumSoFar; +//! [4] //! [5] + double factorSoFar; +//! [5] //! [6] + QString pendingAdditiveOperator; +//! [6] //! [7] + QString pendingMultiplicativeOperator; +//! [7] //! [8] + bool waitingForOperand; +//! [8] + +//! [9] + QLineEdit *display; +//! [9] //! [10] + + enum { NumDigitButtons = 10 }; + Button *digitButtons[NumDigitButtons]; +}; +//! [10] + +#endif diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/calculator.pro b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.pro new file mode 100644 index 00000000..8f132609 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/calculator.pro @@ -0,0 +1,11 @@ +QT += widgets + +HEADERS = button.h \ + calculator.h +SOURCES = button.cpp \ + calculator.cpp \ + main.cpp + +# Single Application implementation +include(../../singleapplication.pri) +DEFINES += QAPPLICATION_CLASS=QApplication diff --git a/third_party/SingleApplication-3.3.0/examples/calculator/main.cpp b/third_party/SingleApplication-3.3.0/examples/calculator/main.cpp new file mode 100644 index 00000000..d45438f4 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/calculator/main.cpp @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QApplication> + +#include <singleapplication.h> + +#include "calculator.h" + +int main(int argc, char *argv[]) +{ + SingleApplication app(argc, argv); + + Calculator calc; + + QObject::connect( &app, &SingleApplication::instanceStarted, [ &calc ]() { + calc.raise(); + calc.activateWindow(); + }); + + calc.show(); + + return app.exec(); +} diff --git a/third_party/SingleApplication-3.3.0/examples/sending_arguments/CMakeLists.txt b/third_party/SingleApplication-3.3.0/examples/sending_arguments/CMakeLists.txt new file mode 100644 index 00000000..2cc55975 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/sending_arguments/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.7.0) + +project(sending_arguments LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +# SingleApplication base class +set(QAPPLICATION_CLASS QCoreApplication) +add_subdirectory(../.. SingleApplication) + +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core REQUIRED) + +add_executable(${PROJECT_NAME} + main.cpp + messagereceiver.cpp + messagereceiver.h + main.cpp +) + +target_link_libraries(${PROJECT_NAME} SingleApplication::SingleApplication) diff --git a/third_party/SingleApplication-3.3.0/examples/sending_arguments/main.cpp b/third_party/SingleApplication-3.3.0/examples/sending_arguments/main.cpp new file mode 100755 index 00000000..a9d34dd9 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/sending_arguments/main.cpp @@ -0,0 +1,28 @@ +#include <singleapplication.h> +#include "messagereceiver.h" + +int main(int argc, char *argv[]) +{ + // Allow secondary instances + SingleApplication app( argc, argv, true ); + + MessageReceiver msgReceiver; + + // If this is a secondary instance + if( app.isSecondary() ) { + app.sendMessage( app.arguments().join(' ').toUtf8() ); + qDebug() << "App already running."; + qDebug() << "Primary instance PID: " << app.primaryPid(); + qDebug() << "Primary instance user: " << app.primaryUser(); + return 0; + } else { + QObject::connect( + &app, + &SingleApplication::receivedMessage, + &msgReceiver, + &MessageReceiver::receivedMessage + ); + } + + return app.exec(); +} diff --git a/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.cpp b/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.cpp new file mode 100644 index 00000000..0560b072 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.cpp @@ -0,0 +1,12 @@ +#include <QDebug> +#include "messagereceiver.h" + +MessageReceiver::MessageReceiver(QObject *parent) : QObject(parent) +{ +} + +void MessageReceiver::receivedMessage(int instanceId, QByteArray message) +{ + qDebug() << "Received message from instance: " << instanceId; + qDebug() << "Message Text: " << message; +} diff --git a/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.h b/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.h new file mode 100644 index 00000000..50a970c8 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/sending_arguments/messagereceiver.h @@ -0,0 +1,15 @@ +#ifndef MESSAGERECEIVER_H +#define MESSAGERECEIVER_H + +#include <QObject> + +class MessageReceiver : public QObject +{ + Q_OBJECT +public: + explicit MessageReceiver(QObject *parent = 0); +public slots: + void receivedMessage( int instanceId, QByteArray message ); +}; + +#endif // MESSAGERECEIVER_H diff --git a/third_party/SingleApplication-3.3.0/examples/sending_arguments/sending_arguments.pro b/third_party/SingleApplication-3.3.0/examples/sending_arguments/sending_arguments.pro new file mode 100755 index 00000000..897636a9 --- /dev/null +++ b/third_party/SingleApplication-3.3.0/examples/sending_arguments/sending_arguments.pro @@ -0,0 +1,9 @@ +# Single Application implementation +include(../../singleapplication.pri) +DEFINES += QAPPLICATION_CLASS=QCoreApplication + +SOURCES += main.cpp \ + messagereceiver.cpp + +HEADERS += \ + messagereceiver.h diff --git a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.cpp b/third_party/SingleApplication-3.3.0/singleapplication.cpp index 276ceee9..09e264ef 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.cpp +++ b/third_party/SingleApplication-3.3.0/singleapplication.cpp @@ -36,7 +36,7 @@ * @param options Optional flags to toggle specific behaviour * @param timeout Maximum time blocking functions are allowed during app load */ -SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, QString userData ) +SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData ) : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) ) { Q_D( SingleApplication ); @@ -172,9 +172,9 @@ SingleApplication::~SingleApplication() * Checks if the current application instance is primary. * @return Returns true if the instance is primary, false otherwise. */ -bool SingleApplication::isPrimary() +bool SingleApplication::isPrimary() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->server != nullptr; } @@ -182,9 +182,9 @@ bool SingleApplication::isPrimary() * Checks if the current application instance is secondary. * @return Returns true if the instance is secondary, false otherwise. */ -bool SingleApplication::isSecondary() +bool SingleApplication::isSecondary() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->server == nullptr; } @@ -194,9 +194,9 @@ bool SingleApplication::isSecondary() * only incremented afterwards. * @return Returns a unique instance id. */ -quint32 SingleApplication::instanceId() +quint32 SingleApplication::instanceId() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->instanceNumber; } @@ -206,9 +206,9 @@ quint32 SingleApplication::instanceId() * specific APIs. * @return Returns the primary instance PID. */ -qint64 SingleApplication::primaryPid() +qint64 SingleApplication::primaryPid() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->primaryPid(); } @@ -216,9 +216,9 @@ qint64 SingleApplication::primaryPid() * Returns the username the primary instance is running as. * @return Returns the username the primary instance is running as. */ -QString SingleApplication::primaryUser() +QString SingleApplication::primaryUser() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->primaryUser(); } @@ -226,7 +226,7 @@ QString SingleApplication::primaryUser() * Returns the username the current instance is running as. * @return Returns the username the current instance is running as. */ -QString SingleApplication::currentUser() +QString SingleApplication::currentUser() const { return SingleApplicationPrivate::getUsername(); } @@ -248,10 +248,7 @@ bool SingleApplication::sendMessage( const QByteArray &message, int timeout ) if( ! d->connectToPrimary( timeout, SingleApplicationPrivate::Reconnect ) ) return false; - d->socket->write( message ); - bool dataWritten = d->socket->waitForBytesWritten( timeout ); - d->socket->flush(); - return dataWritten; + return d->writeConfirmedMessage( timeout, message ); } /** @@ -267,8 +264,8 @@ void SingleApplication::abortSafely() ::exit( EXIT_FAILURE ); } -QStringList SingleApplication::userData() +QStringList SingleApplication::userData() const { - Q_D( SingleApplication ); + Q_D( const SingleApplication ); return d->appData(); } diff --git a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.h b/third_party/SingleApplication-3.3.0/singleapplication.h index d39a6614..91cabf93 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.h +++ b/third_party/SingleApplication-3.3.0/singleapplication.h @@ -85,44 +85,44 @@ public: * Usually 4*timeout would be the worst case (fail) scenario. * @see See the corresponding QAPPLICATION_CLASS constructor for reference */ - explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, QString userData = QString() ); + explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, const QString &userData = {} ); ~SingleApplication() override; /** * @brief Returns if the instance is the primary instance * @returns {bool} */ - bool isPrimary(); + bool isPrimary() const; /** * @brief Returns if the instance is a secondary instance * @returns {bool} */ - bool isSecondary(); + bool isSecondary() const; /** * @brief Returns a unique identifier for the current instance * @returns {qint32} */ - quint32 instanceId(); + quint32 instanceId() const; /** * @brief Returns the process ID (PID) of the primary instance * @returns {qint64} */ - qint64 primaryPid(); + qint64 primaryPid() const; /** * @brief Returns the username of the user running the primary instance * @returns {QString} */ - QString primaryUser(); + QString primaryUser() const; /** * @brief Returns the username of the current user * @returns {QString} */ - QString currentUser(); + QString currentUser() const; /** * @brief Sends a message to the primary instance. Returns true on success. @@ -137,7 +137,7 @@ public: * @brief Get the set user data. * @returns {QStringList} */ - QStringList userData(); + QStringList userData() const; Q_SIGNALS: void instanceStarted(); diff --git a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.pri b/third_party/SingleApplication-3.3.0/singleapplication.pri index ae81f599..ae81f599 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication.pri +++ b/third_party/SingleApplication-3.3.0/singleapplication.pri diff --git a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication_p.cpp b/third_party/SingleApplication-3.3.0/singleapplication_p.cpp index 1ab58c23..13397282 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication_p.cpp +++ b/third_party/SingleApplication-3.3.0/singleapplication_p.cpp @@ -263,20 +263,46 @@ bool SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne #endif writeStream << checksum; - // The header indicates the message length that follows + return writeConfirmedMessage( static_cast<int>(msecs - time.elapsed()), initMsg ); +} + +void SingleApplicationPrivate::writeAck( QLocalSocket *sock ) { + sock->putChar('\n'); +} + +bool SingleApplicationPrivate::writeConfirmedMessage (int msecs, const QByteArray &msg) +{ + QElapsedTimer time; + time.start(); + + // Frame 1: The header indicates the message length that follows QByteArray header; QDataStream headerStream(&header, QIODevice::WriteOnly); #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) headerStream.setVersion(QDataStream::Qt_5_6); #endif - headerStream << static_cast <quint64>( initMsg.length() ); + headerStream << static_cast <quint64>( msg.length() ); - socket->write( header ); - socket->write( initMsg ); - bool result = socket->waitForBytesWritten( static_cast<int>(msecs - time.elapsed()) ); + if( ! writeConfirmedFrame( static_cast<int>(msecs - time.elapsed()), header )) + return false; + + // Frame 2: The message + return writeConfirmedFrame( static_cast<int>(msecs - time.elapsed()), msg ); +} + +bool SingleApplicationPrivate::writeConfirmedFrame( int msecs, const QByteArray &msg ) +{ + socket->write( msg ); socket->flush(); - return result; + + bool result = socket->waitForReadyRead( msecs ); // await ack byte + if (result) { + socket->read( 1 ); + return true; + } + + return false; } quint16 SingleApplicationPrivate::blockChecksum() const @@ -321,32 +347,36 @@ void SingleApplicationPrivate::slotConnectionEstablished() QLocalSocket *nextConnSocket = server->nextPendingConnection(); connectionMap.insert(nextConnSocket, ConnectionInfo()); - QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, + QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, this](){ auto &info = connectionMap[nextConnSocket]; - Q_EMIT this->slotClientConnectionClosed( nextConnSocket, info.instanceId ); + this->slotClientConnectionClosed( nextConnSocket, info.instanceId ); } ); - QObject::connect(nextConnSocket, &QLocalSocket::disconnected, + QObject::connect(nextConnSocket, &QLocalSocket::disconnected, nextConnSocket, &QLocalSocket::deleteLater); + + QObject::connect(nextConnSocket, &QLocalSocket::destroyed, this, [nextConnSocket, this](){ connectionMap.remove(nextConnSocket); - nextConnSocket->deleteLater(); } ); - QObject::connect(nextConnSocket, &QLocalSocket::readyRead, + QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, this](){ auto &info = connectionMap[nextConnSocket]; switch(info.stage){ - case StageHeader: - readInitMessageHeader(nextConnSocket); + case StageInitHeader: + readMessageHeader( nextConnSocket, StageInitBody ); break; - case StageBody: + case StageInitBody: readInitMessageBody(nextConnSocket); break; - case StageConnected: - Q_EMIT this->slotDataAvailable( nextConnSocket, info.instanceId ); + case StageConnectedHeader: + readMessageHeader( nextConnSocket, StageConnectedBody ); + break; + case StageConnectedBody: + this->slotDataAvailable( nextConnSocket, info.instanceId ); break; default: break; @@ -355,7 +385,7 @@ void SingleApplicationPrivate::slotConnectionEstablished() ); } -void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock ) +void SingleApplicationPrivate::readMessageHeader( QLocalSocket *sock, SingleApplicationPrivate::ConnectionStage nextStage ) { if (!connectionMap.contains( sock )){ return; @@ -375,29 +405,35 @@ void SingleApplicationPrivate::readInitMessageHeader( QLocalSocket *sock ) quint64 msgLen = 0; headerStream >> msgLen; ConnectionInfo &info = connectionMap[sock]; - info.stage = StageBody; + info.stage = nextStage; info.msgLen = msgLen; - if ( sock->bytesAvailable() >= (qint64) msgLen ){ - readInitMessageBody( sock ); - } + writeAck( sock ); } -void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) +bool SingleApplicationPrivate::isFrameComplete( QLocalSocket *sock ) { - Q_Q(SingleApplication); - if (!connectionMap.contains( sock )){ - return; + return false; } ConnectionInfo &info = connectionMap[sock]; if( sock->bytesAvailable() < ( qint64 )info.msgLen ){ - return; + return false; } + return true; +} + +void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) +{ + Q_Q(SingleApplication); + + if( !isFrameComplete( sock ) ) + return; + // Read the message body - QByteArray msgBytes = sock->read(info.msgLen); + QByteArray msgBytes = sock->readAll(); QDataStream readStream(msgBytes); #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) @@ -437,8 +473,9 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) return; } + ConnectionInfo &info = connectionMap[sock]; info.instanceId = instanceId; - info.stage = StageConnected; + info.stage = StageConnectedHeader; if( connectionType == NewInstance || ( connectionType == SecondaryInstance && @@ -447,21 +484,28 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock ) Q_EMIT q->instanceStarted(); } - if (sock->bytesAvailable() > 0){ - Q_EMIT this->slotDataAvailable( sock, instanceId ); - } + writeAck( sock ); } void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId ) { Q_Q(SingleApplication); + + if ( !isFrameComplete( dataSocket ) ) + return; + Q_EMIT q->receivedMessage( instanceId, dataSocket->readAll() ); + + writeAck( dataSocket ); + + ConnectionInfo &info = connectionMap[dataSocket]; + info.stage = StageConnectedHeader; } void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId ) { if( closedSocket->bytesAvailable() > 0 ) - Q_EMIT slotDataAvailable( closedSocket, instanceId ); + slotDataAvailable( closedSocket, instanceId ); } void SingleApplicationPrivate::randomSleep() @@ -470,7 +514,7 @@ void SingleApplicationPrivate::randomSleep() QThread::msleep( QRandomGenerator::global()->bounded( 8u, 18u )); #else qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() ); - QThread::msleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 )); + QThread::msleep( qrand() % 11 + 8); #endif } diff --git a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication_p.h b/third_party/SingleApplication-3.3.0/singleapplication_p.h index c49a46dd..58507cf3 100644 --- a/third_party/SingleApplication-3.2.0-dc8042b/singleapplication_p.h +++ b/third_party/SingleApplication-3.3.0/singleapplication_p.h @@ -61,9 +61,10 @@ public: Reconnect = 3 }; enum ConnectionStage : quint8 { - StageHeader = 0, - StageBody = 1, - StageConnected = 2, + StageInitHeader = 0, + StageInitBody = 1, + StageConnectedHeader = 2, + StageConnectedBody = 3, }; Q_DECLARE_PUBLIC(SingleApplication) @@ -79,8 +80,12 @@ public: quint16 blockChecksum() const; qint64 primaryPid() const; QString primaryUser() const; - void readInitMessageHeader(QLocalSocket *socket); + bool isFrameComplete(QLocalSocket *sock); + void readMessageHeader(QLocalSocket *socket, ConnectionStage nextStage); void readInitMessageBody(QLocalSocket *socket); + void writeAck(QLocalSocket *sock); + bool writeConfirmedFrame(int msecs, const QByteArray &msg); + bool writeConfirmedMessage(int msecs, const QByteArray &msg); static void randomSleep(); void addAppData(const QString &data); QStringList appData() const; |
