Port away from remove things in libquotient

Mostly the User class and Omittable

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
       - /gitlab-templates/android-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/windows-qt6.yml
-      - /gitlab-templates/freebsd-qt6.yml
+#      - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/flatpak.yml
       - /gitlab-templates/craft-android-qt6-apks.yml
       - /gitlab-templates/craft-appimage-qt6.yml

.kde-ci.yml

@@ -40,4 +40,4 @@ Dependencies:
 
 Options:
   per-test-timeout: 90
-  require-passing-tests-on: [ '@all' ]
+  require-passing-tests-on: [ 'Linux', 'Android', 'FreeBSD' ]

CMakeLists.txt

@@ -102,7 +102,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(QuotientQt6 0.7)
+find_package(QuotientQt6 0.8.2)
 set_package_properties(QuotientQt6 PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper around Matrix API"

README.md

@@ -38,8 +38,8 @@ Due to the nature of the Matrix specification development NeoChat also supports
 
 Details where to find stable releases for NeoChat can be found on its [homepage](https://apps.kde.org/neochat).
 
-Nightly builds for linux and windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
-Nightly builds for android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
+Nightly builds for Linux and Windows can be downloaded from [cdn.kde.org](https://cdn.kde.org/ci-builds/network/neochat/).
+Nightly builds for Android are available from [KDE's nightly F-Droid repository](https://community.kde.org/Android/F-Droid).
 Nightly Flatpaks are available from [KDE's nightly Flatpak repository](https://userbase.kde.org/Tutorials/Flatpak).
 
 ## Building NeoChat

autotests/chatbarcachetest.cpp

@@ -50,7 +50,7 @@ void ChatBarCacheTest::empty()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -98,7 +98,7 @@ void ChatBarCacheTest::reply()
     QCOMPARE(chatBarCache->replyId(), QLatin1String("$153456789:example.org"));
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -115,7 +115,7 @@ void ChatBarCacheTest::edit()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), true);
     QCOMPARE(chatBarCache->editId(), QLatin1String("$153456789:example.org"));
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(room->user(QLatin1String("@example:example.org"))));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(QLatin1String("@example:example.org")));
     QCOMPARE(chatBarCache->relationMessage(), QLatin1String("This is an example\ntext message"));
     QCOMPARE(chatBarCache->attachmentPath(), QString());
 }
@@ -132,7 +132,7 @@ void ChatBarCacheTest::attachment()
     QCOMPARE(chatBarCache->replyId(), QString());
     QCOMPARE(chatBarCache->isEditing(), false);
     QCOMPARE(chatBarCache->editId(), QString());
-    QCOMPARE(chatBarCache->relationUser(), room->getUser(nullptr));
+    QCOMPARE(chatBarCache->relationUser(), room->getUser(QString()));
     QCOMPARE(chatBarCache->relationMessage(), QString());
     QCOMPARE(chatBarCache->attachmentPath(), QLatin1String("some/path"));
 }

autotests/eventhandlertest.cpp

@@ -101,17 +101,17 @@ void EventHandlerTest::nullEventId()
 void EventHandlerTest::author()
 {
     auto event = room->messageEvents().at(0).get();
-    auto author = room->user(event->senderId());
+    auto author = room->member(event->senderId());
     EventHandler eventHandler(room, event);
 
     auto eventHandlerAuthor = eventHandler.getAuthor();
 
-    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerAuthor["id"_ls], author->id());
-    QCOMPARE(eventHandlerAuthor["displayName"_ls], author->displayname(room));
+    QCOMPARE(eventHandlerAuthor["isLocalUser"_ls], author.id() == room->localMember().id());
+    QCOMPARE(eventHandlerAuthor["id"_ls], author.id());
+    QCOMPARE(eventHandlerAuthor["displayName"_ls], author.displayName());
     QCOMPARE(eventHandlerAuthor["avatarSource"_ls], room->avatarForMember(author));
-    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author->avatarMediaId(room));
-    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author->hueF()));
+    QCOMPARE(eventHandlerAuthor["avatarMediaId"_ls], author.avatarMediaId());
+    QCOMPARE(eventHandlerAuthor["color"_ls], Utils::getUserColor(author.hueF()));
     QCOMPARE(eventHandlerAuthor["object"_ls], QVariant::fromValue(author));
 }
 
@@ -122,7 +122,7 @@ void EventHandlerTest::nullAuthor()
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getAuthor(), room->getUser(nullptr));
+    QCOMPARE(noEventHandler.getAuthor(), room->getUser(QString()));
 }
 
 void EventHandlerTest::authorDisplayName()
@@ -393,21 +393,21 @@ void EventHandlerTest::nullReplyId()
 void EventHandlerTest::replyAuthor()
 {
     auto replyEvent = room->messageEvents().at(0).get();
-    auto replyAuthor = room->user(replyEvent->senderId());
+    auto replyAuthor = room->member(replyEvent->senderId());
     EventHandler eventHandler(room, room->messageEvents().at(5).get());
 
     auto eventHandlerReplyAuthor = eventHandler.getReplyAuthor();
 
-    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor->id() == room->localUser()->id());
-    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor->id());
-    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor->displayname(room));
+    QCOMPARE(eventHandlerReplyAuthor["isLocalUser"_ls], replyAuthor.id() == room->localMember().id());
+    QCOMPARE(eventHandlerReplyAuthor["id"_ls], replyAuthor.id());
+    QCOMPARE(eventHandlerReplyAuthor["displayName"_ls], replyAuthor.displayName());
     QCOMPARE(eventHandlerReplyAuthor["avatarSource"_ls], room->avatarForMember(replyAuthor));
-    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor->avatarMediaId(room));
-    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor->hueF()));
+    QCOMPARE(eventHandlerReplyAuthor["avatarMediaId"_ls], replyAuthor.avatarMediaId());
+    QCOMPARE(eventHandlerReplyAuthor["color"_ls], Utils::getUserColor(replyAuthor.hueF()));
     QCOMPARE(eventHandlerReplyAuthor["object"_ls], QVariant::fromValue(replyAuthor));
 
     EventHandler eventHandlerNoAuthor(room, room->messageEvents().at(0).get());
-    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(nullptr));
+    QCOMPARE(eventHandlerNoAuthor.getReplyAuthor(), room->getUser(QString()));
 }
 
 void EventHandlerTest::nullReplyAuthor()
@@ -417,7 +417,7 @@ void EventHandlerTest::nullReplyAuthor()
 
     EventHandler noEventHandler(room, nullptr);
     QTest::ignoreMessage(QtWarningMsg, "getReplyAuthor called with m_event set to nullptr. Returning empty user.");
-    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(nullptr));
+    QCOMPARE(noEventHandler.getReplyAuthor(), room->getUser(QString()));
 }
 
 void EventHandlerTest::replyBody()

autotests/reactionmodeltest.cpp

@@ -53,7 +53,7 @@ void ReactionModelTest::basicReaction()
     QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
     QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
              QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
-    auto authorList = QVariantList{room->getUser(room->user(QStringLiteral("@alice:matrix.org")))};
+    auto authorList = QVariantList{room->getUser(QStringLiteral("@alice:matrix.org"))};
     QCOMPARE(model.data(model.index(0), ReactionModel::AuthorsRole), authorList);
     QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalUser), false);
 }

org.kde.neochat.appdata.xml

@@ -80,12 +80,14 @@
   <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
+    <p xml:lang="ar">نيوتشات هو تطبيق دردشة يتيح لك الاستفادة الكاملة من شبكة Matrix. فهو يوفر لك طريقة آمنة لإرسال الرسائل النصية ومقاطع الفيديو والملفات الصوتية إلى عائلتك وزملائك وأصدقائك.</p>
     <p xml:lang="ca">El NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="ca-valencia">NeoChat és una aplicació de xat que us permet aprofitar plenament la xarxa Matrix. Proporciona una manera segura d'enviar missatges de text, vídeos i arxius d'àudio a la vostra família, companys i amics.</p>
     <p xml:lang="en-GB">NeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.</p>
     <p xml:lang="eo">NeoChat estas babilej-apo, kiu ebligas al vi plene profiti de la Matrix-reto. Ĝi provizas al vi sekuran manieron sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj.</p>
     <p xml:lang="es">NeoChat es una aplicación de chat que le permite aprovechar al máximo la red Matrix. Le proporciona un modo seguro de enviar mensajes de texto, vídeos y archivos de sonido a su familia, colegas y amigos.</p>
     <p xml:lang="eu">NeoChat, Matrix sarearen abantaila guztiei probetsua ateratzeko aukera ematen dizun berriketa aplikaizo bat da. Zure familiari, kideei eta lagunei testu mezuak, bideoak eta audio fitxategiak era seguruan bidaltzeko aukera ematen dizu.</p>
+    <p xml:lang="fi">NeoChat on keskustelusovellus, jolla Matrix-verkosta saa täyden hyödyn. Se tarjoaa salatun kanavan lähettää perheelle, työkavereille ja ystäville tekstiviestejä sekä video- ja äänitiedostoja.</p>
     <p xml:lang="fr">NeoChat est une application de discussions vous permettant de profiter pleinement du réseau Matrix. Elle vous offre un moyen sécurisé d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos ami(e)s.</p>
     <p xml:lang="hu">A NeoChat egy olyan csevegőalkalmazás, amellyel teljes mértékben kihasználhatja a Matrix hálózatot. Biztonságos módot biztosít szöveges üzenetek, videók és hangfájlok küldéséhez családtagjainak, kollégáinak és barátainak.</p>
     <p xml:lang="ia">NeoChat es un app de conversation que te permitte prender avantage plen del rete Matrix. Il te forni un modo secur de inviar messages de texto, videos e files audio a tui familia, collegas e amicos.</p>
@@ -95,6 +97,7 @@
     <p xml:lang="nl">NeoChat is een chat-toepassing die u het volledige voordeel van het Matrix-netwerk laat genieten. Het levert u op een veilige manier tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden te verzenden.</p>
     <p xml:lang="pl">NoeChat to aplikacja do rozmów, która umożliwia wykorzystanie wszystkich możliwości Matriksa. Umożliwia wysyłanie wiadomości tekstowych, filmów i dźwięków w bezpieczny sposób do twojej rodziny, kolegów i przyjaciół.</p>
     <p xml:lang="sl">NeoChat je aplikacija za klepet, ki vam omogoča, da v celoti izkoristite omrežje Matrix. Zagotavlja vam varen način za pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek vaši družini, sodelavcem in prijateljem.</p>
+    <p xml:lang="sv">NeoChat är ett chattprogram som låter dig dra full nytta av Matrix-nätverket. Det ger dig ett säkert sätt att skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner.</p>
     <p xml:lang="tr">NeoChat, Matrix ağının tüm özelliklerini kullanan bir sohbet uygulamasıdır. Ailenize, arkadaşlarınıza ve iş arkadaşlarınıza metin iletileri, ses ve video dosyaları göndermenin kolay bir yolunu sunar.</p>
     <p xml:lang="uk">NeoChat є програмою для спілкування, за допомогою якої ви можете скористатися усіма перевагами мережі Matrix. За її допомогою ви можете безпечно надсилати текстові повідомлення, відео та звукові файли вашим родичам, колегам та друзям.</p>
     <p xml:lang="x-test">xxNeoChat is a chat app that lets you take full advantage of the Matrix network. It provides you with a secure way to send text messages, videos and audio files to your family, colleagues and friends.xx</p>
@@ -111,7 +114,7 @@
     <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
     <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
     <p xml:lang="hu">A NeoChat célja, hogy a Matrix specifikációnak megfelelő teljes funkcionalitású alkalmazás legyen. Mint ilyen, a jelenlegi stabil specifikáció támogatott a VoIP, a szálak és a végpontok közötti titkosítás egyes elemeinek kivételével. Van még néhány kisebb hiányosság annak köszönhetően, hogy a Matrix specifikáció folyamatosan fejlődik, de végső cél a teljes specifikáció megvalósítása.</p>
-    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
+    <p xml:lang="ia">NeoChat aspira a esser un application plenmente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
     <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
     <p xml:lang="ka">NeoChat მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
     <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
@@ -210,7 +213,7 @@
       <li xml:lang="sl">Sticker Packs - MSC2545</li>
       <li xml:lang="sv">Sticker Packs - MSC2545</li>
       <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
-      <li xml:lang="tr">Yapışkan Paketleri — MSC2545</li>
+      <li xml:lang="tr">Çıkartma Paketleri — MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
       <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
@@ -310,12 +313,14 @@
     <screenshot type="default">
       <image>https://cdn.kde.org/screenshots/neochat/spaces.png</image>
       <caption>Discover new communities with Matrix Spaces</caption>
+      <caption xml:lang="ar">اكتشف مجتمعات جديدة مع فضاءات ماتركس</caption>
       <caption xml:lang="ca">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="ca-valencia">Descobriu comunitats noves amb els espais de Matrix</caption>
       <caption xml:lang="en-GB">Discover new communities with Matrix Spaces</caption>
       <caption xml:lang="eo">Malkovru novajn komunumojn per Matrix Spaces</caption>
       <caption xml:lang="es">Descubra nuevas comunidades con los espacios de Matrix</caption>
       <caption xml:lang="eu">Ezagutu komunitate berriak Matrixeko Tokiak erabiliz</caption>
+      <caption xml:lang="fi">Löydä uusia yhteisöjä Matrix Spacesillä</caption>
       <caption xml:lang="fr">Découvrez de nouvelles communautés avec les espaces sous Matrix</caption>
       <caption xml:lang="hu">Fedezzen fel új közösségeket a Matrix Terek segítségével</caption>
       <caption xml:lang="ia">Discoperi nove communitate con Matrix Spaces (Spatios de Matrix)</caption>
@@ -325,6 +330,7 @@
       <caption xml:lang="nl">Ontdek nieuwe gemeenschappen met Matrix-ruimten</caption>
       <caption xml:lang="pl">Odkrywaj nowe społeczności w Przestrzeniach Matriksa</caption>
       <caption xml:lang="sl">Odkrijte nove skupnosti z Matrix Spaces</caption>
+      <caption xml:lang="sv">Upptäck nya gemenskaper med Matrix Spaces</caption>
       <caption xml:lang="tr">Matrix Alanlar ile yeni topluluklar keşfedin</caption>
       <caption xml:lang="uk">Пошук нових спільнот за допомогою Matrix Spaces</caption>
       <caption xml:lang="x-test">xxDiscover new communities with Matrix Spacesxx</caption>
@@ -407,6 +413,7 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.05.1" date="2024-06-13"/>
     <release version="24.05.0" date="2024-05-23"/>
     <release version="24.02.2" date="2024-04-11"/>
     <release version="24.02.1" date="2024-03-21"/>

po/ast/neochat.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2023-12-12 01:02+0100\n"
 "Last-Translator: Enol P. <enolp@softastur.org>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr ""
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr ""
@@ -88,7 +88,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr ""
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -96,47 +96,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr ""
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
 msgid "Favorite"
 msgstr ""
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -751,18 +751,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr ""
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr ""
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
@@ -808,7 +802,9 @@ msgstr ""
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr ""
 
 #: src/login/Login.qml:25
@@ -829,7 +825,7 @@ msgid "Loading…"
 msgstr ""
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -949,7 +945,7 @@ msgstr ""
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr ""
 
 #: src/login/WelcomePage.qml:124
@@ -1731,38 +1727,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1816,12 +1818,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1843,7 +1845,7 @@ msgid "Notification settings"
 msgstr ""
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr ""
@@ -2209,17 +2211,17 @@ msgstr ""
 msgid "Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2227,56 +2229,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2284,7 +2286,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2412,14 +2414,14 @@ msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2456,16 +2458,16 @@ msgstr ""
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr ""
@@ -2498,17 +2500,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2546,60 +2548,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2607,34 +2609,46 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
+msgid "About Matrix"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
 msgstr ""
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
@@ -2836,7 +2850,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr ""
@@ -2969,7 +2983,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -3120,7 +3134,8 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
+msgctxt "Room actions"
+msgid "Actions"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:78
@@ -3141,7 +3156,7 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
+msgid "Favorite this room"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:109
@@ -3329,33 +3344,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3705,22 +3720,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3867,47 +3882,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -3922,17 +3937,17 @@ msgstr ""
 msgid "%1 is not a correct Matrix identifier"
 msgstr ""
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr ""
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr ""
@@ -4801,108 +4816,108 @@ msgstr ""
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr ""
@@ -5135,87 +5150,131 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/ca/neochat.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 11:26+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 08:43+0200\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -18,14 +18,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 22.12.3\n"
+"X-Generator: Lokalize 24.05.0\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Trieu un fitxer local"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Imatge del porta-retalls"
@@ -91,7 +91,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Cancel·la la resposta"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -99,48 +99,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Rebre les notificacions dels missatges nous"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de la xarxa: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "No s'ha trobat el testimoni d'accés"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Potser s'ha suprimit?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "S'ha denegat l'accés al clauer."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Permeteu que el NeoChat llegeixi el testimoni d'accés"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "No hi ha cap clauer disponible."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Instal·leu un clauer, p. ex. el KWallet o l'anell de claus del GNOME al Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No s'ha pogut llegir el testimoni d'accés"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Rebre les notificacions «push»"
@@ -321,9 +321,9 @@ msgstr "Convidat"
 #: src/enums/neochatroomtype.h:61
 #, kde-format
 msgid "Favorite"
-msgstr "Preferit"
+msgstr "Preferida"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Amics"
@@ -758,18 +758,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Destinació"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "No s'ha configurat cap servidor d'identitats"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Error de la xarxa"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Ha fallat l'inici de la sessió: %1"
@@ -818,8 +812,12 @@ msgstr "S'està carregant"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Espereu. Això pot trigar una mica."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Espereu mentre els missatges es carreguen des del servidor. Això pot trigar "
+"una mica."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -839,7 +837,7 @@ msgid "Loading…"
 msgstr "S'està carregant…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -960,8 +958,8 @@ msgstr "%1 (carregant)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Elimina aquest compte"
+msgid "Log out of this account"
+msgstr "Tanca la sessió d'aquest compte"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1749,38 +1747,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reaccionat amb %3"
 msgstr[1] "%2 han reaccionat amb %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "El fitxer és massa gran per a baixar."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Contacteu amb l'administrador del servidor Matrix per a suport."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "No s'ha configurat cap servidor d'identitats"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ha fallat la creació de la sala: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ha fallat la creació de l'espai: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "L'informe s'ha enviat correctament."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat.: %1, lon.: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Missatge encriptat"
@@ -1834,12 +1838,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rebutja i ignora l'usuari"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Obre el NeoChat"
@@ -1861,7 +1865,7 @@ msgid "Notification settings"
 msgstr "Configuració de les notificacions"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configura"
@@ -2233,17 +2237,17 @@ msgstr "Selecció del tipus"
 msgid "Space"
 msgstr "Espai"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2251,51 +2255,51 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Fes oficial aquest pare"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Crea un espai"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Crea una sala"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Selecciona una sala existent"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Tria la sala"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Exploració de sales"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Us heu unit"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "Teniu el nivell requerit de privilegi en el fill per a establir aquest estat"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2303,7 +2307,7 @@ msgstr ""
 "No teniu el nivell suficient de privilegi en el fill per a establir aquest "
 "estat"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2311,7 +2315,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Fes que aquest espai sigui el pare canònic"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2441,14 +2445,14 @@ msgid "Explore rooms"
 msgstr "Explora les sales"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Cerqueu els vostres amics"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2485,16 +2489,16 @@ msgstr "Sales"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Cerca una sala"
+msgid "Search Rooms"
+msgstr "Cerca sales"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Mostra el menú"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Crea sales i xats"
@@ -2527,17 +2531,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Mostra només els espais"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduïu una adreça de sala"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Cerca una sala…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2575,60 +2579,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "Configura el NeoChat..."
+msgid "Configure NeoChat…"
+msgstr "Configura el NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Configura el NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Surt del NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Fitxer"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Cerca d'amics"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Grup nou…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Navega pels xats…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Edita"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vista"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2636,35 +2640,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Obre el commutador ràpid"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Finestra"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Surt de pantalla completa"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Entra a pantalla completa"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "PMF del Matrix"
+msgid "About Matrix"
+msgstr "Quant a Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Quant al NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Quant a KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2867,7 +2883,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Ubicacions"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "No hi ha ubicacions compartides en aquesta sala."
@@ -3001,7 +3017,7 @@ msgstr "Edició del nivell de permisos d'usuari"
 msgid "New power level"
 msgstr "Nivell nou de permisos"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -3152,8 +3168,9 @@ msgstr "Informació de la sala"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Opcions"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Accions"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3173,8 +3190,8 @@ msgstr "Elimina la sala de les preferides"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Fes preferida la sala"
+msgid "Favorite this room"
+msgstr "Fes preferida aquesta sala"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3367,33 +3384,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Afegeix un servidor nou"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Afegeix un servidor"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "S'ha introduït un servidor vàlid"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Aquest servidor no es pot resoldre o ja s'ha afegit"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "El text que heu introduït no és un URL vàlid"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Introduïu l'URL del servidor (p. ex. kde.org)"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "URL del servidor"
@@ -3750,22 +3767,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Cerca d'amics"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Introduïu un ID d'usuari"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Cerqueu els vostres amics…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Introduïu un text per a iniciar la cerca d'amics"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3945,47 +3962,47 @@ msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 "La verificació de la sessió s'ha cancel·lat a causa d'un error desconegut."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Sense servidor."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "S'està comprovant la disponibilitat del servidor."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Aquest no és un servidor vàlid."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registre en aquest servidor està desactivat."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Sense nom d'usuari."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "S'està comprovant la disponibilitat del nom d'usuari."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Aquest nom d'usuari no està disponible."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "En funcionament"
@@ -4000,17 +4017,17 @@ msgstr "ID de Matrix amb format incorrecte o buida"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 no és cap identificador correcte de Matrix"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Ha fallat en unir-se a la sala"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Heu sol·licitat unir-vos a «%1»"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Ha fallat en sol·licitar unir-vos a la sala"
@@ -4883,114 +4900,114 @@ msgstr "Àlies"
 msgid "No canonical alias set"
 msgstr "No s'ha definit cap àlies canònic"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Fes que aquest àlies sigui l'àlies canònic de la sala"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Suprimeix l'àlies"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Afegeix un àlies nou"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistes prèvies dels URL"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activa les vistes prèvies dels URL de manera predeterminada per als membres "
 "de la sala"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activa les vistes prèvies dels URL"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan activades de manera predeterminada en "
 "aquesta sala"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan desactivades de manera predeterminada en "
 "aquesta sala"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espais pares oficials"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canònic"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fes que sigui pare canònic"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Elimina el pare"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Aquesta sala no té espais pares oficials."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Afegeix un pare oficial nou"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Aquesta sala continua una altra conversa."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Vegeu els missatges més antics…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "S'ha substituït aquesta sala."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Vegeu la sala nova…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualitza la sala"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Selecciona la versió nova"
@@ -5235,62 +5252,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Suprimeix la paraula"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Oculta"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Comparteix"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Elimina"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Completa"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Codi de país del número nou de telèfon"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Adreça de correu electrònic nova"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Número de telèfon nou"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Us hem enviat un correu electrònic"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Us hem enviat un missatge de text"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1. Seguiu les seves instruccions i després feu clic al botó de sota"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "El correu electrònic que heu introduït no és vàlid"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "El número de telèfon que heu introduït no és vàlid"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "S'ha introduït una contrasenya incorrecta"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5299,7 +5340,7 @@ msgstr ""
 "El correu electrònic no s'ha verificat. Aneu al correu electrònic i seguiu "
 "les seves instruccions i després feu clic al botó de sota"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5308,18 +5349,42 @@ msgstr ""
 "El número de telèfon no s'ha verificat. Aneu al missatge de text i seguiu "
 "les seves instruccions i després feu clic al botó de sota"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Enrere"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1. Seguiu les seves instruccions i després feu clic al botó de dalt"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"El correu electrònic no s'ha verificat. Aneu al correu electrònic i seguiu "
+"les seves instruccions i després feu clic al botó de dalt"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"El número de telèfon no s'ha verificat. Aneu al missatge de text i seguiu "
+"les seves instruccions i després feu clic al botó de dalt"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5496,6 +5561,20 @@ msgstr "Mostra"
 msgid "Quit"
 msgstr "Surt"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "PMF del Matrix"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Elimina aquest compte"
+
+#~ msgid "Options"
+#~ msgstr "Opcions"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Fes preferida la sala"
+
 #~ msgid "Member (0)"
 #~ msgstr "Membre (0)"
 

po/ca@valencia/neochat.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 11:26+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 08:43+0200\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -18,14 +18,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 22.12.3\n"
+"X-Generator: Lokalize 24.05.0\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Seleccioneu un fitxer local"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Imatge del porta-retalls"
@@ -91,7 +91,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Cancel·la la resposta"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -99,48 +99,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Rebre les notificacions dels missatges nous"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "S'ha produït un error de la xarxa: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "No s'ha trobat el testimoni d'accés"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Potser s'ha suprimit?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "S'ha denegat l'accés al clauer."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Permeteu que NeoChat llija el testimoni d'accés"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "No hi ha cap clauer disponible."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Instal·leu un clauer, p. ex., KWallet o l'anell de claus de GNOME a Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No s'ha pogut llegir el testimoni d'accés"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Rebre les notificacions «push»"
@@ -321,9 +321,9 @@ msgstr "Convidat"
 #: src/enums/neochatroomtype.h:61
 #, kde-format
 msgid "Favorite"
-msgstr "Preferit"
+msgstr "Preferida"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Amics"
@@ -757,18 +757,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Destinació"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "No s'ha configurat cap servidor d'identitats"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "S'ha produït un error de la xarxa"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "No s'ha pogut fer l'inici de la sessió: %1"
@@ -817,8 +811,12 @@ msgstr "S'està carregant"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Espereu. Açò pot tardar una mica."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Espereu mentre els missatges es carreguen des del servidor. Açò pot tardar "
+"una mica."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -838,7 +836,7 @@ msgid "Loading…"
 msgstr "S'està carregant…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -959,8 +957,8 @@ msgstr "%1 (carregant)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Elimina este compte"
+msgid "Log out of this account"
+msgstr "Tanca la sessió d'este compte"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1748,38 +1746,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reaccionat amb %3"
 msgstr[1] "%2 han reaccionat amb %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "El fitxer és massa gran per a baixar."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Per a suport, contacteu amb l'administrador del servidor de Matrix."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "No s'ha configurat cap servidor d'identitats"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "No s'ha pogut crear la sala: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "No s'ha pogut crear l'espai: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "L'informe s'ha enviat correctament."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat.: %1, lon.: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Missatge encriptat"
@@ -1833,12 +1837,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rebutja i ignora l'usuari"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Obri NeoChat"
@@ -1860,7 +1864,7 @@ msgid "Notification settings"
 msgstr "Configureu les notificacions"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configura"
@@ -2232,17 +2236,17 @@ msgstr "Seleccioneu el tipus"
 msgid "Space"
 msgstr "Espai"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2250,51 +2254,51 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Fes oficial este pare"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Crea un espai"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Crea una sala"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Selecciona una sala existent"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Tria la sala"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Exploració de sales"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Vos heu unit"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "Teniu el nivell requerit de privilegi en el fill per a establir este estat"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2302,7 +2306,7 @@ msgstr ""
 "No teniu el nivell suficient de privilegi en el fill per a establir este "
 "estat"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2310,7 +2314,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Fes que este espai siga el pare canònic"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2440,14 +2444,14 @@ msgid "Explore rooms"
 msgstr "Explora les sales"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Busqueu els vostres amics"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2484,16 +2488,16 @@ msgstr "Sales"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Busca una sala"
+msgid "Search Rooms"
+msgstr "Busca sales"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Mostra el menú"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Crea sales i xats"
@@ -2526,17 +2530,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Mostra només els espais"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduïu una adreça de sala"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Busca una sala…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2574,60 +2578,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Configura NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Configura NeoChat…"
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Ix de NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Fitxer"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Busca d'amics"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Grup nou…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Navega pels xats…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Edita"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vista"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2635,35 +2639,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Obri el commutador ràpid"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Finestra"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Ix de pantalla completa"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Entra a pantalla completa"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "PMF de Matrix"
+msgid "About Matrix"
+msgstr "Quant a Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Quant a NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Quant a KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2866,7 +2882,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Ubicacions"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "No hi ha ubicacions compartides en esta sala."
@@ -3000,7 +3016,7 @@ msgstr "Editeu el nivell de permisos d'usuari"
 msgid "New power level"
 msgstr "Nivell nou de permisos"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -3151,8 +3167,9 @@ msgstr "Informació de la sala"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Opcions"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Accions"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3172,8 +3189,8 @@ msgstr "Elimina la sala de les preferides"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Fes preferida la sala"
+msgid "Favorite this room"
+msgstr "Fes preferida esta sala"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3366,33 +3383,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Afig un servidor nou"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Afig un servidor"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "S'ha introduït un servidor vàlid"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Este servidor no es pot resoldre o ja s'ha afegit"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "El text que heu introduït no és un URL vàlid"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Introduïu l'URL del servidor (p. ex., kde.org)"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "URL del servidor"
@@ -3749,22 +3766,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Busca d'amics"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Introduïu un ID d'usuari"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Busqueu els vostres amics…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Introduïu un text per a iniciar la busca d'amics"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3944,47 +3961,47 @@ msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 "La verificació de la sessió s'ha cancel·lat a causa d'un error desconegut."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Sense servidor."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "S'està comprovant la disponibilitat del servidor."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Este no és un servidor vàlid."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registre en este servidor està desactivat."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Sense nom d'usuari."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "S'està comprovant la disponibilitat del nom d'usuari."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Este nom d'usuari no està disponible."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "En funcionament"
@@ -3999,17 +4016,17 @@ msgstr "ID de Matrix amb format incorrecte o buida"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 no és cap identificador correcte de Matrix"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "No s'ha pogut unir a la sala"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Heu sol·licitat unir-vos a «%1»"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "No s'ha pogut sol·licitar unir-vos a la sala"
@@ -4883,114 +4900,114 @@ msgstr "Àlies"
 msgid "No canonical alias set"
 msgstr "No s'ha establit cap àlies canònic"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Fes que este àlies siga l'àlies canònic de la sala"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Suprimix l'àlies"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Afig un àlies nou"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistes prèvies dels URL"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activa les vistes prèvies dels URL de manera predeterminada per als membres "
 "de la sala"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activa les vistes prèvies dels URL"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan activades de manera predeterminada en esta "
 "sala"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan desactivades de manera predeterminada en "
 "esta sala"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espais pares oficials"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canònic"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fes que siga pare canònic"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Elimina el pare"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Esta sala no té espais pares oficials."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Afig un pare oficial nou"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala continua una altra conversa."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Vegeu els missatges més antics…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "S'ha substituït esta sala."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Vegeu la sala nova…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualitza la sala"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Selecciona la versió nova"
@@ -5234,63 +5251,87 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Suprimix la paraula"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Oculta"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Compartix"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Elimina"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Completa"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Codi de país del número nou de telèfon"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Adreça de correu electrònic nova"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Número de telèfon nou"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Vos hem enviat un correu electrònic"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Vos hem enviat un missatge de text"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 "%1. Seguiu les seues instruccions i després feu clic en el botó de davall"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "El correu electrònic que heu introduït no és vàlid"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "El número de telèfon que heu introduït no és vàlid"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "S'ha introduït una contrasenya incorrecta"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5299,7 +5340,7 @@ msgstr ""
 "El correu electrònic no s'ha verificat. Aneu fins al correu electrònic i "
 "seguiu les seues instruccions i després feu clic en el botó de davall"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5308,18 +5349,43 @@ msgstr ""
 "El número de telèfon no s'ha verificat. Aneu fins al missatge de text i "
 "seguiu les seues instruccions i després feu clic en el botó de davall"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Afig"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Arrere"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+"%1. Seguiu les seues instruccions i després feu clic en el botó de dalt"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"El correu electrònic no s'ha verificat. Aneu fins al correu electrònic i "
+"seguiu les seues instruccions i després feu clic en el botó de dalt"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"El número de telèfon no s'ha verificat. Aneu fins al missatge de text i "
+"seguiu les seues instruccions i després feu clic en el botó de dalt"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/da/neochat.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2020-12-13 17:28+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 20.04.2\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr ""
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr ""
@@ -92,7 +92,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Annullér"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgctxt ""
@@ -101,48 +101,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Indstillinger"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, fuzzy, kde-format
 #| msgid "Network Error"
 msgid "Network Error: %1"
 msgstr "Netværksfejl"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Receiving push notifications"
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Favorite"
 msgstr "Favorit"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -779,18 +779,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr ""
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Login Failed: %1"
@@ -839,7 +833,9 @@ msgstr "Indlæser"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr ""
 
 #: src/login/Login.qml:25
@@ -861,7 +857,7 @@ msgid "Loading…"
 msgstr "Indlæser"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -991,7 +987,7 @@ msgstr "Indlæser"
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr "Send besked"
 
 #: src/login/WelcomePage.qml:124
@@ -1804,40 +1800,46 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Room creation failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Space creation failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Encrypted Message"
@@ -1895,12 +1897,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chat"
 msgid "Open NeoChat"
@@ -1925,7 +1927,7 @@ msgid "Notification settings"
 msgstr "Indstillinger"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr ""
@@ -2313,17 +2315,17 @@ msgstr ""
 msgid "Space"
 msgstr "Medlemmer"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Emne:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2331,34 +2333,34 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Muted"
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Lydløs"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Muted"
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Lydløs"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, fuzzy, kde-format
 #| msgid "Room Name"
@@ -2366,24 +2368,24 @@ msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Værelsesnavn:"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Gik med"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2391,7 +2393,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2525,14 +2527,14 @@ msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2571,17 +2573,17 @@ msgstr "Værelsesnavn:"
 #, fuzzy, kde-format
 #| msgid "Muted"
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "Lydløs"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, fuzzy, kde-format
 #| msgid "Username"
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Brugernavn"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr ""
@@ -2617,18 +2619,18 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Find a room…"
 msgstr "Send besked"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2668,63 +2670,64 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "Chat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
-msgstr ""
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgid "Configure NeoChat…"
+msgstr "Annullér"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, fuzzy, kde-format
 #| msgid "Chat"
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Chat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, fuzzy, kde-format
 #| msgid "Edit"
 msgctxt "menu"
 msgid "Edit"
 msgstr "Redigér"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, fuzzy, kde-format
 #| msgid "View"
 msgctxt "menu"
 msgid "View"
 msgstr "Vis"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2732,35 +2735,50 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:112
-#, kde-format
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgid "Chat"
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr ""
+msgid "About Matrix"
+msgstr "Chat"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgid "Chat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Chat"
+
+#: src/qml/GlobalMenu.qml:110
+#, fuzzy, kde-format
+#| msgid "About"
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Om"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2967,7 +2985,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Indstillinger"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr ""
@@ -3112,7 +3130,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -3274,9 +3292,11 @@ msgid "Room information"
 msgstr "Indstillinger"
 
 #: src/qml/RoomInformation.qml:68
-#, kde-format
-msgid "Options"
-msgstr ""
+#, fuzzy, kde-format
+#| msgid "Settings"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Indstillinger"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3295,9 +3315,10 @@ msgid "Remove room from favorites"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:96
-#, kde-format
-msgid "Make room favorite"
-msgstr ""
+#, fuzzy, kde-format
+#| msgid "Muted"
+msgid "Favorite this room"
+msgstr "Lydløs"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3492,33 +3513,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3889,22 +3910,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgctxt "@info:label"
@@ -4052,48 +4073,48 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Intet navn"
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4108,17 +4129,17 @@ msgstr ""
 msgid "%1 is not a correct Matrix identifier"
 msgstr ""
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr ""
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr ""
@@ -5029,110 +5050,110 @@ msgstr ""
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Remove parent"
 msgstr "Send besked"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "See older messages…"
 msgstr "Send besked"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr ""
@@ -5368,91 +5389,136 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:66
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Fjern"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 #| msgid "Members"
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Medlemmer"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "We've sent you a text message"
 msgstr "Send besked"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, fuzzy, kde-format
 #| msgid "Add"
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/eo/neochat.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 22:24+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-1510:04+0200\n"
 "Last-Translator: Oliver Kellogg <olivermkellogg@gmail.com>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "Language: eo\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: translate-po (https://github.com/zcribe/translate-po)\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Elekti lokan dosieron"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Bildo de tondujo"
@@ -89,7 +89,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Nuligi respondon"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -97,48 +97,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Ricevante sciigojn por novaj mesaĝoj"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Reta Eraro: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Alirĵetono ne estis trovita"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Eble ĝi estis forigita?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Aliro al ŝlosilĉeno estis rifuzita."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Bonvolu permesi al NeoChat legi la alirĵetonon"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Neniu ŝlosilĉeno havebla."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Bonvolu instali ŝlosilĉenon, ekz. KWallet aŭ GNOME-ŝlosilringo en Linukso"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Ne eblas legi alirĵetonon"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Ricevante puŝ-sciigojn"
@@ -321,7 +321,7 @@ msgstr "Invititaj"
 msgid "Favorite"
 msgstr "Ŝatata"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Amikoj"
@@ -755,18 +755,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Celo"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "Agordiĝis neniu identeca servilo"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Reta Eraro"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Ensaluto Malsukcesis: %1"
@@ -814,8 +808,12 @@ msgstr "Ŝargante"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Bonvolu atendi. Ĉi tio eble daŭros iom da tempo."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Bonvolu atendi dum kiam viaj mesaĝoj estas ŝargataj el la servilo. Ĉi tio "
+"eble daŭros iom da tempo."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -835,7 +833,7 @@ msgid "Loading…"
 msgstr "Ŝargante…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -956,8 +954,8 @@ msgstr "%1 (alŝutante)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Forigi ĉi tiun konton"
+msgid "Log out of this account"
+msgstr "Elsaluti el tiu konto"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1744,38 +1742,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 redaktis kun %3"
 msgstr[1] "%2 redaktis kun %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Dosiero tro granda por elŝuti."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Kontaktu vian administranton de matrica servilo por subteno."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "Agordiĝis neniu identeca servilo"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Kreado de ĉambro malsukcesis: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Spackreado malsukcesis: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Raporto sukcese sendita."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Ĉifrita Mesaĝo"
@@ -1829,12 +1833,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Malakcepti kaj Ignori Uzanton"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Malfermi NeoChat"
@@ -1856,7 +1860,7 @@ msgid "Notification settings"
 msgstr "Sciigaj agordoj"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Agordi"
@@ -2228,17 +2232,17 @@ msgstr "Elekti tipon"
 msgid "Space"
 msgstr "Spaco"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nomo:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Temo:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2246,57 +2250,57 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Oficialigi tiun gepatron"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Krei Spacon"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Krei Ĉambron"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Elekti Ekzistantan Ĉambron"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Elekti ĉambron"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Esplori Ĉambrojn"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Aliĝis"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr "Vi havas la bezonatan privilegian nivelon en la ido por meti ĉi staton"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 "Vi ne havas sufiĉe altan privilegionivelon en la ido por meti ĉi tiun staton"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2304,7 +2308,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Igi ĉi tiun spacon la kanonan gepatron"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2434,14 +2438,14 @@ msgid "Explore rooms"
 msgstr "Esplori ĉambrojn"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Trovu viajn amikojn"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2478,16 +2482,16 @@ msgstr "Ĉambroj"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Serĉi Ĉambron"
+msgid "Search Rooms"
+msgstr "Serĉi Ĉambrojn"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Montri Menuon"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Krei ĉambrojn kaj babilojn"
@@ -2520,17 +2524,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Nur montri spacojn"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Enigi ĉambro-adreson"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Trovi ĉambron…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2568,60 +2572,61 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Agordi NeoChat..."
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Agordi NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Forlasi NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Dosiero"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Trovu viajn amikojn"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nova Grupo…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Foliumi Babilojn…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Redakti"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vido"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2629,35 +2634,50 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Malfermu Rapidan Ŝaltilon"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Fenestro"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Eliri Plenan Ekranon"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Eniri Plenan Ekranon"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Helpo"
 
-#: src/qml/GlobalMenu.qml:112
-#, kde-format
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Oftaj Demandoj pri Matrico"
+msgid "About Matrix"
+msgstr "Pri NeoChat"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Pri NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, fuzzy, kde-format
+#| msgid "About KDE"
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Pri KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2860,7 +2880,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Lokoj"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "Ne estas lokoj kunhavataj en ĉi tiu ĉambro."
@@ -2993,7 +3013,7 @@ msgstr "Redakti Potenconivelon de Uzanto"
 msgid "New power level"
 msgstr "Nova potencnivelo"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Konfirmi"
@@ -3146,8 +3166,9 @@ msgstr "Informoj pri ĉambro"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Opcioj"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Agoj"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3167,8 +3188,8 @@ msgstr "Forigi ĉambron el plej ŝatataj"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Fari ĉambron ŝatata"
+msgid "Favorite this room"
+msgstr "Plejŝatigi ĉi tiun ĉambron"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3358,33 +3379,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Aldoni novan servilon"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Aldoni servilon"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Valida servilo eniris"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Ĉi tiu servilo ne povas esti solvita aŭ jam estis aldonita"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "La enigita teksto ne estas valida URL"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Enigu servilan url ekz. kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "Servila URL"
@@ -3738,22 +3759,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Trovu Viajn Amikojn"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Enigu uzant-ID"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Trovi viajn amikojn…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Enigi tekston por komenci serĉi viajn amikojn"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3914,47 +3935,47 @@ msgstr "La fora partio nuligis la sean konfirmon ĉar la ŝlosiloj ne kongruas."
 msgid "The session verification was canceled due to an unknown error."
 msgstr "La seancokonfirmo estis nuligita pro nekonata eraro."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Neniu servilo."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Kontrolante la haveblecon de la Servilo."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Ĉi tio ne estas valida servilo."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registrado por ĉi tiu servilo estas malŝaltita."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Neniu uzantnomo."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Kontrolante uzantnoman haveblecon."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Ĉi tiu uzantnomo ne disponeblas."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Daŭrigi"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "Laborante"
@@ -3969,17 +3990,17 @@ msgstr "Misforma aŭ malplena Matrico-id"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 ne estas ĝusta Matrico-identigilo"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Malsukcesis aliĝi al ĉambro"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Vi petis aliĝi al '%1'"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Malsukcesis peti aliĝon al ĉambro"
@@ -4849,108 +4870,108 @@ msgstr "Kaŝnomo"
 msgid "No canonical alias set"
 msgstr "Neniu kanonika kaŝnomo aro"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Igi ĉi tiun kaŝnomon la kanonikan kaŝnomon de la ĉambro"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Forigi kaŝnomon"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Aldoni novan kaŝnomon"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "URL Antaŭrigardoj"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Ebligi URL-antaŭrigardojn defaŭlte por ĉambromembroj"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Ebligi URL-antaŭrigardojn"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL-antaŭrigardoj estas ebligitaj defaŭlte en ĉi tiu ĉambro"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL-antaŭrigardoj estas defaŭlte malŝaltitaj en ĉi tiu ĉambro"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Oficialaj Gepatrejoj"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Kanonika"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fari kanonikan gepatron"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Forigi gepatron"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Ĉi tiu ĉambro ne havas oficialajn gepatrospacojn."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Aldoni novan oficialan gepatron"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ĉi tiu ĉambro daŭrigas alian konversacion."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Vidi pli malnovajn mesaĝojn…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ĉi tiu ĉambro estis anstataŭigita."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Vidi novan ĉambron…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Altrangigi la Ĉambron"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Elekti novan version"
@@ -5192,62 +5213,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Forigi vorton"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Kaŝi"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Kunhavigi"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Forigi"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Kompletigi"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Nuligi"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Landkodo por nova telefonnumero"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Nova retpoŝta adreso"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Nova telefonnumero"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Ni sendis al vi retpoŝton"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Ni sendis al vi tekstmesaĝon"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1. Bonvolu sekvi la instruojn tie kaj poste klaki la butonon malsupre"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "La enigita retpoŝto ne estas valida"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "La enigita telefonnumero ne estas valida"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Malĝusta pasvorto enigita"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5256,7 +5301,7 @@ msgstr ""
 "La retpoŝto ne estis konfirmita. Bonvolu iri al la retpoŝto kaj sekvi la "
 "instruojn tie kaj poste klaki la butonon malsupre"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5265,18 +5310,42 @@ msgstr ""
 "La telefonnumero ne estis konfirmita. Bonvolu iri al la retpoŝto kaj sekvi "
 "la instruojn tie kaj poste klaki la butonon malsupre"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Aldoni"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Reen"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1. Bonvolu sekvi la instruojn tie kaj poste klaki la butonon supre"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"La retpoŝto ne estis konfirmita. Bonvolu iri al la retpoŝto kaj sekvi la "
+"instruojn tie kaj poste klaki la butonon supre"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"La telefonnumero ne estis konfirmita. Bonvolu iri al la retpoŝto kaj sekvi "
+"la instruojn tie kaj poste klaki la butonon supre"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5452,5 +5521,6 @@ msgstr "Montri"
 msgid "Quit"
 msgstr "Forlasi"
 
-#~ msgid "Member (0)"
-#~ msgstr "Membro (0)"
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Oftaj Demandoj pri Matrico"

po/es/neochat.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-27 00:24+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-25 17:55+0200\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
@@ -17,14 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 24.02.2\n"
+"X-Generator: Lokalize 24.05.1\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Escoger archivo local"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Imagen del portapapeles"
@@ -90,7 +90,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Cancelar respuesta"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -98,48 +98,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Recibir notificaciones de nuevos mensajes"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de red: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "El token de acceso no se ha encontrado"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "¿Es posible que se haya borrado?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Se ha denegado el acceso a la cadena de claves."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Por favor, permita que NeoChat pueda leer el token de acceso"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Ninguna cadena de claves disponible."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Instale una cadena de claves, como KWallet o el llavero de GNOME en Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No se ha podido leer el token de acceso"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recepción de notificaciones push"
@@ -322,7 +322,7 @@ msgstr "Invitado"
 msgid "Favorite"
 msgstr "Favorito"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Amigos"
@@ -756,18 +756,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Destino"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "No se ha configurado ningún servidor de identidades"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Error de red"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "El inicio de sesión ha fallado: %1"
@@ -815,8 +809,12 @@ msgstr "Cargando"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Por favor, espere. Esto puede tardar un poco."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Espere mientras sus mensajes se cargan del servidor. Esto puede tardar un "
+"poco."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -836,7 +834,7 @@ msgid "Loading…"
 msgstr "Cargando..."
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -957,8 +955,8 @@ msgstr "%1 (cargando)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Eliminar esta cuenta"
+msgid "Log out of this account"
+msgstr "Cerrar sesión de esta cuenta"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1747,40 +1745,46 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reaccionado con %3"
 msgstr[1] "%2 han reaccionado con %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Archivo demasiado grande para descargarlo."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Póngase en contacto con el administrador del servidor matrix para obtener "
 "asistencia."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "No se ha configurado ningún servidor de identidades"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "La creación de la sala ha fallado: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "La creación del espacio ha fallado: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "La denuncia se ha enviado correctamente."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Mensaje cifrado"
@@ -1834,12 +1838,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rechazar e ignorar usuario"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Abrir NeoChat"
@@ -1861,7 +1865,7 @@ msgid "Notification settings"
 msgstr "Preferencias de notificaciones"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configurar"
@@ -2233,17 +2237,17 @@ msgstr "Seleccione tipo"
 msgid "Space"
 msgstr "Espacio"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2251,52 +2255,52 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Hacer oficial este espacio padre"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Crear espacio"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Crear sala"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Seleccione sala existente"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Escoger sala"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Explorar salas"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Unido"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "Tiene el nivel de privilegio necesario en el espacio hijo para definir este "
 "estado"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2304,7 +2308,7 @@ msgstr ""
 "No tiene el nivel de privilegio suficientemente alto en el espacio hijo para "
 "definir este estado"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2312,7 +2316,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Hacer que este espacio sea el espacio padre canónico"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2442,14 +2446,14 @@ msgid "Explore rooms"
 msgstr "Explorar salas"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Encontrar amigos"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2486,16 +2490,16 @@ msgstr "Salas"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Buscar sala"
+msgid "Search Rooms"
+msgstr "Buscar salas"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Mostrar el menú"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Crear salas y chats"
@@ -2528,17 +2532,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Mostrar solo espacios"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduzca la dirección de una sala"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Encontrar una sala..."
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2576,60 +2580,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Configurar NeoChat..."
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Configurar NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Salir de NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Archivo"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Encontrar amigos"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nuevo grupo..."
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Explorar chats..."
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Editar"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Ver"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2637,35 +2641,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Abrir el selector rápido"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Ventana"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Salir de pantalla completa"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Entrar en pantalla completa"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Preguntas frecuentes de Matrix"
+msgid "About Matrix"
+msgstr "Acerca de Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Acerca de NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Acerca de KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2868,7 +2884,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "No hay ubicaciones compartidas en esta sala."
@@ -3001,7 +3017,7 @@ msgstr "Editar el nivel de poderes del usuario"
 msgid "New power level"
 msgstr "Nuevo nivel de poderes"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmar"
@@ -3152,8 +3168,9 @@ msgstr "Información de la sala"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Opciones"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Acciones"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3173,8 +3190,8 @@ msgstr "Eliminar sala de las favoritas"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Poner sala en favoritas"
+msgid "Favorite this room"
+msgstr "Hacer favorita esta sala"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3363,33 +3380,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Añadir nuevo servidor"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Añadir servidor"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Se ha introducido un servidor correcto"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "No se puede resolver este servidor o ya se ha añadido antes"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "El texto introducido no es una URL válida"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Introduzca URL del servidor (por ejemplo, kde.org)"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "URL del servidor"
@@ -3745,22 +3762,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Encontrar amigos"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Introduzca un ID de usuario"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Encontrar amigos..."
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Introduzca un texto para empezar a buscar amigos"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3942,47 +3959,47 @@ msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 "La verificación de la sesión se ha cancelado debido a un error desconocido."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "No hay ningún servidor."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Comprobando disponibilidad del servidor."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Este servidor no es válido."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registro de este servidor está desactivado."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Sin nombre de usuario."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Comprobando disponibilidad del nombre de usuario."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Este nombre de usuario no está disponible."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "Trabajando"
@@ -3997,17 +4014,17 @@ msgstr "Id de Matrix mal formada o vacía"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 no es un identificador de Matrix correcto"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "No se ha podido unir a la sala"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Ha solicitado unirse a «%1»"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "No se ha podido solicitar unirse a la sala"
@@ -4879,114 +4896,114 @@ msgstr "Alias"
 msgid "No canonical alias set"
 msgstr "Ningún alias canónico definido"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Hacer que este sea el alias canónico de la sala"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Borrar alias"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nuevo_alias:servidor.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Añadir nuevo alias"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistas previas de URL"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activar las vistas previas de URL de forma predeterminada para los miembros "
 "de la sala"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activar vistas previas de URL"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Las vistas previas de URL están activadas de forma predeterminada en esta "
 "sala"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Las vistas previas de URL están desactivadas de forma predeterminada en esta "
 "sala"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espacios padre oficiales"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canónico"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Hacer que sea el padre canónico"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Eliminar padre"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Esta sala no tiene ningún espacio padre oficial."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Añadir nuevo padre oficial"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala continúa otra conversación."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Ver mensajes antiguos..."
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Se ha sustituido esta sala."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Ver la nueva sala..."
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualizar la sala"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Seleccionar nueva versión"
@@ -5231,62 +5248,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Borrar palabra"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Ocultar"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Compartir"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Completar"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Código de país para el nuevo número de teléfono"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Nueva dirección de correo electrónico"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Nuevo número de teléfono"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Le hemos enviado un mensaje de correo"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Le hemos enviado un mensaje de texto"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1. Siga las instrucciones del mismo y pulse el botón inferior."
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "El correo electrónico introducido no es válido"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "El número de teléfono introducido no es válido"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Se ha introducido una contraseña incorrecta"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5295,7 +5336,7 @@ msgstr ""
 "El correo electrónico no ha sido verificado. Vaya al mensaje de correo, siga "
 "las instrucciones que contiene y pulse el botón inferior."
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5304,18 +5345,42 @@ msgstr ""
 "El número de teléfono no ha sido verificado. Vaya al mensaje de texto, siga "
 "las instrucciones que contiene y pulse el botón inferior."
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Añadir"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Volver"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1. Siga las instrucciones del mismo y pulse el botón superior."
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"El correo electrónico no ha sido verificado. Vaya al mensaje de correo, siga "
+"las instrucciones que contiene y pulse el botón superior."
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"El número de teléfono no ha sido verificado. Vaya al mensaje de texto, siga "
+"las instrucciones que contiene y pulse el botón superior."
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5491,6 +5556,20 @@ msgstr "Mostrar"
 msgid "Quit"
 msgstr "Salir"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Preguntas frecuentes de Matrix"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Eliminar esta cuenta"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Poner sala en favoritas"
+
 #~ msgid "Member (0)"
 #~ msgstr "Miembro (0)"
 

po/ia/neochat.po

@@ -1,14 +1,14 @@
 # Copyright (C) 2023 This file is copyright:
 # This file is distributed under the same license as the neochat package.
 #
-# SPDX-FileCopyrightText: 2021, 2022, 2023 Giovanni Sora <g.sora@tiscali.it>
+# SPDX-FileCopyrightText: 2021, 2022, 2023, 2024 Giovanni Sora <g.sora@tiscali.it>
 # giovanni <g.sora@tiscali.it>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-27 12:21+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 11:35+0200\n"
 "Last-Translator: giovanni <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 22.12.3\n"
+"X-Generator: Lokalize 23.08.5\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Selige file local"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Image de Area de transferentia"
@@ -89,7 +89,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Cancella responsa"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -97,48 +97,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Recipente notificationes de nove messages"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de rete: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Indicio de accesso non esseva trovate"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan il esseva delite?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesso a portaclave (keychain) esseva negate"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Pro favor tu permitte que NeoCht pote leger le indicio de accesso"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Nulle portaclaves disponibile"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Pro favor tu installa un portaclave, p.ex. KWallet oGNOMe keyring sur Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Incapace a leger indicio"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recipente notificationes de push"
@@ -321,7 +321,7 @@ msgstr "Invitate"
 msgid "Favorite"
 msgstr "Favorito"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Amicos"
@@ -755,18 +755,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Destination"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "Nulle servitor de identitate configurate"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Error de rete"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Accesso falleva: %1"
@@ -815,8 +809,12 @@ msgstr "Cargante"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Pro favor, tu expecta. Isto poterea prender un pauc de tempore."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Pro favor, tu expecta durante que tu message es cargate ex le servitor.  "
+"Isto poterea prender un pauc de tempore."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -836,7 +834,7 @@ msgid "Loading…"
 msgstr "Cargante..."
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -958,8 +956,8 @@ msgstr "%1 (cargante)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Edita iste conto"
+msgid "Log out of this account"
+msgstr "Claude session de iste conto"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1744,38 +1742,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 reagite con %3"
 msgstr[1] "%2 reagite con %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "File troppo grande a discargar."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Continge tu administrator de servitor de matrix per supporto."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "Nulle servitor de identitate configurate"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Creation de sala falleva: \"%1\""
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Creation de spatio falleva: \"%1\""
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Reporto inviate con successo."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Message Cryptate"
@@ -1829,12 +1833,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rejecta e ignora usator"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Aperi Neochat"
@@ -1856,7 +1860,7 @@ msgid "Notification settings"
 msgstr "Preferentias de notificationes"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configura"
@@ -2230,17 +2234,17 @@ msgstr "Selige typo"
 msgid "Space"
 msgstr "Spatio"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nomine:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Topico:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2248,51 +2252,51 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Face iste genitor official"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Crea spatio"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Crea sala"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Selige Sala Existente"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Selige data"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Explora salas"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Unite"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "Tu ha le nivello de privilegio requirite in le filio pro assignar iste stato"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2300,7 +2304,7 @@ msgstr ""
 "Tu non ha un nivello de privilegio assatis alte in le filio pro assignar "
 "iste stato"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2308,7 +2312,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Face iste spatio le genitor canonic"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2438,14 +2442,14 @@ msgid "Explore rooms"
 msgstr "Explora salas"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Trova tu amicos"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2482,16 +2486,16 @@ msgstr "Salas"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Cerca Sala"
+msgid "Search Rooms"
+msgstr "Cerca Salas"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Monstra menu"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Crea salas e conversationes"
@@ -2524,17 +2528,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Monstra solmente spatios"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Inserta adresse de sala"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Trova un sala ..."
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2572,60 +2576,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "Neochat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "Configura NeoChat..."
+msgid "Configure NeoChat…"
+msgstr "Configura NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Configura NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Abandona NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "File"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Trova tu amicos"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nove gruppo…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Naviga per Chats (Conversationes in directo)"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vista"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2633,35 +2637,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Aperi Commutator rapide (Open Quick Switch)"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Fenestra"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Exi del schermo integre"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Inserta schermo plen"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Adjuta"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "FAQ de Matrix:"
+msgid "About Matrix"
+msgstr "A proposito de Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "A proposito de NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "A proposito de KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2864,7 +2880,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Locationes"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "Il non ha locationes compartite in iste sala."
@@ -2997,7 +3013,7 @@ msgstr "Modifica le nivello de fortia de usator"
 msgid "New power level"
 msgstr "Assigna le nivello de fortia "
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -3150,8 +3166,9 @@ msgstr "Information de sala"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Optiones"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Actiones"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3171,8 +3188,8 @@ msgstr "Remove sala ex favoritos"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Face sala favorite"
+msgid "Favorite this room"
+msgstr "Favorite iste sala"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3362,33 +3379,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Adde nove servitor "
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Adde Servitor"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Servitor valide insertate"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Iste servitor non pote esser resolvite o ha ja essite addite"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "Le texto insertate non es un url valide"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Inserta usr de servitor p.ex. kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "URL de servitor"
@@ -3744,22 +3761,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Trova tu amicos"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Inserta  un ID de usator"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Trova tu amicos…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Inserta un texto per initiar a cercar tu amicos"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3940,47 +3957,47 @@ msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 "Le verification de session esseva cancellate debite a un error incognite."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Nulle servitor."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Verificante disponibilitate de Servitor."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Isto non es un valide servitor."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registration per iste servitor es dishabilitate."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Necun nomine de usator."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Verificante disponibilitate de nomine de usator."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Iste nomine de usator non es disponibile."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "travaliante"
@@ -3995,17 +4012,17 @@ msgstr "Malformate o Id de Matrice vacue"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 non es un correcte identificator de matrice"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Falleva a unir sala"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Tu requireva unir a '%1'"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Il falleva a requirer unir sala"
@@ -4878,108 +4895,108 @@ msgstr "Aliases"
 msgid "No canonical alias set"
 msgstr "Necun Alias canonic fixate"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Face iste alias le alias canonic de sala"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Dele alias"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Adde nove alias"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistas preliminar de URL"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Habilita vistas preliminar de URL predefinite per membros de sala"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Habilita vista preliminar de URL"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Viste preliminar de URL es habilitate per definition in iste sala"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Viste preliminar de URL es dishabilitate per definition in iste sala"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Spatio Official de Genitor"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canonic"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Face genitor canonic"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Remove  genitor"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Iste sala ha nulle spatios official de parente."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Adde nove genitor official"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Iste sala continua un altere conversation."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Vide messages plus vetere..."
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Iste sala ha essite reimplaciate."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Vide nove sala..."
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualisa le sala"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Selige nove version"
@@ -5224,64 +5241,88 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Dele parola"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Cela"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Comparti"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Remove"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Complete"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Cancella"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Codice de Pais per nove numero de telephono"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Nove adresse de e-posta"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Nove numero de telephono"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Nos te inviava un message de e-posta"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr " Nos te ha inviate un message de texto"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
-"%1, pro favor tu seque le instructiones illac e postea clissa sur le button "
+"%1, pro favor tu seque le instructiones illac e postea clicca sur le button "
 "a basso"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "Le eposta insertate non es valide"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "Le numero de telephono  insertate non es valide"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Contrasigno incorrecte insertate"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5290,7 +5331,7 @@ msgstr ""
 "Le message de e-posta non ha essite verificate. Pro favor vade al message de "
 "e-posta e seque le instructiones illac e postea clicca le button a basso"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5299,18 +5340,44 @@ msgstr ""
 "Le numero de telephono non ha essite verificate. Pro favor vade al message "
 "de texto e seque le instructiones illac e postea clicca le button a basso"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Adde"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Retro"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+"%1, pro favor tu seque le instructiones illac e postea clicca sur le button "
+"in alto"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"Le message de e-posta non ha essite verificate. Pro favor vade al message de "
+"e-posta e seque le instructiones illac e postea clicca le button in alto"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"Le numero de telephono non ha essite verificate. Pro favor vade al message "
+"de texto e seque le instructiones illac e postea clicca le button in alto"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5486,6 +5553,20 @@ msgstr "Monstra "
 msgid "Quit"
 msgstr "Quita"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "FAQ de Matrix:"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Edita iste conto"
+
+#~ msgid "Options"
+#~ msgstr "Optiones"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Face sala favorite"
+
 #~ msgid "Member (0)"
 #~ msgstr " Member (0)"
 

po/ie/neochat.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2022-10-28 19:18+0700\n"
 "Last-Translator: OIS <mistresssilvara@hotmail.com>\n"
 "Language-Team: kde-i18n-doc@kde.org\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Selecter un local file"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Image in li Paperiere"
@@ -92,7 +92,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Anullar li response"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgctxt ""
@@ -101,47 +101,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Inviar notificationes pri li tippada"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Errore de rete: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, fuzzy, kde-format
 msgid "Access token wasn't found"
 msgstr "Li plugin necessi por accesse al files MP3 ne esset trovat"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan it esset removet?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, fuzzy, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesse a %1 es refusat."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Null porta-clave disponibil."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, fuzzy, kde-format
 msgid "Unable to read access token"
 msgstr "Ne posset acessar «%s»"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Receiving push notifications"
@@ -336,7 +336,7 @@ msgstr "Invitat"
 msgid "Favorite"
 msgstr "Preferet"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -789,18 +789,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Inviar un invitation"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Errore de rete"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, fuzzy, kde-format
 msgid "Login Failed: %1"
 msgstr "Ne successat inregistrar: %1"
@@ -848,7 +842,9 @@ msgstr "Cargante..."
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr ""
 
 #: src/login/Login.qml:25
@@ -870,7 +866,7 @@ msgid "Loading…"
 msgstr "Cargante..."
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -998,7 +994,7 @@ msgstr "Cargante..."
 #: src/login/WelcomePage.qml:95
 #, fuzzy, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr "_Conto:"
 
 #: src/login/WelcomePage.qml:124
@@ -1861,38 +1857,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, fuzzy, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, fuzzy, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Raport sta inviat successosimen."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Ciffrat missage"
@@ -1948,12 +1950,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1976,7 +1978,7 @@ msgid "Notification settings"
 msgstr "Notificationes:"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configurar"
@@ -2368,18 +2370,18 @@ msgstr "Select omnicos"
 msgid "Space"
 msgstr "Spacies"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Nómine:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, fuzzy, kde-format
 #| msgid "No Topic"
 msgid "Topic:"
 msgstr "Sin tema"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2387,34 +2389,34 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Crear un chambre"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Crear un chambre"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -2422,24 +2424,24 @@ msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Explorar chambres"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Adheret"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, fuzzy, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2447,7 +2449,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Pseudonim"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2578,14 +2580,14 @@ msgid "Explore rooms"
 msgstr "Explorar chambres"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2624,17 +2626,17 @@ msgstr "Chambres"
 #: src/qml/ExploreComponent.qml:105
 #, fuzzy, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "Saliente Cinnamon"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, fuzzy, kde-format
 #| msgid "Ban this user"
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Bannir ti usator"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create rooms and chats"
@@ -2671,18 +2673,18 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, fuzzy, kde-format
 #| msgid "Find a room..."
 msgid "Find a room…"
 msgstr "Trovar un chambre..."
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, fuzzy, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2721,60 +2723,61 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Configurar NeoChat..."
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Configurar NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Surtir de NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "File"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nov gruppe..."
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, fuzzy, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "_Trovar"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Redacter"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vise"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, fuzzy, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2782,35 +2785,49 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Cambiar documentes"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Fenestre"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, fuzzy, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "_Plen-ecran"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, fuzzy, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "_Plen-ecran"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Auxilie"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
+msgctxt "menu"
+msgid "About Matrix"
+msgstr "Pri NeoChat"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Pri NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "FAQ de Matrix"
+msgid "About KDE"
+msgstr ""
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -3015,7 +3032,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Notificationes"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, fuzzy, kde-format
 #| msgid "You are already in this room."
 msgid "There are no locations shared in this room."
@@ -3163,7 +3180,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmar"
@@ -3325,9 +3342,10 @@ msgstr "Information pri li chambre"
 
 #: src/qml/RoomInformation.qml:68
 #, fuzzy, kde-format
-#| msgid "Options:"
-msgid "Options"
-msgstr "Optiones:"
+#| msgid "Notifications"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Notificationes"
 
 #: src/qml/RoomInformation.qml:78
 #, fuzzy, kde-format
@@ -3347,8 +3365,8 @@ msgstr "Remover ex li preferat"
 
 #: src/qml/RoomInformation.qml:96
 #, fuzzy, kde-format
-msgid "Make room favorite"
-msgstr "chambre"
+msgid "Favorite this room"
+msgstr "Saliente Cinnamon"
 
 #: src/qml/RoomInformation.qml:109
 #, fuzzy, kde-format
@@ -3546,33 +3564,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3946,23 +3964,23 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, fuzzy, kde-format
 #| msgid "Enter your Matrix ID"
 msgid "Enter a user ID"
 msgstr "Provide vor ID de Matrix"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, fuzzy, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -4109,52 +4127,52 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "Hem-servitor:"
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Sin nómine"
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Null usatores disponibil"
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4169,17 +4187,17 @@ msgstr "Provide vor ID de Matrix"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "«%1» ne sembla quam un ID de Matrix."
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, fuzzy, kde-format
 msgid "Failed to join room"
 msgstr "Invitar un usator"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, fuzzy, kde-format
 msgid "Failed to request joining room"
 msgstr "Invitar un usator"
@@ -5108,116 +5126,116 @@ msgstr "Altri pseudonimes:"
 msgid "No canonical alias set"
 msgstr "Pseudonim"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "Remover"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are enabled by default in this room"
 msgstr "%1 ja es in ti chambre."
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are disabled by default in this room"
 msgstr "%1 ja es in ti chambre."
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, fuzzy, kde-format
 msgid "Canonical"
 msgstr "Pseudonim"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, fuzzy, kde-format
 msgid "Make canonical parent"
 msgstr "Pseudonim"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, fuzzy, kde-format
 #| msgid "Report Message"
 msgid "Remove parent"
 msgstr "Raportar li missage"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, fuzzy, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Missage esset respondet"
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, fuzzy, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Pseudonim"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, fuzzy, kde-format
 msgid "See older messages…"
 msgstr "(o plu old)"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, fuzzy, kde-format
 msgid "This room has been replaced."
 msgstr "Missage esset respondet"
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, fuzzy, kde-format
 msgid "See new room…"
 msgstr "Vu have un nov invitation a un chambre"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "forlassat li chambre"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, fuzzy, kde-format
 msgid "Select new version"
 msgstr "Vu have un nov invitation a un chambre"
@@ -5461,85 +5479,112 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Remover li parol"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, fuzzy, kde-format
+#| msgid "Share"
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Partir"
+
+#: src/settings/ThreePIdCard.qml:66
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Remover"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, fuzzy, kde-format
+#| msgid "Compact"
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Compact"
+
+#: src/settings/ThreePIdCard.qml:90
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Anullar"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Visibil nómine"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 #| msgid "Members"
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Membres"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, fuzzy, kde-format
 msgid "We've sent you a text message"
 msgstr "Ne successat inviar un missage D-Bus"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, fuzzy, kde-format
 msgid "Incorrect password entered"
 msgstr "Contrasigne es ínvalid."
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, fuzzy, kde-format
 #| msgid "Add"
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Adjunter"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Back"
@@ -5547,6 +5592,26 @@ msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Retro"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
@@ -5724,6 +5789,24 @@ msgstr "Monstrar"
 msgid "Quit"
 msgstr "Surtir"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "FAQ de Matrix"
+
+#, fuzzy
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "_Conto:"
+
+#, fuzzy
+#~| msgid "Options:"
+#~ msgid "Options"
+#~ msgstr "Optiones:"
+
+#, fuzzy
+#~ msgid "Make room favorite"
+#~ msgstr "chambre"
+
 #, fuzzy
 #~| msgid "Members"
 #~ msgid "Member (0)"

po/ja/neochat.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2020-11-05 23:50-0800\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr ""
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr ""
@@ -85,7 +85,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr ""
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -93,47 +93,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr ""
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
@@ -313,7 +313,7 @@ msgstr ""
 msgid "Favorite"
 msgstr ""
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -746,18 +746,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr ""
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr ""
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
@@ -803,7 +797,9 @@ msgstr ""
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr ""
 
 #: src/login/Login.qml:25
@@ -824,7 +820,7 @@ msgid "Loading…"
 msgstr ""
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -944,7 +940,7 @@ msgstr ""
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr ""
 
 #: src/login/WelcomePage.qml:124
@@ -1722,38 +1718,44 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1807,12 +1809,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1834,7 +1836,7 @@ msgid "Notification settings"
 msgstr ""
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr ""
@@ -2200,17 +2202,17 @@ msgstr ""
 msgid "Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2218,56 +2220,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2275,7 +2277,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2403,14 +2405,14 @@ msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2447,16 +2449,16 @@ msgstr ""
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr ""
@@ -2489,17 +2491,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2537,60 +2539,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2598,34 +2600,46 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
+msgid "About Matrix"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
 msgstr ""
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
@@ -2827,7 +2841,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr ""
@@ -2960,7 +2974,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -3111,7 +3125,8 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
+msgctxt "Room actions"
+msgid "Actions"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:78
@@ -3132,7 +3147,7 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
+msgid "Favorite this room"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:109
@@ -3319,33 +3334,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3692,22 +3707,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3854,47 +3869,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -3909,17 +3924,17 @@ msgstr ""
 msgid "%1 is not a correct Matrix identifier"
 msgstr ""
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr ""
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr ""
@@ -4788,108 +4803,108 @@ msgstr ""
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr ""
@@ -5122,87 +5137,131 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/ka/neochat.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-27 04:41+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 05:45+0200\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <kde-i18n-doc@kde.org>\n"
 "Language: ka\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.3.2\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "აირჩიეთ ლოკალური ფაილი"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "ბუფერის გამოსახულება"
@@ -89,7 +89,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "პასუხის გაუქმება"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -97,47 +97,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "გაფრთხილებების მიღება ახალი შეტყობინებებისთვის"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "ქსელის შეცდომა: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "წვდომის კოდი ვერ ვიპოვე"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "შეიძლება წაშლილია?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "ბრელოკთან წვდომა აკრძალულია."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "მიეცით უფლება NeoChat-ს, წვდომის კოდი წაიკითხოს"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "ბრელოკი მიუწვდომელია."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "დააყენეთ ბრელოკი, მაგალითად, ლინუქსზე KWallet ან GNOME Keyring"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "წვდომის კოდის წაკითხვის შეცდომა"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "პუშ გაფრთხილებების მიღება"
@@ -320,7 +320,7 @@ msgstr "მოწვეულია"
 msgid "Favorite"
 msgstr "რჩეული"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "მეგობრები"
@@ -754,18 +754,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "დანიშნულება"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "იდენტიფიკატორების სერვერი მორგებული არაა"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "ქსელის შეცდომა"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "შესვლის შეცდომა: %1"
@@ -813,8 +807,12 @@ msgstr "იტვირთება"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "მოითმინეთ. ამას საკმაო დრო შეიძლება დასჭირდეს."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"მოითმინეთ, სანამ სერვერიდან თქვენი შეტყობინებები იტვირთება. ამას საკმაო დრო "
+"შეიძლება დასჭირდეს."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -834,7 +832,7 @@ msgid "Loading…"
 msgstr "ჩატვირთვა…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -956,8 +954,8 @@ msgstr "%1 (ჩატვირთვა)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "ამ ანგარიშის წაშლა"
+msgid "Log out of this account"
+msgstr "ამ ანგარიშიდან გასვლა"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1742,38 +1740,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2-ის რეაქცია იყო %3"
 msgstr[1] "%2-ის რეაქცია იყო %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "ფაილი გადმოსაწერად ძალიან დიდია."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "მხარდაჭერისთვის დაუკავშირდით თქვენი მატრიქსის სერვერის ადმინისტრატორს."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "იდენტიფიკატორების სერვერი მორგებული არაა"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "ოთახის შექმნის შეცდომა: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "სივრცის შექმნის შეცდომა: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "ანგარიში წარმატებით გაიგზავნა."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "გან: %1, გრძ: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "დაშიფრული შეტყობინება"
@@ -1827,12 +1831,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "მომხმარებლის უარყოფა და იგნორი"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "NeoChat-ის გახსნა"
@@ -1854,7 +1858,7 @@ msgid "Notification settings"
 msgstr "გაფრთხილებების მორგება"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "მორგება"
@@ -2226,17 +2230,17 @@ msgstr "ტიპის არჩევა"
 msgid "Space"
 msgstr "სივრცე"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "სახელი:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "თემა:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2244,57 +2248,57 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "ამ მშობლის გაოფიციალურება"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "სივრცის შექმნა"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "ოთახის შექმნა"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "აირჩიეთ არსებული ოთახი"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "აირჩიეთ ოთახი"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "ოთახების დათვალიერება"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "შეერთებული"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr "ამ მდგომარეობის დასაყენებლად შვილში საჭირო პრივილეგიის დონე გაგაჩნიათ"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 "ამ მდგომარეობის დასაყენებლად შვილში საჭირო პრივილეგიის დონეები არ გაგაჩნიათ"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2302,7 +2306,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "ამ სივრცის კანონიკურ მშობლად დაყენება"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2431,14 +2435,14 @@ msgid "Explore rooms"
 msgstr "ოთახების დათვალიერება"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "იპოვეთ თქვენი მეგობრები"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2475,16 +2479,16 @@ msgstr "ოთახები"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "ოთახის ძებნა"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "მენიუს ჩვენება"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "ჩატებისა და ოთახების შექმნა"
@@ -2517,17 +2521,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "მხოლოდ, სივრცეების ჩვენება"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "შეიყვანეთ ოთახის მისამართი"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "ოთახის პოვნა…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2565,60 +2569,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "NeoChat-ის მორგება..."
+msgid "Configure NeoChat…"
+msgstr "NeoChat-ის მორგება…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "NeoChat-ის მორგება..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "NeoChat-დან გასვლა"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "ფაილი"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "იპოვეთ თქვენი მეგობრები"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "ახალი ჯგუფი…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "ჩატების დათვალიერება…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "ჩასწორება"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "ნახვა"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2626,35 +2630,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "სწრაფი გადამრთველის გახსნა"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "ფანჯარა"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "სრული ეკრანიდან გამოსვლა"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "სრული ეკრანი"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "დახმარება"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix -ის ხდკ"
+msgid "About Matrix"
+msgstr "Matrix-ს შესახებ"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "NeoChat-ის შესახებ"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "KDE-ის შესახებ"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2857,7 +2873,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "მდებარეობები"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "ამ ოთახში მდებარეობები გაზიარებული არაა."
@@ -2990,7 +3006,7 @@ msgstr "მომხმარებლის წვდომის დონი
 msgid "New power level"
 msgstr "ახალი წვდომის დონე"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "დადასტურება"
@@ -3141,8 +3157,9 @@ msgstr "ინფორმაცია ოთახის შესახებ"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "პარამეტრები"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "ქმედებები"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3162,8 +3179,8 @@ msgstr "ოთახის რჩეულებიდან წაშლა"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "ოთახის რჩეულად მონიშვნა"
+msgid "Favorite this room"
+msgstr "ამ ოთახის რჩეულებში ჩამატება"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3352,33 +3369,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "ახალი სერვერის დამატება"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "სერვერის დამატება"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "შეყვანილი სერვერი სწორია"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "სერვერის ამოხსნა შეუძლებელია ან ის უკვე დამატებულია"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "შეყვანილი ტექსტი სწორ URL-ს არ წარმოადგენს"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "შეიყვანეთ სერვერის URL. მაგ: kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "სერვერის URL"
@@ -3732,22 +3749,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "იპოვეთ თქვენი მეგობრები"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "შეიყვანეთ მომხმარებლის ID"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "იპოვეთ თქვენი მეგობრები…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "მეგობრების ძებნის დასაწყებად შეიყვანეთ ტექსტი"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3908,47 +3925,47 @@ msgstr "დაშორებულმა სესიის გადამო
 msgid "The session verification was canceled due to an unknown error."
 msgstr "სესიის გადამოწმება უცნობი შეცდომის გამო გაუქმდა."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "სერვერის გარეშე."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "სერვერის წვდომადობის შემოწმება."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "ეს სწორი სერვერი არაა."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "ამ სერვერისთვის რეგისტრაცია გამორთულია."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "მომხმარებლის სახელის გარეშე."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "მომხმარებლის სახელის წვდომადობის შემოწმება."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "ეს მომხმარებლის სახელი ხელმისაწვდომი არაა."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "გაგრძელება"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "მუშაობს"
@@ -3963,17 +3980,17 @@ msgstr "არასწორი ან ცარიელი Matrix-ის ID"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1-ი Matrix-ის არასწორი იდენტიფიკატორია"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "ოთახში შესვლის შეცდომა"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "მოითხოვეთ '%1'-ზე შესვლა"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "ოთახში შესვლის მოთხოვნის შეცდომა"
@@ -3982,7 +3999,7 @@ msgstr "ოთახში შესვლის მოთხოვნის შ
 #, kde-format
 msgctxt "@title:window"
 msgid "About NeoChat"
-msgstr "NeoChat-ს შესახებ"
+msgstr "NeoChat-ის შესახებ"
 
 #: src/settings/AboutKDE.qml:7
 #, kde-format
@@ -4647,7 +4664,7 @@ msgstr "ქსელის პროქსი"
 #: src/settings/NeoChatSettings.qml:102
 #, kde-format
 msgid "About NeoChat"
-msgstr "NeoChat-ს შესახებ"
+msgstr "NeoChat-ის შესახებ"
 
 #: src/settings/NeoChatSettings.qml:108
 #, kde-format
@@ -4843,108 +4860,108 @@ msgstr "მეტსახელები"
 msgid "No canonical alias set"
 msgstr "კანონიკური მეტსახელი დაყენებული არაა"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "ამ მეტსახელის ოთახის კანონიკურ მეტსახელად დაყენება"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "მეტსახელის წაშლა"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "ახალი მეტსახელის დამატება"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "ბმულის მინიატურები"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "ოთახის წევრებისთვის ბმულების მინიატურების ნაგულისხმევად ჩართვა"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "ბმულის მინიატურების ჩართვა"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "ამ ოთახში ბმულების ავტომატური მინიატურები ნაგულისხმევადაა ჩართული"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "ამ ოთახში ბმულების ავტომატური მინიატურები ნაგულისხმევად გამორთულია"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "ოფიციალური მშობელი სივრცეები"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "კანონიკური"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "კანონიკურ მშობლად დაყენება"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "მშობლის წაშლა"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "ამ ოთახს ოფიციალური მშობელი სივრცეები არ გააჩნია."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "ოფიციალური მშობლის დამატება"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "ოთახი საუბრის შემდეგ გრძელდება."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "ძველი შეტყობინებების ნახვა…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "ეს ოთახი გამოცვლილია."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "ახალი ოთახის ნახვა…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "ოთახის გაუმჯობესება"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "აირჩიეთ ახალი ვერსია"
@@ -5186,62 +5203,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "სიტყვის წაშლა"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "დამალვა"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "გაზიარება"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "წაშლა"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "დასრულებულია"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "გაუქმება"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "ქვეყნის კოდი ახალი ტელეფონის ნომრისთვის"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "ახალი ელფოსტის მისამართი"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "ახალი ტელეფონის ნომერი"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "ჩვენ ელფოსტა გამოგიგზავნეთ"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "ჩვენ ტექსტური შეტყობინება გამოგიგზავნეთ"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
-msgstr "%1, მიჰყევით ინსტრუქციებს და დააწკაპუნეთ ქვემოთ ღილაკზე"
+msgstr "%1, მიჰყევით ინსტრუქციებს და დააწკაპუნეთ ღილაკზე ქვემოთ"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "შეყვანილი ელფოსტა არასწორია"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "შეყვანილი ტელეფონის ნომერი არასწორია"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "შეყვანილი პაროლი არასწორია"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5250,7 +5291,7 @@ msgstr ""
 "ელფოსტა არ გადამოწმებულა. გადადით ელფოსტაზე და მიჰყავთ ინსტრუქციებს, "
 "რომლებიც გამოგიგზავნეთ, შემდეგ კი ქვემოთ ღილაკზე დააწკაპუნეთ"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5260,18 +5301,43 @@ msgstr ""
 "მიჰყევით ინსტრუქციებს, რომელიც დაგხვდებათ. შემდეგ კი ქვემოთ ღილაკზე "
 "დააწკაპუნეთ"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "დამატება"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "უკან"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1, მიჰყევით ინსტრუქციებს და დააწკაპუნეთ ღილაკზე ზემოთ"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"ელფოსტა არ გადამოწმებულა. გადადით ელფოსტაზე და მიჰყავთ ინსტრუქციებს, "
+"რომლებიც გამოგიგზავნეთ, შემდეგ კი ზემოთ ღილაკზე დააწკაპუნეთ"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"ტელეფონის ნომერი გადამოწმებული არაა. გადადით ტექსტურ შეტყობინებაზე და "
+"მიჰყევით ინსტრუქციებს, რომელიც დაგხვდებათ. შემდეგ კი ზემოთ ღილაკზე "
+"დააწკაპუნეთ"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5446,6 +5512,20 @@ msgstr "ჩვენება"
 msgid "Quit"
 msgstr "დატოვება"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Matrix -ის ხდკ"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "ამ ანგარიშის წაშლა"
+
+#~ msgid "Options"
+#~ msgstr "პარამეტრები"
+
+#~ msgid "Make room favorite"
+#~ msgstr "ოთახის რჩეულად მონიშვნა"
+
 #~ msgid "Member (0)"
 #~ msgstr "წევრი (0)"
 

po/ko/neochat.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2024-02-24 22:09+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 23.08.1\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "로컬 파일 선택"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "클립보드의 그림"
@@ -88,7 +88,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "답장 취소"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -96,47 +96,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "새 메시지 알림 수신 중"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "네트워크 오류: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "접근 토큰을 찾을 수 없음"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "삭제되었을 수도 있습니다."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "키체인 접근이 거부되었습니다."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "NeoChat에서 접근 토큰 사용을 허용하십시오"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "키체인을 사용할 수 없습니다."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "키체인을 설치하십시오. 리눅스라면 KWallet, 그놈 키 모음 등이 있습니다"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "접근 토큰을 읽을 수 없음"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "푸시 알림 수신 중"
@@ -325,7 +325,7 @@ msgstr "초대 받음"
 msgid "Favorite"
 msgstr "책갈피"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "친구"
@@ -765,18 +765,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "대상"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "네트워크 오류"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "로그인 실패: %1"
@@ -823,8 +817,11 @@ msgid "Loading"
 msgstr "불러오는 중"
 
 #: src/login/Loading.qml:16
-#, kde-format
-msgid "Please wait. This might take a little while."
+#, fuzzy, kde-format
+#| msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr "잠시 기다려 주십시오. 시간이 걸릴 수 있습니다."
 
 #: src/login/Login.qml:25
@@ -845,7 +842,7 @@ msgid "Loading…"
 msgstr "불러오는 중…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -963,10 +960,11 @@ msgid "%1 (loading)"
 msgstr "%1(불러오는 중)"
 
 #: src/login/WelcomePage.qml:95
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Edit this account"
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "이 계정 삭제"
+msgid "Log out of this account"
+msgstr "이 계정 편집"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1795,38 +1793,44 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 님이 %3(으)로 반응함"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "파일이 다운로드하기에 너무 큽니다."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Matrix 서버 관리자에게 연락하십시오."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "대화방 생성 실패: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "스페이스 생성 실패: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "신고했습니다."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "위도: %1, 경도: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "암호화된 메시지"
@@ -1880,12 +1884,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "거부하고 사용자 무시"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1(%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "NeoChat 열기"
@@ -1907,7 +1911,7 @@ msgid "Notification settings"
 msgstr "알림 설정"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "설정"
@@ -2307,17 +2311,17 @@ msgstr "종류 선택"
 msgid "Space"
 msgstr "스페이스"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "이름:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "주제:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2325,58 +2329,58 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "이 부모를 공식으로 설정"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Space"
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "스페이스 만들기"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "대화방 만들기"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "기존 대화방 선택"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "대화방 선택"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "대화방 탐색"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "입장함"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr "이 상태를 설정하기에 충분한 권한 수준이 있음"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr "이 상태를 설정하기에 자식 대화방에서 충분한 권한 수준이 없음"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2384,7 +2388,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "이 스페이스를 공식 부모로 설정"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2515,14 +2519,14 @@ msgid "Explore rooms"
 msgstr "대화방 탐색"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "친구 찾기"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2561,17 +2565,17 @@ msgstr "대화방"
 #, fuzzy, kde-format
 #| msgid "Search"
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "검색"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, fuzzy, kde-format
 #| msgid "Switch User"
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "사용자 전환"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "대화방과 개인 대화 만들기"
@@ -2605,17 +2609,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "대화방 주소 입력"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "대화방 찾기…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2653,60 +2657,61 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "NeoChat 설정..."
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "NeoChat 설정..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "NeoChat 끝내기"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "파일"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "친구 찾기"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "새 그룹…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "대화 탐색…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "편집"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "보기"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2714,35 +2719,50 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "빠른 전환기 열기"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "창"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "전체 화면 나가기"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "전체 화면으로 전환"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "도움말"
 
-#: src/qml/GlobalMenu.qml:112
-#, kde-format
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix FAQ"
+msgid "About Matrix"
+msgstr "NeoChat 정보"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "NeoChat 정보"
+
+#: src/qml/GlobalMenu.qml:110
+#, fuzzy, kde-format
+#| msgid "About KDE"
+msgctxt "menu"
+msgid "About KDE"
+msgstr "KDE 정보"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2949,7 +2969,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "위치"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "이 대화방에 공유된 위치가 없습니다."
@@ -3087,7 +3107,7 @@ msgstr "사용자 권한 수준 편집"
 msgid "New power level"
 msgstr "새 권한 수준"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "확인"
@@ -3238,9 +3258,12 @@ msgid "Room information"
 msgstr "대화방 정보"
 
 #: src/qml/RoomInformation.qml:68
-#, kde-format
-msgid "Options"
-msgstr "옵션"
+#, fuzzy, kde-format
+#| msgctxt "Locations on a map"
+#| msgid "Locations"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "위치"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3259,9 +3282,10 @@ msgid "Remove room from favorites"
 msgstr "책갈피에서 대화방 삭제"
 
 #: src/qml/RoomInformation.qml:96
-#, kde-format
-msgid "Make room favorite"
-msgstr "책갈피에 대화방 추가"
+#, fuzzy, kde-format
+#| msgid "Leaving this room."
+msgid "Favorite this room"
+msgstr "이 대화방을 떠납니다."
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3449,33 +3473,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "새 서버 추가"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "서버 추가"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "올바른 서버를 입력함"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "이 서버를 해석할 수 없거나 이미 추가됨"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "입력한 텍스트가 올바른 URL이 아님"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "서버 URL 입력(예: kde.org)"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "서버 URL"
@@ -3833,22 +3857,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "친구 찾기"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "사용자 ID 입력"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "친구 찾기…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "친구 목록 검색을 시작하려면 텍스트를 입력하십시오"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3999,47 +4023,47 @@ msgstr "원격지에서 키가 일치하지 않아서 세션 확인을 취소했
 msgid "The session verification was canceled due to an unknown error."
 msgstr "알 수 없는 이유로 세션 확인이 취소되었습니다."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "서버가 없습니다."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "서버를 확인하고 있습니다."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "올바른 서버가 아닙니다."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "이 서버에 등록이 비활성화되어 있습니다."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "사용자 이름이 없습니다."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "사용자 이름 사용 가능 여부를 확인하고 있습니다."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "이 사용자 이름을 사용할 수 없습니다."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "계속"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "작업 중"
@@ -4054,17 +4078,17 @@ msgstr "잘못되었거나 빈 Matrix ID"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1이(가) 올바른 Matrix 식별자가 아님"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "대화방에 입장할 수 없음"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "'%1'에 입장을 요청함"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "대화방 입장 요청을 할 수 없음"
@@ -4954,108 +4978,108 @@ msgstr "별칭"
 msgid "No canonical alias set"
 msgstr "주 별명이 설정되지 않음"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "이 별명을 대화방의 주 별명으로 설정"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "별명 삭제"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "새 별명 추가"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "URL 미리 보기"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "기본값으로 대화방 구성원에 대하여 URL 미리 보기 활성화"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL 미리 보기 활성화"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "이 대화방에는 URL 미리 보기가 기본값으로 활성화되어 있음"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "이 대화방에는 URL 미리 보기가 기본값으로 비활성화되어 있음"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "공식 부모 스페이스"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canonical"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "공식 부모로 설정"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "부모 삭제"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "이 대화방에는 공식 부모 스페이스가 없습니다."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "새 공식 부모 추가"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "이 대화방에서 다른 대화가 진행 중입니다."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "이전 메시지 보기…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "이 대화방이 대체되었습니다."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "새 대화방 보기…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "대화방 업그레이드"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "새 버전 선택"
@@ -5292,90 +5316,117 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "단어 삭제"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, fuzzy, kde-format
+#| msgid "Share"
+msgctxt "@action:button"
+msgid "Share"
+msgstr "공유"
+
+#: src/settings/ThreePIdCard.qml:66
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "삭제"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, fuzzy, kde-format
+#| msgid "Compact"
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "간략함"
+
+#: src/settings/ThreePIdCard.qml:90
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "취소"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 #| msgid "Add an e-mail address:"
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "이메일 주소 추가:"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 #| msgid "Members"
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "구성원"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, fuzzy, kde-format
 #| msgid "sent a message"
 msgid "We've sent you a text message"
 msgstr "님이 메시지를 보냄"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "The entered email is not valid"
 msgstr "입력한 텍스트가 올바른 URL이 아님"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "The entered phone number is not valid"
 msgstr "입력한 텍스트가 올바른 URL이 아님"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, fuzzy, kde-format
 #| msgid "Wrong password entered"
 msgid "Incorrect password entered"
 msgstr "암호가 잘못됨"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, fuzzy, kde-format
 #| msgid "Add"
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "추가"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Back"
@@ -5383,6 +5434,26 @@ msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "뒤로"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, fuzzy, kde-format
 #| msgid "Copy room ID to clipboard"
@@ -5559,6 +5630,20 @@ msgstr "표시"
 msgid "Quit"
 msgstr "끝내기"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Matrix FAQ"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "이 계정 삭제"
+
+#~ msgid "Options"
+#~ msgstr "옵션"
+
+#~ msgid "Make room favorite"
+#~ msgstr "책갈피에 대화방 추가"
+
 #~ msgid "Member (0)"
 #~ msgstr "회원(0)"
 

po/lt/neochat.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2023-02-25 01:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
 "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr ""
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr ""
@@ -89,7 +89,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr ""
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -97,47 +97,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr ""
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
@@ -320,7 +320,7 @@ msgstr ""
 msgid "Favorite"
 msgstr ""
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -756,18 +756,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr ""
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr ""
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
@@ -813,7 +807,9 @@ msgstr ""
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr ""
 
 #: src/login/Login.qml:25
@@ -834,7 +830,7 @@ msgid "Loading…"
 msgstr ""
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -954,7 +950,7 @@ msgstr ""
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr ""
 
 #: src/login/WelcomePage.qml:124
@@ -1741,38 +1737,44 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1826,12 +1828,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1853,7 +1855,7 @@ msgid "Notification settings"
 msgstr ""
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr ""
@@ -2219,17 +2221,17 @@ msgstr ""
 msgid "Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2237,56 +2239,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2294,7 +2296,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2422,14 +2424,14 @@ msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2466,16 +2468,16 @@ msgstr ""
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr ""
@@ -2508,17 +2510,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2556,60 +2558,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2617,34 +2619,46 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
+msgid "About Matrix"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
 msgstr ""
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
@@ -2846,7 +2860,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr ""
@@ -2979,7 +2993,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -3130,7 +3144,8 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
+msgctxt "Room actions"
+msgid "Actions"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:78
@@ -3151,7 +3166,7 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
+msgid "Favorite this room"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:109
@@ -3341,33 +3356,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3722,22 +3737,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3884,47 +3899,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -3939,17 +3954,17 @@ msgstr ""
 msgid "%1 is not a correct Matrix identifier"
 msgstr ""
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr ""
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr ""
@@ -4818,108 +4833,108 @@ msgstr ""
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr ""
@@ -5152,87 +5167,131 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/nl/neochat.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 13:39+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 10:11+0200\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,14 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 24.02.2\n"
+"X-Generator: Lokalize 24.05.1\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Lokaal bestand kiezen"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Afbeelding in klembord"
@@ -89,7 +89,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Antwoord annuleren"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -97,48 +97,48 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Meldingen voor nieuwe berichten worden ontvangen"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Netwerkfout: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Toegangstoken is niet gevonden"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Misschien is het verwijderd?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Toegang tot sleutelring is geweigerd."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "laat NeoChat het toegangstoken lezen"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Geen sleutelring beschikbaar"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Installeer een sleutelring, bijv. KWallet of GNOME sleutelring op Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Lezen van toegangstoken lukt niet"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Push-meldingen ontvangen"
@@ -321,7 +321,7 @@ msgstr "Uitgenodigd"
 msgid "Favorite"
 msgstr "Favoriet"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Vrienden"
@@ -755,18 +755,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Bestemming"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "Geen identiteitsserver geconfigureerd"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Aanmelden mislukt: %1"
@@ -814,8 +808,12 @@ msgstr "Laden"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Even wachten. Dit kan even duren."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Even wachten terwijl uw berichten uit de server worden geladen. Dit kan even "
+"duren."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -835,7 +833,7 @@ msgid "Loading…"
 msgstr "Laden…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -957,8 +955,8 @@ msgstr "%1 (bezig met laden)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Dit account verwijderen"
+msgid "Log out of this account"
+msgstr "Uit dit account afmelden"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1745,38 +1743,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 reageerde met %3"
 msgstr[1] "%2 reageerde met %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Bestand is te groot om te downloaden."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Neem contact op met uw matrix-serverbeheerder voor ondersteuning."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "Geen identiteitsserver geconfigureerd"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Aanmaken van room is mislukt: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ruimte aanmaken is mislukt: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapport met succes verzonden."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Bte: %1, Lte: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Versleuteld bericht"
@@ -1830,12 +1834,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Gebruiker afwijzen en negeren"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Neochat openen"
@@ -1857,7 +1861,7 @@ msgid "Notification settings"
 msgstr "Instellingen van meldingen"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Configureren"
@@ -2231,17 +2235,17 @@ msgstr "Type selecteren"
 msgid "Space"
 msgstr "Ruimte"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2249,51 +2253,51 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Deze ouder officieel maken"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Ruimte aanmaken"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Kamer aanmaken"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Bestaande room selecteren"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Room kiezen"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Rooms verkennen"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Neemt deel aan"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "U hebt het vereiste rechtenniveau in het kind om deze status in te stellen"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2301,7 +2305,7 @@ msgstr ""
 "U hebt niet het vereiste rechtenniveau in het kind om deze status in te "
 "stellen"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2309,7 +2313,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Deze ruimte de canonieke ouder maken"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2439,14 +2443,14 @@ msgid "Explore rooms"
 msgstr "Rooms verkennen"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Zoek uw vrienden"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2483,16 +2487,16 @@ msgstr "Rooms"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Room doorzoeken"
+msgid "Search Rooms"
+msgstr "Rooms doorzoeken"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Menu tonen"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Rooms en chats aanmaken"
@@ -2525,17 +2529,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Alleen spaties tonen"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Een room-adres invoeren"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Een room zoeken…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2573,60 +2577,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "NeoChat configureren..."
+msgid "Configure NeoChat…"
+msgstr "NeoChat configureren…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "NeoChat configureren..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "NeoChat afsluiten"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Bestand"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Zoek uw vrienden"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nieuwe groep…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "In chats balderen…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Bewerken"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Beeld"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2634,35 +2638,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Snelle wisselaar openen"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Venster"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Volledig scherm verlaten"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Volledig scherm ingaan"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Help"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix-FAQ"
+msgid "About Matrix"
+msgstr "Info over Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Info over NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Info over KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2865,7 +2881,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Locaties"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "Er worden geen locaties in deze room gedeeld."
@@ -2998,7 +3014,7 @@ msgstr "Niveau van macht van gebruiker bewerken"
 msgid "New power level"
 msgstr "Niveau van macht"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Bevestigen"
@@ -3151,8 +3167,9 @@ msgstr "Informatie over room"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Opties"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Acties"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3172,8 +3189,8 @@ msgstr "Room uit favorieten verwijderen"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Room als favoriet instellen"
+msgid "Favorite this room"
+msgstr "Deze chatroom als favoriet markeren."
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3364,33 +3381,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Nieuwe server toevoegen"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Server toevoegen"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Geldige server ingevoerd"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Deze server is niet te vinden of is al toegevoegd"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "De ingevoerde tekst is geen geldige URL"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Server-URL invoeren bijv. kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "URL-adres server"
@@ -3747,22 +3764,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Zoek uw vrienden"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Een gebruiker-ID invoeren"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Zoek uw vrienden…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Tekst invoeren om te beginnen met zoeken naar uw vrienden"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3942,47 +3959,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr "Verificatie van de sessie is geannuleerd vanwege een onbekende fout."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Geen server."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Beschikbaarheid van server controleren."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Dit is geen geldige server."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registratie voor deze server is uitgeschakeld."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Geen gebruikersnaam."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Beschikbaarheid van gebruikersnaam controleren."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Deze gebruikersnaam is niet beschikbaar."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "Werkend"
@@ -3997,17 +4014,17 @@ msgstr "Verminkte of lege Matrix-id"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 is geen juiste Matrix-identifier"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Deelnemen aan room is mislukt"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "U verzocht om mee te doen met '%1'"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Verzoek om mee te doen met room is mislukt"
@@ -4879,108 +4896,108 @@ msgstr "Aliassen"
 msgid "No canonical alias set"
 msgstr "Geen canonieke alias ingesteld"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Deze alias de canonieke alias van de room maken"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Alias verwijderen"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Nieuwe alias toevoegen"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "URL voorbeelden"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "URL voorbeelden standaard inschakelen voor roomleden"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL voorbeelden inschakelen"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL voorbeelden zijn ingeschakeld voor dit room"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL voorbeelden zijn uitgeschakeld voor dit room"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Officiële ruimten voor ouders"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Canoniek"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Canonieke ouder maken"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Ouder verwijderen"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Deze room heeft geen officiële ouderruimten."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Nieuwe officiële ouderruimte toevoegen"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Deze room laat een andere conversatie verdergaan."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Zie oudere berichten…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Deze room is vervangen."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Zie nieuwe room…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "De room opwaarderen"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Nieuwe versie selecteren"
@@ -5226,62 +5243,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Woord verwijderen"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Verbergen"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Delen"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Voltooid"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Landcode voor nieuw telefoonnummer"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Nieuw e-mailadres"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Nieuw telefoonnummer"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "We hebben u een e-mail gestuurd"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "We hebben u een tekstbericht gestuurd"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1. Volg de instructies daar en klik daarna op de onderstaande knop"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "De ingevoerde e-mail is niet geldig"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "Het ingevoerde telefoonnummer is niet geldig"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Verkeerd wachtwoord ingevoerd"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5290,7 +5331,7 @@ msgstr ""
 "De e-mail is niet geverifieerd. Ga naar de e-mail en volg de instructies "
 "daar en klik daarna op de onderstaande knop"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5299,18 +5340,42 @@ msgstr ""
 "De telefoonnummer is niet geverifieerd. Ga naar het tekstbericht en volg de "
 "instructies daar en klik daarna op de onderstaande knop"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Terug"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1. Volg de instructies daar en klik daarna op de bovenstaande knop"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"De e-mail is niet geverifieerd. Ga naar de e-mail en volg de instructies "
+"daar en klik daarna op de bovenstaande knop"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"De telefoonnummer is niet geverifieerd. Ga naar het tekstbericht en volg de "
+"instructies daar en klik daarna op de bovenstaande knop"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5485,6 +5550,20 @@ msgstr "Tonen"
 msgid "Quit"
 msgstr "Afsluiten"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Matrix-FAQ"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Dit account verwijderen"
+
+#~ msgid "Options"
+#~ msgstr "Opties"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Room als favoriet instellen"
+
 #~ msgid "Member (0)"
 #~ msgstr "Lid (0)"
 

po/nn/neochat.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2023-08-24 21:25+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
@@ -20,12 +20,12 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Vel lokal fil"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Utklippstavle-bilete"
@@ -93,7 +93,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Avbryt svar"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgctxt ""
@@ -102,47 +102,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Send varsling om skriving"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Nettverksfeil: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Fann ikkje tilgangspollett"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Kanskje han er sletta?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Vart nekta tilgang til nøkkelring."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Gje NeoChat løyve til å lesa tilgangspolletten"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Ingen nøkkelring er tilgjengeleg."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Installer ein nøkkelring, for eksempel KWallet eller GNOME Keyring"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Klarte ikkje lesa tilgangspollett"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
@@ -337,7 +337,7 @@ msgstr "Invitert"
 msgid "Favorite"
 msgstr "Favorittar"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -780,18 +780,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Mål"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Feil ved innlogging: %1"
@@ -836,8 +830,11 @@ msgid "Loading"
 msgstr ""
 
 #: src/login/Loading.qml:16
-#, kde-format
-msgid "Please wait. This might take a little while."
+#, fuzzy, kde-format
+#| msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr "Vent litt. Dette kan ta ei stund."
 
 #: src/login/Login.qml:25
@@ -858,7 +855,7 @@ msgid "Loading…"
 msgstr "Lastar …"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -983,7 +980,7 @@ msgstr "Lastar opp"
 #, fuzzy, kde-format
 #| msgid "Edit this account"
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr "Rediger kontoen"
 
 #: src/login/WelcomePage.qml:124
@@ -1845,38 +1842,44 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 reagerte med %3"
 msgstr[1] "%2 reagerte med %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Fila er for stor til å kunna lastast ned."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Ta kontakt med administratoren av Matrix-tenaren for brukarstøtte."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Feil ved romregistrering: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Feil ved registrering av område: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapporten er no send."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Breiddegr.: %1 – lengdegr.: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Kryptert melding"
@@ -1932,12 +1935,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1960,7 +1963,7 @@ msgid "Notification settings"
 msgstr "Varslings­innstillingar"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Set opp"
@@ -2360,18 +2363,18 @@ msgstr "Merk alt"
 msgid "Space"
 msgstr "Område"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, fuzzy, kde-format
 #| msgid "No Topic"
 msgid "Topic:"
 msgstr "Manglar emne"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
 msgctxt ""
@@ -2380,58 +2383,58 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Space"
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Opprett område"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Opprett rom"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Vart med"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
 msgctxt ""
@@ -2440,7 +2443,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2573,14 +2576,14 @@ msgid "Explore rooms"
 msgstr "Utforsk rom"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2620,17 +2623,17 @@ msgstr "Rom"
 #| msgctxt "@action:title"
 #| msgid "Search"
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "Søk"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, fuzzy, kde-format
 #| msgid "Switch User"
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Byt brukar"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Opprett rom og diskusjonar"
@@ -2668,18 +2671,18 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, fuzzy, kde-format
 #| msgid "Find a room..."
 msgid "Find a room…"
 msgstr "Finn eit rom …"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, fuzzy, kde-format
 #| msgctxt "@info:label"
 #| msgid "No rooms found"
@@ -2719,60 +2722,61 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Set opp NeoChat …"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Set opp NeoChat …"
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Avslutt NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Fil"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Ny gruppe …"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Bla gjennom pratar …"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Rediger"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Vis"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2780,35 +2784,50 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Opna snøggvekslar"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Vindauge"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Gå ut av fullskjermsmodus"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Start fullskjermmodus"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/qml/GlobalMenu.qml:112
-#, kde-format
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix-OSS"
+msgid "About Matrix"
+msgstr "Om NeoChat"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgid "About NeoChat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Om NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, fuzzy, kde-format
+#| msgid "About KDE"
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Om KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -3017,7 +3036,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Posisjonar"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "Ingen posisjonar er delte i rommet."
@@ -3167,7 +3186,7 @@ msgstr "Rediger maktnivå for brukar"
 msgid "New power level"
 msgstr "Vel maktnivå for brukar"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Stadfest"
@@ -3321,11 +3340,13 @@ msgctxt "@action:title"
 msgid "Room information"
 msgstr ""
 
-# Er ulike handlingar ein kan gjera, for eksempel gjera rommet til favoritt. «Handlingar» fungerer derfor betre enn «Val» eller «Alternativ».
 #: src/qml/RoomInformation.qml:68
-#, kde-format
-msgid "Options"
-msgstr "Handlingar"
+#, fuzzy, kde-format
+#| msgctxt "Locations on a map"
+#| msgid "Locations"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Posisjonar"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3344,9 +3365,10 @@ msgid "Remove room from favorites"
 msgstr "Fjern rommet frå favorittar"
 
 #: src/qml/RoomInformation.qml:96
-#, kde-format
-msgid "Make room favorite"
-msgstr "Gjer rommet til favoritt"
+#, fuzzy, kde-format
+#| msgid "Leaving this room."
+msgid "Favorite this room"
+msgstr "Forlèt rommet."
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3549,33 +3571,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Legg til ny tenar"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Legg tenar"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Gyldig tenar"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Fann ikkje adressa til tenaren, eller så er han alt lagd til"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "Oppgjeven tekst er ikkje ei gyldig adresse"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Skriv inn adressa til tenaren, eks. kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "Tenaradresse"
@@ -3947,24 +3969,24 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, fuzzy, kde-format
 #| msgid "unbanned a user"
 msgid "Enter a user ID"
 msgstr "oppheva utestenging av ein brukar"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, fuzzy, kde-format
 #| msgid "Enter a text to start searching"
 msgid "Enter text to start searching for your friends"
 msgstr "Skriv inn tekst for å starta søket"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, fuzzy, kde-format
 #| msgid "No results found"
 msgctxt "@info:label"
@@ -4129,47 +4151,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr "Stadfestinga av økta vart av ukjend grunn avbroten."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4184,17 +4206,17 @@ msgstr "Tom eller ugyldig Matrix-ID"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 er ikkje ein gyldig Matrix-identifikator"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Klarte ikkje verta med i rommet"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Du har bedt om å få verta med i «%1»"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Klarte ikkje be om å få verta med i rommet"
@@ -5089,114 +5111,114 @@ msgstr "Alias"
 msgid "No canonical alias set"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Slett aliaset"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nytt_alias:tenar.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Registrer nytt alias"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Førehandsvising av nettadresser"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Slå på førehandsvising av nettadresser for rommedlemmar"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Slå på førehandsvising av nettadresser"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Førehandsvising av nettadresser er som standard slått på for dette rommet"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Førehandsvising av nettadresser er som standard slått av for dette rommet"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Fjern melding"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Rommet er bytt ut."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Rommet er framhald av ein tidlegare samtale."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Vis eldre meldingar …"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Rommet er bytt ut."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Sjå det nye rommet …"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Oppgrader rommet"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Vel ny versjon"
@@ -5442,94 +5464,141 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Fjern ord"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, fuzzy, kde-format
+#| msgid "Share"
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Del"
+
+#: src/settings/ThreePIdCard.qml:66
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Fjern"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, fuzzy, kde-format
+#| msgid "Compact"
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Kompakt"
+
+#: src/settings/ThreePIdCard.qml:90
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, fuzzy, kde-format
 #| msgid "Members"
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Medlemmar"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, fuzzy, kde-format
 #| msgid "sent a message"
 msgid "We've sent you a text message"
 msgstr "sende ei melding"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "The entered email is not valid"
 msgstr "Oppgjeven tekst er ikkje ei gyldig adresse"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "The entered phone number is not valid"
 msgstr "Oppgjeven tekst er ikkje ei gyldig adresse"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, fuzzy, kde-format
 #| msgid "Wrong password entered"
 msgid "Incorrect password entered"
 msgstr "Du skreiv inn feil passord"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, fuzzy, kde-format
 #| msgid "Add"
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Legg til"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, fuzzy, kde-format
 #| msgid "Copy room ID to clipboard"

po/sl/neochat.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 07:24+0200\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 08:13+0200\n"
 "Last-Translator: Matjaž Jeran <matjaz.jeran@amis.net>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
@@ -21,12 +21,12 @@ msgstr ""
 "%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 3.4.4\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Izberi lokalno datoteko"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Slika odložišča"
@@ -92,7 +92,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Prekliči odgovor"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -100,47 +100,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Sprejemanje obvestil za nova sporočila"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Napaka omrežja: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Žetona za dostop ni bilo mogoče najti"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Ali je bil mogoče izbrisan?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Dostop do verige ključev je bil zavrnjen."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Dovolite, da NeoChat prebere žeton za dostop"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Nobene verige ključev ni na voljo."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Namestite verigo ključev, npr. KWallet ali GNOME Keyring v Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Žetona za dostop ni mogoče prebrati"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Sprejemanje potisnih obvestil"
@@ -325,7 +325,7 @@ msgstr "Povabila"
 msgid "Favorite"
 msgstr "Priljubljeno"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Prijatelji"
@@ -761,18 +761,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Cilj"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "Ni konfigurirana identiteta strežnika"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Napaka omrežja"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Prijava je spodletela: %1"
@@ -820,8 +814,12 @@ msgstr "Nalaganje"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Prosim počakajte. To utegne trajati nekaj časa."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Počakajte, da se vaša sporočila naložijo iz strežnika. To lahko traja nekaj "
+"časa."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -841,7 +839,7 @@ msgid "Loading…"
 msgstr "Nalaganje …"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -961,8 +959,8 @@ msgstr "%1 (nalaganje)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Odstrani ta račun"
+msgid "Log out of this account"
+msgstr "Odjavi se iz tega računa"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1752,38 +1750,44 @@ msgstr[1] "%2 se je odzval z %3"
 msgstr[2] "%2 sta se odzvala z %3"
 msgstr[3] "%2 so se odzvali z %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Datoteka je prevelika za prenos."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Stopite v stik za podporo z vašim skrbnikom matrixa."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "Ni konfigurirana identiteta strežnika"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ustvarjanje sobe ni uspelo: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ustvarjanje prostora ni uspelo: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Poročilo uspešno poslano."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Širina: %1, Dolžina: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Šifrirano sporočilo"
@@ -1837,12 +1841,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Zavrni in prezri uporabnika"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Odpri NeoChat"
@@ -1864,7 +1868,7 @@ msgid "Notification settings"
 msgstr "Nastavitve obvestil"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Nastavi"
@@ -2236,17 +2240,17 @@ msgstr "Izberi vrsto"
 msgid "Space"
 msgstr "Prostor"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Tema:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2254,56 +2258,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Določi tega nadrejenega kot uradnega"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Ustvari prostor"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Ustvari sobo"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Izberite obstoječo sobo"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Poberite sobo"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Razišči sobe"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Pridružen"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr "Imate zahtevane pravice odvisnega, da nastavite to stanje"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr "Nimate dovolj pravic odvisnega, da nastavite to stanje"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2311,7 +2315,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Določi ta prostor kot kanonično nadrejenega"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2441,14 +2445,14 @@ msgid "Explore rooms"
 msgstr "Razišči sobe"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Poišči vaše prijatelje"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2485,16 +2489,16 @@ msgstr "Sobe"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Išči sobo"
+msgid "Search Rooms"
+msgstr "Išči sobe"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Prikaži meni"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Ustvari sobe in klepete"
@@ -2527,17 +2531,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Prikazuj samo prostore"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Vnesite naslov sobe"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Najdi sobo …"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2575,60 +2579,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "Nastavi NeoChat …"
+msgid "Configure NeoChat…"
+msgstr "Konfiguriraj NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Nastavi NeoChat …"
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Zapusti NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Datoteka"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Najdi vaše prijatelje"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Nova skupina …"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Brskaj po klepetih …"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Uredi"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Pogled"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2636,35 +2640,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Odpri hitri preklopnik"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Okno"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Izhod iz celozaslonskega načina"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Vstopi na celotni zaslon"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Pomoč"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Pogosta vprašanja o Matrixu"
+msgid "About Matrix"
+msgstr "O programu Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "O programu NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "O KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2867,7 +2883,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Lokacije"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "Ni deljenih lokacij v tej sobi."
@@ -3000,7 +3016,7 @@ msgstr "Uredi raven moči uporabnika"
 msgid "New power level"
 msgstr "Nova raven moči"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Potrdi"
@@ -3151,8 +3167,9 @@ msgstr "Informacije o sobi"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Možnosti"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Dejavnosti"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3172,8 +3189,8 @@ msgstr "Odstrani sobo iz priljubljenih"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Dodaj sobo med priljubljene"
+msgid "Favorite this room"
+msgstr "Označi to sobo za najljubšo"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3366,33 +3383,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Dodaj novi strežnik"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Dodaj strežnik"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Vnesen veljaven strežnik"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Tega strežnika ni mogoče rešiti ali pa je že dodan"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "Vneseno besedilo ni veljavni naslov url"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Vnesite strežnikov naslov url npr. kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "Strežnikov naslov url"
@@ -3753,22 +3770,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Poišči vaše prijatelje"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Vnesite določilnik uporabnika (ID)"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Poiščite svoje prijatelje …"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Vnesite besedilo za začetek iskanja vaših prijateljev"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3939,47 +3956,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr "Verifikacija seje je bila preklicana zaradi neznane napake."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Ni strežnika."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Preverjanje razpoložljivosti strežnika."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "To ni veljavni strežnik."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registracija za ta strežnik je onemogočena."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Ni uporabniškega imena."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Preverjanje razpoložljivosti uporabniškega imena."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Tega uporabniškega imena ni na voljo."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "V delovanju"
@@ -3994,17 +4011,17 @@ msgstr "Slabo oblikovan ali prazen Matrix id"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 ni pravilen Matrix identifikator"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Neuspela pridružitev v sobo"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Prosili ste za pridružitev v »%1«"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Neuspela prošnja za pridružitev v sobo"
@@ -4875,108 +4892,108 @@ msgstr "Vzdevki"
 msgid "No canonical alias set"
 msgstr "Ni nastavljenega kanoničnega vzdevka"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Nastavi ta vzdevek kot kanonični vzdevek sobe"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Zbriši vzdevek"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Dodaj novi vzdevek"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Predogledi URL"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Privzeto omogoči predoglede URL za člane sobe"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Omogoči predoglede URL"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Predogledi URL so privzeto omogočeni v tej sobi"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Predogledi URL so privzeto onemogočeni v tej sobi"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Uradni nadrejeni prostori"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Kanonični"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Naredi kanonično nadrejenega"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Odstrani nadrejenega"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Ta soba nima uradnih nadrejenih prostorov."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Dodaj novega uradno nadrejenega"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ta soba nadaljuje drug klepet."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Prikaži starejša sporočila …"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ta soba je bila zamenjana."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Prikaži novo sobo …"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Nadgradi sobo"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Izberi novo različico"
@@ -5220,62 +5237,86 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Izbriši besedo"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Skrij"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Deli"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Odstrani"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Dokončano"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Koda države za novo telefonsko številko"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Novi naslov e-pošte"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Nova telefonska številka"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Poslali smo vam elektronsko sporočilo"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Poslali smo vam besedilno sporočilo"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1. Sledite navodilom in nato kliknite na gumb spodaj"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "Vneseni naslov e-pošte ni veljaven"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "Vnesena telefonska številka ni veljavna"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Vneseno napačno geslo"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5284,7 +5325,7 @@ msgstr ""
 "E-pošta ni bila preverjena. Pojdite v e-pošto in sledite tamkajšnjim "
 "navodilom ter nato kliknite spodnji gumb"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5293,18 +5334,42 @@ msgstr ""
 "Telefonska številka ni bila preverjena. Pojdite na besedilno sporočilo in "
 "sledite tamkajšnjim navodilom ter nato kliknite na gumb spodaj"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Nazaj"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1. Sledite navodilom in nato kliknite na gumb zgoraj"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"E-pošta ni bila preverjena. Pojdite v e-pošto in sledite tamkajšnjim "
+"navodilom ter nato kliknite gumb zgoraj"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"Telefonska številka ni bila preverjena. Pojdite na besedilno sporočilo in "
+"sledite tamkajšnjim navodilom ter nato kliknite na gumb zgoraj"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5480,6 +5545,20 @@ msgstr "Prikaži"
 msgid "Quit"
 msgstr "Zapusti"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Pogosta vprašanja o Matrixu"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Odstrani ta račun"
+
+#~ msgid "Options"
+#~ msgstr "Možnosti"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Dodaj sobo med priljubljene"
+
 #~ msgid "Member (0)"
 #~ msgstr "Član (0)"
 

po/tok/neochat.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2024-01-08 19:47-0500\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Toki Pona <http://weblate.blackquill.cc/projects/ante-toki-pi-"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : 3;\n"
 "X-Generator: Poedit 3.4.2\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr ""
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr ""
@@ -95,7 +95,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "o ala"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, fuzzy, kde-format
 #| msgid "Receiving push notifications"
 msgctxt ""
@@ -104,49 +104,49 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Receiving push notifications"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "pakala linluwi: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "nanpa sijelo len li ken ala alasa"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "ken la ona li kama ala"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "poki len li pana ala e ken kepeken"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "o ken e ilo NeoChat tawa nanpa sijelo len"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "poki len li lon ala."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "o kama jo e poki len. sina kepeken ilo Linux la ilo KWallet anu ilo GNOME "
 "Keyring li poki len."
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "mi ken ala kepeken nanpa sijelo len."
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Receiving push notifications"
@@ -336,7 +336,7 @@ msgstr ""
 msgid "Favorite"
 msgstr ""
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr ""
@@ -782,18 +782,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr ""
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr ""
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "sina ken ala sijelo: %1"
@@ -840,8 +834,11 @@ msgid "Loading"
 msgstr "mi pali…"
 
 #: src/login/Loading.qml:16
-#, kde-format
-msgid "Please wait. This might take a little while."
+#, fuzzy, kde-format
+#| msgid "Please wait. This might take a little while."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
 msgstr "o awen. ken la tenpo ni li tenpo meso..."
 
 #: src/login/Login.qml:25
@@ -863,7 +860,7 @@ msgid "Loading…"
 msgstr "mi pali…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -996,7 +993,7 @@ msgstr "mi pali…"
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgctxt "@action:button"
-msgid "Remove this account"
+msgid "Log out of this account"
 msgstr "o ante e toki"
 
 #: src/login/WelcomePage.qml:124
@@ -1821,38 +1818,44 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "lipu li suli pi ken jo ala."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "o toki tawa lawa sina pi ilo Matrix."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Encrypted Message"
@@ -1907,12 +1910,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, fuzzy, kde-format
 #| msgctxt "menu"
 #| msgid "NeoChat"
@@ -1936,7 +1939,7 @@ msgid "Notification settings"
 msgstr ""
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "o ante e lawa"
@@ -2319,18 +2322,18 @@ msgstr ""
 msgid "Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "nimi:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, fuzzy, kde-format
 #| msgid "Room Topic"
 msgid "Topic:"
 msgstr "nasin tomo"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2338,34 +2341,34 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "o pali e tomo toki"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "o pali e tomo toki"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, fuzzy, kde-format
 #| msgid "Create a Room"
@@ -2373,24 +2376,24 @@ msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "o pali e tomo toki"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2398,7 +2401,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2529,14 +2532,14 @@ msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2576,17 +2579,17 @@ msgstr "nimi tomo"
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "o pali e tomo toki"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, fuzzy, kde-format
 #| msgid "Ban this user"
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "o weka wawa e jan ni"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, fuzzy, kde-format
 #| msgid "Open a private chat"
 msgid "Create rooms and chats"
@@ -2622,18 +2625,18 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Find a room…"
 msgstr "o pana e toki"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2671,60 +2674,61 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "ilo toki NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
-#, kde-format
-msgid "Configure NeoChat..."
+#: src/qml/GlobalMenu.qml:24
+#, fuzzy, kde-format
+#| msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "o ante e lawa pi ilo toki NeoChat..."
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "o ante e lawa pi ilo toki NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "o pini e ilo toki NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "lipu"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr ""
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "o lon e tomo kulupu sin…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "o alasa e tomo toki…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "ante"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "lukin"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2732,35 +2736,51 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "o open e ilo tawa"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "sijelo ilo"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "o weka tan ilo suli"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "o tawa ilo suli"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "wile pona"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
+#, fuzzy, kde-format
+#| msgctxt "menu"
+#| msgid "Quit NeoChat"
+msgctxt "menu"
+msgid "About Matrix"
+msgstr "o pini e ilo toki NeoChat"
+
+#: src/qml/GlobalMenu.qml:106
+#, fuzzy, kde-format
+#| msgctxt "menu"
+#| msgid "Quit NeoChat"
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "o pini e ilo toki NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "lipu sona pi ilo Matrix"
+msgid "About KDE"
+msgstr ""
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2964,7 +2984,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr ""
@@ -3105,7 +3125,7 @@ msgstr ""
 msgid "New power level"
 msgstr ""
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -3260,7 +3280,8 @@ msgstr ""
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
+msgctxt "Room actions"
+msgid "Actions"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:78
@@ -3280,9 +3301,10 @@ msgid "Remove room from favorites"
 msgstr ""
 
 #: src/qml/RoomInformation.qml:96
-#, kde-format
-msgid "Make room favorite"
-msgstr ""
+#, fuzzy, kde-format
+#| msgid "Create a Room"
+msgid "Favorite this room"
+msgstr "o pali e tomo toki"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3482,33 +3504,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr ""
@@ -3879,23 +3901,23 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, fuzzy, kde-format
 #| msgid "Enter your Matrix ID"
 msgid "Enter a user ID"
 msgstr "o pana e nimi sina pi ilo Matrix"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgctxt "@info:label"
@@ -4043,52 +4065,52 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr ""
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "nasin URL ilo:"
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, fuzzy, kde-format
 #| msgctxt "NAME OF TRANSLATORS"
 #| msgid "Your names"
 msgid "No username."
 msgstr "kulupu pi ante toki pi toki pona"
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "o awen tawa"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4103,17 +4125,17 @@ msgstr ""
 msgid "%1 is not a correct Matrix identifier"
 msgstr ""
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr ""
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr ""
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr ""
@@ -5006,113 +5028,113 @@ msgstr ""
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "o weka"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "o ante e toki"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "See older messages…"
 msgstr "o pana e toki"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgid "Upgrade the Room"
 msgstr "o pali e tomo toki"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr ""
@@ -5348,90 +5370,135 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "o weka"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:66
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "o ante e toki"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, fuzzy, kde-format
+#| msgid "Cancel"
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "o ala"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "We've sent you a text message"
 msgstr "o pana e toki"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, fuzzy, kde-format
 #| msgid "Add"
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "o lon e nimi len luka"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5608,6 +5675,10 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "lipu sona pi ilo Matrix"
+
 #, fuzzy
 #~| msgid "Open in new window"
 #~ msgid "Open in New Window"

po/uk/neochat.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 08:31+0300\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-24 09:45+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian\n"
 "Language: uk\n"
@@ -20,12 +20,12 @@ msgstr ""
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 23.04.3\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "Виберіть локальний файл"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "Зображення з буфера"
@@ -91,7 +91,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "Скасувати відповідь"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -99,49 +99,49 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "Отримання сповіщень щодо нових повідомлень"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Помилка у мережі: %1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Не знайдено жетона доступу"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Можливо, його вилучено?"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Відмовлено у доступі до засобу керування ключами."
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Будь ласка, дозвольте NeoChat читання жетона доступу"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "Немає доступних засобів керування ключами."
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Будь ласка, встановіть засіб керування ключами, наприклад KWallet або GNOME "
 "keyring у Linux"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Не вдалося прочитати жетон доступу"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Отримання імпульсних сповіщень"
@@ -326,7 +326,7 @@ msgstr "Запрошено"
 msgid "Favorite"
 msgstr "Улюблене"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "Друзі"
@@ -762,18 +762,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "Призначення"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "Не налаштовано жодного сервера профілів"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "Помилка у мережі"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Невдала спроба увійти: %1"
@@ -822,8 +816,12 @@ msgstr "Завантаження"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "Будь ласка, зачекайте. Обробка може бути досить тривалою."
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
+"Будь ласка, зачекайте, доки ваші повідомлення буде завантажено з сервера. "
+"Обробка може бути досить тривалою."
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -843,7 +841,7 @@ msgid "Loading…"
 msgstr "Завантаження…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -963,8 +961,8 @@ msgstr "%1 (завантаження)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "Вилучити цей обліковий запис"
+msgid "Log out of this account"
+msgstr "Вийти з цього облікового запису"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1762,39 +1760,45 @@ msgstr[1] "Реакція %2 — %3"
 msgstr[2] "Реакція %2 — %3"
 msgstr[3] "Реакція %2 — %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "Файл є надто великим для отримання."
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Зв'яжіться із адміністратором вашого сервера matrix, щоб отримати допомогу."
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "Не налаштовано жодного сервера профілів"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Не вдалося створити кімнату: %1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Не вдалося створити простір: %1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Скаргу успішно надіслано."
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Шир: %1, Довг: %2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Зашифроване повідомлення"
@@ -1848,12 +1852,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Відмовити та ігнорувати користувача"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Відкрити NeoChat"
@@ -1875,7 +1879,7 @@ msgid "Notification settings"
 msgstr "Параметри сповіщень"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "Налаштувати"
@@ -2249,17 +2253,17 @@ msgstr "Вибрати тип"
 msgid "Space"
 msgstr "Простір"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "Тема:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2267,52 +2271,52 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "Зробити цей батьківський запис офіційним"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "Створити простір"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "Створити кімнату"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "Виберіть наявну кімнату"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "Вибрати кімнату"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "Ознайомитися з кімнатами"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "Долучення виконано"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 "У вас недостатній рівень прав доступу у дочірньому записі для встановлення "
 "цього стану"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
@@ -2320,7 +2324,7 @@ msgstr ""
 "У вас недостатньо високий рівень прав доступу у дочірньому записів для "
 "встановлення цього стану"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2328,7 +2332,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "Зробити цей простір канонічним батьківським"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2458,14 +2462,14 @@ msgid "Explore rooms"
 msgstr "Ознайомитися з кімнатами"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "Знайдіть ваших друзів"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2502,16 +2506,16 @@ msgstr "Кімнати"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
-msgstr "Шукати кімнату"
+msgid "Search Rooms"
+msgstr "Шукати кімнати"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "Показати меню"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "Створити кімнати і спілкування"
@@ -2544,17 +2548,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "Показати лише простори"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "Введіть адресу кімнати"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "Знайти кімнату…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2592,60 +2596,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
+msgid "Configure NeoChat…"
 msgstr "Налаштувати NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "Налаштувати NeoChat…"
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "Вийти з NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "Файл"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "Знайдіть ваших друзів"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "Створити групу…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "Навігація спілкуваннями…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "Зміни"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "Перегляд"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2653,35 +2657,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "Відкрити «Швидкий перемикач»"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "Вікно"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "Вийти з повноекранного режиму"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "Увійти до повноекранного режиму"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "Довідка"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Поширені питання щодо Matrix"
+msgid "About Matrix"
+msgstr "Про Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "Про NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "Про KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2884,7 +2900,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "Місця"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "У цій кімнаті не оприлюднюються місця перебування."
@@ -3017,7 +3033,7 @@ msgstr "Редагування рівня можливостей користу
 msgid "New power level"
 msgstr "Новий рівень можливостей"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "Підтвердити"
@@ -3169,8 +3185,9 @@ msgstr "Відомості щодо кімнати"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "Параметри"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "Дії"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3190,8 +3207,8 @@ msgstr "Вилучити кімнату з улюблених"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "Зробити кімнату улюбленою"
+msgid "Favorite this room"
+msgstr "Зробити улюбленою цю кімнату"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3385,33 +3402,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "Додати новий сервер"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "Додавання сервера"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "Введено коректний сервер"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "Цей сервер не вдалося визначити або сервер уже було додано"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "Введений текст не є коректною адресою"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "Введіть адресу сервера. Приклад: kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "Адреса сервера"
@@ -3774,22 +3791,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "Знайдіть ваших друзів"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "Введіть ідентифікатор користувача"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "Знайти ваших друзів…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "Введіть фрагмент тексту, щоб почати пошук ваших друзів"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3962,47 +3979,47 @@ msgstr ""
 msgid "The session verification was canceled due to an unknown error."
 msgstr "Перевірку сеансу скасовано через невідому помилку."
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "Немає сервера."
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Перевірка доступності сервера."
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Цей сервер є некоректним."
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Реєстрацію на цьому сервері вимкнено."
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "Немає імені користувача."
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "Перевірка доступності імені користувача."
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "Це ім’я користувача є недоступним."
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "Продовжити"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "Працюємо"
@@ -4017,17 +4034,17 @@ msgstr "Помилково форматований або порожній ід
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 не є правильним ідентифікатором Matrix"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "Не вдалося приєднатися до кімнати"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "Ви надіслали запит щодо долучення до «%1»"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "Не вдалося надіслати запит щодо долучення до кімнати"
@@ -4901,109 +4918,109 @@ msgstr "Альтернативи"
 msgid "No canonical alias set"
 msgstr "Не встановлено канонічної альтернативи"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Зробити цю альтернативу основною альтернативою кімнати"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "Вилучити альтернативу"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#нова_альтернатива:сервер.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "Додати новий псевдонім"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "Перегляд вмісту адрес"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Увімкнути типовий попередній перегляд вмісту адрес для учасників кімнати"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Увімкнути перегляд вмісту адрес"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "У цій кімнаті типово увімкнено попередній перегляд вмісту адрес"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "У цій кімнаті типово вимкнено попередній перегляд вмісту адрес"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Офіційні батьківські простори"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "Канонічний"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Зробити канонічним батьківським"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "Вилучити батьківський"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "У цієї кімнати немає офіційних батьківських просторів."
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Додати новий офіційний батьківський простір"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "У цій кімнаті продовжується інше спілкування."
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "Переглянути старі повідомлення…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Цю кімнат було замінено."
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "Переглянути нову кімнату…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Оновити кімнату"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "Виберіть нову версію"
@@ -5248,41 +5265,65 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Вилучити слово"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "Приховати"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "Оприлюднити"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "Вилучити"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "Завершено"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "Код країни для нового номера телефону"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "Нова адреса електронної пошти"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "Новий номер телефону"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "Ми надіслали вам повідомлення електронної пошти"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "Ми надіслали вам текстове повідомлення"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
@@ -5290,22 +5331,22 @@ msgstr ""
 "%1. Будь ласка, виконайте настанови з нього, а потім натисніть кнопку, яку "
 "розташовано нижче"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "Введена адреса електронної пошти є некоректною"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "Введений номер телефону є некоректним"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "Введено помилковий пароль"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
@@ -5315,7 +5356,7 @@ msgstr ""
 "повідомлення електронної пошти і виконайте настанови з нього, а потім "
 "натисніть кнопку, яку розташовано нижче"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
@@ -5325,18 +5366,46 @@ msgstr ""
 "повідомлення і виконайте настанови з нього, а потім натисніть кнопку, яку "
 "розташовано нижче"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "Додати"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "Назад"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+"%1. Будь ласка, виконайте настанови з нього, а потім натисніть кнопку, яку "
+"розташовано вище"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+"Адреса електронної пошти не пройшла перевірки. Будь ласка, перейдіть до "
+"повідомлення електронної пошти і виконайте настанови з нього, а потім "
+"натисніть кнопку, яку розташовано вище"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+"Номер телефону не пройшов перевірки. Будь ласка, перейдіть до текстового "
+"повідомлення і виконайте настанови з нього, а потім натисніть кнопку, яку "
+"розташовано вище"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5512,6 +5581,20 @@ msgstr "Показати"
 msgid "Quit"
 msgstr "Вийти"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Поширені питання щодо Matrix"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "Вилучити цей обліковий запис"
+
+#~ msgid "Options"
+#~ msgstr "Параметри"
+
+#~ msgid "Make room favorite"
+#~ msgstr "Зробити кімнату улюбленою"
+
 #~ msgid "Member (0)"
 #~ msgstr "Учасник (0)"
 

po/zh_CN/neochat.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
 "PO-Revision-Date: 2024-04-23 19:24\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -17,12 +17,12 @@ msgstr ""
 "X-Crowdin-File: /kf6-trunk/messages/neochat/neochat.pot\n"
 "X-Crowdin-File-ID: 44721\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "选择本地文件"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "剪贴板图像"
@@ -88,7 +88,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "取消回复"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -96,49 +96,49 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "接收新消息通知"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "网络错误：%1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "无法找到访问令牌"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "可能已被删除？"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "访问钥匙环被拒绝。"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "请允许 NeoChat 读取访问令牌"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "没有可用的钥匙环。"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "请安装钥匙环，例如 Linux 平台上的 KDE 密码库（KWallet）或 GNOME 钥匙圈"
 "（GNOME keyring）"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "无法读取访问令牌"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "正在接收推送通知"
@@ -318,7 +318,7 @@ msgstr "已邀请"
 msgid "Favorite"
 msgstr "收藏夹"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "好友"
@@ -751,18 +751,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "目标文件夹"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr ""
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "登录失败：%1"
@@ -809,8 +803,10 @@ msgstr "加载中"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "请稍候。这可能需要一些时间。"
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr ""
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -830,7 +826,7 @@ msgid "Loading…"
 msgstr "加载中…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -950,8 +946,8 @@ msgstr "%1 (加载中)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "删除此账户"
+msgid "Log out of this account"
+msgstr ""
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1732,38 +1728,44 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 回应了 %3"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "文件太大，无法下载。"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "请联系 Matrix 服务器管理员寻求支持。"
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr ""
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "聊天室创建失败：%1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "空间创建失败：%1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "举报成功。"
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "纬度：%1，经度：%2"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "加密的消息"
@@ -1817,12 +1819,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "拒绝并忽略用户"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "打开 NeoChat"
@@ -1844,7 +1846,7 @@ msgid "Notification settings"
 msgstr "通知设置"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "配置"
@@ -2214,17 +2216,17 @@ msgstr "选择类型"
 msgid "Space"
 msgstr "空间"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "名称："
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "话题:"
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2232,56 +2234,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "选择已有聊天室"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "选择聊天室"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "探索聊天室"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "已加入"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2289,7 +2291,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2417,14 +2419,14 @@ msgid "Explore rooms"
 msgstr "探索聊天室"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "查找好友"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2456,21 +2458,21 @@ msgstr "扫描二维码"
 #, kde-format
 msgctxt "@title"
 msgid "Rooms"
-msgstr ""
+msgstr "聊天室"
 
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr ""
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "显示菜单"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "创建聊天室和聊天"
@@ -2503,17 +2505,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "仅显示空间"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "输入一个聊天室地址"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "查找房间"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2551,60 +2553,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "配置 NeoChat..."
+msgid "Configure NeoChat…"
+msgstr ""
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "配置 NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "退出 NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "文件"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "查找好友"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "创建群聊…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "浏览聊天…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "编辑"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "视图"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2612,35 +2614,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "打开快速切换器"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "窗口"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "退出全屏模式"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "进入全屏模式"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "帮助"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix 常见问题解答"
+msgid "About Matrix"
+msgstr ""
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "关于 NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "关于 KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2761,7 +2775,7 @@ msgstr "添加"
 #: src/qml/InviteUserPage.qml:70
 #, kde-format
 msgid "No users available"
-msgstr "无可用用户"
+msgstr "没有可用的用户"
 
 #: src/qml/InviteUserPage.qml:101
 #, kde-format
@@ -2841,7 +2855,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "位置"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "此聊天室中没有共享位置。"
@@ -2974,7 +2988,7 @@ msgstr "编辑用户权力等级"
 msgid "New power level"
 msgstr "新建权力等级"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "确认"
@@ -3125,8 +3139,9 @@ msgstr "聊天室信息"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "选项"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr ""
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3146,8 +3161,8 @@ msgstr "从收藏夹中移除聊天室"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "收藏聊天室"
+msgid "Favorite this room"
+msgstr ""
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3333,33 +3348,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "添加新服务器"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "添加服务器"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "输入的服务器可用"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "该服务器无法解析或已添加"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "输入的文本不是有效的 URL"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "输入服务器 URL，例如 kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "服务器 URL"
@@ -3708,22 +3723,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "查找好友"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "输入用户 ID"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "查找好友..."
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "输入文本开始搜索您的好友"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3873,47 +3888,47 @@ msgstr "由于密钥不匹配，另一端取消了会话验证。"
 msgid "The session verification was canceled due to an unknown error."
 msgstr "由于未知错误，会话验证被取消。"
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "无服务器。"
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "正在检查服务器状态"
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "此服务器无效。"
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "此服务器已禁止注册。"
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "无用户名。"
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "正在检查用户名是否可用。"
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "该用户名不可用。"
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "继续"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "正在处理"
@@ -3928,17 +3943,17 @@ msgstr "Matrix id 为空或格式错误"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 不是正确的 Matrix 标识符"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "加入聊天室失败"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "您请求加入 '%1'"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "请求加入聊天室失败"
@@ -4807,108 +4822,108 @@ msgstr "别名"
 msgid "No canonical alias set"
 msgstr "未设置主别名"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "将此别名设置为聊天室主别名"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "删除别名"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "添加新别名"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "URL 预览"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "默认情况下为聊天室成员启用 URL 预览"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "启用 URL 预览"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "此聊天室默认启用 URL 预览"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "此聊天室默认禁用 URL 预览"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "此聊天室接续了另一个对话。"
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "查看更早的消息..."
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "此聊天室已被替换。"
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "查看新聊天室..."
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "升级此聊天室"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "选择新版本"
@@ -5141,87 +5156,131 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "删除单词"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "分享"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "移除"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr ""
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "取消"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr ""
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "添加"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr ""
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr ""
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr ""
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"

po/zh_TW/neochat.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-05-28 00:38+0000\n"
-"PO-Revision-Date: 2024-05-26 16:10+0900\n"
+"POT-Creation-Date: 2024-06-24 00:38+0000\n"
+"PO-Revision-Date: 2024-06-26 06:41+0900\n"
 "Last-Translator: Kisaragi Hiu <mail@kisaragi-hiu.com>\n"
 "Language-Team: Traditional Chinese <zh-l10n@lists.slat.org>\n"
 "Language: zh_TW\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 24.04.70\n"
 
-#: src/chatbar/AttachDialog.qml:27
+#: src/chatbar/AttachDialog.qml:29
 #, kde-format
 msgid "Choose local file"
 msgstr "選擇本機檔案"
 
-#: src/chatbar/AttachDialog.qml:46
+#: src/chatbar/AttachDialog.qml:45
 #, kde-format
 msgid "Clipboard image"
 msgstr "剪貼簿影像"
@@ -91,7 +91,7 @@ msgctxt "@action:button"
 msgid "Cancel reply"
 msgstr "取消回覆"
 
-#: src/controller.cpp:130
+#: src/controller.cpp:132
 #, kde-format
 msgctxt ""
 "The reason for using push notifications, as in: '[Push notifications are "
@@ -99,47 +99,47 @@ msgctxt ""
 msgid "Receiving notifications for new messages"
 msgstr "正在接收新訊息的通知"
 
-#: src/controller.cpp:209
+#: src/controller.cpp:211
 #, kde-format
 msgid "Network Error: %1"
 msgstr "網路錯誤：%1"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "找不到存取權杖"
 
-#: src/controller.cpp:231
+#: src/controller.cpp:233
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "或許它已被刪除？"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "鑰匙圈存取被拒絕。"
 
-#: src/controller.cpp:235
+#: src/controller.cpp:237
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "請允許 NeoChat 讀取存取權杖"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "No keychain available."
 msgstr "沒有可用的鑰匙圈。"
 
-#: src/controller.cpp:238
+#: src/controller.cpp:240
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "請安裝一個鑰匙圈，例如 Linux 上的 KWallet 或 GNOME 鑰匙圈"
 
-#: src/controller.cpp:241
+#: src/controller.cpp:243
 #, kde-format
 msgid "Unable to read access token"
 msgstr "無法讀取存取權杖"
 
-#: src/controller.cpp:337
+#: src/controller.cpp:339
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "正在接收推送通知"
@@ -319,7 +319,7 @@ msgstr "已邀請"
 msgid "Favorite"
 msgstr "最愛"
 
-#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:83
+#: src/enums/neochatroomtype.h:63 src/qml/UserSearchPage.qml:84
 #, kde-format
 msgid "Friends"
 msgstr "好友"
@@ -752,18 +752,12 @@ msgctxt "The location being downloaded to"
 msgid "Destination"
 msgstr "目的地"
 
-#: src/identityserverhelper.cpp:52 src/identityserverhelper.cpp:59
-#, kde-format
-msgctxt "@info"
-msgid "No identity server configured"
-msgstr "未設定身份伺服器"
-
-#: src/login.cpp:85 src/login.cpp:100
+#: src/login.cpp:90 src/login.cpp:105
 #, kde-format
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/login.cpp:93
+#: src/login.cpp:98
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "登入失敗：%1"
@@ -810,8 +804,10 @@ msgstr "載入中"
 
 #: src/login/Loading.qml:16
 #, kde-format
-msgid "Please wait. This might take a little while."
-msgstr "請稍候。這可能會花上一段時間。"
+msgid ""
+"Please wait while your messages are loaded from the server. This might take "
+"a little while."
+msgstr "請稍候，正在從伺服器載入您的訊息。這可能會花上一段時間。"
 
 #: src/login/Login.qml:25
 #, kde-format
@@ -831,7 +827,7 @@ msgid "Loading…"
 msgstr "載入中…"
 
 #: src/login/Login.qml:38 src/login/WelcomePage.qml:198
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -951,8 +947,8 @@ msgstr "%1 (載入中)"
 #: src/login/WelcomePage.qml:95
 #, kde-format
 msgctxt "@action:button"
-msgid "Remove this account"
-msgstr "移除這個帳號"
+msgid "Log out of this account"
+msgstr "從這個帳號登出"
 
 #: src/login/WelcomePage.qml:124
 #, kde-format
@@ -1729,38 +1725,44 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 用 %3 反應"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "File too large to download."
 msgstr "要下載的檔案太大了。"
 
-#: src/neochatconnection.cpp:77
+#: src/neochatconnection.cpp:85
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "請聯絡您的 matrix 伺服器管理員以求支援。"
 
-#: src/neochatconnection.cpp:284
+#: src/neochatconnection.cpp:296
+#, kde-format
+msgctxt "@info"
+msgid "No identity server configured"
+msgstr "未設定身份伺服器"
+
+#: src/neochatconnection.cpp:327
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "聊天室建立失敗：%1"
 
-#: src/neochatconnection.cpp:316
+#: src/neochatconnection.cpp:364
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "聊天空間建立失敗：%1"
 
-#: src/neochatroom.cpp:1399 src/neochatroom.cpp:1400
+#: src/neochatroom.cpp:1404 src/neochatroom.cpp:1405
 #, kde-format
 msgid "Report sent successfully."
 msgstr "已成功傳送檢舉"
 
-#: src/neochatroom.cpp:1674 src/neochatroom.cpp:1682
+#: src/neochatroom.cpp:1679 src/neochatroom.cpp:1687
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "緯度：%2，經度：%1"
 
-#: src/notificationsmanager.cpp:131 src/notificationsmanager.cpp:326
+#: src/notificationsmanager.cpp:120 src/notificationsmanager.cpp:325
 #, kde-format
 msgid "Encrypted Message"
 msgstr "已加密訊息"
@@ -1814,12 +1816,12 @@ msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "拒絕並忽略使用者"
 
-#: src/notificationsmanager.cpp:319
+#: src/notificationsmanager.cpp:318
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:330
+#: src/notificationsmanager.cpp:329
 #, kde-format
 msgid "Open NeoChat"
 msgstr "開啟 NeoChat"
@@ -1841,7 +1843,7 @@ msgid "Notification settings"
 msgstr "通知設定"
 
 #: src/qml/AccountMenu.qml:37 src/qml/AccountMenu.qml:49
-#: src/qml/GlobalMenu.qml:35 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
+#: src/qml/GlobalMenu.qml:31 src/qml/Main.qml:327 src/qml/UserInfo.qml:107
 #, kde-format
 msgid "Configure"
 msgstr "設定"
@@ -2213,17 +2215,17 @@ msgstr "選取類型"
 msgid "Space"
 msgstr "聊天空間"
 
-#: src/qml/CreateRoomDialog.qml:72 src/settings/AccountEditorPage.qml:106
+#: src/qml/CreateRoomDialog.qml:77 src/settings/AccountEditorPage.qml:106
 #, kde-format
 msgid "Name:"
 msgstr "名稱："
 
-#: src/qml/CreateRoomDialog.qml:80
+#: src/qml/CreateRoomDialog.qml:87
 #, kde-format
 msgid "Topic:"
 msgstr "主題："
 
-#: src/qml/CreateRoomDialog.qml:86 src/qml/CreateRoomDialog.qml:217
+#: src/qml/CreateRoomDialog.qml:96 src/qml/CreateRoomDialog.qml:235
 #, kde-format
 msgctxt ""
 "@option:check As in make the space from which this dialog was created an "
@@ -2231,56 +2233,56 @@ msgctxt ""
 msgid "Make this parent official"
 msgstr "將此上層聊天空間設為官方"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Space"
 msgstr "建立聊天空間"
 
-#: src/qml/CreateRoomDialog.qml:91
+#: src/qml/CreateRoomDialog.qml:106
 #, kde-format
 msgctxt "@action:button"
 msgid "Create Room"
 msgstr "建立聊天室"
 
-#: src/qml/CreateRoomDialog.qml:106
+#: src/qml/CreateRoomDialog.qml:121
 #, kde-format
 msgid "Select Existing Room"
 msgstr "選取現存的聊天室"
 
-#: src/qml/CreateRoomDialog.qml:112 src/qml/SelectParentDialog.qml:50
+#: src/qml/CreateRoomDialog.qml:127 src/qml/SelectParentDialog.qml:50
 #, kde-format
 msgctxt "@action:button"
 msgid "Pick room"
 msgstr "選取聊天室"
 
-#: src/qml/CreateRoomDialog.qml:117 src/qml/CreateRoomDialog.qml:200
+#: src/qml/CreateRoomDialog.qml:132 src/qml/CreateRoomDialog.qml:215
 #: src/qml/ExploreComponent.qml:29 src/qml/ExploreComponentMobile.qml:58
-#: src/qml/GlobalMenu.qml:74 src/qml/RoomListPage.qml:210
+#: src/qml/GlobalMenu.qml:70 src/qml/RoomListPage.qml:210
 #: src/qml/SelectParentDialog.qml:142
 #, kde-format
 msgctxt "@title"
 msgid "Explore Rooms"
 msgstr "瀏覽聊天室"
 
-#: src/qml/CreateRoomDialog.qml:166 src/qml/ExplorerDelegate.qml:77
+#: src/qml/CreateRoomDialog.qml:181 src/qml/ExplorerDelegate.qml:77
 #: src/qml/SelectParentDialog.qml:106 src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
 msgid "Joined"
 msgstr "已加入"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid "You have the required privilege level in the child to set this state"
 msgstr "您在子項目有足夠權限來設定這個狀態"
 
-#: src/qml/CreateRoomDialog.qml:218
+#: src/qml/CreateRoomDialog.qml:236
 #, kde-format
 msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr "您在子項目沒有足夠權限來設定這個狀態"
 
-#: src/qml/CreateRoomDialog.qml:235
+#: src/qml/CreateRoomDialog.qml:258
 #, kde-format
 msgctxt ""
 "@option:check The canonical parent is the default one if a room has multiple "
@@ -2288,7 +2290,7 @@ msgctxt ""
 msgid "Make this space the canonical parent"
 msgstr "將此聊天空間設為主要上層聊天空間"
 
-#: src/qml/CreateRoomDialog.qml:241 src/qml/ServerComboBox.qml:148
+#: src/qml/CreateRoomDialog.qml:267 src/qml/ServerComboBox.qml:155
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -2416,14 +2418,14 @@ msgid "Explore rooms"
 msgstr "瀏覽聊天室"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:67
-#: src/qml/GlobalMenu.qml:52 src/qml/GlobalMenu.qml:61
+#: src/qml/GlobalMenu.qml:48 src/qml/GlobalMenu.qml:57
 #: src/qml/RoomListPage.qml:172 src/qml/RoomListPage.qml:221
 #, kde-format
 msgid "Find your friends"
 msgstr "尋找您的朋友"
 
 #: src/qml/ExploreComponent.qml:42 src/qml/ExploreComponentMobile.qml:73
-#: src/qml/GlobalMenu.qml:56 src/qml/RoomListPage.qml:180
+#: src/qml/GlobalMenu.qml:52 src/qml/RoomListPage.qml:180
 #: src/qml/RoomListPage.qml:225
 #, kde-format
 msgctxt "@title"
@@ -2460,16 +2462,16 @@ msgstr "聊天室"
 #: src/qml/ExploreComponent.qml:105
 #, kde-format
 msgctxt "@action"
-msgid "Search Room"
+msgid "Search Rooms"
 msgstr "搜尋聊天室"
 
-#: src/qml/ExploreComponent.qml:119
+#: src/qml/ExploreComponent.qml:123
 #, kde-format
 msgctxt "@action:button"
 msgid "Show Menu"
 msgstr "顯示選單"
 
-#: src/qml/ExploreComponent.qml:188
+#: src/qml/ExploreComponent.qml:192
 #, kde-format
 msgid "Create rooms and chats"
 msgstr "建立聊天室或私人聊天"
@@ -2502,17 +2504,17 @@ msgctxt "@action:button"
 msgid "Only show spaces"
 msgstr "只顯示聊天空間"
 
-#: src/qml/ExploreRoomsPage.qml:92
+#: src/qml/ExploreRoomsPage.qml:93
 #, kde-format
 msgid "Enter a room address"
 msgstr "輸入聊天室位址"
 
-#: src/qml/ExploreRoomsPage.qml:106
+#: src/qml/ExploreRoomsPage.qml:107
 #, kde-format
 msgid "Find a room…"
 msgstr "尋找聊天室…"
 
-#: src/qml/ExploreRoomsPage.qml:107
+#: src/qml/ExploreRoomsPage.qml:108
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -2550,60 +2552,60 @@ msgctxt "menu"
 msgid "NeoChat"
 msgstr "NeoChat"
 
-#: src/qml/GlobalMenu.qml:28
+#: src/qml/GlobalMenu.qml:24
 #, kde-format
-msgid "Configure NeoChat..."
-msgstr "設定 NeoChat..."
+msgid "Configure NeoChat…"
+msgstr "設定 NeoChat…"
 
-#: src/qml/GlobalMenu.qml:29
+#: src/qml/GlobalMenu.qml:25
 #, kde-format
 msgctxt "menu"
 msgid "Configure NeoChat..."
 msgstr "設定 NeoChat..."
 
-#: src/qml/GlobalMenu.qml:41
+#: src/qml/GlobalMenu.qml:37
 #, kde-format
 msgctxt "menu"
 msgid "Quit NeoChat"
 msgstr "離開 NeoChat"
 
-#: src/qml/GlobalMenu.qml:48
+#: src/qml/GlobalMenu.qml:44
 #, kde-format
 msgctxt "menu"
 msgid "File"
 msgstr "檔案"
 
-#: src/qml/GlobalMenu.qml:51
+#: src/qml/GlobalMenu.qml:47
 #, kde-format
 msgctxt "menu"
 msgid "Find your friends"
 msgstr "尋找您的朋友"
 
-#: src/qml/GlobalMenu.qml:60
+#: src/qml/GlobalMenu.qml:56
 #, kde-format
 msgctxt "menu"
 msgid "New Group…"
 msgstr "建立新群組…"
 
-#: src/qml/GlobalMenu.qml:69
+#: src/qml/GlobalMenu.qml:65
 #, kde-format
 msgctxt "menu"
 msgid "Browse Chats…"
 msgstr "瀏覽私人聊天…"
 
-#: src/qml/GlobalMenu.qml:83
+#: src/qml/GlobalMenu.qml:79
 #, kde-format
 msgctxt "menu"
 msgid "Edit"
 msgstr "編輯"
 
-#: src/qml/GlobalMenu.qml:87
+#: src/qml/GlobalMenu.qml:83
 #, kde-format
 msgctxt "menu"
 msgid "View"
 msgstr "檢視"
 
-#: src/qml/GlobalMenu.qml:90
+#: src/qml/GlobalMenu.qml:86
 #, kde-format
 msgctxt ""
 "menu item that opens a UI element called the 'Quick Switcher', which offers "
@@ -2611,35 +2613,47 @@ msgctxt ""
 msgid "Open Quick Switcher"
 msgstr "開啟快速切換器"
 
-#: src/qml/GlobalMenu.qml:96
+#: src/qml/GlobalMenu.qml:91
 #, kde-format
 msgctxt "menu"
 msgid "Window"
 msgstr "視窗"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Exit Full Screen"
 msgstr "離開全螢幕"
 
-#: src/qml/GlobalMenu.qml:103
+#: src/qml/GlobalMenu.qml:94
 #, kde-format
 msgctxt "menu"
 msgid "Enter Full Screen"
 msgstr "進入全螢幕"
 
-#: src/qml/GlobalMenu.qml:109
+#: src/qml/GlobalMenu.qml:99
 #, kde-format
 msgctxt "menu"
 msgid "Help"
 msgstr "說明"
 
-#: src/qml/GlobalMenu.qml:112
+#: src/qml/GlobalMenu.qml:102
 #, kde-format
 msgctxt "menu"
-msgid "Matrix FAQ"
-msgstr "Matrix 常見問題"
+msgid "About Matrix"
+msgstr "關於 Matrix"
+
+#: src/qml/GlobalMenu.qml:106
+#, kde-format
+msgctxt "menu"
+msgid "About NeoChat"
+msgstr "關於 NeoChat"
+
+#: src/qml/GlobalMenu.qml:110
+#, kde-format
+msgctxt "menu"
+msgid "About KDE"
+msgstr "關於 KDE"
 
 #: src/qml/GroupChatDrawerHeader.qml:67 src/timeline/TimelineEndDelegate.qml:68
 #, kde-format
@@ -2840,7 +2854,7 @@ msgctxt "Locations on a map"
 msgid "Locations"
 msgstr "位置"
 
-#: src/qml/LocationsPage.qml:56
+#: src/qml/LocationsPage.qml:65
 #, kde-format
 msgid "There are no locations shared in this room."
 msgstr "沒有在這個聊天室裡分享的位置。"
@@ -2973,7 +2987,7 @@ msgstr "編輯使用者能力等級"
 msgid "New power level"
 msgstr "新能力等級"
 
-#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:416
+#: src/qml/PowerLevelDialog.qml:43 src/settings/RoomGeneralPage.qml:418
 #, kde-format
 msgid "Confirm"
 msgstr "確認"
@@ -3124,8 +3138,9 @@ msgstr "聊天室資訊"
 
 #: src/qml/RoomInformation.qml:68
 #, kde-format
-msgid "Options"
-msgstr "選項"
+msgctxt "Room actions"
+msgid "Actions"
+msgstr "動作"
 
 #: src/qml/RoomInformation.qml:78
 #, kde-format
@@ -3145,8 +3160,8 @@ msgstr "從最愛中移除聊天室"
 
 #: src/qml/RoomInformation.qml:96
 #, kde-format
-msgid "Make room favorite"
-msgstr "標記聊天室為最愛"
+msgid "Favorite this room"
+msgstr "將此聊天室加入最愛"
 
 #: src/qml/RoomInformation.qml:109
 #, kde-format
@@ -3332,33 +3347,33 @@ msgctxt "@action:button"
 msgid "Add new server"
 msgstr "新增伺服器"
 
-#: src/qml/ServerComboBox.qml:103
+#: src/qml/ServerComboBox.qml:110
 #, kde-format
 msgctxt "@title:window"
 msgid "Add server"
 msgstr "新增伺服器"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Valid server entered"
 msgstr "已輸入有效伺服器"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "This server cannot be resolved or has already been added"
 msgstr "無法解析這個伺服器，或是已經加入"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "The entered text is not a valid url"
 msgstr "輸入的文字不是有效的網址"
 
-#: src/qml/ServerComboBox.qml:118
+#: src/qml/ServerComboBox.qml:125
 #, kde-format
 msgid "Enter server url e.g. kde.org"
 msgstr "輸入伺服器網址，如 kde.org"
 
-#: src/qml/ServerComboBox.qml:125
+#: src/qml/ServerComboBox.qml:132
 #, kde-format
 msgid "Server URL"
 msgstr "伺服器網址"
@@ -3707,22 +3722,22 @@ msgctxt "@action:title"
 msgid "Find Your Friends"
 msgstr "尋找您的朋友"
 
-#: src/qml/UserSearchPage.qml:45
+#: src/qml/UserSearchPage.qml:46
 #, kde-format
 msgid "Enter a user ID"
 msgstr "輸入一個使用者 ID"
 
-#: src/qml/UserSearchPage.qml:90
+#: src/qml/UserSearchPage.qml:91
 #, kde-format
 msgid "Find your friends…"
 msgstr "尋找您的朋友…"
 
-#: src/qml/UserSearchPage.qml:91
+#: src/qml/UserSearchPage.qml:92
 #, kde-format
 msgid "Enter text to start searching for your friends"
 msgstr "輸入文字開始搜尋朋友"
 
-#: src/qml/UserSearchPage.qml:92
+#: src/qml/UserSearchPage.qml:93
 #, kde-format
 msgctxt "@info:label"
 msgid "No matches found"
@@ -3872,47 +3887,47 @@ msgstr "遠端由於雙方金鑰不相符而取消了工作階段驗證。"
 msgid "The session verification was canceled due to an unknown error."
 msgstr "工作階段驗證由於不明錯誤而取消。"
 
-#: src/registration.cpp:300
+#: src/registration.cpp:310
 #, kde-format
 msgid "No server."
 msgstr "無伺服器。"
 
-#: src/registration.cpp:302
+#: src/registration.cpp:312
 #, kde-format
 msgid "Checking Server availability."
 msgstr "正在檢查伺服器可用性。"
 
-#: src/registration.cpp:304
+#: src/registration.cpp:314
 #, kde-format
 msgid "This is not a valid server."
 msgstr "這不是一個有效的伺服器。"
 
-#: src/registration.cpp:306
+#: src/registration.cpp:316
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "此伺服器已停用註冊。"
 
-#: src/registration.cpp:308
+#: src/registration.cpp:318
 #, kde-format
 msgid "No username."
 msgstr "無使用者名稱。"
 
-#: src/registration.cpp:310
+#: src/registration.cpp:320
 #, kde-format
 msgid "Checking username availability."
 msgstr "正在檢查使用者名稱是否可用。"
 
-#: src/registration.cpp:312
+#: src/registration.cpp:322
 #, kde-format
 msgid "This username is not available."
 msgstr "無法使用這個使用者名稱。"
 
-#: src/registration.cpp:314
+#: src/registration.cpp:324
 #, kde-format
 msgid "Continue"
 msgstr "繼續"
 
-#: src/registration.cpp:316
+#: src/registration.cpp:326
 #, kde-format
 msgid "Working"
 msgstr "處理中"
@@ -3927,17 +3942,17 @@ msgstr "不正確或空白的 Matrix ID"
 msgid "%1 is not a correct Matrix identifier"
 msgstr "%1 不是一個正確的 Matrix ID"
 
-#: src/roommanager.cpp:315
+#: src/roommanager.cpp:333
 #, kde-format
 msgid "Failed to join room"
 msgstr "加入聊天室失敗"
 
-#: src/roommanager.cpp:334
+#: src/roommanager.cpp:365
 #, kde-format
 msgid "You requested to join '%1'"
 msgstr "您已請求加入 '%1'"
 
-#: src/roommanager.cpp:337
+#: src/roommanager.cpp:369
 #, kde-format
 msgid "Failed to request joining room"
 msgstr "請求加入聊天室失敗"
@@ -4806,108 +4821,108 @@ msgstr "別名"
 msgid "No canonical alias set"
 msgstr "未設定主要別名"
 
-#: src/settings/RoomGeneralPage.qml:181
+#: src/settings/RoomGeneralPage.qml:183
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "將此別名設為聊天室主要別名"
 
-#: src/settings/RoomGeneralPage.qml:196
+#: src/settings/RoomGeneralPage.qml:198
 #, kde-format
 msgid "Delete alias"
 msgstr "刪除別名"
 
-#: src/settings/RoomGeneralPage.qml:220
+#: src/settings/RoomGeneralPage.qml:222
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/settings/RoomGeneralPage.qml:237
+#: src/settings/RoomGeneralPage.qml:239
 #, kde-format
 msgid "Add new alias"
 msgstr "新增別名"
 
-#: src/settings/RoomGeneralPage.qml:257
+#: src/settings/RoomGeneralPage.qml:259
 #, kde-format
 msgid "URL Previews"
 msgstr "網址預覽"
 
-#: src/settings/RoomGeneralPage.qml:261
+#: src/settings/RoomGeneralPage.qml:263
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "預設為聊天室成員啟用網址預覽"
 
-#: src/settings/RoomGeneralPage.qml:269
+#: src/settings/RoomGeneralPage.qml:271
 #, kde-format
 msgid "Enable URL previews"
 msgstr "啟用網址預覽"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "這個聊天室預設為啟用網址預覽"
 
-#: src/settings/RoomGeneralPage.qml:271
+#: src/settings/RoomGeneralPage.qml:273
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "這個聊天室預設已停用網址預覽"
 
-#: src/settings/RoomGeneralPage.qml:279
+#: src/settings/RoomGeneralPage.qml:281
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "官方上層聊天空間"
 
-#: src/settings/RoomGeneralPage.qml:312
+#: src/settings/RoomGeneralPage.qml:314
 #, kde-format
 msgid "Canonical"
 msgstr "主要"
 
-#: src/settings/RoomGeneralPage.qml:319
+#: src/settings/RoomGeneralPage.qml:321
 #, kde-format
 msgid "Make canonical parent"
 msgstr "標記為主要上層"
 
-#: src/settings/RoomGeneralPage.qml:331
+#: src/settings/RoomGeneralPage.qml:333
 #, kde-format
 msgid "Remove parent"
 msgstr "移除上層"
 
-#: src/settings/RoomGeneralPage.qml:344
+#: src/settings/RoomGeneralPage.qml:346
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "此聊天室沒有任何官方上層聊天空間。"
 
-#: src/settings/RoomGeneralPage.qml:348
+#: src/settings/RoomGeneralPage.qml:350
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "新增官方上層項目"
 
-#: src/settings/RoomGeneralPage.qml:363
+#: src/settings/RoomGeneralPage.qml:365
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "這個聊天室接續了另一個對話。"
 
-#: src/settings/RoomGeneralPage.qml:367
+#: src/settings/RoomGeneralPage.qml:369
 #, kde-format
 msgid "See older messages…"
 msgstr "檢視更舊的訊息…"
 
-#: src/settings/RoomGeneralPage.qml:377
+#: src/settings/RoomGeneralPage.qml:379
 #, kde-format
 msgid "This room has been replaced."
 msgstr "這個聊天室已被取代。"
 
-#: src/settings/RoomGeneralPage.qml:381
+#: src/settings/RoomGeneralPage.qml:383
 #, kde-format
 msgid "See new room…"
 msgstr "查看新聊天室…"
 
-#: src/settings/RoomGeneralPage.qml:404
+#: src/settings/RoomGeneralPage.qml:406
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "更新聊天室"
 
-#: src/settings/RoomGeneralPage.qml:408
+#: src/settings/RoomGeneralPage.qml:410
 #, kde-format
 msgid "Select new version"
 msgstr "選取新版本"
@@ -5140,87 +5155,131 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "刪除單詞"
 
-#: src/settings/ThreePIdCard.qml:52
+#: src/settings/ThreePIdCard.qml:55
+#, kde-format
+msgctxt "@action:button"
+msgid "Hide"
+msgstr "隱藏"
+
+#: src/settings/ThreePIdCard.qml:61
+#, kde-format
+msgctxt "@action:button"
+msgid "Share"
+msgstr "分享"
+
+#: src/settings/ThreePIdCard.qml:66
 #, kde-format
 msgctxt "@action:button"
 msgid "Remove"
 msgstr "移除"
 
-#: src/settings/ThreePIdCard.qml:73
+#: src/settings/ThreePIdCard.qml:85
+#, kde-format
+msgctxt "@action:button"
+msgid "Complete"
+msgstr "完成"
+
+#: src/settings/ThreePIdCard.qml:90
+#, kde-format
+msgctxt "@action:button"
+msgid "Cancel"
+msgstr "取消"
+
+#: src/settings/ThreePIdCard.qml:130
 #, kde-format
 msgctxt "@label:textbox"
 msgid "Country Code for new phone number"
 msgstr "新的電話號碼的國碼"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New email address"
 msgstr "新的電子郵件地址"
 
-#: src/settings/ThreePIdCard.qml:89
+#: src/settings/ThreePIdCard.qml:146
 #, kde-format
 msgctxt "@label:textbox"
 msgid "New phone number"
 msgstr "新的電話號碼"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you an email"
 msgstr "我們已向您傳送電子郵件"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150 src/threepidbindhelper.cpp:177
 #, kde-format
 msgid "We've sent you a text message"
 msgstr "我們已向您傳送簡訊"
 
-#: src/settings/ThreePIdCard.qml:93
+#: src/settings/ThreePIdCard.qml:150
 #, kde-format
 msgid ""
 "%1. Please follow the instructions there and then click the button below"
 msgstr "%1。請跟隨該訊息的指示後點擊下方的按鈕。"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered email is not valid"
 msgstr "輸入的電子郵件無效"
 
-#: src/settings/ThreePIdCard.qml:95
+#: src/settings/ThreePIdCard.qml:152 src/threepidbindhelper.cpp:179
 #, kde-format
 msgid "The entered phone number is not valid"
 msgstr "輸入的電話號碼無效"
 
-#: src/settings/ThreePIdCard.qml:97
+#: src/settings/ThreePIdCard.qml:154
 #, kde-format
 msgid "Incorrect password entered"
 msgstr "輸入了錯誤的密碼"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The email has not been verified. Please go to the email and follow the "
 "instructions there and then click the button below"
 msgstr "電子郵件尚未驗證。請至電子郵件跟隨訊息的指示，之後點擊下方的按鈕"
 
-#: src/settings/ThreePIdCard.qml:99
+#: src/settings/ThreePIdCard.qml:156
 #, kde-format
 msgid ""
 "The phone number has not been verified. Please go to the text message and "
 "follow the instructions there and then click the button below"
 msgstr "電話號碼尚未驗證。請至簡訊並跟隨其的指示，之後點擊下方的按鈕"
 
-#: src/settings/ThreePIdCard.qml:124
+#: src/settings/ThreePIdCard.qml:181
 #, kde-format
 msgctxt "@action:button Add new email or phone number"
 msgid "Add"
 msgstr "新增"
 
-#: src/settings/ThreePIdCard.qml:132
+#: src/settings/ThreePIdCard.qml:189
 #, kde-format
 msgctxt "@action:button As in 'go back'"
 msgid "Back"
 msgstr "返回"
 
+#: src/threepidbindhelper.cpp:176
+#, kde-format
+msgid ""
+"%1. Please follow the instructions there and then click the button above"
+msgstr "%1。請跟隨該訊息的指示後點擊上方的按鈕"
+
+#: src/threepidbindhelper.cpp:182
+#, kde-format
+msgid ""
+"The email has not been verified. Please go to the email and follow the "
+"instructions there and then click the button above"
+msgstr "電子郵件尚未驗證。請至電子郵件跟隨訊息的指示，之後點擊上方的按鈕"
+
+#: src/threepidbindhelper.cpp:183
+#, kde-format
+msgid ""
+"The phone number has not been verified. Please go to the text message and "
+"follow the instructions there and then click the button above"
+msgstr "電話號碼尚未驗證。請至簡訊並跟隨其的指示，之後點擊上方的按鈕"
+
 #: src/timeline/CodeComponent.qml:168
 #, kde-format
 msgid "Copy to clipboard"
@@ -5391,6 +5450,20 @@ msgstr "顯示"
 msgid "Quit"
 msgstr "離開"
 
+#~ msgctxt "menu"
+#~ msgid "Matrix FAQ"
+#~ msgstr "Matrix 常見問題"
+
+#~ msgctxt "@action:button"
+#~ msgid "Remove this account"
+#~ msgstr "移除這個帳號"
+
+#~ msgid "Options"
+#~ msgstr "選項"
+
+#~ msgid "Make room favorite"
+#~ msgstr "標記聊天室為最愛"
+
 #~ msgid "Member (0)"
 #~ msgstr "成員 (0)"
 

src/CMakeLists.txt

@@ -185,14 +185,14 @@ add_library(neochat STATIC
     enums/powerlevel.h
     models/permissionsmodel.cpp
     models/permissionsmodel.h
+    threepidbindhelper.cpp
+    threepidbindhelper.h
 )
 
 set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
     QT_QML_SINGLETON_TYPE TRUE
 )
 
-kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
-
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
     OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
     QML_FILES
@@ -420,6 +420,8 @@ if (TARGET KF6::Crash)
     target_link_libraries(neochat PUBLIC KF6::Crash)
 endif()
 
+kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
+
 if(NEOCHAT_FLATPAK)
     target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
 endif()

src/actionshandler.cpp

@@ -91,7 +91,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
 
             for (auto it = m_room->messageEvents().crbegin(); it != m_room->messageEvents().crend(); it++) {
                 if (const auto event = eventCast<const RoomMessageEvent>(&**it)) {
-                    if (event->senderId() == m_room->localUser()->id() && event->hasTextContent()) {
+                    if (event->senderId() == m_room->localMember().id() && event->hasTextContent()) {
                         QString originalString;
                         if (event->content()) {
                             originalString = static_cast<const Quotient::EventContent::TextContent *>(event->content())->body;

src/chatbar/AttachDialog.qml

@@ -13,13 +13,15 @@ import org.kde.neochat
 QQC2.Popup {
     id: root
 
-    padding: 16
+    padding: Kirigami.Units.largeSpacing
 
     signal chosen(string path)
 
     contentItem: RowLayout {
+
+        spacing: Kirigami.Units.smallSpacing
+
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
             icon.name: 'mail-attachment'
@@ -28,7 +30,7 @@ QQC2.Popup {
 
             onClicked: {
                 root.close();
-                var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay);
+                var fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay);
                 fileDialog.chosen.connect(path => root.chosen(path));
                 fileDialog.open();
             }
@@ -37,11 +39,8 @@ QQC2.Popup {
         Kirigami.Separator {}
 
         QQC2.ToolButton {
-            Layout.preferredWidth: 160
             Layout.fillHeight: true
 
-            padding: 16
-
             icon.name: 'insert-image'
             text: i18n("Clipboard image")
             onClicked: {

src/chatbar/ChatBar.qml

@@ -115,7 +115,7 @@ QQC2.Control {
             displayHint: QQC2.AbstractButton.IconOnly
 
             onTriggered: {
-                locationChooser.createObject(QQC2.ApplicationWindow.overlay, {
+                locationChooser.createObject(QQC2.Overlay.overlay, {
                     room: root.currentRoom
                 }).open();
             }
@@ -219,7 +219,7 @@ QQC2.Control {
                     }
 
                     onTextChanged: {
-                        if (!repeatTimer.running && NeoChatConfig.typingNotifications) {
+                        if (!repeatTimer.running && Config.typingNotifications) {
                             var textExists = text.length > 0;
                             root.currentRoom.sendTypingNotification(textExists);
                             textExists ? repeatTimer.start() : repeatTimer.stop();
@@ -353,8 +353,8 @@ QQC2.Control {
         startBreakpoint: Kirigami.Units.gridUnit * 46
         endBreakpoint: Kirigami.Units.gridUnit * 66
         startPercentWidth: 100
-        endPercentWidth: NeoChatConfig.compactLayout ? 100 : 85
-        maxWidth: NeoChatConfig.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
+        endPercentWidth: Config.compactLayout ? 100 : 85
+        maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60
 
         parentWidth: root.width
     }

src/chatbarcache.cpp

@@ -96,9 +96,9 @@ QVariantMap ChatBarCache::relationUser() const
         return {};
     }
     if (m_relationId.isEmpty()) {
-        return room->getUser(nullptr);
+        return room->getUser(QString());
     }
-    return room->getUser(room->user((*room->findInTimeline(m_relationId))->senderId()));
+    return room->getUser((*room->findInTimeline(m_relationId))->senderId());
 }
 
 QString ChatBarCache::relationMessage() const

src/controller.cpp

@@ -103,14 +103,16 @@ Controller::Controller(QObject *parent)
     connect(&m_accountRegistry, &AccountRegistry::accountCountChanged, this, [this]() {
         if (m_accountRegistry.size() > oldAccountCount) {
             auto connection = dynamic_cast<NeoChatConnection *>(m_accountRegistry.accounts()[m_accountRegistry.size() - 1]);
-            connect(connection, &NeoChatConnection::syncDone, this, [connection]() {
-                NotificationsManager::instance().handleNotifications(connection);
-            });
-            connectSingleShot(connection, &NeoChatConnection::syncDone, this, [this, connection] {
-                if (!m_endpoint.isEmpty()) {
-                    connection->setupPushNotifications(m_endpoint);
-                }
-            });
+            connect(
+                connection,
+                &NeoChatConnection::syncDone,
+                this,
+                [this, connection] {
+                    if (!m_endpoint.isEmpty()) {
+                        connection->setupPushNotifications(m_endpoint);
+                    }
+                },
+                Qt::SingleShotConnection);
         }
         oldAccountCount = m_accountRegistry.size();
     });
@@ -409,7 +411,16 @@ void Controller::removeConnection(const QString &userId)
 
 bool Controller::ssssSupported() const
 {
-#if __has_include("Quotient/e2ee/sssshandler.h")
+#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
+    return true;
+#else
+    return false;
+#endif
+}
+
+bool Controller::csSupported() const
+{
+#if Quotient_VERSION_MINOR > 9
     return true;
 #else
     return false;

src/controller.h

@@ -51,6 +51,7 @@ class Controller : public QObject
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
     Q_PROPERTY(bool ssssSupported READ ssssSupported CONSTANT)
+    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
 
 public:
     static Controller &instance();
@@ -97,6 +98,7 @@ public:
     Q_INVOKABLE void removeConnection(const QString &userId);
 
     bool ssssSupported() const;
+    bool csSupported() const;
 
 private:
     explicit Controller(QObject *parent = nullptr);

src/definitions.h

@@ -0,0 +1,11 @@
+// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#if Quotient_VERSION_MINOR > 8
+#define Omittable std::optional
+#define quotientNone std::nullopt
+#else
+#include <Quotient/omittable.h>
+#define Omittable Quotient::Omittable
+#define quotientNone Quotient::none
+#endif

src/devtools/DebugOptions.qml

@@ -17,25 +17,25 @@ FormCard.FormCardPage {
 
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show hidden events in the timeline")
-            checked: NeoChatConfig.showAllEvents
+            checked: Config.showAllEvents
 
-            onToggled: NeoChatConfig.showAllEvents = checked
+            onToggled: Config.showAllEvents = checked
         }
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Always allow device verification")
             description: i18n("Allow the user to start a verification session with devices that were already verified")
-            checked: NeoChatConfig.alwaysVerifyDevice
+            checked: Config.alwaysVerifyDevice
 
-            onToggled: NeoChatConfig.alwaysVerifyDevice = checked
+            onToggled: Config.alwaysVerifyDevice = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check", "Show focus in window header")
-            checked: NeoChatConfig.windowTitleFocus
+            checked: Config.windowTitleFocus
 
             onToggled: {
-                NeoChatConfig.windowTitleFocus = checked;
-                NeoChatConfig.save();
+                Config.windowTitleFocus = checked;
+                Config.save();
             }
         }
     }

src/devtools/FeatureFlagPage.qml

@@ -18,23 +18,23 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: roomAccountDataVisibleCheck
             text: i18nc("@option:check Enable the matrix 'threads' feature", "Threads")
-            checked: NeoChatConfig.threads
+            checked: Config.threads
 
-            onToggled: NeoChatConfig.threads = checked
+            onToggled: Config.threads = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix 'secret backup' feature", "Secret Backup")
-            checked: NeoChatConfig.secretBackup
+            checked: Config.secretBackup
 
-            onToggled: NeoChatConfig.secretBackup = checked
+            onToggled: Config.secretBackup = checked
         }
         FormCard.FormCheckDelegate {
             text: i18nc("@option:check Enable the matrix feature to add a phone number as a third party ID", "Add phone numbers as 3PIDs")
-            checked: NeoChatConfig.phone3PId
+            checked: Config.phone3PId
 
             onToggled: {
-                NeoChatConfig.phone3PId = checked
-                NeoChatConfig.save();
+                Config.phone3PId = checked
+                Config.save();
             }
         }
     }

src/eventhandler.cpp

@@ -70,10 +70,10 @@ QVariantMap EventHandler::getAuthor(bool isPending) const
     // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
     if (m_event == nullptr) {
         qCWarning(EventHandling) << "getAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
+        return m_room->getUser(QString());
     }
 
-    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
+    const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
     return m_room->getUser(author);
 }
 
@@ -96,8 +96,8 @@ QString EventHandler::getAuthorDisplayName(bool isPending) const
         }
         return previousDisplayName;
     } else {
-        const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-        return m_room->htmlSafeMemberName(author->id());
+        const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
+        return author.htmlSafeDisplayName();
     }
 }
 
@@ -112,8 +112,8 @@ QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
         return {};
     }
 
-    const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-    auto displayName = m_room->safeMemberName(author->id());
+    const auto author = isPending ? m_room->localMember() : m_room->member(m_event->senderId());
+    auto displayName = author.displayName();
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
@@ -220,7 +220,7 @@ bool EventHandler::isHidden()
         }
     }
 
-    if (m_room->connection()->isIgnored(m_room->user(m_event->senderId()))) {
+    if (m_room->connection()->isIgnored(m_event->senderId())) {
         return true;
     }
 
@@ -255,7 +255,7 @@ QString EventHandler::rawMessageBody(const Quotient::RoomMessageEvent &event)
 
     QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
+        body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
@@ -318,7 +318,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
         },
         [this, prettyPrint](const RoomMemberEvent &e) {
             // FIXME: Rewind to the name that was at the time of this event
-            auto subjectName = m_room->htmlSafeMemberName(e.userId());
+            auto subjectName = m_room->member(e.userId()).htmlSafeDisplayName();
             if (e.membership() == Membership::Leave) {
                 if (e.prevContent() && e.prevContent()->displayName) {
                     subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
@@ -479,7 +479,7 @@ QString EventHandler::getMessageBody(const RoomMessageEvent &event, Qt::TextForm
 
     QString body;
     if (event.hasTextContent() && event.content()) {
-        body = static_cast<const MessageEventContent::TextContent *>(event.content())->body;
+        body = static_cast<const EventContent::TextContent *>(event.content())->body;
     } else {
         body = event.plainBody();
     }
@@ -809,16 +809,15 @@ QVariantMap EventHandler::getReplyAuthor() const
     // If we have a room we can return an empty user by handing nullptr to m_room->getUser.
     if (m_event == nullptr) {
         qCWarning(EventHandling) << "getReplyAuthor called with m_event set to nullptr. Returning empty user.";
-        return m_room->getUser(nullptr);
+        return m_room->getUser(QString());
     }
 
     auto replyPtr = m_room->getReplyForEvent(*m_event);
 
     if (replyPtr) {
-        auto replyUser = m_room->user(replyPtr->senderId());
-        return m_room->getUser(replyUser);
+        return m_room->getUser(replyPtr->senderId());
     } else {
-        return m_room->getUser(nullptr);
+        return m_room->getUser(QString());
     }
 }
 
@@ -966,7 +965,7 @@ bool EventHandler::hasReadMarkers() const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
+    userIds.remove(m_room->localMember().id());
     return userIds.size() > 0;
 }
 
@@ -982,7 +981,7 @@ QVariantList EventHandler::getReadMarkers(int maxMarkers) const
     }
 
     auto userIds_temp = m_room->userIdsAtEvent(m_event->id());
-    userIds_temp.remove(m_room->localUser()->id());
+    userIds_temp.remove(m_room->localMember().id());
 
     auto userIds = userIds_temp.values();
     if (userIds.count() > maxMarkers) {
@@ -992,7 +991,7 @@ QVariantList EventHandler::getReadMarkers(int maxMarkers) const
     QVariantList users;
     users.reserve(userIds.size());
     for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
+        auto user = m_room->member(userId);
         users += m_room->getUser(user);
     }
 
@@ -1011,7 +1010,7 @@ QString EventHandler::getNumberExcessReadMarkers(int maxMarkers) const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
+    userIds.remove(m_room->localMember().id());
 
     if (userIds.count() > maxMarkers) {
         return QStringLiteral("+ ") + QString::number(userIds.count() - maxMarkers);
@@ -1032,7 +1031,7 @@ QString EventHandler::getReadMarkersString() const
     }
 
     auto userIds = m_room->userIdsAtEvent(m_event->id());
-    userIds.remove(m_room->localUser()->id());
+    userIds.remove(m_room->localMember().id());
 
     /**
      * The string ends up in the form
@@ -1040,8 +1039,8 @@ QString EventHandler::getReadMarkersString() const
      */
     QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
     for (const auto &userId : userIds) {
-        auto user = m_room->user(userId);
-        auto displayName = user->displayname(m_room);
+        auto user = m_room->member(userId);
+        auto displayName = user.displayName();
         if (displayName.isEmpty()) {
             displayName = userId;
         }

src/events/imagepackevent.cpp

@@ -16,7 +16,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
             fromJson<Omittable<QString>>(json["pack"_ls].toObject()["attribution"_ls]),
         };
     } else {
-        pack = none;
+        pack = quotientNone;
     }
 
     const auto &keys = json["images"_ls].toObject().keys();
@@ -25,7 +25,7 @@ ImagePackEventContent::ImagePackEventContent(const QJsonObject &json)
         if (json["images"_ls][k].toObject().contains(QStringLiteral("info"))) {
             info = EventContent::ImageInfo(QUrl(json["images"_ls][k]["url"_ls].toString()), json["images"_ls][k]["info"_ls].toObject(), k);
         } else {
-            info = none;
+            info = quotientNone;
         }
         images += ImagePackImage{
             k,

src/events/imagepackevent.h

@@ -7,6 +7,8 @@
 #include <Quotient/events/eventcontent.h>
 #include <Quotient/events/stateevent.h>
 
+#include "definitions.h"
+
 namespace Quotient
 {
 /**
@@ -26,10 +28,10 @@ public:
      * @brief Defines the properties of an image pack.
      */
     struct Pack {
-        Quotient::Omittable<QString> displayName; /**< The display name of the pack. */
-        Quotient::Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
-        Quotient::Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
-        Quotient::Omittable<QString> attribution; /**< The attribution for the pack author(s). */
+        Omittable<QString> displayName; /**< The display name of the pack. */
+        Omittable<QUrl> avatarUrl; /**< The source mxc URL for the pack avatar. */
+        Omittable<QStringList> usage; /**< An array of the usages for this pack. Possible usages are "emoticon" and "sticker". */
+        Omittable<QString> attribution; /**< The attribution for the pack author(s). */
     };
 
     /**
@@ -38,14 +40,14 @@ public:
     struct ImagePackImage {
         QString shortcode; /**< The shortcode for the image. */
         QUrl url; /**< The mxc URL for this image. */
-        Quotient::Omittable<QString> body; /**< An optional text body for this image. */
-        Quotient::Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
+        Omittable<QString> body; /**< An optional text body for this image. */
+        Omittable<Quotient::EventContent::ImageInfo> info; /**< The ImageInfo object used for the info block of m.sticker events. */
         /**
          * @brief An array of the usages for this image.
          *
          * The possible values match those of the usage key of a pack object.
          */
-        Quotient::Omittable<QStringList> usage;
+        Omittable<QStringList> usage;
     };
 
     /**
@@ -53,7 +55,7 @@ public:
      *
      * @sa Pack
      */
-    Quotient::Omittable<Pack> pack;
+    Omittable<Pack> pack;
 
     /**
      * @brief Return a vector of images in the pack.

src/foreigntypes.h

@@ -7,11 +7,25 @@
 
 #include <Quotient/accountregistry.h>
 #include <Quotient/keyverificationsession.h>
-#if __has_include("Quotient/e2ee/sssshandler.h")
+#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
 #include <Quotient/e2ee/sssshandler.h>
 #endif
 
 #include "controller.h"
+#include "neochatconfig.h"
+
+struct ForeignConfig {
+    Q_GADGET
+    QML_FOREIGN(NeoChatConfig)
+    QML_NAMED_ELEMENT(Config)
+    QML_SINGLETON
+public:
+    static NeoChatConfig *create(QQmlEngine *, QJSEngine *)
+    {
+        QQmlEngine::setObjectOwnership(NeoChatConfig::self(), QQmlEngine::CppOwnership);
+        return NeoChatConfig::self();
+    }
+};
 
 struct ForeignAccountRegistry {
     Q_GADGET
@@ -33,7 +47,7 @@ struct ForeignKeyVerificationSession {
     QML_UNCREATABLE("")
 };
 
-#if __has_include("Quotient/e2ee/sssshandler.h")
+#if Quotient_VERSION_MINOR > 8 || Quotient_VERSION_PATCH > 1
 struct ForeignSSSSHandler {
     Q_GADGET
     QML_FOREIGN(Quotient::SSSSHandler)

src/identityserverhelper.cpp

@@ -33,43 +33,6 @@ void IdentityServerHelper::setConnection(NeoChatConnection *connection)
 
     m_connection = connection;
     Q_EMIT connectionChanged();
-    Q_EMIT currentServerChanged();
-
-    connect(m_connection, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
-        if (type == QLatin1String("m.identity_server")) {
-            Q_EMIT currentServerChanged();
-        }
-    });
-}
-
-QString IdentityServerHelper::currentServer() const
-{
-    if (m_connection == nullptr) {
-        return {};
-    }
-
-    if (!m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
-        return i18nc("@info", "No identity server configured");
-    }
-
-    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
-    if (!url.isEmpty()) {
-        return url.toString();
-    }
-    return i18nc("@info", "No identity server configured");
-}
-
-bool IdentityServerHelper::hasCurrentServer() const
-{
-    if (m_connection == nullptr && !m_connection->hasAccountData(QLatin1String("m.identity_server"))) {
-        return false;
-    }
-
-    const auto url = m_connection->accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
-    if (!url.isEmpty()) {
-        return true;
-    }
-    return false;
 }
 
 QString IdentityServerHelper::url() const
@@ -100,7 +63,7 @@ void IdentityServerHelper::checkUrl()
         m_idServerCheckRequest.clear();
     }
 
-    if (m_url == currentServer()) {
+    if (m_url == m_connection->identityServer().toString()) {
         m_status = Match;
         Q_EMIT statusChanged();
         return;
@@ -134,7 +97,7 @@ void IdentityServerHelper::checkUrl()
 
 void IdentityServerHelper::setIdentityServer()
 {
-    if (m_url == currentServer()) {
+    if (m_url == m_connection->identityServer().toString()) {
         return;
     }
 
@@ -145,7 +108,7 @@ void IdentityServerHelper::setIdentityServer()
 
 void IdentityServerHelper::clearIdentityServer()
 {
-    if (currentServer().isEmpty()) {
+    if (m_connection->identityServer().isEmpty()) {
         return;
     }
     m_connection->setAccountData(QLatin1String("m.identity_server"), {{QLatin1String("base_url"), QString()}});

src/identityserverhelper.h

@@ -26,16 +26,6 @@ class IdentityServerHelper : public QObject
      */
     Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
-    /**
-     * @brief The current identity server.
-     */
-    Q_PROPERTY(QString currentServer READ currentServer NOTIFY currentServerChanged)
-
-    /**
-     * @brief Whether an identity server is currently configured.
-     */
-    Q_PROPERTY(bool hasCurrentServer READ hasCurrentServer NOTIFY currentServerChanged)
-
     /**
      * @brief The URL for the desired server.
      */
@@ -64,10 +54,6 @@ public:
     [[nodiscard]] NeoChatConnection *connection() const;
     void setConnection(NeoChatConnection *connection);
 
-    [[nodiscard]] QString currentServer() const;
-
-    [[nodiscard]] bool hasCurrentServer() const;
-
     [[nodiscard]] QString url() const;
     void setUrl(const QString &url);
 
@@ -87,7 +73,6 @@ public:
 
 Q_SIGNALS:
     void connectionChanged();
-    void currentServerChanged();
     void urlChanged();
     void statusChanged();
 

src/jobs/neochatadd3pidjob.h

@@ -6,8 +6,10 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
+#include "definitions.h"
+
 class NeochatAdd3PIdJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+    explicit NeochatAdd3PIdJob(const QString &clientSecret, const QString &sid, const Omittable<QJsonObject> &auth = {});
 };

src/jobs/neochatchangepasswordjob.h

@@ -6,8 +6,10 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
+#include "definitions.h"
+
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+    explicit NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth = {});
 };

src/jobs/neochatdeactivateaccountjob.h

@@ -6,8 +6,10 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
+#include "definitions.h"
+
 class NeoChatDeactivateAccountJob : public Quotient::BaseJob
 {
 public:
-    explicit NeoChatDeactivateAccountJob(const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+    explicit NeoChatDeactivateAccountJob(const Omittable<QJsonObject> &auth = {});
 };

src/jobs/neochatdeletedevicejob.h

@@ -6,8 +6,10 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/omittable.h>
 
+#include "definitions.h"
+
 class NeochatDeleteDeviceJob : public Quotient::BaseJob
 {
 public:
-    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Quotient::Omittable<QJsonObject> &auth = Quotient::none);
+    explicit NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth = {});
 };

src/login.cpp

@@ -54,14 +54,19 @@ void LoginHelper::init()
             m_connection = new NeoChatConnection();
         }
         m_connection->resolveServer(m_matrixId);
-        connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
-            setHomeserverReachable(true);
-            m_testing = false;
-            Q_EMIT testingChanged();
-            m_supportsSso = m_connection->supportsSso();
-            m_supportsPassword = m_connection->supportsPasswordAuth();
-            Q_EMIT loginFlowsChanged();
-        });
+        connect(
+            m_connection.get(),
+            &Connection::loginFlowsChanged,
+            this,
+            [this]() {
+                setHomeserverReachable(true);
+                m_testing = false;
+                Q_EMIT testingChanged();
+                m_supportsSso = m_connection->supportsSso();
+                m_supportsPassword = m_connection->supportsPasswordAuth();
+                Q_EMIT loginFlowsChanged();
+            },
+            Qt::SingleShotConnection);
     });
     connect(m_connection, &Connection::connected, this, [this] {
         Q_EMIT connected();
@@ -100,9 +105,14 @@ void LoginHelper::init()
         Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
-    connectSingleShot(m_connection.get(), &Connection::syncDone, this, [this]() {
-        Q_EMIT loaded();
-    });
+    connect(
+        m_connection.get(),
+        &Connection::syncDone,
+        this,
+        [this]() {
+            Q_EMIT loaded();
+        },
+        Qt::SingleShotConnection);
 }
 
 void LoginHelper::setHomeserverReachable(bool reachable)
@@ -182,11 +192,16 @@ QUrl LoginHelper::ssoUrl() const
 void LoginHelper::loginWithSso()
 {
     m_connection->resolveServer(m_matrixId);
-    connectSingleShot(m_connection.get(), &Connection::loginFlowsChanged, this, [this]() {
-        SsoSession *session = m_connection->prepareForSso(m_deviceName);
-        m_ssoUrl = session->ssoUrl();
-        Q_EMIT ssoUrlChanged();
-    });
+    connect(
+        m_connection.get(),
+        &Connection::loginFlowsChanged,
+        this,
+        [this]() {
+            SsoSession *session = m_connection->prepareForSso(m_deviceName);
+            m_ssoUrl = session->ssoUrl();
+            Q_EMIT ssoUrlChanged();
+        },
+        Qt::SingleShotConnection);
 }
 
 bool LoginHelper::testing() const

src/login/Loading.qml

@@ -13,7 +13,7 @@ LoginStep {
     id: root
 
     FormCard.FormTextDelegate {
-        text: i18n("Please wait. This might take a little while.")
+        text: i18n("Please wait while your messages are loaded from the server. This might take a little while.")
     }
     FormCard.AbstractFormDelegate {
         contentItem: QQC2.BusyIndicator {}

src/login/WelcomePage.qml

@@ -92,7 +92,7 @@ FormCard.FormCardPage {
                     }
 
                     QQC2.ToolButton {
-                        text: i18nc("@action:button", "Remove this account")
+                        text: i18nc("@action:button", "Log out of this account")
                         icon.name: "edit-delete-remove"
                         onClicked: Controller.removeConnection(modelData)
                         display: QQC2.Button.IconOnly

src/models/actionsmodel.cpp

@@ -202,11 +202,11 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                 return QString();
             }
-            if (room->localUser()->id() == text) {
+            if (room->localMember().id() == text) {
                 Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                 return QString();
             }
-            if (room->users().contains(room->user(text))) {
+            if (room->memberIds().contains(text)) {
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already in this room.", "%1 is already in this room.", text));
                 return QString();
             }
@@ -359,7 +359,7 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is already ignored.", "%1 is already ignored.", text));
                 return QString();
             }
-            room->connection()->addToIgnoredUsers(room->connection()->user(text));
+            room->connection()->addToIgnoredUsers(text);
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is now ignored", "%1 is now ignored.", text));
             return QString();
         },
@@ -382,7 +382,7 @@ QList<ActionsModel::Action> actions{
                 Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<username> is not ignored.", "%1 is not ignored.", text));
                 return QString();
             }
-            room->connection()->removeFromIgnoredUsers(room->connection()->user(text));
+            room->connection()->removeFromIgnoredUsers(text);
             Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> is no longer ignored.", "%1 is no longer ignored.", text));
             return QString();
         },
@@ -431,11 +431,11 @@ QList<ActionsModel::Action> actions{
             if (!plEvent) {
                 return QString();
             }
-            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                 return QString();
             }
-            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
+            if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
                 Q_EMIT room->showMessage(
                     NeoChatRoom::Error,
                     i18nc("You are not allowed to ban <username> from this room.", "You are not allowed to ban %1 from this room.", parts[0]));
@@ -464,7 +464,7 @@ QList<ActionsModel::Action> actions{
             if (!plEvent) {
                 return QString();
             }
-            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
+            if (plEvent->ban() > plEvent->powerLevelForUser(room->localMember().id())) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                 return QString();
             }
@@ -495,7 +495,7 @@ QList<ActionsModel::Action> actions{
                                          i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", parts[0]));
                 return QString();
             }
-            if (parts[0] == room->localUser()->id()) {
+            if (parts[0] == room->localMember().id()) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                 return QString();
             }
@@ -508,11 +508,11 @@ QList<ActionsModel::Action> actions{
                 return QString();
             }
             auto kick = plEvent->kick();
-            if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
+            if (plEvent->powerLevelForUser(room->localMember().id()) < kick) {
                 Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));
                 return QString();
             }
-            if (plEvent->powerLevelForUser(room->localUser()->id()) <= plEvent->powerLevelForUser(parts[0])) {
+            if (plEvent->powerLevelForUser(room->localMember().id()) <= plEvent->powerLevelForUser(parts[0])) {
                 Q_EMIT room->showMessage(
                     NeoChatRoom::Error,
                     i18nc("You are not allowed to kick <username> from this room", "You are not allowed to kick %1 from this room.", parts[0]));

src/models/locationsmodel.cpp

@@ -63,7 +63,7 @@ void LocationsModel::addLocation(const RoomMessageEvent *event)
         .latitude = latitude,
         .longitude = longitude,
         .content = event->contentJson(),
-        .author = m_room->user(event->senderId()),
+        .author = event->senderId(),
     };
     endInsertRows();
 }

src/models/locationsmodel.h

@@ -57,7 +57,7 @@ private:
         float latitude;
         float longitude;
         QJsonObject content;
-        Quotient::User *author;
+        QString author;
     };
     QList<LocationData> m_locations;
     void addLocation(const Quotient::RoomMessageEvent *event);

src/models/messageeventmodel.cpp

@@ -222,7 +222,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             beginResetModel();
             endResetModel();
         });
-        qCDebug(MessageEvent) << "Connected to room" << room->id() << "as" << room->localUser()->id();
+        qCDebug(MessageEvent) << "Connected to room" << room->id() << "as" << room->localMember().id();
     } else {
         lastReadEventId.clear();
     }
@@ -592,7 +592,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
     }
 
     if (role == IsEditableRole) {
-        return eventHandler.messageComponentType() == MessageComponentType::Text && evt.senderId() == m_currentRoom->localUser()->id();
+        return eventHandler.messageComponentType() == MessageComponentType::Text && evt.senderId() == m_currentRoom->localMember().id();
     }
 
     return {};

src/models/notificationsmodel.cpp

@@ -116,7 +116,7 @@ void NotificationsModel::loadData()
                 if (!room) {
                     continue;
                 }
-                auto u = room->memberAvatarUrl(authorId);
+                auto u = room->member(authorId).avatarUrl();
                 auto avatar = u.isEmpty() ? QUrl() : connection()->makeMediaUrl(u);
                 const auto &authorAvatar = avatar.isValid() && avatar.scheme() == QStringLiteral("mxc") ? avatar : QUrl();
 
@@ -125,9 +125,9 @@ void NotificationsModel::loadData()
                 beginInsertRows({}, m_notifications.length(), m_notifications.length());
                 m_notifications += Notification{
                     .roomId = notification.roomId,
-                    .text = room->htmlSafeMemberName(authorId) + (roomEvent->is<StateEvent>() ? QStringLiteral(" ") : QStringLiteral(": "))
+                    .text = room->member(authorId).htmlSafeDisplayName() + (roomEvent->is<StateEvent>() ? QStringLiteral(" ") : QStringLiteral(": "))
                         + eventHandler.getPlainBody(true),
-                    .authorName = room->htmlSafeMemberName(authorId),
+                    .authorName = room->member(authorId).htmlSafeDisplayName(),
                     .authorAvatar = authorAvatar,
                     .eventId = roomEvent->id(),
                     .roomDisplayName = room->displayName(),

src/models/reactionmodel.cpp

@@ -92,7 +92,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     if (role == HasLocalUser) {
         for (auto author : reaction.authors) {
-            if (author.toMap()[QStringLiteral("id")] == m_room->localUser()->id()) {
+            if (author.toMap()[QStringLiteral("id")] == m_room->localMember().id()) {
                 return true;
             }
         }
@@ -121,13 +121,13 @@ void ReactionModel::updateReactions()
         return;
     };
 
-    QMap<QString, QList<Quotient::User *>> reactions = {};
+    QMap<QString, QList<Quotient::RoomMember>> reactions = {};
     for (const auto &a : annotations) {
         if (a->isRedacted()) { // Just in case?
             continue;
         }
         if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) {
-            reactions[e->key()].append(m_room->user(e->senderId()));
+            reactions[e->key()].append(m_room->member(e->senderId()));
             if (e->contentJson()[QStringLiteral("shortcode")].toString().length()) {
                 m_shortcodes[e->key()] = e->contentJson()[QStringLiteral("shortcode")].toString().toHtmlEscaped();
             }

src/models/searchmodel.cpp

@@ -44,7 +44,7 @@ void SearchModel::search()
     }
 
     RoomEventFilter filter;
-    filter.unreadThreadNotifications = none;
+    filter.unreadThreadNotifications = {};
     filter.lazyLoadMembers = true;
     filter.includeRedundantMembers = false;
     filter.notRooms = QStringList();
@@ -58,7 +58,7 @@ void SearchModel::search()
         .orderBy = "recent"_ls,
         .eventContext = SearchJob::IncludeEventContext{3, 3, true},
         .includeState = false,
-        .groupings = none,
+        .groupings = {},
 
     };
 
@@ -122,6 +122,9 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
         }
         return {};
     }
+    case IsEditableRole: {
+        return false;
+    }
     }
     return DelegateType::Message;
 }
@@ -158,6 +161,7 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {IsThreadedRole, "isThreaded"},
         {ThreadRootRole, "threadRoot"},
         {ContentModelRole, "contentModel"},
+        {IsEditableRole, "isEditable"},
     };
 }
 

src/models/searchmodel.h

@@ -71,6 +71,7 @@ public:
         IsThreadedRole,
         ThreadRootRole,
         ContentModelRole,
+        IsEditableRole,
     };
     Q_ENUM(Roles)
     explicit SearchModel(QObject *parent = nullptr);

src/models/spacechildrenmodel.cpp

@@ -6,6 +6,7 @@
 #include <Quotient/jobs/basejob.h>
 #include <Quotient/room.h>
 
+#include "definitions.h"
 #include "neochatconnection.h"
 #include "neochatroom.h"
 
@@ -87,7 +88,7 @@ void SpaceChildrenModel::refreshModel()
     m_rootItem =
         new SpaceTreeItem(dynamic_cast<NeoChatConnection *>(m_space->connection()), nullptr, m_space->id(), m_space->displayName(), m_space->canonicalAlias());
     endResetModel();
-    auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(m_space->id(), Quotient::none, Quotient::none, 1);
+    auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(m_space->id(), quotientNone, quotientNone, 1);
     m_currentJobs.append(job);
     connect(job, &Quotient::BaseJob::success, this, [this, job]() {
         insertChildren(job->rooms());
@@ -136,7 +137,7 @@ void SpaceChildrenModel::insertChildren(std::vector<Quotient::GetSpaceHierarchyJ
                 }
             }
             if (children[i].childrenState.size() > 0) {
-                auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(children[i].roomId, Quotient::none, Quotient::none, 1);
+                auto job = m_space->connection()->callApi<Quotient::GetSpaceHierarchyJob>(children[i].roomId, quotientNone, quotientNone, 1);
                 m_currentJobs.append(job);
                 connect(job, &Quotient::BaseJob::success, this, [this, parent, insertRow, job]() {
                     insertChildren(job->rooms(), index(insertRow, 0, parent));

src/models/threepidmodel.cpp

@@ -3,6 +3,12 @@
 
 #include "threepidmodel.h"
 
+#include <QCryptographicHash>
+#include <QNetworkReply>
+
+#include <Quotient/csapi/openid.h>
+#include <Quotient/networkaccessmanager.h>
+
 #include "neochatconnection.h"
 
 ThreePIdModel::ThreePIdModel(NeoChatConnection *connection)
@@ -30,6 +36,9 @@ QVariant ThreePIdModel::data(const QModelIndex &index, int role) const
     if (role == MediumRole) {
         return m_threePIds.at(index.row()).medium;
     }
+    if (role == IsBoundRole) {
+        return m_bindings.contains(m_threePIds.at(index.row()).address);
+    }
 
     return {};
 }
@@ -45,6 +54,7 @@ QHash<int, QByteArray> ThreePIdModel::roleNames() const
     return {
         {AddressRole, QByteArrayLiteral("address")},
         {MediumRole, QByteArrayLiteral("medium")},
+        {IsBoundRole, QByteArrayLiteral("isBound")},
     };
 }
 
@@ -57,8 +67,80 @@ void ThreePIdModel::refreshModel()
             beginResetModel();
             m_threePIds = threePIdJob->threepids();
             endResetModel();
+
+            refreshBindStatus();
         });
     }
 }
 
+void ThreePIdModel::refreshBindStatus()
+{
+    const auto connection = dynamic_cast<NeoChatConnection *>(this->parent());
+    if (connection == nullptr || !connection->hasIdentityServer()) {
+        return;
+    }
+
+    const auto openIdJob = connection->callApi<Quotient::RequestOpenIdTokenJob>(connection->userId());
+    connect(openIdJob, &Quotient::BaseJob::success, this, [this, connection, openIdJob]() {
+        const auto requestUrl = QUrl(connection->identityServer().toString() + QStringLiteral("/_matrix/identity/v2/account/register"));
+        if (!(requestUrl.scheme() == QStringLiteral("https") || requestUrl.scheme() == QStringLiteral("http"))) {
+            return;
+        }
+
+        QNetworkRequest request(requestUrl);
+        auto newRequest = Quotient::NetworkAccessManager::instance()->post(request, QJsonDocument(openIdJob->jsonData()).toJson());
+        connect(newRequest, &QNetworkReply::finished, this, [this, connection, newRequest]() {
+            QJsonObject replyJson = QJsonDocument::fromJson(newRequest->readAll()).object();
+            const auto identityServerToken = replyJson[QLatin1String("token")].toString();
+
+            const auto requestUrl = QUrl(connection->identityServer().toString() + QStringLiteral("/_matrix/identity/v2/hash_details"));
+            if (!(requestUrl.scheme() == QStringLiteral("https") || requestUrl.scheme() == QStringLiteral("http"))) {
+                return;
+            }
+
+            QNetworkRequest hashRequest(requestUrl);
+            hashRequest.setRawHeader("Authorization", "Bearer " + identityServerToken.toLatin1());
+
+            auto hashReply = Quotient::NetworkAccessManager::instance()->get(hashRequest);
+            connect(hashReply, &QNetworkReply::finished, this, [this, connection, identityServerToken, hashReply]() {
+                QJsonObject replyJson = QJsonDocument::fromJson(hashReply->readAll()).object();
+                const auto lookupPepper = replyJson[QLatin1String("lookup_pepper")].toString();
+
+                const auto requestUrl = QUrl(connection->identityServer().toString() + QStringLiteral("/_matrix/identity/v2/lookup"));
+                if (!(requestUrl.scheme() == QStringLiteral("https") || requestUrl.scheme() == QStringLiteral("http"))) {
+                    return;
+                }
+
+                QNetworkRequest lookupRequest(requestUrl);
+                lookupRequest.setRawHeader("Authorization", "Bearer " + identityServerToken.toLatin1());
+
+                QJsonObject requestData = {
+                    {QLatin1String("algorithm"), QLatin1String("none")},
+                    {QLatin1String("pepper"), lookupPepper},
+                };
+                QJsonArray idLookups;
+                for (const auto &id : m_threePIds) {
+                    idLookups += QStringLiteral("%1 %2").arg(id.address, id.medium);
+                }
+                requestData[QLatin1String("addresses")] = idLookups;
+
+                auto lookupReply = Quotient::NetworkAccessManager::instance()->post(lookupRequest, QJsonDocument(requestData).toJson(QJsonDocument::Compact));
+                connect(lookupReply, &QNetworkReply::finished, this, [this, connection, lookupReply]() {
+                    beginResetModel();
+                    m_bindings.clear();
+
+                    QJsonObject mappings = QJsonDocument::fromJson(lookupReply->readAll()).object()[QLatin1String("mappings")].toObject();
+                    for (const auto &id : mappings.keys()) {
+                        if (mappings[id] == connection->userId()) {
+                            m_bindings += id.section(u' ', 0, 0);
+                        }
+                    }
+
+                    endResetModel();
+                });
+            });
+        });
+    });
+}
+
 #include "moc_threepidmodel.cpp"

src/models/threepidmodel.h

@@ -28,6 +28,7 @@ public:
     enum EventRoles {
         AddressRole = Qt::DisplayRole, /**< The third-party identifier address. */
         MediumRole, /**< The medium of the third-party identifier. One of: [email, msisdn]. */
+        IsBoundRole, /**< Whether the 3PID is bound to the current identity server. */
     };
 
     explicit ThreePIdModel(NeoChatConnection *parent);
@@ -57,4 +58,8 @@ public:
 
 private:
     QVector<Quotient::GetAccount3PIDsJob::ThirdPartyIdentifier> m_threePIds;
+
+    QList<QString> m_bindings;
+
+    void refreshBindStatus();
 };

src/models/userlistmodel.cpp

@@ -5,7 +5,9 @@
 
 #include <QGuiApplication>
 
+#include <Quotient/avatar.h>
 #include <Quotient/events/roompowerlevelsevent.h>
+#include <Quotient/room.h>
 
 #include "enums/powerlevel.h"
 #include "neochatroom.h"
@@ -26,18 +28,26 @@ void UserListModel::setRoom(NeoChatRoom *room)
 
     if (m_currentRoom) {
         m_currentRoom->disconnect(this);
+        m_currentRoom->connection()->disconnect(this);
     }
     m_currentRoom = room;
 
     if (m_currentRoom) {
-        connect(m_currentRoom, &Room::userAdded, this, &UserListModel::userAdded);
-        connect(m_currentRoom, &Room::userRemoved, this, &UserListModel::userRemoved);
-        connect(m_currentRoom, &Room::memberAboutToRename, this, &UserListModel::userRemoved);
-        connect(m_currentRoom, &Room::memberRenamed, this, &UserListModel::userAdded);
-        connect(m_currentRoom, &Room::changed, this, &UserListModel::refreshAllUsers);
+        connect(m_currentRoom, &Room::memberJoined, this, &UserListModel::memberJoined);
+        connect(m_currentRoom, &Room::memberLeft, this, &UserListModel::memberLeft);
+        connect(m_currentRoom, &Room::memberNameUpdated, this, [this](RoomMember member) {
+            refreshMember(member, {DisplayNameRole});
+        });
+        connect(m_currentRoom, &Room::memberAvatarUpdated, this, [this](RoomMember member) {
+            refreshMember(member, {AvatarRole});
+        });
+        connect(m_currentRoom, &Room::changed, this, &UserListModel::refreshAllMembers);
+        connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
+            setRoom(nullptr);
+        });
     }
 
-    refreshAllUsers();
+    refreshAllMembers();
     Q_EMIT roomChanged();
 }
 
@@ -46,44 +56,36 @@ NeoChatRoom *UserListModel::room() const
     return m_currentRoom;
 }
 
-Quotient::User *UserListModel::userAt(QModelIndex index) const
-{
-    if (index.row() < 0 || index.row() >= m_users.size()) {
-        return nullptr;
-    }
-    return m_users.at(index.row());
-}
-
 QVariant UserListModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
         return QVariant();
     }
 
-    if (index.row() >= m_users.count()) {
+    if (index.row() >= m_members.count()) {
         qDebug() << "UserListModel, something's wrong: index.row() >= "
                     "users.count()";
         return {};
     }
-    auto user = m_users.at(index.row());
+    auto member = m_members.at(index.row());
     if (role == DisplayNameRole) {
-        return user->displayname(m_currentRoom);
+        return m_currentRoom->member(member).disambiguatedName();
     }
     if (role == UserIdRole) {
-        return user->id();
+        return member;
     }
     if (role == AvatarRole) {
-        return m_currentRoom->avatarForMember(user);
+        return m_currentRoom->memberAvatar(member).url();
     }
     if (role == ObjectRole) {
-        return QVariant::fromValue(user);
+        return QVariant::fromValue(member);
     }
     if (role == PowerLevelRole) {
         auto plEvent = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
         if (!plEvent) {
             return 0;
         }
-        return plEvent->powerLevelForUser(user->id());
+        return plEvent->powerLevelForUser(member);
     }
     if (role == PowerLevelStringRole) {
         auto pl = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
@@ -93,7 +95,7 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
             return QStringLiteral("Not Available");
         }
 
-        auto userPl = pl->powerLevelForUser(user->id());
+        auto userPl = pl->powerLevelForUser(member);
 
         return i18nc("%1 is the name of the power level, e.g. admin and %2 is the value that represents.",
                      "%1 (%2)",
@@ -109,87 +111,77 @@ int UserListModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid()) {
         return 0;
     }
-    return m_users.count();
+    return m_members.count();
 }
 
 bool UserListModel::event(QEvent *event)
 {
     if (event->type() == QEvent::ApplicationPaletteChange) {
-        refreshAllUsers();
+        refreshAllMembers();
     }
     return QObject::event(event);
 }
 
-void UserListModel::userAdded(Quotient::User *user)
+void UserListModel::memberJoined(const Quotient::RoomMember &member)
 {
-    auto pos = findUserPos(user);
+    auto pos = findUserPos(member);
     beginInsertRows(QModelIndex(), pos, pos);
-    m_users.insert(pos, user);
+    m_members.insert(pos, member.id());
     endInsertRows();
-    connect(user, &User::defaultAvatarChanged, this, [this, user]() {
-        refreshUser(user, {AvatarRole});
-    });
 }
 
-void UserListModel::userRemoved(Quotient::User *user)
+void UserListModel::memberLeft(const Quotient::RoomMember &member)
 {
-    auto pos = findUserPos(user);
-    if (pos != m_users.size()) {
+    auto pos = findUserPos(member);
+    if (pos != m_members.size()) {
         beginRemoveRows(QModelIndex(), pos, pos);
-        m_users.removeAt(pos);
+        m_members.removeAt(pos);
         endRemoveRows();
-        user->disconnect(this);
     } else {
         qWarning() << "Trying to remove a room member not in the user list";
     }
 }
 
-void UserListModel::refreshUser(Quotient::User *user, const QList<int> &roles)
+void UserListModel::refreshMember(const Quotient::RoomMember &member, const QList<int> &roles)
 {
-    auto pos = findUserPos(user);
-    if (pos != m_users.size()) {
+    auto pos = findUserPos(member);
+    if (pos != m_members.size()) {
         Q_EMIT dataChanged(index(pos), index(pos), roles);
     } else {
         qWarning() << "Trying to access a room member not in the user list";
     }
 }
 
-void UserListModel::refreshAllUsers()
+void UserListModel::refreshAllMembers()
 {
     beginResetModel();
-    for (User *user : std::as_const(m_users)) {
-        user->disconnect(this);
-    }
-    m_users.clear();
+    m_members.clear();
 
     if (m_currentRoom != nullptr) {
-        m_users = m_currentRoom->users();
-        std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
-
-        for (User *user : std::as_const(m_users)) {
-            connect(user, &User::defaultAvatarChanged, this, [this, user]() {
-                refreshUser(user, {AvatarRole});
-            });
-        }
-        connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
-            setRoom(nullptr);
+        m_members = m_currentRoom->joinedMemberIds();
+        std::sort(m_members.begin(), m_members.end(), [this](const auto &left, const auto &right) {
+            return m_currentRoom->member(left).displayName() < m_currentRoom->member(right).displayName();
         });
     }
     endResetModel();
     Q_EMIT usersRefreshed();
 }
 
-int UserListModel::findUserPos(Quotient::User *user) const
+int UserListModel::findUserPos(const RoomMember &member) const
 {
-    return findUserPos(m_currentRoom->safeMemberName(user->id()));
+    return findUserPos(member.id());
 }
 
-int UserListModel::findUserPos(const QString &username) const
+int UserListModel::findUserPos(const QString &userId) const
 {
     if (!m_currentRoom) {
         return 0;
     }
-    return m_currentRoom->memberSorter().lowerBoundIndex(m_users, username);
+#if Quotient_VERSION_MINOR > 8
+    return Quotient::lowerBoundMemberIndex(m_members, m_currentRoom->member(userId).displayName(), m_currentRoom);
+#else
+    return m_currentRoom->memberSorter().lowerBoundIndex(m_currentRoom->members(), m_currentRoom->member(userId));
+#endif
 }
 
 QHash<int, QByteArray> UserListModel::roleNames() const

src/models/userlistmodel.h

@@ -56,11 +56,6 @@ public:
     [[nodiscard]] NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
-    /**
-     * @brief The user at the given index of the model.
-     */
-    [[nodiscard]] Quotient::User *userAt(QModelIndex index) const;
-
     /**
      * @brief Get the given role value at the given index.
      *
@@ -90,15 +85,15 @@ protected:
     bool event(QEvent *event) override;
 
 private Q_SLOTS:
-    void userAdded(Quotient::User *user);
-    void userRemoved(Quotient::User *user);
-    void refreshUser(Quotient::User *user, const QList<int> &roles = {});
-    void refreshAllUsers();
+    void memberJoined(const Quotient::RoomMember &member);
+    void memberLeft(const Quotient::RoomMember &member);
+    void refreshMember(const Quotient::RoomMember &member, const QList<int> &roles = {});
+    void refreshAllMembers();
 
 private:
     QPointer<NeoChatRoom> m_currentRoom;
-    QList<Quotient::User *> m_users;
+    QList<QString> m_members;
 
-    int findUserPos(Quotient::User *user) const;
-    [[nodiscard]] int findUserPos(const QString &username) const;
+    int findUserPos(const Quotient::RoomMember &member) const;
+    [[nodiscard]] int findUserPos(const QString &userId) const;
 };

src/neochat.notifyrc

@@ -253,6 +253,7 @@ Action=Popup
 
 [Event/Share]
 Name=Share
+Name[ar]=شارك
 Name[ca]=Compartició
 Name[ca@valencia]=Compartició
 Name[cs]=Sdílet
@@ -260,6 +261,7 @@ Name[en_GB]=Share
 Name[eo]=Kundividi
 Name[es]=Compartir
 Name[eu]=Partekatu
+Name[fi]=Jaa
 Name[fr]=Partager
 Name[hu]=Megosztás
 Name[ia]=Comparti
@@ -269,18 +271,21 @@ Name[lv]=Kopīgot
 Name[nl]=Gedeelde
 Name[pl]=Udostępnij
 Name[sl]=Deli
+Name[sv]=Dela
 Name[ta]=பகிர்
 Name[tr]=Paylaş
 Name[uk]=Оприлюднення
 Name[x-test]=xxSharexx
 Name[zh_TW]=分享
 Comment=The result of sharing a piece of content
+Comment[ar]=نتيجة مشاركة محتوى
 Comment[ca]=El resultat de compartir una peça de contingut
 Comment[ca@valencia]=El resultat de compartir una peça de contingut
 Comment[en_GB]=The result of sharing a piece of content
 Comment[eo]=La rezulto el kundividado de enhavero
 Comment[es]=El resultado de compartir una parte de contenido
 Comment[eu]=Eduki pieza bat partekatzearen emaitza
+Comment[fi]=Tulos yhden sisältöosasen jakamisesta
 Comment[fr]=Le résultat du partage d'une partie de contenu.
 Comment[hu]=Tartalom megosztásának eredménye
 Comment[ia]=Le exito de compartir un pecietta de contento
@@ -290,6 +295,7 @@ Comment[lv]=Satura kopīgošanas rezultāts
 Comment[nl]=Het resultaat van het delen van een stukje inhoud
 Comment[pl]=Wynik udostępniania kawałka treści
 Comment[sl]=Rezultat deljenega kosa vsebine
+Comment[sv]=Resultatet av att dela innehåll
 Comment[ta]=எதையோ பகிர்ந்த‍தன் விளைவு
 Comment[tr]=Bir parça içerik paylaşımının sonucu
 Comment[uk]=Результат оприлюднення даних

src/neochatconfig.kcfgc

@@ -7,4 +7,3 @@ DefaultValueGetters=true
 GenerateProperties=true
 ParentInConstructor=true
 Singleton=true
-QmlRegistration=true

src/neochatconnection.cpp

@@ -12,6 +12,7 @@
 #include "linkpreviewer.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "notificationsmanager.h"
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 
@@ -60,9 +61,16 @@ void NeoChatConnection::connectSignals()
         if (type == QLatin1String("org.kde.neochat.account_label")) {
             Q_EMIT labelChanged();
         }
+        if (type == QLatin1String("m.identity_server")) {
+            Q_EMIT identityServerChanged();
+        }
     });
     connect(this, &NeoChatConnection::syncDone, this, [this] {
         setIsOnline(true);
+
+        connect(this, &NeoChatConnection::syncDone, this, [this]() {
+            NotificationsManager::instance().handleNotifications(this);
+        });
     });
     connect(this, &NeoChatConnection::networkError, this, [this]() {
         setIsOnline(false);
@@ -256,6 +264,41 @@ ThreePIdModel *NeoChatConnection::threePIdModel() const
     return m_threePIdModel;
 }
 
+bool NeoChatConnection::hasIdentityServer() const
+{
+    if (!hasAccountData(QLatin1String("m.identity_server"))) {
+        return false;
+    }
+
+    const auto url = accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return true;
+    }
+    return false;
+}
+
+QUrl NeoChatConnection::identityServer() const
+{
+    if (!hasAccountData(QLatin1String("m.identity_server"))) {
+        return {};
+    }
+
+    const auto url = accountData(QLatin1String("m.identity_server"))->contentPart<QUrl>(QLatin1String("base_url"));
+    if (!url.isEmpty()) {
+        return url;
+    }
+    return {};
+}
+
+QString NeoChatConnection::identityServerUIString() const
+{
+    if (!hasIdentityServer()) {
+        return i18nc("@info", "No identity server configured");
+    }
+
+    return identityServer().toString();
+}
+
 void NeoChatConnection::createRoom(const QString &name, const QString &topic, const QString &parent, bool setChildParent)
 {
     QList<CreateRoomJob::StateEvent> initialStateEvents;
@@ -283,9 +326,14 @@ void NeoChatConnection::createRoom(const QString &name, const QString &topic, co
     connect(job, &CreateRoomJob::failure, this, [job] {
         Q_EMIT Controller::instance().errorOccured(i18n("Room creation failed: %1", job->errorString()), {});
     });
-    connectSingleShot(this, &Connection::newRoom, this, [](Room *room) {
-        RoomManager::instance().resolveResource(room->id());
-    });
+    connect(
+        this,
+        &Connection::newRoom,
+        this,
+        [](Room *room) {
+            RoomManager::instance().resolveResource(room->id());
+        },
+        Qt::SingleShotConnection);
 }
 
 void NeoChatConnection::createSpace(const QString &name, const QString &topic, const QString &parent, bool setChildParent)
@@ -315,9 +363,14 @@ void NeoChatConnection::createSpace(const QString &name, const QString &topic, c
     connect(job, &CreateRoomJob::failure, this, [job] {
         Q_EMIT Controller::instance().errorOccured(i18n("Space creation failed: %1", job->errorString()), {});
     });
-    connectSingleShot(this, &Connection::newRoom, this, [](Room *room) {
-        RoomManager::instance().resolveResource(room->id());
-    });
+    connect(
+        this,
+        &Connection::newRoom,
+        this,
+        [](Room *room) {
+            RoomManager::instance().resolveResource(room->id());
+        },
+        Qt::SingleShotConnection);
 }
 
 bool NeoChatConnection::directChatExists(Quotient::User *user)
@@ -328,29 +381,30 @@ bool NeoChatConnection::directChatExists(Quotient::User *user)
 void NeoChatConnection::openOrCreateDirectChat(const QString &userId)
 {
     if (auto user = this->user(userId)) {
-        openOrCreateDirectChat(user);
+        const auto existing = directChats();
+
+        if (existing.contains(user)) {
+            const auto room = this->room(existing.value(user));
+            if (room) {
+                RoomManager::instance().resolveResource(room->id());
+                return;
+            }
+        }
+        requestDirectChat(userId);
+        connect(
+            this,
+            &Connection::directChatAvailable,
+            this,
+            [=](auto room) {
+                room->activateEncryption();
+            },
+            Qt::SingleShotConnection);
+
     } else {
         qWarning() << "openOrCreateDirectChat: Couldn't get user object for ID " << userId << ", unable to open/request direct chat.";
     }
 }
 
-void NeoChatConnection::openOrCreateDirectChat(User *user)
-{
-    const auto existing = directChats();
-
-    if (existing.contains(user)) {
-        const auto room = this->room(existing.value(user));
-        if (room) {
-            RoomManager::instance().resolveResource(room->id());
-            return;
-        }
-    }
-    requestDirectChat(user);
-    connectSingleShot(this, &Connection::directChatAvailable, this, [=](auto room) {
-        room->activateEncryption();
-    });
-}
-
 qsizetype NeoChatConnection::directChatNotifications() const
 {
     qsizetype notifications = 0;

src/neochatconnection.h

@@ -36,6 +36,19 @@ class NeoChatConnection : public Quotient::Connection
      */
     Q_PROPERTY(ThreePIdModel *threePIdModel READ threePIdModel CONSTANT)
 
+    /**
+     * @brief Whether an identity server is configured.
+     */
+    Q_PROPERTY(bool hasIdentityServer READ hasIdentityServer NOTIFY identityServerChanged)
+
+    /**
+     * @brief The identity server URL as a string for showing in a UI.
+     *
+     * Will return the string "No identity server configured" if no identity
+     * server configured. Otherwise it returns the URL as a string.
+     */
+    Q_PROPERTY(QString identityServer READ identityServerUIString NOTIFY identityServerChanged)
+
     /**
      * @brief The total number of notifications for all direct chats.
      */
@@ -105,6 +118,17 @@ public:
 
     ThreePIdModel *threePIdModel() const;
 
+    bool hasIdentityServer() const;
+
+    /**
+     * @brief The identity server URL.
+     *
+     * Empty if no identity server configured.
+     */
+    QUrl identityServer() const;
+
+    QString identityServerUIString() const;
+
     /**
      * @brief Create new room for a group chat.
      */
@@ -127,13 +151,6 @@ public:
      */
     Q_INVOKABLE void openOrCreateDirectChat(const QString &userId);
 
-    /**
-     * @brief Join a direct chat with the given user object.
-     *
-     * If a direct chat with the user doesn't exist one is created and then joined.
-     */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
-
     /**
      * @brief Get the account data with \param type as a formatted JSON string.
      */
@@ -162,6 +179,7 @@ public:
 
 Q_SIGNALS:
     void labelChanged();
+    void identityServerChanged();
     void directChatNotificationsChanged();
     void directChatsHaveHighlightNotificationsChanged();
     void homeNotificationsChanged();

src/neochatroom.cpp

@@ -96,23 +96,31 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
     });
     connect(this, &Room::displaynameChanged, this, &NeoChatRoom::displayNameChanged);
 
-    connectSingleShot(this, &Room::baseStateLoaded, this, [this]() {
-        updatePushNotificationState(QStringLiteral("m.push_rules"));
+    connect(
+        this,
+        &Room::baseStateLoaded,
+        this,
+        [this, connection]() {
+            updatePushNotificationState(QStringLiteral("m.push_rules"));
 
-        Q_EMIT canEncryptRoomChanged();
-        if (this->joinState() != JoinState::Invite) {
-            return;
-        }
-        auto roomMemberEvent = currentState().get<RoomMemberEvent>(localUser()->id());
-        QImage avatar_image;
-        if (roomMemberEvent && !user(roomMemberEvent->senderId())->avatarUrl(this).isEmpty()) {
-            avatar_image = user(roomMemberEvent->senderId())->avatar(128, this);
-        } else {
-            qWarning() << "using this room's avatar";
-            avatar_image = avatar(128);
-        }
-        NotificationsManager::instance().postInviteNotification(this, displayName(), htmlSafeMemberName(roomMemberEvent->senderId()), avatar_image);
-    });
+            Q_EMIT canEncryptRoomChanged();
+            if (this->joinState() != JoinState::Invite) {
+                return;
+            }
+            auto roomMemberEvent = currentState().get<RoomMemberEvent>(localMember().id());
+            QImage avatar_image;
+            if (roomMemberEvent && !member(roomMemberEvent->senderId()).avatarUrl().isEmpty()) {
+                avatar_image = memberAvatar(roomMemberEvent->senderId()).get(connection, 128, {});
+            } else {
+                qWarning() << "using this room's avatar";
+                avatar_image = avatar(128);
+            }
+            NotificationsManager::instance().postInviteNotification(this,
+                                                                    displayName(),
+                                                                    member(roomMemberEvent->senderId()).htmlSafeDisplayName(),
+                                                                    avatar_image);
+        },
+        Qt::SingleShotConnection);
     connect(this, &Room::changed, this, [this] {
         Q_EMIT canEncryptRoomChanged();
         Q_EMIT parentIdsChanged();
@@ -259,18 +267,18 @@ void NeoChatRoom::forget()
 
 QVariantList NeoChatRoom::getUsersTyping() const
 {
-    auto users = usersTyping();
-    users.removeAll(localUser());
+    auto users = membersTyping();
+    users.removeAll(localMember());
     QVariantList userVariants;
     for (const auto &user : users) {
-        if (connection()->isIgnored(user->id())) {
+        if (connection()->isIgnored(user.id())) {
             continue;
         }
         userVariants.append(QVariantMap{
-            {"id"_ls, user->id()},
-            {"avatarMediaId"_ls, user->avatarMediaId(this)},
-            {"displayName"_ls, user->displayname(this)},
-            {"display"_ls, user->name()},
+            {"id"_ls, user.id()},
+            {"avatarMediaId"_ls, user.avatarMediaId()},
+            {"displayName"_ls, user.displayName()},
+            {"display"_ls, user.name()},
         });
     }
     return userVariants;
@@ -278,7 +286,7 @@ QVariantList NeoChatRoom::getUsersTyping() const
 
 void NeoChatRoom::sendTypingNotification(bool isTyping)
 {
-    connection()->callApi<SetTypingJob>(BackgroundRequest, localUser()->id(), id(), isTyping, 10000);
+    connection()->callApi<SetTypingJob>(BackgroundRequest, localMember().id(), id(), isTyping, 10000);
 }
 
 const RoomEvent *NeoChatRoom::lastEvent() const
@@ -316,7 +324,7 @@ const RoomEvent *NeoChatRoom::lastEvent() const
             }
         }
 
-        if (connection()->isIgnored(user(event->senderId()))) {
+        if (connection()->isIgnored(event->senderId())) {
             continue;
         }
 
@@ -376,13 +384,13 @@ bool NeoChatRoom::isEventHighlighted(const RoomEvent *e) const
 
 void NeoChatRoom::checkForHighlights(const Quotient::TimelineItem &ti)
 {
-    auto localUserId = localUser()->id();
+    auto localUserId = localMember().id();
     if (ti->senderId() == localUserId) {
         return;
     }
     if (auto *e = ti.viewAs<RoomMessageEvent>()) {
         const auto &text = e->plainBody();
-        if (text.contains(localUserId) || text.contains(safeMemberName(localUserId))) {
+        if (text.contains(localUserId) || text.contains(localUserId)) {
             highlights.insert(e);
         }
     }
@@ -441,24 +449,20 @@ static const QVariantMap emptyUser = {
 
 QVariantMap NeoChatRoom::getUser(const QString &userID) const
 {
-    return getUser(user(userID));
+    return getUser(member(userID));
 }
 
-QVariantMap NeoChatRoom::getUser(User *user) const
+QVariantMap NeoChatRoom::getUser(RoomMember member) const
 {
-    if (user == nullptr) {
-        return emptyUser;
-    }
-
     return QVariantMap{
-        {QStringLiteral("isLocalUser"), user->id() == localUser()->id()},
-        {QStringLiteral("id"), user->id()},
-        {QStringLiteral("displayName"), user->displayname(this)},
-        {QStringLiteral("escapedDisplayName"), htmlSafeMemberName(user->id())},
-        {QStringLiteral("avatarSource"), avatarForMember(user)},
-        {QStringLiteral("avatarMediaId"), user->avatarMediaId(this)},
-        {QStringLiteral("color"), Utils::getUserColor(user->hueF())},
-        {QStringLiteral("object"), QVariant::fromValue(user)},
+        {QStringLiteral("isLocalUser"), member.id() == localMember().id()},
+        {QStringLiteral("id"), member.id()},
+        {QStringLiteral("displayName"), member.displayName()},
+        {QStringLiteral("escapedDisplayName"), member.htmlSafeDisplayName()},
+        {QStringLiteral("avatarSource"), member.avatarUrl()},
+        {QStringLiteral("avatarMediaId"), member.avatarMediaId()},
+        {QStringLiteral("color"), Utils::getUserColor(member.hueF())},
+        {QStringLiteral("object"), QVariant::fromValue(member)},
     };
 }
 
@@ -469,10 +473,10 @@ QString NeoChatRoom::avatarMediaId() const
     }
 
     // Use the first (excluding self) user's avatar for direct chats
-    const auto dcUsers = directChatUsers();
+    const auto dcUsers = directChatMembers();
     for (const auto u : dcUsers) {
-        if (u != localUser()) {
-            return u->avatarMediaId(this);
+        if (u != localMember()) {
+            return u.avatarMediaId().mid(6);
         }
     }
 
@@ -639,7 +643,7 @@ void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction
                     continue;
                 }
 
-                if (e->senderId() == localUser()->id()) {
+                if (e->senderId() == localMember().id()) {
                     redactEventIds.push_back(e->id());
                     break;
                 }
@@ -668,7 +672,7 @@ bool NeoChatRoom::canSendEvent(const QString &eventType) const
         return false;
     }
     auto pl = plEvent->powerLevelForEvent(eventType);
-    auto currentPl = plEvent->powerLevelForUser(localUser()->id());
+    auto currentPl = plEvent->powerLevelForUser(localMember().id());
 
     return currentPl >= pl;
 }
@@ -680,7 +684,7 @@ bool NeoChatRoom::canSendState(const QString &eventType) const
         return false;
     }
     auto pl = plEvent->powerLevelForState(eventType);
-    auto currentPl = plEvent->powerLevelForUser(localUser()->id());
+    auto currentPl = plEvent->powerLevelForUser(localMember().id());
 
     return currentPl >= pl;
 }
@@ -858,7 +862,7 @@ void NeoChatRoom::setUrlPreviewEnabled(const bool &urlPreviewEnabled)
      *  "type": "org.matrix.room.preview_urls",
      * }
      */
-    connection()->callApi<SetAccountDataPerRoomJob>(localUser()->id(),
+    connection()->callApi<SetAccountDataPerRoomJob>(localMember().id(),
                                                     id(),
                                                     "org.matrix.room.preview_urls"_ls,
                                                     QJsonObject{{"disable"_ls, !urlPreviewEnabled}});
@@ -1526,7 +1530,7 @@ void NeoChatRoom::editLastMessage()
         }
 
         // check if the current message's sender's id is same as the user's id
-        if ((*it)->senderId() == localUser()->id()) {
+        if ((*it)->senderId() == localMember().id()) {
             auto content = (*it)->contentJson();
 
             if (e->msgtype() != MessageEventType::Unknown) {
@@ -1651,13 +1655,13 @@ int NeoChatRoom::maxRoomVersion() const
     return maxVersion;
 }
 
-Quotient::User *NeoChatRoom::directChatRemoteUser() const
+RoomMember NeoChatRoom::directChatRemoteUser() const
 {
-    auto users = connection()->directChatUsers(this);
+    auto users = connection()->directChatMemberIds(this);
     if (users.isEmpty()) {
-        return nullptr;
+        return {};
     }
-    return users[0];
+    return member(users[0]);
 }
 
 void NeoChatRoom::sendLocation(float lat, float lon, const QString &description)
@@ -1689,9 +1693,9 @@ QByteArray NeoChatRoom::roomAcountDataJson(const QString &eventType)
     return QJsonDocument(accountData(eventType)->fullJson()).toJson();
 }
 
-QUrl NeoChatRoom::avatarForMember(Quotient::User *user) const
+QUrl NeoChatRoom::avatarForMember(RoomMember member) const
 {
-    const auto &url = memberAvatarUrl(user->id());
+    const auto &url = member.avatarUrl();
     if (url.isEmpty() || url.scheme() != "mxc"_ls) {
         return {};
     }
@@ -1775,9 +1779,9 @@ void NeoChatRoom::cleanupExtraEvent(const QString &eventId)
     }
 }
 
-User *NeoChatRoom::invitingUser() const
+QString NeoChatRoom::invitingUserId() const
 {
-    return connection()->user(currentState().get<RoomMemberEvent>(connection()->userId())->senderId());
+    return currentState().get<RoomMemberEvent>(connection()->userId())->senderId();
 }
 
 void NeoChatRoom::setRoomState(const QString &type, const QString &stateKey, const QByteArray &content)

src/neochatroom.h

@@ -95,7 +95,7 @@ class NeoChatRoom : public Quotient::Room
     /**
      * @brief Get a user object for the other person in a direct chat.
      */
-    Q_PROPERTY(Quotient::User *directChatRemoteUser READ directChatRemoteUser CONSTANT)
+    Q_PROPERTY(Quotient::RoomMember directChatRemoteUser READ directChatRemoteUser CONSTANT)
 
     /**
      * @brief The Matrix IDs of this room's parents.
@@ -285,7 +285,7 @@ public:
      *
      * @sa Quotient::User
      */
-    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(Quotient::User *user) const;
+    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(Quotient::RoomMember member) const;
 
     [[nodiscard]] QVariantList getUsersTyping() const;
 
@@ -400,7 +400,7 @@ public:
 
     [[nodiscard]] QString avatarMediaId() const;
 
-    Quotient::User *directChatRemoteUser() const;
+    Quotient::RoomMember directChatRemoteUser() const;
 
     /**
      * @brief Whether this room has one or more parent spaces set.
@@ -630,7 +630,7 @@ public:
      */
     Q_INVOKABLE QByteArray roomAcountDataJson(const QString &eventType);
 
-    Q_INVOKABLE [[nodiscard]] QUrl avatarForMember(Quotient::User *user) const;
+    Q_INVOKABLE [[nodiscard]] QUrl avatarForMember(Quotient::RoomMember member) const;
 
     /**
      * @brief Loads the event with the given id from the server and saves it locally.
@@ -660,7 +660,7 @@ public:
     /**
      * If we're invited to this room, the user that invited us. Undefined in other cases.
      */
-    Q_INVOKABLE Quotient::User *invitingUser() const;
+    Q_INVOKABLE QString invitingUserId() const;
 
 private:
     QSet<const Quotient::RoomEvent *> highlights;

src/notificationsmanager.cpp

@@ -42,109 +42,100 @@ NotificationsManager::NotificationsManager(QObject *parent)
 
 void NotificationsManager::handleNotifications(QPointer<NeoChatConnection> connection)
 {
-    if (!m_connActiveJob.contains(connection->user()->id())) {
+    if (!m_connActiveJob.contains(connection->userId())) {
         auto job = connection->callApi<GetNotificationsJob>();
         m_connActiveJob.append(connection->user()->id());
         connect(job, &BaseJob::success, this, [this, job, connection]() {
-            m_connActiveJob.removeAll(connection->user()->id());
-            processNotificationJob(connection, job, !m_oldNotifications.contains(connection->user()->id()));
+            m_connActiveJob.removeAll(connection->userId());
+            processNotificationJob(connection, job, !m_oldNotifications.contains(connection->userId()));
         });
     }
 }
 
 void NotificationsManager::processNotificationJob(QPointer<NeoChatConnection> connection, Quotient::GetNotificationsJob *job, bool initialization)
 {
-    if (job == nullptr) {
-        return;
-    }
-    if (connection == nullptr || !connection->isLoggedIn()) {
-        qWarning() << QStringLiteral("No connection for GetNotificationsJob %1").arg(job->objectName());
+    if (!job || !connection || !connection->isLoggedIn()) {
         return;
     }
 
-    const auto connectionId = connection->user()->id();
-
-    // If pagination has occurred set off the next job
-    auto nextToken = job->jsonData()["next_token"_ls].toString();
-    if (!nextToken.isEmpty()) {
-        auto nextJob = connection->callApi<GetNotificationsJob>(nextToken);
-        m_connActiveJob.append(connectionId);
-        connect(nextJob, &BaseJob::success, this, [this, nextJob, connection, initialization]() {
-            m_connActiveJob.removeAll(connection->user()->id());
-            processNotificationJob(connection, nextJob, initialization);
-        });
-    }
+    const auto connectionId = connection->userId();
 
     const auto notifications = job->jsonData()["notifications"_ls].toArray();
     if (initialization) {
-        m_oldNotifications[connectionId] = QStringList();
-        for (const auto &n : notifications) {
+        for (const auto &notification : notifications) {
             if (!m_initialTimestamp.contains(connectionId)) {
-                m_initialTimestamp[connectionId] = n.toObject()["ts"_ls].toDouble();
+                m_initialTimestamp[connectionId] = notification["ts"_ls].toVariant().toLongLong();
             } else {
-                qint64 timestamp = n.toObject()["ts"_ls].toDouble();
+                qint64 timestamp = notification["ts"_ls].toVariant().toLongLong();
                 if (timestamp > m_initialTimestamp[connectionId]) {
                     m_initialTimestamp[connectionId] = timestamp;
                 }
             }
 
             auto connectionNotifications = m_oldNotifications.value(connectionId);
-            connectionNotifications += n.toObject()["event"_ls].toObject()["event_id"_ls].toString();
+            connectionNotifications += notification["event"_ls]["event_id"_ls].toString();
             m_oldNotifications[connectionId] = connectionNotifications;
         }
         return;
     }
+
+    QMap<QString, std::pair<qint64, QJsonObject>> notificationsToPost;
     for (const auto &n : notifications) {
         const auto notification = n.toObject();
         if (notification["read"_ls].toBool()) {
             continue;
         }
         auto connectionNotifications = m_oldNotifications.value(connectionId);
-        if (connectionNotifications.contains(notification["event"_ls].toObject()["event_id"_ls].toString())) {
+        if (connectionNotifications.contains(notification["event"_ls]["event_id"_ls].toString())) {
             continue;
         }
-        connectionNotifications += notification["event"_ls].toObject()["event_id"_ls].toString();
+        connectionNotifications += notification["event"_ls]["event_id"_ls].toString();
         m_oldNotifications[connectionId] = connectionNotifications;
 
-        auto room = connection->room(notification["room_id"_ls].toString());
-        if (shouldPostNotification(connection, n)) {
-            // The room might have been deleted (for example rejected invitation).
-            auto sender = room->user(notification["event"_ls].toObject()["sender"_ls].toString());
-
-            QString body;
-
-            if (notification["event"_ls].toObject()["type"_ls].toString() == "org.matrix.msc3381.poll.start"_ls) {
-                body = notification["event"_ls]
-                           .toObject()["content"_ls]
-                           .toObject()["org.matrix.msc3381.poll.start"_ls]
-                           .toObject()["question"_ls]
-                           .toObject()["body"_ls]
-                           .toString();
-            } else {
-                body = notification["event"_ls].toObject()["content"_ls].toObject()["body"_ls].toString();
-            }
-
-            if (notification["event"_ls]["type"_ls] == "m.room.encrypted"_ls) {
-                auto decrypted = connection->decryptNotification(notification);
-                body = decrypted["content"_ls].toObject()["body"_ls].toString();
-                if (body.isEmpty()) {
-                    body = i18n("Encrypted Message");
-                }
-            }
-
-            QImage avatar_image;
-            if (!sender->avatarUrl(room).isEmpty()) {
-                avatar_image = sender->avatar(128, room);
-            } else {
-                avatar_image = room->avatar(128);
-            }
-            postNotification(dynamic_cast<NeoChatRoom *>(room),
-                             sender->displayname(room),
-                             body,
-                             avatar_image,
-                             notification["event"_ls].toObject()["event_id"_ls].toString(),
-                             true);
+        if (!shouldPostNotification(connection, n)) {
+            continue;
         }
+
+        const auto &roomId = notification["room_id"_ls].toString();
+        if (!notificationsToPost.contains(roomId) || notificationsToPost[roomId].first < notification["ts"_ls].toVariant().toLongLong()) {
+            notificationsToPost[roomId] = {notification["ts"_ls].toVariant().toLongLong(), notification};
+        }
+    }
+
+    for (const auto &[roomId, pair] : notificationsToPost.asKeyValueRange()) {
+        const auto &notification = pair.second;
+        const auto room = connection->room(roomId);
+        if (!room) {
+            continue;
+        }
+        auto sender = room->member(notification["event"_ls]["sender"_ls].toString());
+
+        QString body;
+        if (notification["event"_ls]["type"_ls].toString() == "org.matrix.msc3381.poll.start"_ls) {
+            body = notification["event"_ls]["content"_ls]["org.matrix.msc3381.poll.start"_ls]["question"_ls]["body"_ls].toString();
+        } else if (notification["event"_ls]["type"_ls] == "m.room.encrypted"_ls) {
+            const auto decrypted = connection->decryptNotification(notification);
+            body = decrypted["content"_ls]["body"_ls].toString();
+            if (body.isEmpty()) {
+                body = i18n("Encrypted Message");
+            }
+        } else {
+            body = notification["event"_ls]["content"_ls]["body"_ls].toString();
+        }
+
+        QImage avatar_image;
+        if (!sender.avatarUrl().isEmpty()) {
+            avatar_image = room->memberAvatar(sender.id()).get(connection, 128, {});
+        } else {
+            avatar_image = room->avatar(128);
+        }
+        postNotification(dynamic_cast<NeoChatRoom *>(room),
+                         sender.displayName(),
+                         body,
+                         avatar_image,
+                         notification["event"_ls].toObject()["event_id"_ls].toString(),
+                         true,
+                         pair.first);
     }
 }
 
@@ -175,6 +166,10 @@ bool NotificationsManager::shouldPostNotification(QPointer<NeoChatConnection> co
         return false;
     }
 
+    if (m_notifications.contains(room->id()) && m_notifications[room->id()].first > timestamp) {
+        return false;
+    }
+
     return true;
 }
 
@@ -183,18 +178,23 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
                                             const QString &text,
                                             const QImage &icon,
                                             const QString &replyEventId,
-                                            bool canReply)
+                                            bool canReply,
+                                            qint64 timestamp)
 {
     const QString roomId = room->id();
-    KNotification *notification = m_notifications.value(roomId);
-    if (!notification) {
-        notification = new KNotification(QStringLiteral("message"));
-        m_notifications.insert(roomId, notification);
-        connect(notification, &KNotification::closed, this, [this, roomId] {
-            m_notifications.remove(roomId);
-        });
+
+    if (auto notification = m_notifications.value(roomId).second) {
+        notification->close();
     }
 
+    auto notification = new KNotification(QStringLiteral("message"));
+    m_notifications.insert(roomId, {timestamp, notification});
+    connect(notification, &KNotification::closed, this, [this, roomId, notification] {
+        if (m_notifications[roomId].second == notification) {
+            m_notifications.remove(roomId);
+        }
+    });
+
     QString entry;
     if (sender == room->displayName()) {
         notification->setTitle(sender);
@@ -204,7 +204,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         entry = i18n("%1: %2", sender, text.toHtmlEscaped());
     }
 
-    notification->setText(notification->text() + QLatin1Char('\n') + entry);
+    notification->setText(entry);
     notification->setPixmap(createNotificationImage(icon, room));
 
     auto defaultAction = notification->addDefaultAction(i18n("Open NeoChat in this room"));
@@ -213,7 +213,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         if (!room) {
             return;
         }
-        auto connection = dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().get(room->localUser()->id()));
+        auto connection = dynamic_cast<NeoChatConnection *>(Controller::instance().accounts().get(room->localMember().id()));
         Controller::instance().setActiveConnection(connection);
         RoomManager::instance().setConnection(connection);
         RoomManager::instance().resolveResource(room->id());
@@ -230,7 +230,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
         notification->setReplyAction(std::move(replyAction));
     }
 
-    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localUser()->id());
+    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localMember().id());
     notification->sendEvent();
 }
 
@@ -276,7 +276,7 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom, const QS
             return;
         }
         RoomManager::instance().leaveRoom(room);
-        room->connection()->addToIgnoredUsers(room->invitingUser());
+        room->connection()->addToIgnoredUsers(room->invitingUserId());
         notification->close();
     });
     connect(notification, &KNotification::closed, this, [this, room]() {
@@ -286,10 +286,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom, const QS
         m_invitations.remove(room->id());
     });
 
-    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localUser()->id());
+    notification->setHint(QStringLiteral("x-kde-origin-name"), room->localMember().id());
 
     notification->sendEvent();
-    m_invitations.insert(room->id(), notification);
 }
 
 void NotificationsManager::clearInvitationNotification(const QString &roomId)
@@ -343,7 +342,7 @@ void NotificationsManager::postPushNotification(const QByteArray &message)
 
         notification->sendEvent();
 
-        m_notifications.insert(roomId, notification);
+        m_notifications.insert(roomId, {json["ts"_ls].toVariant().toLongLong(), notification});
     } else {
         qWarning() << "Skipping unsupported push notification" << type;
     }

src/notificationsmanager.h

@@ -47,8 +47,13 @@ public:
     /**
      * @brief Display a native notification for an message.
      */
-    Q_INVOKABLE void
-    postNotification(NeoChatRoom *room, const QString &sender, const QString &text, const QImage &icon, const QString &replyEventId, bool canReply);
+    Q_INVOKABLE void postNotification(NeoChatRoom *room,
+                                      const QString &sender,
+                                      const QString &text,
+                                      const QImage &icon,
+                                      const QString &replyEventId,
+                                      bool canReply,
+                                      qint64 timestamp);
 
     /**
      * @brief Display a native notification for an invite.
@@ -82,7 +87,7 @@ private:
 
     bool shouldPostNotification(QPointer<NeoChatConnection> connection, const QJsonValue &notification);
 
-    QHash<QString, KNotification *> m_notifications;
+    QHash<QString, std::pair<qint64, KNotification *>> m_notifications;
     QHash<QString, QPointer<KNotification>> m_invitations;
 
 private Q_SLOTS:

src/notifyrc.qrc

@@ -3,7 +3,7 @@
     SPDX-License-Identifier: CC0-1.0
 -->
 <RCC>
-    <qresource prefix="/knotifications5">
+    <qresource prefix="/knotifications6">
         <file>neochat.notifyrc</file>
     </qresource>
 </RCC>

src/pollhandler.cpp

@@ -154,7 +154,7 @@ void PollHandler::sendPollAnswer(const QString &eventId, const QString &answerId
         return;
     }
     QStringList ownAnswers;
-    for (const auto &answer : m_answers[room->localUser()->id()].toArray()) {
+    for (const auto &answer : m_answers[room->localMember().id()].toArray()) {
         ownAnswers += answer.toString();
     }
     if (ownAnswers.contains(answerId)) {
@@ -169,7 +169,7 @@ void PollHandler::sendPollAnswer(const QString &eventId, const QString &answerId
     }
 
     auto response = new PollResponseEvent(eventId, ownAnswers);
-    handleAnswer(response->contentJson(), room->localUser()->id(), QDateTime::currentDateTime());
+    handleAnswer(response->contentJson(), room->localMember().id(), QDateTime::currentDateTime());
     room->postEvent(response);
 }
 

src/purpose/purposeplugin.json

@@ -3,6 +3,7 @@
         "Authors": [
             {
                 "Name": "Tobias Fella",
+                "Name[ar]": "توبياس فلة",
                 "Name[ca@valencia]": "Tobias Fella",
                 "Name[ca]": "Tobias Fella",
                 "Name[cs]": "Tobias Fella",
@@ -11,6 +12,7 @@
                 "Name[eo]": "Tobias Fella",
                 "Name[es]": "Tobias Fella",
                 "Name[eu]": "Tobias Fella",
+                "Name[fi]": "Tobias Fella",
                 "Name[fr]": "Tobias Fella",
                 "Name[gl]": "Tobias Fella",
                 "Name[hu]": "Tobias Fella",
@@ -22,6 +24,7 @@
                 "Name[pl]": "Tobias Fella",
                 "Name[ru]": "Tobias Fella",
                 "Name[sl]": "Tobias Fella",
+                "Name[sv]": "Tobias Fella",
                 "Name[ta]": "டோபியாஸ் ஃபெல்லா",
                 "Name[tr]": "Tobias Fella",
                 "Name[uk]": "Tobias Fella",
@@ -31,6 +34,7 @@
         ],
         "Category": "Utilities",
         "Description": "Share via NeoChat",
+        "Description[ar]": "شارك بواسطة نيوتشات",
         "Description[ca@valencia]": "Compartix a través de NeoChat",
         "Description[ca]": "Comparteix a través del NeoChat",
         "Description[de]": "Über NeoChat teilen",
@@ -38,6 +42,7 @@
         "Description[eo]": "Kundividi per NeoChat",
         "Description[es]": "Compartir mediante NeoChat",
         "Description[eu]": "Partekatu NeoChat bidez",
+        "Description[fi]": "Jaa NeoChatillä",
         "Description[fr]": "Partager grâce à NeoChat",
         "Description[gl]": "Compartir por NeoChat",
         "Description[hu]": "Megosztás NeoChatben",
@@ -49,6 +54,7 @@
         "Description[pl]": "Udostępnij przez NeoChat",
         "Description[ru]": "Опубликовать в NeoChat",
         "Description[sl]": "Deli prek NeoChat",
+        "Description[sv]": "Dela via NeoChat",
         "Description[ta]": "நியோச்சாட் மூலம் பகிர்",
         "Description[tr]": "NeoChat ile Paylaş",
         "Description[uk]": "Оприлюднити за допомогою NeoChat",
@@ -57,6 +63,7 @@
         "Icon": "org.kde.neochat",
         "License": "GPL",
         "Name": "NeoChat",
+        "Name[ar]": "نيوتشات",
         "Name[ast]": "NeoChat",
         "Name[ca@valencia]": "NeoChat",
         "Name[ca]": "NeoChat",
@@ -66,6 +73,7 @@
         "Name[eo]": "NeoChat",
         "Name[es]": "NeoChat",
         "Name[eu]": "NeoChat",
+        "Name[fi]": "NeoChat",
         "Name[fr]": "NeoChat",
         "Name[gl]": "NeoChat",
         "Name[hu]": "NeoChat",
@@ -77,6 +85,7 @@
         "Name[pl]": "NeoChat",
         "Name[ru]": "NeoChat",
         "Name[sl]": "NeoChat",
+        "Name[sv]": "NeoChat",
         "Name[ta]": "நியோச்சாட்",
         "Name[tr]": "NeoChat",
         "Name[uk]": "NeoChat",

src/qml/AccountMenu.qml

@@ -54,7 +54,7 @@ QQC2.Menu {
     QQC2.MenuItem {
         text: i18n("Open developer tools")
         icon.name: "tools"
-        visible: NeoChatConfig.developerTools
+        visible: Config.developerTools
         onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
             connection: root.connection
         }, {
@@ -66,12 +66,18 @@ QQC2.Menu {
     QQC2.MenuItem {
         text: i18nc("@action:inmenu", "Open Secret Backup")
         icon.name: "unlock"
-        visible: NeoChatConfig.secretBackup
+        visible: Config.secretBackup
         onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, {
             title: i18nc("@title:window", "Open Key Backup")
         })
         enabled: Controller.ssssSupported
     }
+    QQC2.MenuItem {
+        text: i18nc("@action:inmenu", "Verify this Device")
+        icon.name: "security-low"
+        onTriggered: root.connection.startSelfVerification()
+        enabled: Controller.csSupported
+    }
     QQC2.MenuItem {
         text: i18n("Logout")
         icon.name: "list-remove-user"

src/qml/CreateRoomDialog.qml

@@ -67,6 +67,11 @@ FormCard.FormCardPage {
                 }
             }
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.showChildType
+        }
+
         FormCard.FormTextFieldDelegate {
             id: roomNameField
             label: i18n("Name:")
@@ -75,17 +80,27 @@ FormCard.FormCardPage {
             }
         }
 
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormTextFieldDelegate {
             id: roomTopicField
             label: i18n("Topic:")
             onAccepted: ok.clicked()
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormCheckDelegate {
             id: newOfficialCheck
             visible: root.parentId.length > 0
             text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
             checked: true
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }
+
         FormCard.FormButtonDelegate {
             id: ok
             text: root.isSpace ? i18nc("@action:button", "Create Space") : i18nc("@action:button", "Create Room")
@@ -211,6 +226,9 @@ FormCard.FormCardPage {
                 });
             }
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormCheckDelegate {
             id: existingOfficialCheck
             visible: root.parentId.length > 0
@@ -230,6 +248,11 @@ FormCard.FormCardPage {
                 return false;
             }
         }
+
+        FormCard.FormDelegateSeparator {
+            visible: root.parentId.length > 0
+        }
+
         FormCard.FormCheckDelegate {
             id: makeCanonicalCheck
             text: i18nc("@option:check The canonical parent is the default one if a room has multiple parent spaces.", "Make this space the canonical parent")
@@ -237,6 +260,9 @@ FormCard.FormCardPage {
 
             enabled: existingOfficialCheck.enabled
         }
+
+        FormCard.FormDelegateSeparator {}
+
         FormCard.FormButtonDelegate {
             text: i18nc("@action:button", "Ok")
             enabled: chosenRoomDelegate.visible

src/qml/DelegateContextMenu.qml

@@ -83,7 +83,7 @@ Loader {
      * Some common actions shared between menus
      */
     component ViewSourceAction: Kirigami.Action {
-        visible: NeoChatConfig.developerTools
+        visible: Config.developerTools
         text: i18n("View Source")
         icon.name: "code-context"
         onTriggered: RoomManager.viewEventSource(root.eventId)

src/qml/DirectChatDrawerHeader.qml

@@ -59,12 +59,27 @@ ColumnLayout {
         }
     }
 
-    Kirigami.Heading {
+    RowLayout {
         Layout.fillWidth: true
-        type: Kirigami.Heading.Type.Primary
-        wrapMode: QQC2.Label.Wrap
-        text: root.room.displayName
-        textFormat: Text.PlainText
-        horizontalAlignment: Text.AlignHCenter
+        Layout.alignment: Qt.AlignHCenter
+        Kirigami.Icon {
+            id: securityIcon
+            //TODO figure out how to make this update
+            source: room.connection.isUserVerified(root.room.directChatRemoteMember.id) ?
+                        (room.connection.allSessionsSelfVerified(root.room.directChatRemoteMember.id) ? "security-high" : "security-medium")
+                        : "security-low"
+
+        }
+        Kirigami.Heading {
+            type: Kirigami.Heading.Type.Primary
+            wrapMode: QQC2.Label.Wrap
+            text: root.room.displayName
+            textFormat: Text.PlainText
+            horizontalAlignment: Text.AlignHCenter
+        }
+        Item {
+            Layout.preferredWidth: visible ? securityIcon.width : 0
+            visible: securityIcon.visible
+        }
     }
 }