GIT_SILENT Sync po/docbooks with svn

Currently the ability to reply in threads was added but not the ability to actually view threads so this doesn't currently make much sense to just have enabled int he main build.

Note: I want to cherrypick this so it's just the flag. I'll add a feature flag page to dev tools for master soon.


(cherry picked from commit 864f9b8f74)

CMakeLists.txt

@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)
 
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
-set(RELEASE_SERVICE_VERSION_MINOR "04")
+set(RELEASE_SERVICE_VERSION_MINOR "02")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MICRO "0")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

org.kde.neochat.appdata.xml

@@ -87,6 +87,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
     <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
     <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
+    <p xml:lang="hu">A NeoChat egy kliens a Matrixhoz, az azonnali üzenetküldés decentralizált komunikációs protokolljához.. Szöveges üzeneteket, videókat és hangfájlokat küldhet családjának, kollégáinak és barátainak. A KDE keretrendszert használja, a Kirigaminak köszönhetően konvergens élményt nyújt több platformon is.</p>
     <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
     <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
     <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
@@ -238,11 +239,44 @@ to provide a convergent experience across multiple platforms.</p>
   <categories>
     <category>Network</category>
   </categories>
-  <developer>
+  <developer_name>The KDE Community</developer_name>
-    <id>kde.org</id>
+  <developer_name xml:lang="ar">مجتمع كِيدِي</developer_name>
-    <name>The KDE Community</name>
+  <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
-    <url>https://kde.org</url>
+  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
-  </developer>
+  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
+  <developer_name xml:lang="cs">Komunita KDE</developer_name>
+  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
+  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
+  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
+  <developer_name xml:lang="eo">La KDE-Komunumo</developer_name>
+  <developer_name xml:lang="es">La comunidad KDE</developer_name>
+  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
+  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
+  <developer_name xml:lang="fr">La communauté de KDE</developer_name>
+  <developer_name xml:lang="gl">A comunidade KDE</developer_name>
+  <developer_name xml:lang="hu">A KDE Közösség</developer_name>
+  <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
+  <developer_name xml:lang="id">Komunitas KDE</developer_name>
+  <developer_name xml:lang="ie">Li comunité de KDE</developer_name>
+  <developer_name xml:lang="it">La comunità KDE</developer_name>
+  <developer_name xml:lang="ka">KDE-ის საზოგადოება</developer_name>
+  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
+  <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
+  <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>
+  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
+  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
+  <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
+  <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
+  <developer_name xml:lang="ru">Сообщество KDE</developer_name>
+  <developer_name xml:lang="sk">KDE Komunita</developer_name>
+  <developer_name xml:lang="sl">Skupnost KDE</developer_name>
+  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
+  <developer_name xml:lang="ta">கே.டீ.யீ. சமூகம்</developer_name>
+  <developer_name xml:lang="tr">KDE Topluluğu</developer_name>
+  <developer_name xml:lang="uk">Спільнота KDE</developer_name>
+  <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
+  <developer_name xml:lang="zh-CN">KDE 社区</developer_name>
+  <developer_name xml:lang="zh-TW">KDE 社群</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <custom>
@@ -324,6 +358,24 @@ to provide a convergent experience across multiple platforms.</p>
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="24.02.0" date="2024-02-28">
+      <url>https://kde.org/announcements/megarelease/6/#neochat</url>
+      <description>
+        <p>In the newest version, when launching the app, you will get a welcome page that lets you choose which account you want to use and lets you log in to other accounts. The welcome screen will also warn you when NeoChat cannot load an account.</p>
+        <p>NeoChat will also let you register a new account directly from the app itself. Deactivating your Matrix account is also possible from within NeoChat.</p>
+        <p>Spaces are a relatively new feature of Matrix that let you group chat channels together. This is used to improve the discoverability of rooms, manage large communities, or just tidy all the channels you are in. You can now do all this without leaving NeoChat.</p>
+        <p>NeoChat won't let you miss any new notifications anymore. We added a new page that includes all your recent notifications and when NeoChat is closed, you will still be able to receive push notifications. The main timeline will let you know when more messages are loading and when you reach the end of it.</p>
+        <p>More NeoChat Goodies</p>
+        <ul>
+          <li>QR Codes to share contacts</li>
+          <li>Improved room upgrades</li>
+          <li>Added button to reject invitation and ignore user</li>
+          <li>Display device security details</li>
+          <li>Added room security settings</li>
+        </ul>
+      </description>
+    </release>
+    <release version="23.08.5" date="2024-02-15"/>
     <release version="23.08.4" date="2023-12-07"/>
     <release version="23.08.3" date="2023-11-09"/>
     <release version="23.08.2" date="2023-10-12"/>

org.kde.neochat.desktop

@@ -65,7 +65,7 @@ GenericName[ie]=Cliente de Matrix
 GenericName[it]=Client Matrix
 GenericName[ka]=Matrix -ის კლიენტი
 GenericName[ko]=Matrix 클라이언트
-GenericName[lt]=Matrix kliento programa
+GenericName[lt]=Matrix kliento programą
 GenericName[nl]=Matrix-client
 GenericName[nn]=Matrix-klient
 GenericName[pa]=ਮੈਟਰਿਕਸ ਕਲਾਈਂਟ

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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,51 +17,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr ""
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1075,52 +1085,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr ""
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
@@ -1130,7 +1130,7 @@ msgstr ""
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1152,7 +1152,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr ""
@@ -1457,7 +1457,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr ""
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1618,27 +1618,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr ""
@@ -1661,18 +1661,18 @@ msgstr ""
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1680,26 +1680,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1751,7 +1751,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1770,7 +1770,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2077,24 +2077,22 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
@@ -2122,36 +2120,14 @@ msgstr ""
 msgid "Create New"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2159,36 +2135,19 @@ msgctxt ""
 msgid "Open File"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2468,26 +2427,41 @@ msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2524,7 +2498,7 @@ msgstr ""
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
 msgstr ""
 
 #: src/qml/GlobalMenu.qml:53
@@ -2660,17 +2634,17 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr ""
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2750,7 +2724,7 @@ msgstr ""
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2760,7 +2734,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2775,6 +2749,74 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2845,7 +2887,7 @@ msgstr ""
 msgid "Send this location"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2866,7 +2908,7 @@ msgstr ""
 msgid "Matrix ID"
 msgstr ""
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3091,7 +3133,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3434,7 +3476,7 @@ msgstr ""
 msgid "Muted room"
 msgstr ""
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3486,93 +3528,82 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3589,32 +3620,11 @@ msgstr ""
 msgid "NeoChat is offline. Please check your network connection."
 msgstr ""
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr ""
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3752,6 +3762,22 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr ""
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr ""
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3823,53 +3849,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4021,27 +4000,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr ""
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4141,6 +4104,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr ""
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4160,22 +4138,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4243,13 +4221,7 @@ msgstr ""
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
 msgstr ""
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4288,28 +4260,6 @@ msgstr ""
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr ""
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4483,19 +4433,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr ""
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 11:03+0100\n"
+"PO-Revision-Date: 2024-02-15 12:31+0100\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -20,52 +20,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Rebre les notificacions «push»"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de la xarxa: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "No s'ha trobat el testimoni d'accés"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Potser s'ha suprimit?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "S'ha denegat l'accés al clauer."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, 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:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "No hi ha cap clauer disponible."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No s'ha pogut llegir el testimoni d'accés"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "El fitxer és massa gran per a baixar."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Contacteu amb l'administrador del servidor Matrix per a suport."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1081,52 +1091,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reaccionat amb %3"
 msgstr[1] "%2 han reaccionat amb %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Convidat"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Preferit"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Amics"
+msgstr "Missatges directes"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Prioritat baixa"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Espais"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "El fitxer és massa gran per a baixar."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Contacteu amb l'administrador del servidor Matrix per a suport."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ha fallat la creació de la sala: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ha fallat la creació de l'espai: %1"
@@ -1136,7 +1136,7 @@ msgstr "Ha fallat la creació de l'espai: %1"
 msgid "Report sent successfully."
 msgstr "L'informe s'ha enviat correctament."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1158,7 +1158,7 @@ msgid "Open NeoChat in this room"
 msgstr "Obre el NeoChat en aquesta sala"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Respon"
@@ -1463,7 +1463,7 @@ msgstr "Imatge del porta-retalls"
 msgid "Attachment:"
 msgstr "Adjunt:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1628,27 +1628,27 @@ msgstr "Segur que voleu tancar la sessió?"
 msgid "Open in New Window"
 msgstr "Obre en una finestra nova"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Elimina de les preferides"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Afegeix a les preferides"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Torna a prioritzar"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Desprioritza"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marca com a llegit"
@@ -1671,18 +1671,18 @@ msgstr "Copia l'adreça al porta-retalls"
 msgid "Notification State"
 msgstr "Estat de les notificacions"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Segueix l'opció global"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Totes"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1690,26 +1690,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@mencions i paraules clau"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Desactivades"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Configuració de la sala"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Surt de la sala"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1761,7 +1761,7 @@ msgid "Make this parent official"
 msgstr "Fes oficial aquest pare"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1780,7 +1780,7 @@ msgstr "Tria la sala"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2099,25 +2099,23 @@ msgstr ""
 "aquest dispositiu."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explora les sales"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Cerqueu els vostres amics"
+msgstr "Inicia un xat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Cerca d'amics"
+msgstr "Inicia un xat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2144,36 +2142,14 @@ msgstr "Cerca"
 msgid "Create New"
 msgstr "Crea nou"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Exploració de sales"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Introduïu una adreça de sala"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Cerca una sala…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "No s'ha trobat cap sala pública"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Baixa"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2181,36 +2157,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Obre el fitxer"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Atura la baixada"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Cotxe: %1, Seient: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Envia al KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2498,26 +2457,41 @@ msgstr "Mostra els esdeveniments d'actualització d'avatar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Sales i xats privats"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Separat/da"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Barrejat"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Useu la sintaxi «s/text/substitució» per a editar el darrer missatge"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Envia notificacions d'escriptura"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Configuració de desenvolupament"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Activa les eines de desenvolupament"
@@ -2554,8 +2528,8 @@ msgstr "Fitxer"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Cerca d'amics"
+msgstr "Xat privat nou…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2690,17 +2664,17 @@ msgstr "El registre està desactivat en aquest servidor."
 msgid "Loading"
 msgstr "S'està carregant"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "El missatge s'ha enviat des d'un dispositiu verificat"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reacciona"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Resposta al fil"
@@ -2782,7 +2756,7 @@ msgstr "Accepta"
 msgid "Invite a User"
 msgstr "Convida un usuari"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Cerca un usuari..."
@@ -2792,7 +2766,7 @@ msgstr "Cerca un usuari..."
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No hi ha cap usuari disponible"
@@ -2807,6 +2781,74 @@ msgstr "Envia una invitació"
 msgid "User is either already a member or has been invited"
 msgstr "L'usuari ja és membre o ha estat convidat"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Exploració de sales"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Cerca una sala..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Afegir un servidor nou"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Servidor domèstic"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Afegeix un servidor nou"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Afegeix un servidor"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "S'ha introduït un servidor vàlid"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Introduïu l'URL del servidor (p. ex. kde.org)"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "URL del servidor"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Introduïu una adreça de sala"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "No s'ha trobat cap sala pública"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2877,7 +2919,7 @@ msgstr "Trieu una ubicació"
 msgid "Send this location"
 msgstr "Envia aquesta ubicació"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2898,7 +2940,7 @@ msgstr "ID de Matrix:"
 msgid "Matrix ID"
 msgstr "ID de Matrix"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3126,7 +3168,7 @@ msgstr "Activa el ressaltat de missatges"
 msgid "Delete keyword"
 msgstr "Suprimeix una paraula clau"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3475,7 +3517,7 @@ msgstr "Estat de la sala"
 msgid "Muted room"
 msgstr "Sala silenciada"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Configura la sala"
@@ -3527,95 +3569,82 @@ msgstr "Obre les eines de desenvolupament"
 msgid "Search in this room"
 msgstr "Cerca en aquesta sala"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Cerca"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Elimina la sala de les preferides"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Fes preferida la sala"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Mostra les ubicacions per a aquesta sala"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Membres"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Convida un usuari"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Convida un usuari a la sala"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 membre"
 msgstr[1] "%1 membres"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "No hi ha comptador de membres"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "No s'ha trobat cap amic"
+msgstr "Visualitza les notificacions"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No s'ha trobat cap sala"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Encara no heu afegit cap dels vostres amics, feu clic a sota per a cercar-"
-"los."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Uniu-vos a diverses sales per a començar"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Cerca en el directori de sales"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Cerca en el directori d'amics"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Redueix %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3634,32 +3663,11 @@ msgstr ""
 "El NeoChat està en fora de línia. Comproveu l'estat de la vostra connexió de "
 "xarxa."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Codi font del missatge"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Cerca missatges"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Cerca missatges…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Introduïu un text per a iniciar la cerca"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "No s'ha trobat cap missatge"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3807,6 +3815,22 @@ msgstr ""
 "Els membres nous poden veure l'historial de missatges a partir del punt que "
 "es van unir a la sala."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Cerca missatges"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Introduïu un text per a iniciar la cerca"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "No s'ha trobat cap resultat"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3880,53 +3904,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Selecció dels espais"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Afegir un servidor nou"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Servidor domèstic"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Afegeix un servidor nou"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Afegeix un servidor"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "S'ha introduït un servidor vàlid"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, 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:116
-#, 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:124
-#, kde-format
-msgid "Server URL"
-msgstr "URL del servidor"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4080,27 +4057,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Suprimeix la paraula"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Visualitza les notificacions"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Totes les sales"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Amics"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Creació d'un espai"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4200,6 +4161,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Torna a obrir l'URL de SSO"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Xat"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Uneix-te a un xat existent"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Crea un xat nou"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4222,22 +4198,22 @@ msgstr ""
 "Aquest és el començament del xat. No hi ha missatges històrics més enllà "
 "d'aquest punt."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ves al primer missatge sense llegir"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ves al darrer missatge"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arrossegueu aquí els elements per a compartir"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4305,14 +4281,8 @@ msgstr "Eliminació de missatges"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Obre en un xat privat"
-msgstr "Xat amb %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Convida a un xat privat"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4350,28 +4320,6 @@ msgstr "Nom d'usuari:"
 msgid "Username unavailable"
 msgstr "Nom d'usuari no disponible"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Cerca d'amics"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Cerqueu els vostres amics…"
-
-#: src/qml/UserSearchPage.qml:81
-#, 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:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "No s'ha trobat cap coincidència"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4578,19 +4526,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Continua amb un compte existent"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (carregant)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Elimina aquest compte"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Inicieu la sessió o creeu un compte nou"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4703,46 +4657,3 @@ msgstr "Mostra"
 #, kde-format
 msgid "Quit"
 msgstr "Surt"
-
-#~ msgid "Start a Chat"
-#~ msgstr "Inicia un xat"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Inicia un xat"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Xat privat nou…"
-
-#~ msgid "Chat"
-#~ msgstr "Xat"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Uneix-te a un xat existent"
-
-#~ msgid "Create new chat"
-#~ msgstr "Crea un xat nou"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Sales i xats privats"
-
-#~ msgid "Separated"
-#~ msgstr "Separat/da"
-
-#~ msgid "Intermixed"
-#~ msgstr "Barrejat"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Missatges directes"
-
-#~ msgid "Login Failed: Access Token invalid or revoked"
-#~ msgstr ""
-#~ "Ha fallat l'inici de sessió: El testimoni d'accés no és vàlid o està "
-#~ "revocat"
-
-#~ msgid "[REDACTED]"
-#~ msgstr "[REDACTAT]"
-
-#~ msgid "[REDACTED: %1]"
-#~ msgstr "[REDACTAT: %1]"

po/cs/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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
 "PO-Revision-Date: 2023-11-23 10:08+0100\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -17,51 +17,61 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 23.08.3\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Chyba sítě: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Soubor je pro stažení příliš velký."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Pomoc hledejte u správce serveru matrix."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -458,10 +468,9 @@ msgid "Matrix client"
 msgstr "Klient protokolu Matrix"
 
 #: src/main.cpp:133
-#, fuzzy, kde-format
+#, kde-format
-#| msgid "© 2018-2020 Black Hat, 2020-2023 KDE Community"
 msgid "© 2018-2020 Black Hat, 2020-2024 KDE Community"
-msgstr "© 2018-2020 Black Hat, 2020-2023 Komunita KDE"
+msgstr ""
 
 #: src/main.cpp:134
 #, kde-format
@@ -993,11 +1002,9 @@ msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
 #: src/models/pushrulemodel.cpp:20
-#, fuzzy
-#| msgid "Enable notifications"
 msgctxt "Notification type"
 msgid "Enable notifications for this account"
-msgstr "Povolit upozornění"
+msgstr ""
 
 #: src/models/pushrulemodel.cpp:21
 msgctxt "Notification type"
@@ -1045,11 +1052,9 @@ msgid "Messages containing the local part of my Matrix ID"
 msgstr ""
 
 #: src/models/pushrulemodel.cpp:30
-#, fuzzy
-#| msgid "Enable notifications"
 msgctxt "Notification type"
 msgid "Whole room (@room) notifications"
-msgstr "Povolit upozornění"
+msgstr ""
 
 #: src/models/pushrulemodel.cpp:31
 msgctxt "Notification type"
@@ -1085,52 +1090,42 @@ msgstr[0] "%2 reagoval pomocí %3"
 msgstr[1] "%2 reagovali pomocí %3"
 msgstr[2] "%2 reagovali pomocí %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Oblíbené"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normální"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Nízká priorita"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Mezery"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Soubor je pro stažení příliš velký."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Pomoc hledejte u správce serveru matrix."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Vytvoření místnosti selhalo: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Vytvoření místnosti selhalo: %1"
@@ -1140,7 +1135,7 @@ msgstr "Vytvoření místnosti selhalo: %1"
 msgid "Report sent successfully."
 msgstr "Hlášení bylo úspěšně odesláno."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1162,7 +1157,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Odpovědět"
@@ -1470,7 +1465,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr "Příloha:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1631,27 +1626,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr "Otevřít v novém okně"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Odstranit z oblíbených"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Přidat k oblíbeným"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Označit jako přečtený"
@@ -1674,18 +1669,18 @@ msgstr "Kopírovat adresu do schránky"
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Vše"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1693,26 +1688,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Vypnuto"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Opustit místnost"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1764,7 +1759,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1783,7 +1778,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2090,25 +2085,23 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Zahájit rozhovor"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Zahájit rozhovor"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2135,38 +2128,14 @@ msgstr "Hledat"
 msgid "Create New"
 msgstr "Vytvořit nový"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "All Rooms"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Všechny místnosti"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Send a message…"
-msgid "Find a room…"
-msgstr "Poslat správu…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2174,38 +2143,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Zastavit stahování"
 
-#: src/qml/FileDelegate.qml:216
-#, fuzzy, kde-format
-#| msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
-#| msgid "Lat: %1, Lon: %2"
-msgid "Coach: %1, Seat: %2"
-msgstr "Šíř.: %1, Dél.: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2485,26 +2435,41 @@ msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Oddělený(á)"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Posílat oznamování o psaní"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2541,8 +2506,8 @@ msgstr "Soubor"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "Nový soukromý rozhovor..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2677,17 +2642,17 @@ msgstr ""
 msgid "Loading"
 msgstr "Načítání"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Zareagovat"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Odpovědět ve vláknu"
@@ -2767,7 +2732,7 @@ msgstr "Přijmout"
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2777,7 +2742,7 @@ msgstr ""
 msgid "Add"
 msgstr "Přidat"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2792,6 +2757,74 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Přidat nový server"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Přidat nový server"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Přidat server"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "URL serveru"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2862,7 +2895,7 @@ msgstr "Vyberte polohu"
 msgid "Send this location"
 msgstr "Poslat tuto polohu"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2883,7 +2916,7 @@ msgstr ""
 msgid "Matrix ID"
 msgstr ""
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3108,7 +3141,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3452,7 +3485,7 @@ msgstr ""
 msgid "Muted room"
 msgstr ""
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3504,44 +3537,44 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Hledat"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Členové"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Pozvat uživatele"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
@@ -3549,50 +3582,38 @@ msgstr[0] "%1 člen"
 msgstr[1] "%1 členové"
 msgstr[2] "%1 členů"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Žádný počet členů"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
-#, fuzzy, kde-format
+#, kde-format
-#| msgid "No results found"
+msgid "View notifications"
-msgid "No friends found"
+msgstr "Zobrazit upozornění"
-msgstr "Nenalezeny žádné výsledky"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Svinout %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3609,34 +3630,11 @@ msgstr ""
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat je offline. Prosím, zkontrolujte internetové připojení."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Hledat zprávy"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-#| msgid "Send a message…"
-msgid "Find messages…"
-msgstr "Poslat správu…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgid "No messages found"
-msgstr "Nenalezeny žádné výsledky"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3774,6 +3772,22 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Hledat zprávy"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Nenalezeny žádné výsledky"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3845,53 +3859,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Přidat nový server"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Přidat nový server"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Přidat server"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "URL serveru"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4044,28 +4011,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Odstranit slovo"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Zobrazit upozornění"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Všechny místnosti"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, fuzzy, kde-format
-#| msgid "Create a Space"
-msgid "Create a space"
-msgstr "Vytvořit místnost"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4165,6 +4115,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Rozhovor"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Vytvořit nový rozhovor"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4184,22 +4149,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Přejít na první nepřečtenou zprávu"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4268,13 +4233,7 @@ msgstr ""
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
 msgstr ""
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4313,29 +4272,6 @@ msgstr "Uživatelské jméno:"
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Nenalezeny žádné výsledky"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4509,19 +4445,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (načítání)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr ""
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4632,23 +4574,3 @@ msgstr "Zobrazit"
 #, kde-format
 msgid "Quit"
 msgstr "Ukončit"
-
-#~ msgid "Start a Chat"
-#~ msgstr "Zahájit rozhovor"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Zahájit rozhovor"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nový soukromý rozhovor..."
-
-#~ msgid "Chat"
-#~ msgstr "Rozhovor"
-
-#~ msgid "Create new chat"
-#~ msgstr "Vytvořit nový rozhovor"
-
-#~ msgid "Separated"
-#~ msgstr "Oddělený(á)"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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,53 +17,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 20.04.2\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Receiving push notifications"
 msgstr "Indstillinger"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, fuzzy, kde-format
 #| msgid "Network Error"
 msgid "Network Error: %1"
 msgstr "Netværksfejl"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr ""
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1097,53 +1107,43 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Favorit"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Lav prioritet"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr ""
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-
-#: src/neochatconnection.cpp:240
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Room creation failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Space creation failed: %1"
@@ -1154,7 +1154,7 @@ msgstr "Login mislykkedes"
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1177,7 +1177,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Svar"
@@ -1495,7 +1495,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr ""
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1661,28 +1661,28 @@ msgstr ""
 msgid "Open in New Window"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, fuzzy, kde-format
 #| msgid "Favorite"
 msgid "Add to Favourites"
 msgstr "Favorit"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Markér som læst"
@@ -1705,18 +1705,18 @@ msgstr ""
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1724,27 +1724,27 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Room Settings"
 msgstr "Indstillinger"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1801,7 +1801,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1820,7 +1820,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Room Name"
@@ -2140,25 +2140,24 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Start en chat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
+#, fuzzy, kde-format
-#: src/qml/RoomListPage.qml:312
+#| msgid "Start a Chat"
-#, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Start en chat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2186,38 +2185,14 @@ msgstr ""
 msgid "Create New"
 msgstr "Lydløs"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "Room Name"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Værelsesnavn:"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "Find a room…"
-msgstr "Send besked"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2225,36 +2200,19 @@ msgctxt ""
 msgid "Open File"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2544,30 +2502,45 @@ msgid "Show avatar update events"
 msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
+#, kde-format
+msgid "Rooms and private chats"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Adskilt"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
 #, fuzzy, kde-format
 #| msgid "Edit"
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Redigér"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Send typing notifications"
 msgstr "Indstillinger"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Developer Settings"
 msgstr "Indstillinger"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2606,7 +2579,7 @@ msgstr ""
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
 msgstr ""
 
 #: src/qml/GlobalMenu.qml:53
@@ -2750,17 +2723,17 @@ msgstr ""
 msgid "Loading"
 msgstr "Indlæser"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr ""
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2840,7 +2813,7 @@ msgstr "Acceptér"
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2850,7 +2823,7 @@ msgstr ""
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2865,6 +2838,74 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2938,7 +2979,7 @@ msgstr ""
 msgid "Send this location"
 msgstr "Indstillinger"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgctxt "Locations on a map"
@@ -2960,7 +3001,7 @@ msgstr ""
 msgid "Matrix ID"
 msgstr ""
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3198,7 +3239,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgctxt "@title"
@@ -3560,7 +3601,7 @@ msgstr "Værelsesnavn:"
 msgid "Muted room"
 msgstr "Lydløs"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3616,95 +3657,84 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Medlemmer"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, fuzzy, kde-format
 #| msgid "Invite"
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Invitér"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, fuzzy, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "Medlem"
 msgstr[1] "Medlemmer"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, fuzzy, kde-format
-#| msgid "Send message"
+#| msgid "Settings"
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Send besked"
+msgstr "Indstillinger"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3722,35 +3752,11 @@ msgstr "Indstillinger"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr ""
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Send besked"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "Find messages…"
-msgstr "Send besked"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "No messages found"
-msgstr "Send besked"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3891,6 +3897,23 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, fuzzy, kde-format
+#| msgid "Send message"
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Send besked"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr ""
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3963,53 +3986,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Se kildetekst"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4165,30 +4141,12 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, fuzzy, kde-format
-#| msgid "Settings"
-msgid "View notifications"
-msgstr "Indstillinger"
-
-#: src/qml/SpaceDrawer.qml:86
 #, fuzzy, kde-format
 #| msgid "Room Name"
 msgid "All Rooms"
 msgstr "Værelsesnavn:"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, fuzzy, kde-format
-#| msgid "Muted"
-msgid "Create a space"
-msgstr "Lydløs"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4295,6 +4253,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Chat"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr ""
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4314,22 +4287,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Gå til første ulæste besked"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4400,16 +4373,9 @@ msgstr "Send besked"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
 msgstr ""
 
-#: src/qml/UserDetailDialog.qml:218
-#, fuzzy, kde-format
-#| msgid "Invite"
-msgid "Invite to private chat"
-msgstr "Invitér"
-
 #: src/qml/UserDetailDialog.qml:229
 #, fuzzy, kde-format
 #| msgid "Copy"
@@ -4450,29 +4416,6 @@ msgstr "Brugernavn"
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Send besked"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4647,20 +4590,27 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, fuzzy, kde-format
 #| msgid "Loading"
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "Indlæser"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Send message"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Send besked"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4773,21 +4723,6 @@ msgstr "Vis"
 msgid "Quit"
 msgstr ""
 
-#~ msgid "Start a Chat"
-#~ msgstr "Start en chat"
-
-#, fuzzy
-#~| msgid "Start a Chat"
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Start en chat"
-
-#~ msgid "Chat"
-#~ msgstr "Chat"
-
-#~ msgid "Separated"
-#~ msgstr "Adskilt"
-
 #~ msgid "Please choose a file"
 #~ msgstr "Vælg venligst en fil"
 
@@ -4903,6 +4838,11 @@ msgstr ""
 #~ msgid "Image View - %1"
 #~ msgstr "Billedvisning - %1"
 
+#, fuzzy
+#~| msgid "Send message"
+#~ msgid "All messages"
+#~ msgstr "Send besked"
+
 #, fuzzy
 #~| msgctxt "@action:button Undo modification"
 #~| msgid "Undo"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 17:22+0100\n"
+"PO-Revision-Date: 2024-01-03 13:01+0100\n"
 "Last-Translator: Oliver Kellogg <okellogg@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "Language: eo\n"
@@ -18,52 +18,62 @@ msgstr ""
 "X-Generator: translate-po (https://github.com/zcribe/translate-po)\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Ricevante puŝ-sciigojn"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Reta Eraro: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Alirĵetono ne estis trovita"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Eble ĝi estis forigita?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Aliro al ŝlosilĉeno estis rifuzita."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Bonvolu permesi al NeoChat legi la alirĵetonon"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Neniu ŝlosilĉeno havebla."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Ne eblas legi alirĵetonon"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Dosiero tro granda por elŝuti."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Kontaktu vian administranton de matrica servilo por subteno."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -459,9 +469,10 @@ msgid "Matrix client"
 msgstr "Matrico-kliento"
 
 #: src/main.cpp:133
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "© 2018-2020 Black Hat, 2020-2023 KDE Community"
 msgid "© 2018-2020 Black Hat, 2020-2024 KDE Community"
-msgstr "© 2018-2020 Black Hat, 2020-2024 KDE-Komunumo"
+msgstr "© 2018-2020 Black Hat, 2020-2023 KDE-Komunumo"
 
 #: src/main.cpp:134
 #, kde-format
@@ -1077,52 +1088,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 redaktis kun %3"
 msgstr[1] "%2 redaktis kun %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invititaj"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Ŝatata"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Amikoj"
+msgstr "Rektaj Mesaĝoj"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normala"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Malalta prioritato"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Spacoj"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Dosiero tro granda por elŝuti."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Kontaktu vian administranton de matrica servilo por subteno."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Kreado de ĉambro malsukcesis: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Spackreado malsukcesis: %1"
@@ -1132,7 +1133,7 @@ msgstr "Spackreado malsukcesis: %1"
 msgid "Report sent successfully."
 msgstr "Raporto sukcese sendita."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1154,7 +1155,7 @@ msgid "Open NeoChat in this room"
 msgstr "Malfermu NeoChat en ĉi tiu ĉambro"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Respondi"
@@ -1459,7 +1460,7 @@ msgstr "Bildo de tondujo"
 msgid "Attachment:"
 msgstr "Aldonaĵo:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1624,27 +1625,27 @@ msgstr "Ĉu vi certas, ke vi volas elsaluti?"
 msgid "Open in New Window"
 msgstr "Malfermi en Nova Fenestro"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Forigi el Favoritoj"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Aldoni al Favoritoj"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Reprioritigi"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Malprioritigi"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marki kiel Legita"
@@ -1667,18 +1668,18 @@ msgstr "Kopii Adreson al Tondujo"
 msgid "Notification State"
 msgstr "Sciigostato"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Sekvi Ĉiean Agordon"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Ĉiuj"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1686,26 +1687,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Mencioj kaj Ŝlosilvortoj"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Malŝaltita"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Ĉambraj Agordoj"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Forlasi Ĉambron"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1757,7 +1758,7 @@ msgid "Make this parent official"
 msgstr "Oficialigi tiun gepatron"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1776,7 +1777,7 @@ msgstr "Elekti ĉambron"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2090,25 +2091,23 @@ msgstr ""
 "tiu aparato."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Esplori ĉambrojn"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Trovu viajn amikojn"
+msgstr "Komenci Babiladon"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Trovu viajn amikojn"
+msgstr "Komenci Babiladon"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2135,36 +2134,14 @@ msgstr "Serĉi"
 msgid "Create New"
 msgstr "Krei Novan"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Esplori Ĉambrojn"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Enigi ĉambro-adreson"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Trovi ĉambron…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Trovis neniujn publikajn ĉambrojn"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Elŝutu"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2172,36 +2149,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Malfermu Dosieron"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Ĉesi Elŝuton"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Kupeo: %1, Seĝo: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Sendi al KDE-Itinero"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2482,26 +2442,41 @@ msgstr "Montri eventojn pri ĝisdatigo de avataro"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Ĉambroj kaj privataj babilejoj"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Disigita"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Intermiksitaj"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Redaktoro"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Uzu s/text/anstataŭan sintakson por redakti vian lastan mesaĝon"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Sendi tajpajn sciigojn"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Agordoj por programistoj"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Ebligi programistajn ilojn"
@@ -2538,8 +2513,8 @@ msgstr "Dosiero"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Trovu viajn amikojn"
+msgstr "Nova Privata Babilejo…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2674,17 +2649,17 @@ msgstr "Registrado estas malŝaltita ĉe ĉi tiu servilo."
 msgid "Loading"
 msgstr "Ŝargante"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Ĉi tiu mesaĝo estis sendita de kontrolita aparato"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reagi"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Respondi en Fadeno"
@@ -2766,7 +2741,7 @@ msgstr "Akcepti"
 msgid "Invite a User"
 msgstr "Inviti Uzanton"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Trovi uzanton..."
@@ -2776,7 +2751,7 @@ msgstr "Trovi uzanton..."
 msgid "Add"
 msgstr "Aldoni"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Neniuj uzantoj disponeblaj"
@@ -2791,6 +2766,74 @@ msgstr "Sendi inviton"
 msgid "User is either already a member or has been invited"
 msgstr "Uzanto aŭ jam estas membro aŭ estas invitita"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Esplori Ĉambrojn"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Trovi ĉambron..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Aldoni Novan Servilon"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Hejma Servilo"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Aldoni novan servilon"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Aldoni servilon"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Valida servilo eniris"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "La enigita teksto ne estas valida URL"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Enigu servilan url ekz. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Servila URL"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Enigi ĉambro-adreson"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Trovis neniujn publikajn ĉambrojn"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2861,7 +2904,7 @@ msgstr "Elekti Lokon"
 msgid "Send this location"
 msgstr "Sendi ĉi tiun lokon"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2882,7 +2925,7 @@ msgstr "Matrica ID:"
 msgid "Matrix ID"
 msgstr "Matrica ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3109,7 +3152,7 @@ msgstr "Ebligi mesaĝ-emfazojn"
 msgid "Delete keyword"
 msgstr "Forigi ŝlosilvorton"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3460,7 +3503,7 @@ msgstr "Ĉambra Stato"
 msgid "Muted room"
 msgstr "Silentigita ĉambro"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Agordi ĉambron"
@@ -3512,94 +3555,82 @@ msgstr "Malfermi programistajn ilojn"
 msgid "Search in this room"
 msgstr "Serĉi en ĉi tiu ĉambro"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Serĉi"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Forigi ĉambron el plej ŝatataj"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Fari ĉambron ŝatata"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Montri lokojn por ĉi tiu ĉambro"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Membroj"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Inviti Uzanton"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Inviti uzanton al ĉambro"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 membro"
 msgstr[1] "%1 membroj"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Neniu membrokalkulo"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Neniuj amikoj trovitaj"
+msgstr "Rigardi sciigojn"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Neniuj ĉambroj trovitaj"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Vi ankoraŭ ne aldonis iujn el viaj amikoj, klaku malsupre por serĉi ilin."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Aliĝi al iuj ĉambroj por komenci"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Serĉi en ĉambra dosierujo"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Serĉi en amika dosierujo"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Kolapsi %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3616,32 +3647,11 @@ msgstr "Ĉambro-Komunikaĵoj"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat estas eksterrete. Bonvolu kontroli vian retan konekton."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Mesaĝfonto"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Serĉi Mesaĝojn"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Trovi mesaĝojn…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Enigi tekston por komenci serĉi"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "Trovis neniujn mesaĝojn"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3786,6 +3796,22 @@ msgstr ""
 "Novaj membroj povas vidi la mesaĝhistorion de la punkto, kiam ili aliĝis al "
 "la ĉambro."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Serĉi Mesaĝojn"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Enigi tekston por komenci serĉi"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Neniuj rezultoj trovitaj"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3859,53 +3885,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Elekti Spacojn"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Aldoni Novan Servilon"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Hejma Servilo"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Aldoni novan servilon"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Aldoni servilon"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Valida servilo eniris"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "La enigita teksto ne estas valida URL"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Enigu servilan url ekz. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Servila URL"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4059,27 +4038,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Forigi vorton"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Rigardi sciigojn"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Ĉiuj Ĉambroj"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Amikoj"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Krei spacon"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4179,6 +4142,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Remalfermi SSO-URL"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Babilado"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Aliĝi al ekzistanta babilejo"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Krei novan babilejon"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4201,22 +4179,22 @@ msgstr ""
 "Ĉi tio estas komenco de la babilo. Ne estas historiaj mesaĝoj preter ĉi "
 "punkto."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Salti al la unua nelegita mesaĝo"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salti al la plej nova mesaĝo"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Treni erojn ĉi tien por dividi ilin"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4284,14 +4262,8 @@ msgstr "Forigi Mesaĝojn"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Malfermi privatan babilejon"
-msgstr "Babili kun %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Inviti al privata babilejo"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4329,28 +4301,6 @@ msgstr "Uzantnomo:"
 msgid "Username unavailable"
 msgstr "Uzantnomo nedisponebla"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Trovu Aiajn Amikojn"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Trovi viajn amikojn…"
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "Enigi tekston por komenci serĉi viajn amikojn"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Trovis neniujn kongruojn"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4538,19 +4488,26 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Daŭrigi kun ekzistanta konto"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (alŝutante)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit this account"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Redakti ĉi tiun konton"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Ensaluti aŭ Krei Novan Konton"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4662,3 +4619,15 @@ msgstr "Montri"
 #, kde-format
 msgid "Quit"
 msgstr "Forlasi"
+
+#~ msgid "Login Failed: Access Token invalid or revoked"
+#~ msgstr "Ensaluto Malsukcesa: Aliro-Signo nevalida aŭ revokita"
+
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDAKTITA]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDAKTITA: %1]"
+
+#~ msgid "The room id you are trying to join is not valid"
+#~ msgstr "La ĉambro-identigilo, al kiu vi provas aliĝi, ne validas"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 11:58+0100\n"
+"PO-Revision-Date: 2024-02-16 00:50+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
@@ -19,52 +19,64 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recepción de notificaciones push"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de red: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "El token de acceso no se ha encontrado"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "¿Es posible que se haya borrado?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Se ha denegado el acceso a la cadena de claves."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, 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:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Ninguna cadena de claves disponible."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No se ha podido leer el token de acceso"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Archivo demasiado grande para descargarlo."
+
+#: src/controller.cpp:298
+#, 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/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1080,54 +1092,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reaccionado con %3"
 msgstr[1] "%2 han reaccionado con %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invitado"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Favorito"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Amigos"
+msgstr "Mensajes directos"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Baja prioridad"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Espacios"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Archivo demasiado grande para descargarlo."
-
-#: src/neochatconnection.cpp:69
-#, 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:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "La creación de la sala ha fallado: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "La creación del espacio ha fallado: %1"
@@ -1137,7 +1137,7 @@ msgstr "La creación del espacio ha fallado: %1"
 msgid "Report sent successfully."
 msgstr "La denuncia se ha enviado correctamente."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1159,7 +1159,7 @@ msgid "Open NeoChat in this room"
 msgstr "Abrir NeoChat en esta sala"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Responder"
@@ -1464,7 +1464,7 @@ msgstr "Imagen del portapapeles"
 msgid "Attachment:"
 msgstr "Adjunto:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1629,27 +1629,27 @@ msgstr "¿Seguro que quiere cerrar la sesión?"
 msgid "Open in New Window"
 msgstr "Abrir en nueva ventana"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Eliminar de favoritas"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Añadir a favoritas"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Cambiar prioridad"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Quitar prioridad"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marcar como leído"
@@ -1672,18 +1672,18 @@ msgstr "Copiar dirección en el portapapeles"
 msgid "Notification State"
 msgstr "Estado de notificaciones"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Seguir las preferencias globales"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Todas"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1691,26 +1691,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Menciones y palabras clave"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Desactivadas"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Preferencias de la sala"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Salir de la sala"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1762,7 +1762,7 @@ msgid "Make this parent official"
 msgstr "Hacer oficial este espacio padre"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1781,7 +1781,7 @@ msgstr "Escoger sala"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2098,25 +2098,23 @@ msgstr ""
 "dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar salas"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Encontrar amigos"
+msgstr "Iniciar un chat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Encontrar amigos"
+msgstr "Iniciar un chat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2143,36 +2141,14 @@ msgstr "Buscar"
 msgid "Create New"
 msgstr "Crear nuevo"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Explorar salas"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Introduzca la dirección de una sala"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Encontrar una sala..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "No se han encontrado salas públicas"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Descargar"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2180,36 +2156,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Detener descarga"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Coche: %1, Asiento: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Enviar a KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2497,26 +2456,41 @@ msgstr "Mostrar eventos de actualización de avatar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Salas y chats privados"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Por separado"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Entremezcladas"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Use la sintaxis s/texto/sustitución para editar su último mensaje"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Enviar notificaciones de escritura"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Preferencias del desarrollador"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Activar las herramientas del desarrollador"
@@ -2553,8 +2527,8 @@ msgstr "Archivo"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Encontrar amigos"
+msgstr "Nuevo chat privado..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2690,17 +2664,17 @@ msgstr "El registro está desactivado en este servidor."
 msgid "Loading"
 msgstr "Cargando"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Este mensaje se ha enviado desde un dispositivo verificado"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reaccionar"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Responder en el hilo"
@@ -2782,7 +2756,7 @@ msgstr "Aceptar"
 msgid "Invite a User"
 msgstr "Invitar a un usuario"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Encontrar un usuario..."
@@ -2792,7 +2766,7 @@ msgstr "Encontrar un usuario..."
 msgid "Add"
 msgstr "Añadir"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No hay usuarios disponibles"
@@ -2807,6 +2781,74 @@ msgstr "Enviar invitación"
 msgid "User is either already a member or has been invited"
 msgstr "El usuario ya es miembro o ha sido invitado"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Explorar salas"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Encontrar una sala..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Añadir nuevo servidor"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Servidor doméstico"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Añadir nuevo servidor"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Añadir servidor"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Se ha introducido un servidor correcto"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "El texto introducido no es una URL válida"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Introduzca URL del servidor (por ejemplo, kde.org)"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "URL del servidor"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Introduzca la dirección de una sala"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "No se han encontrado salas públicas"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2877,7 +2919,7 @@ msgstr "Escoger una ubicación"
 msgid "Send this location"
 msgstr "Enviar esta ubicación"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2898,7 +2940,7 @@ msgstr "ID de Matrix:"
 msgid "Matrix ID"
 msgstr "ID de Matrix"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3125,7 +3167,7 @@ msgstr "Activar resaltado de mensajes"
 msgid "Delete keyword"
 msgstr "Borrar palabra clave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3474,7 +3516,7 @@ msgstr "Estado de la sala"
 msgid "Muted room"
 msgstr "Sala silenciada"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Configurar la sala"
@@ -3526,93 +3568,82 @@ msgstr "Abrir las herramientas del desarrollador"
 msgid "Search in this room"
 msgstr "Buscar en esta sala"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Buscar"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Eliminar sala de las favoritas"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Poner sala en favoritas"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Mostrar ubicaciones de esta sala"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Miembros"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Invitar a un usuario"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Invitar usuario a la sala"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 miembro"
 msgstr[1] "%1 miembros"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Sin contador de miembros"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "No se ha encontrado ningún amigo"
+msgstr "Ver notificaciones"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No se ha encontrado ninguna sala"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr "Todavía no ha añadido ningún amigo. Pulse abajo para buscarlos."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Únase a algunas salas para empezar"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Buscar en el directorio de la sala"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Buscar en el directorio de amigos"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Contraer %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3629,32 +3660,11 @@ msgstr "Multimedia de la sala"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat no está conectado. Compruebe su conexión de red."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Fuente del mensaje"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Buscar mensajes"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Buscar mensajes..."
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Introduzca un texto para empezar a buscar"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "No se han encontrado mensajes"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3802,6 +3812,22 @@ msgstr ""
 "Los nuevos miembros pueden ver el historial de mensajes desde el momento en "
 "que se unieron a la sala."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Buscar mensajes"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Introduzca un texto para empezar a buscar"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "No se han encontrado coincidencias"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3875,53 +3901,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Seleccionar espacios"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Añadir nuevo servidor"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Servidor doméstico"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Añadir nuevo servidor"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Añadir servidor"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Se ha introducido un servidor correcto"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, 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:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Introduzca URL del servidor (por ejemplo, kde.org)"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "URL del servidor"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4075,27 +4054,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Borrar palabra"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Ver notificaciones"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Todas las salas"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Amigos"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Crear un espacio"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4195,6 +4158,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Volver a abrir URL de SSO"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Chatear"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Unirse a chat existente"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Crear nuevo chat"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4217,22 +4195,22 @@ msgstr ""
 "Este es el inicio del chat. No hay mensajes en el historial antes de este "
 "punto."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Saltar al primer mensaje sin leer"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Saltar al último mensaje"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arrastre elementos aquí para compartirlos"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4300,14 +4278,8 @@ msgstr "Eliminar mensajes"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Abrir un chat privado"
-msgstr "Chatear con %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Invitar a un chat privado"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4345,28 +4317,6 @@ msgstr "Nombre de usuario:"
 msgid "Username unavailable"
 msgstr "Nombre de usuario no disponible"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Encontrar amigos"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Encontrar amigos..."
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "Introduzca un texto para empezar a buscar amigos"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "No se han encontrado coincidencias"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4575,19 +4525,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Continuar con una cuenta existente"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (cargando)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Eliminar esta cuenta"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Iniciar sesión o crear una nueva cuenta"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4701,38 +4657,6 @@ msgstr "Mostrar"
 msgid "Quit"
 msgstr "Salir"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Iniciar un chat"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Iniciar un chat"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nuevo chat privado..."
-
-#~ msgid "Chat"
-#~ msgstr "Chatear"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Unirse a chat existente"
-
-#~ msgid "Create new chat"
-#~ msgstr "Crear nuevo chat"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Salas y chats privados"
-
-#~ msgid "Separated"
-#~ msgstr "Por separado"
-
-#~ msgid "Intermixed"
-#~ msgstr "Entremezcladas"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Mensajes directos"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "Inicio de sesión fallido: Token de acceso no válido o revocado"
 

po/eu/neochat.po

@@ -4,13 +4,13 @@
 # SPDX-FileCopyrightText: 2023, 2024 KDE euskaratzeko proiektuko arduraduna <xalba@ni.eus>
 #
 # Translators:
-# Iñigo Salvador Azurmendi <xalba@ni.eus>, 2020, 2021, 2022, 2023, 2024.
+# Iñigo Salvador Azurmendi <xalba@ni.eus>, 2020, 2021, 2022, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 17:46+0100\n"
+"PO-Revision-Date: 2024-02-15 18:52+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@ni.eus>\n"
 "Language-Team: Basque <kde-i18n-eu@kde.org>\n"
 "Language: eu\n"
@@ -20,52 +20,64 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Bultzada-jakinarazpenak jasotzea"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Sareko errorea: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Sartzeko tokena ez du aurkitu"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Agian ezabatu egin da?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Gako-katerako sarrera ukatu egin da."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Mesedez, utzi NeoChat-i sartzeko tokena irakurtzen"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Ez dago gako-kate erabilgarririk."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Mesedez, instalatu gako-kate bat, adib. KWallet edo «GNOME keyring» Linux-en"
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Ez da sartzeko tokena irakurtzeko gai"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Fitxategia zama-jaisteko handiegia da."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+"Jar zaitez zure matrix zerbitzariaren administratzailearekin harremanean "
+"euskarria lortzeko."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1081,54 +1093,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2en erreakzioa %3 izan da"
 msgstr[1] "%2(r)en erreakzioa %3 izan da"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Gonbidatuta"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Gogokoak"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Lagunak"
+msgstr "Zuzeneko mezua"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Arrunta"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Lehentasun txikia"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Tokiak"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Fitxategia zama-jaisteko handiegia da."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-"Jar zaitez zure matrix zerbitzariaren administratzailearekin harremanean "
-"euskarria lortzeko."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Gela sortzea huts egin du: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Tokia sortzea huts egin du: %1"
@@ -1138,7 +1138,7 @@ msgstr "Tokia sortzea huts egin du: %1"
 msgid "Report sent successfully."
 msgstr "Txosten bidalketa arrakastatsua."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1160,7 +1160,7 @@ msgid "Open NeoChat in this room"
 msgstr "Ireki NeoChat gela honetan"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Erantzun"
@@ -1465,7 +1465,7 @@ msgstr "Arbelako irudia"
 msgid "Attachment:"
 msgstr "Eranskina:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1630,27 +1630,27 @@ msgstr "Ziur zaude saio-itxi nahi duzula?"
 msgid "Open in New Window"
 msgstr "Ireki leiho berrian"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Kendu gogokoetatik"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Gehitu gogokoetara"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Lehentasuna aldatzea"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Lehentasuna kentzea"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Markatu irakurritako gisa"
@@ -1673,18 +1673,18 @@ msgstr "Kopiatu helbidea arbelera"
 msgid "Notification State"
 msgstr "Jakinarazpenaren egoera"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Jarraitu ezarpen orokorra"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Guztia"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1692,26 +1692,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@aipamenak eta gako-hitzak"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Itzalita"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Gelaren ezarpenak"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Irten gelatik"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1763,7 +1763,7 @@ msgid "Make this parent official"
 msgstr "Egin guraso hori ofiziala"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1782,7 +1782,7 @@ msgstr "Hautatu gela"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2094,25 +2094,23 @@ msgstr ""
 "Mezu hori zifratuta dago eta igorleak ez du gakoa gailu honekin partekatu."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Esploratu gelak"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Aurkitu zure lagunak"
+msgstr "Hasi berriketa bat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Aurkitu zure lagunak"
+msgstr "Hasi berriketa bat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2139,36 +2137,14 @@ msgstr "Bilatu"
 msgid "Create New"
 msgstr "Sortu berria"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Esploratu gelak"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Sartu gela baten helbidea"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Aurkitu gela bat..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Ez da gela publikorik aurkitu"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Zama-jaitsi"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2176,36 +2152,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Ireki fitxategia"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Gelditu zama-jaistea"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Bagoia: %1 jarlekua: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Bidali KDE «Itinerary»ra"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2487,26 +2446,41 @@ msgstr "Erakutsi abatara eguneratzeko gertaerak"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Gelak eta berriketa pribatuak"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Bereizita"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Elkarren artean nahastuta"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editorea"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Erabili «s/testua/ordezko sintaxia» zure azken mezua editatzeko"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Bidali tekleatze-jakinarazpenak"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Garatzailearen ezarpenak"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Gaitu garatzailearen tresnak"
@@ -2543,8 +2517,8 @@ msgstr "Fitxategia"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Aurkitu zure lagunak"
+msgstr "Berriketa pribatu berria..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2679,17 +2653,17 @@ msgstr "Erregistratzea ezgaituta dago zerbitzari horretan."
 msgid "Loading"
 msgstr "Zamatzen..."
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Mezu hau egiaztatutako gailu batetik bidali da"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Erreakzioa"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Erantzun harian"
@@ -2771,7 +2745,7 @@ msgstr "Onartu"
 msgid "Invite a User"
 msgstr "Gonbidatu erabiltzaile bat"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Aurkitu erabiltzaile bat..."
@@ -2781,7 +2755,7 @@ msgstr "Aurkitu erabiltzaile bat..."
 msgid "Add"
 msgstr "Gehitu"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Ez dago erabiltzaile erabilgarririk"
@@ -2796,6 +2770,74 @@ msgstr "Bidali gonbita"
 msgid "User is either already a member or has been invited"
 msgstr "Erabiltzailea dagoeneko bazkidea da edo gonbidapena jaso du"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Esploratu gelak"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Bilatu gela bat..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Gehitu zerbitzari berria"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Etxeko zerbitzaria"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Gehitu zerbitzari berria"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Gehitu zerbitzaria"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Zerbitzari balioduna sartu da"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "Zerbitzari hori ezin da ebatzi edo dagoeneko gehitu da"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Sartutako testua ez da URL baliodun bat"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Sartu zerbitzariaren URLa, adib. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Zerbitzariaren URLa"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Sartu gela baten helbidea"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Ez da gela publikorik aurkitu"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2866,7 +2908,7 @@ msgstr "Hautatu kokaleku bat"
 msgid "Send this location"
 msgstr "Bidali kokaleku hori"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2887,7 +2929,7 @@ msgstr "Matrix ID:"
 msgid "Matrix ID"
 msgstr "Matrix ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3115,7 +3157,7 @@ msgstr "Gaitu mezu-nabarmentzea"
 msgid "Delete keyword"
 msgstr "Ezabatu gako-hitza"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3460,7 +3502,7 @@ msgstr "Gelaren egoera"
 msgid "Muted room"
 msgstr "Isilarazitako gela"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Konfiguratu gela"
@@ -3512,95 +3554,82 @@ msgstr "Ireki garatzailearen tresnak"
 msgid "Search in this room"
 msgstr "Bilatu gela honetan"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Kendu gela gogokoetatik"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Egin gela gogoko"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Erakutsi gela honetarako kokalekuak"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Bazkideak"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Gonbidatu erabiltzaile bat"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Gonbidatu erabiltzaile bat gelara"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "Bazkide %1"
 msgstr[1] "%1 bazkide"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Ez dago bazkide zenbaketarik"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Ez du lagunik aurkitu"
+msgstr "Ikusi jakinarazpenak"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Ez da gelarik aurkitu"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Oraindik ez duzu zure lagunetako inor gehitu, egin klik behean haiek "
-"bilatzeko."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Hasteko, batu gela batzuetara"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Bilatu gelen direktorioan"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Bilatu lagun direktorioan"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Tolestu %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3617,32 +3646,11 @@ msgstr "Gelako hedabideak"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat lerroz kanpo dago. Mesedez, berrikusi zure sare-konexioa."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Mezuaren sorburua"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Bilatu mezuak"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Bidali mezuak..."
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Sartu bilatzen hasteko testua"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "Ez da mezurik aurkitu"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3787,6 +3795,22 @@ msgstr ""
 "Bazkide berriek mezuen historia ikus dezakete, gelara batu ziren unetik "
 "aurrera."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Bilatu mezuak"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Sartu testu bat bilatzen hasteko"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Ez da emaitzarik aurkitu"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3859,53 +3883,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Aukeratu tokiak"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Gehitu zerbitzari berria"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Etxeko zerbitzaria"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Gehitu zerbitzari berria"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Gehitu zerbitzaria"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Zerbitzari balioduna sartu da"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "Zerbitzari hori ezin da ebatzi edo dagoeneko gehitu da"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Sartutako testua ez da URL baliodun bat"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Sartu zerbitzariaren URLa, adib. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Zerbitzariaren URLa"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4059,27 +4036,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Ezabatu hitza"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Ikusi jakinarazpenak"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Gela guztiak"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Lagunak"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Sortu toki bat"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4179,6 +4140,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Berrireki SSO URL"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Berriketa"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Batu dagoen berriketa batera"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Sortu berriketa berria"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4202,22 +4178,22 @@ msgstr ""
 "Hau berriketaren hasiera da. Puntu horretatik haratago ez dago mezu "
 "historikorik."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Jauzi irakurri gabeko lehenengo mezura"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Jauzi azken mezura"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arrastatu elementuak hona haiek partekatzeko"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4285,14 +4261,8 @@ msgstr "Kendu mezuak"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Ireki berriketa pribatu bat"
-msgstr "%1(e)rekin berriketa"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Gonbidatu berriketa pribatura"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4330,28 +4300,6 @@ msgstr "Erabiltzaile-izena:"
 msgid "Username unavailable"
 msgstr "Erabiltzaile-izena ez dago erabilgarri"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Aurkitu zure lagunak"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Aurkitu zure lagunak…"
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "Sartu zure lagunak bilatzen hasteko testua"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Ez da bat datorrenik aurkitu"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4552,19 +4500,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Jarraitu aurrez dagoen kontu batekin"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (Zamatzen)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Kendu kontu hau"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Saioa hasi edo sortu kontu bat"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4677,38 +4631,6 @@ msgstr "Erakutsi"
 msgid "Quit"
 msgstr "Irten"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Hasi berriketa bat"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Hasi berriketa bat"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Berriketa pribatu berria..."
-
-#~ msgid "Chat"
-#~ msgstr "Berriketa"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Batu dagoen berriketa batera"
-
-#~ msgid "Create new chat"
-#~ msgstr "Sortu berriketa berria"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Gelak eta berriketa pribatuak"
-
-#~ msgid "Separated"
-#~ msgstr "Bereizita"
-
-#~ msgid "Intermixed"
-#~ msgstr "Elkarren artean nahastuta"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Zuzeneko mezua"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr ""
 #~ "Saio-hastea huts egin du: Sartzeko token baliogabea edo indargabetua"

po/ia/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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-22 11:01+0100\n"
+"PO-Revision-Date: 2024-02-15 12:16+0100\n"
 "Last-Translator: giovanni <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
@@ -18,52 +18,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recipente notificationes de push"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de rete: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Indicio de accesso non esseva trovate"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan il esseva delite?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesso a portaclave (keychain) esseva negate"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, 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:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Nulle portaclaves disponibile"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Incapace a leger indicio"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "File troppo grande a discargar."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Continge tu administrator de servitor de matrix per supporto."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1079,52 +1089,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 reagite con %3"
 msgstr[1] "%2 reagite con %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invitate"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Favorito"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Amicos"
+msgstr "Messages directe"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Basse prioritate"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Spatios"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "File troppo grande a discargar."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Continge tu administrator de servitor de matrix per supporto."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Creation de sala falleva: \"%1\""
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Creation de spatio falleva: \"%1\""
@@ -1134,7 +1134,7 @@ msgstr "Creation de spatio falleva: \"%1\""
 msgid "Report sent successfully."
 msgstr "Reporto inviate con successo."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1156,7 +1156,7 @@ msgid "Open NeoChat in this room"
 msgstr "Aperi NeoChat in iste sala"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Responde"
@@ -1463,7 +1463,7 @@ msgstr "Image de Area de transferentia"
 msgid "Attachment:"
 msgstr "Attachamento:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1629,27 +1629,27 @@ msgstr "Tu es secur que tu vole exir?"
 msgid "Open in New Window"
 msgstr "Aperi in nove fenestra"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Remove ex favoritos"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Adde a favoritos"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Repone prioritate"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Leva prioritate"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marca como legite"
@@ -1672,18 +1672,18 @@ msgstr "Copia adresse a area de transferentia"
 msgid "Notification State"
 msgstr "Stato de  notification"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Seque Preferentias Global"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Omne"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1691,26 +1691,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Mentiones e Parolas Claves"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "De-Activate (Off)"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Preferentias de sala"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Lassa sala"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1762,7 +1762,7 @@ msgid "Make this parent official"
 msgstr "Face iste genitor official"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1781,7 +1781,7 @@ msgstr "Selige data"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2098,25 +2098,23 @@ msgstr ""
 "dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explora salas"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Trova tu amicos"
+msgstr "Initia un conversation"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Trova tu amicos"
+msgstr "Initia un conversation"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2143,36 +2141,14 @@ msgstr "Cerca"
 msgid "Create New"
 msgstr "Crea nove"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Explora salas"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Inserta adresse de sala"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Trova un sala ..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Nulle salas public trovate"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Discarga"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2180,36 +2156,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Aperi file"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Stoppa discargamento"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Autocar: %1 Placia: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Invia a  KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2491,26 +2450,41 @@ msgstr "Monstra eventos de actualisar de avatar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Salas e conversationes private"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Separate"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Intermiscite"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Usa syntaxe de s/texto/reimplaciamento per modificar tu ultime message"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Invia notificationes de typar"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr " de disviluppatorPreferentias"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Habilita instrumentos de disveloppator"
@@ -2547,8 +2521,8 @@ msgstr "File"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Trova tu amicos"
+msgstr "Nove conversation private..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2683,17 +2657,17 @@ msgstr "Registration es dishabilitate sur iste servitor."
 msgid "Loading"
 msgstr "Cargante"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Iste message esseva inviate ex un dispositivo verificate"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reage"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Responde in Topico"
@@ -2775,7 +2749,7 @@ msgstr "Accepta"
 msgid "Invite a User"
 msgstr "Invita un usator"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Trova un usator..."
@@ -2785,7 +2759,7 @@ msgstr "Trova un usator..."
 msgid "Add"
 msgstr "Adde"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nulle usatores disponibile"
@@ -2800,6 +2774,74 @@ msgstr "Invia invitation"
 msgid "User is either already a member or has been invited"
 msgstr "Usatoir o ja es un membro o ja ha  essite invitate"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Explora salas"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Trova un sala ..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Adde nove servitor "
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Servitor de casa"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Adde nove servitor "
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Adde Servitor"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Servitor valide insertate"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Le texto insertate non es un url valide"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Inserta usr de servitor p.ex. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "URL de servitor"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Inserta adresse de sala"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Nulle salas public trovate"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2870,7 +2912,7 @@ msgstr "Selige un Location"
 msgid "Send this location"
 msgstr "Invia iste location"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2891,7 +2933,7 @@ msgstr "ID de Matrix:"
 msgid "Matrix ID"
 msgstr "ID de Matrix:"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3119,7 +3161,7 @@ msgstr "Habilita evidentias de message"
 msgid "Delete keyword"
 msgstr "Dele parola clave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3466,7 +3508,7 @@ msgstr "Stato de sala "
 msgid "Muted room"
 msgstr "Sala Silentiate"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Configura sala"
@@ -3518,94 +3560,82 @@ msgstr "Aperi instrumentos de disveloppator"
 msgid "Search in this room"
 msgstr "Cerca in iste sala"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Cerca"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Remove sala ex favoritos"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Face sala favorite"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Monstra locationes per iste sala"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Membros"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Invita un usator"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Invita  usator a sala"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 Member"
 msgstr[1] "%1 Membros"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Necun computo de membro"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Necun amicos trovate"
+msgstr "Vide notificationes"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nulle salas trovat"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Tu non ha ancora addite alcun de tu amicos, clicca a basso per cercar los."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Uni alcun salas per initiar"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "cerca in directorio de sala"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Cerca in directorio de amico"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Plica %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3622,32 +3652,11 @@ msgstr "Media de sala"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat es foras de linea. Per vafor tu verifica tu connexion de rete."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Fonte de message"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Cerca Messages"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Trova messages..."
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Inserta un texto per initiar a cercar"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "Necun messages trovate"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3795,6 +3804,22 @@ msgstr ""
 "Nove membros pote vider le chronologia de messages ab le puncto de lor union "
 "al sala."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Cerca Messages"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Inserta un texto per initiar a cercar"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Necun resultatos trovate"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3868,53 +3893,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Selige  spatios"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Adde nove servitor "
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Servitor de casa"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Adde nove servitor "
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Adde Servitor"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Servitor valide insertate"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Le texto insertate non es un url valide"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Inserta usr de servitor p.ex. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "URL de servitor"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4068,27 +4046,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Dele parola"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Vide notificationes"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Omne Salas"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Amicos"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Crea un spatio"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4188,6 +4150,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Re-aperi SSO URL"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Conversation in directo"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Unite a conversation in directo existente "
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Crea nove conversation"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4211,22 +4188,22 @@ msgstr ""
 "Isto es le initio del conversation in directo (chat). Il non ha alcun "
 "messages historic ultra iste puncto."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Salta al prime message non legite"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salta al ultime message"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Trahe elementos hic per compartir los"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4294,14 +4271,8 @@ msgstr "Remove messages"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Aperi in conversation private"
-msgstr "Conversa con %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Invita in conversation private"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4339,28 +4310,6 @@ msgstr "Nomine de usator:"
 msgid "Username unavailable"
 msgstr "Nomine de usator non disponibile"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Trova tu amicos"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Trova tu amicos…"
-
-#: src/qml/UserSearchPage.qml:81
-#, 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:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Il non trovava ulle correspondentia"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4568,19 +4517,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Continua con un conto existente"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (cargante)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Remove iste conto"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Accede  o crea un conto nove"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4694,38 +4649,6 @@ msgstr "Monstra "
 msgid "Quit"
 msgstr "Quita"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Initia un conversation"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Initia un conversation"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nove conversation private..."
-
-#~ msgid "Chat"
-#~ msgstr "Conversation in directo"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Unite a conversation in directo existente "
-
-#~ msgid "Create new chat"
-#~ msgstr "Crea nove conversation"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Salas e conversationes private"
-
-#~ msgid "Separated"
-#~ msgstr "Separate"
-
-#~ msgid "Intermixed"
-#~ msgstr "Intermiscite"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Messages directe"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "Accesso falleva: indicio (token) de accesso invalide o revocate"
 

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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,52 +18,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Receiving push notifications"
 msgstr "Inviar notificationes pri li tippada"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Errore de rete: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, fuzzy, kde-format
 msgid "Access token wasn't found"
 msgstr "Li plugin necessi por accesse al files MP3 ne esset trovat"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan it esset removet?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, fuzzy, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesse a %1 es refusat."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Null porta-clave disponibil."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, fuzzy, kde-format
 msgid "Unable to read access token"
 msgstr "Ne posset acessar «%s»"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr ""
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1147,52 +1157,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invitat"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Preferet"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr ""
+msgstr "Direct missages"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Bass prioritá"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Spacies"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr ""
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-
-#: src/neochatconnection.cpp:240
 #, fuzzy, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, fuzzy, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
@@ -1202,7 +1202,7 @@ msgstr "Ne successat crear un contextu OpenGL"
 msgid "Report sent successfully."
 msgstr "Raport sta inviat successosimen."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1224,7 +1224,7 @@ msgid "Open NeoChat in this room"
 msgstr "Aperter NeoChat in ti chambre"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Responder"
@@ -1542,7 +1542,7 @@ msgstr "Image in li Paperiere"
 msgid "Attachment:"
 msgstr "Atachament:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1708,27 +1708,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr "Aperter in nov fenestre"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, fuzzy, kde-format
 msgid "Remove from Favourites"
 msgstr "Li preferet"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Adjunter al preferet"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marcar quam leet"
@@ -1753,18 +1753,18 @@ msgstr "Copiar li adresse al Paperiere"
 msgid "Notification State"
 msgstr "State:"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, fuzzy, kde-format
 msgid "Follow Global Setting"
 msgstr "Global"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Omni"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, fuzzy, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1772,26 +1772,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "Mentiones"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, fuzzy, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "No"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, fuzzy, kde-format
 msgid "Room Settings"
 msgstr "Parametres del chambre"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, fuzzy, kde-format
 msgid "Leave Room"
 msgstr "Forlassar li chambre"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@title"
@@ -1852,7 +1852,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1871,7 +1871,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -2194,25 +2194,24 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar chambres"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Iniciar conversation"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
+#, fuzzy, kde-format
-#: src/qml/RoomListPage.qml:312
+#| msgid "Start a Chat"
-#, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Iniciar conversation"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2242,38 +2241,14 @@ msgstr ""
 msgid "Create New"
 msgstr "Chambres e privat conversationes:"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "Explore Rooms"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Explorar chambres"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Find a room..."
-msgid "Find a room…"
-msgstr "Trovar un chambre..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, fuzzy, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Chambres"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Descargar"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2281,36 +2256,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Aperter li file"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, fuzzy, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Descargar:"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, fuzzy, kde-format
 msgid "Open Externally"
@@ -2611,28 +2569,44 @@ msgstr "Monstrar li avatar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, fuzzy, kde-format
+#| msgid "Rooms and private chats:"
+msgid "Rooms and private chats"
+msgstr "Chambres e privat conversationes:"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Separat"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Intermixtet"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, fuzzy, kde-format
 #| msgid "Edit"
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Modificar"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Usar li sintaxe «s/quo/nov-textu» por redacter li ultim missage"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Send typing notifications"
 msgstr "Inviar notificationes pri li tippada"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, fuzzy, kde-format
 msgid "Developer Settings"
 msgstr "Parametres del chambre"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2669,8 +2643,8 @@ msgstr "File"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "Nov privat conversation..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2813,17 +2787,17 @@ msgstr ""
 msgid "Loading"
 msgstr "Cargante..."
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reacter"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2903,7 +2877,7 @@ msgstr "Acceptar"
 msgid "Invite a User"
 msgstr "Invitar un usator"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Trovar un usator..."
@@ -2913,7 +2887,7 @@ msgstr "Trovar un usator..."
 msgid "Add"
 msgstr "Adjunter"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Null usatores disponibil"
@@ -2928,6 +2902,75 @@ msgstr "Inviar un invitation"
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Explorar chambres"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Trovar un chambre..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, fuzzy, kde-format
+#| msgid "Homeserver:"
+msgid "Home Server"
+msgstr "Hem-servitor:"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, fuzzy, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Chambres"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -3001,7 +3044,7 @@ msgstr "Selecter un local file"
 msgid "Send this location"
 msgstr "Inviar notificationes pri li tippada"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "Locations on a map"
@@ -3025,7 +3068,7 @@ msgstr "ID de Matrix:"
 msgid "Matrix ID"
 msgstr "ID de Matrix:"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3265,7 +3308,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "Remover li parol"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3628,7 +3671,7 @@ msgstr "Nómine del chambre"
 msgid "Muted room"
 msgstr "Assurdat"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, fuzzy, kde-format
 msgid "Configure room"
 msgstr "Configurar"
@@ -3685,45 +3728,45 @@ msgstr ""
 msgid "Search in this room"
 msgstr "Saliente Cinnamon"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, fuzzy, kde-format
 msgid "Remove room from favorites"
 msgstr "Remover ex li preferat"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, fuzzy, kde-format
 msgid "Make room favorite"
 msgstr "chambre"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, fuzzy, kde-format
 msgid "Show locations for this room"
 msgstr "Saliente Cinnamon"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Membres"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, fuzzy, kde-format
 #| msgid "Invite a User"
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Invitar un usator"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, fuzzy, kde-format
 msgid "Invite user to room"
 msgstr "Invitar un usator"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, fuzzy, kde-format
 #| msgid "%1 Member"
 #| msgid_plural "%1 Members"
@@ -3732,50 +3775,40 @@ msgid_plural "%1 members"
 msgstr[0] "%1 membre"
 msgstr[1] "%1 membres"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, fuzzy, kde-format
 #| msgid "No Member Count"
 msgid "No member count"
 msgstr "Sin númere de membres"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, fuzzy, kde-format
-msgid "No friends found"
+#| msgid "Show notifications"
-msgstr "Chambres"
+msgid "View notifications"
+msgstr "Monstrar notificationes"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, fuzzy, kde-format
 msgid "No rooms found"
 msgstr "Chambres"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, fuzzy, kde-format
 msgid "Search in room directory"
 msgstr "DIRECTORIA"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, fuzzy, kde-format
-msgid "Search in friend directory"
-msgstr "DIRECTORIA"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -3794,33 +3827,11 @@ msgstr "Information pri li chambre"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr ""
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, fuzzy, kde-format
 msgid "Message Source"
 msgstr "_Missage..."
 
-#: src/qml/RoomSearchPage.qml:25
-#, fuzzy, kde-format
-#| msgid "Direct Messages"
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Direct missages"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-msgid "Find messages…"
-msgstr "Ne successat inviar un missage D-Bus"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-msgid "No messages found"
-msgstr "Chambres"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3963,6 +3974,23 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, fuzzy, kde-format
+#| msgid "Direct Messages"
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Direct missages"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, fuzzy, kde-format
+msgid "No results found"
+msgstr "Chambres"
+
 #: src/qml/Security.qml:17
 #, fuzzy, kde-format
 #| msgid "Security"
@@ -4040,54 +4068,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Select omnicos"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, fuzzy, kde-format
-#| msgid "Homeserver:"
-msgid "Home Server"
-msgstr "Hem-servitor:"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4248,31 +4228,13 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Remover li parol"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, fuzzy, kde-format
-#| msgid "Show notifications"
-msgid "View notifications"
-msgstr "Monstrar notificationes"
-
-#: src/qml/SpaceDrawer.qml:86
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Show All Rooms"
 msgid "All Rooms"
 msgstr "Monstrar omni chambres"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, fuzzy, kde-format
-#| msgid "Create a Room"
-msgid "Create a space"
-msgstr "Crear un chambre"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4380,6 +4342,22 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Conversation"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, fuzzy, kde-format
+#| msgid "Rooms and private chats:"
+msgid "Create new chat"
+msgstr "Chambres e privat conversationes:"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4399,22 +4377,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ear al prim ínleet missage"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ear al ultim missage"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4489,14 +4467,7 @@ msgstr "Raportar li missage"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, fuzzy, kde-format
-#| msgid "Open a private chat"
-msgid "Invite to private chat"
 msgstr "Aperte un privat conversation"
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4538,28 +4509,6 @@ msgstr "Bannir ti usator"
 msgid "Username unavailable"
 msgstr "Null usatores disponibil"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Chambres"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4734,20 +4683,26 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, fuzzy, kde-format
 #| msgid "Loading…"
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "Cargante..."
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "_Conto:"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4864,41 +4819,6 @@ msgstr "Monstrar"
 msgid "Quit"
 msgstr "Surtir"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Iniciar conversation"
-
-#, fuzzy
-#~| msgid "Start a Chat"
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Iniciar conversation"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nov privat conversation..."
-
-#~ msgid "Chat"
-#~ msgstr "Conversation"
-
-#, fuzzy
-#~| msgid "Rooms and private chats:"
-#~ msgid "Create new chat"
-#~ msgstr "Chambres e privat conversationes:"
-
-#, fuzzy
-#~| msgid "Rooms and private chats:"
-#~ msgid "Rooms and private chats"
-#~ msgstr "Chambres e privat conversationes:"
-
-#~ msgid "Separated"
-#~ msgstr "Separat"
-
-#~ msgid "Intermixed"
-#~ msgstr "Intermixtet"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Direct missages"
-
 #~ msgid "[REDACTED]"
 #~ msgstr "[CENSURAT]"
 

po/it/neochat.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-14 10:45+0100\n"
+"PO-Revision-Date: 2024-02-16 09:14+0100\n"
 "Last-Translator: Vincenzo Reale <smart2128vr@gmail.com>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -17,52 +17,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Ricezione delle notifiche push"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Errore di rete: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Il token di accesso non è stato trovato"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forse è stato eliminato?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "L'accesso al portachiavi è stato negato."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Consenti a Neochat di leggere il token di accesso"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Nessun portachiavi trovato."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Installa un portachiavi, ad es. KWallet o il portachiavi di GNOME su Linux"
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Impossibile leggere il token di accesso"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "File troppo grande per essere scaricato."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Contatta l'amministratore del server Matrix per assistenza."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1079,52 +1089,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 ha reagito con %3"
 msgstr[1] "%2 hanno reagito con %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invitato"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Preferito"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Amici"
+msgstr "Messaggi diretti"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normale"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Bassa priorità"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Spazi"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "File troppo grande per essere scaricato."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Contatta l'amministratore del server Matrix per assistenza."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Creazione della stanza non riuscita: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Creazione dello spazio non riuscita: %1"
@@ -1134,7 +1134,7 @@ msgstr "Creazione dello spazio non riuscita: %1"
 msgid "Report sent successfully."
 msgstr "Segnalazione inviata correttamente."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1156,7 +1156,7 @@ msgid "Open NeoChat in this room"
 msgstr "Apri NeoChat in questa stanza"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Rispondi"
@@ -1461,7 +1461,7 @@ msgstr "Immagine dagli appunti"
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1627,27 +1627,27 @@ msgstr "Sei sicuro di voler uscire?"
 msgid "Open in New Window"
 msgstr "Apri in una nuova finestra"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Rimuovi dai preferiti"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Aggiungi ai preferiti"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Modifica la priorità"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Riduci priorità"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Marca come letto"
@@ -1670,18 +1670,18 @@ msgstr "Copia indirizzo negli appunti"
 msgid "Notification State"
 msgstr "Stato delle notifiche"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Segui le impostazioni globali"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Tutto"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1689,26 +1689,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@menzioni e parole chiave"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Spento"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Impostazioni della stanza"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Lascia la stanza"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1760,7 +1760,7 @@ msgid "Make this parent official"
 msgstr "Rendi ufficiale questa genitore"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1779,7 +1779,7 @@ msgstr "Scegli la stanza"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2099,25 +2099,23 @@ msgstr ""
 "questo dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Esplora le stanze"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Avvia una chat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Avvia una chat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2144,38 +2142,14 @@ msgstr "Cerca"
 msgid "Create New"
 msgstr "Crea nuovo"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "Explore Rooms"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Esplora le stanze"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Digita l'indirizzo di una stanza"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Find a room..."
-msgid "Find a room…"
-msgstr "Trova una stanza..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Nessuna stanza pubblica trovata"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Scarica"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2183,36 +2157,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Apri file"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Ferma lo scaricamento"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Carrozza: %1, posto: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Invia a KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2500,27 +2457,42 @@ msgstr "Mostra gli eventi di aggiornamento degli avatar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Stanze e chat private"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Separate"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Mescolate"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 "usa la sintassi s/testo/sostituzione per modificare il tuo ultimo messaggio"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Invia le notifiche di digitazione"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Impostazioni per sviluppatori"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Abilita gli strumenti per sviluppatori"
@@ -2557,8 +2529,8 @@ msgstr "File"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "Nuova chat privata…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2693,17 +2665,17 @@ msgstr "La registrazione è disabilitata su questo server."
 msgid "Loading"
 msgstr "Caricamento"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Questo messaggio è stato inviato da un dispositivo verificato"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reagisci"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Rispondi nella conversazione"
@@ -2785,7 +2757,7 @@ msgstr "Accetta"
 msgid "Invite a User"
 msgstr "Invita un utente"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Trova un utente..."
@@ -2795,7 +2767,7 @@ msgstr "Trova un utente..."
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nessun utente disponibile"
@@ -2810,6 +2782,74 @@ msgstr "Invia l'invito"
 msgid "User is either already a member or has been invited"
 msgstr "L'utente è già membro o è stato invitato"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Esplora le stanze"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Trova una stanza..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Aggiungi nuovo server"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Server principale"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Aggiungi nuovo server"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Aggiungi server"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Server valido inserito"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "Questo server non può essere risolto o è già stato aggiunto"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Il testo digitato non è un URL valido"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Digita l'URL del server, ad es. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "URL del server"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Digita l'indirizzo di una stanza"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Nessuna stanza pubblica trovata"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2880,7 +2920,7 @@ msgstr "Scegli una località"
 msgid "Send this location"
 msgstr "Invia questa località"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2901,7 +2941,7 @@ msgstr "ID Matrix:"
 msgid "Matrix ID"
 msgstr "ID Matrix"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3128,7 +3168,7 @@ msgstr "Abilita le evidenziazioni dei messaggi"
 msgid "Delete keyword"
 msgstr "Elimina la parola chiave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3479,7 +3519,7 @@ msgstr "Stato della stanza"
 msgid "Muted room"
 msgstr "Stanza silenziata"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Configura la stanza"
@@ -3531,95 +3571,82 @@ msgstr "Apri gli strumenti per sviluppatori"
 msgid "Search in this room"
 msgstr "Cerca in questa stanza"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Cerca"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Rimuovi la stanza dai preferiti"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Rendi preferita la stanza"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Mostra le posizioni per questa stanza"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Membri"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Invita un utente"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Invita utente alla stanza"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 membro"
 msgstr[1] "%1 membri"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Nessun conteggio dei membri"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
-#, fuzzy, kde-format
+#, kde-format
-#| msgid "No rooms found"
+msgid "View notifications"
-msgid "No friends found"
+msgstr "Visualizza le notifiche"
-msgstr "Nessuna stanza trovata"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nessuna stanza trovata"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Entra in qualche stanza per iniziare"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Cerca nella cartella delle stanze"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, fuzzy, kde-format
-#| msgid "Search in room directory"
-msgid "Search in friend directory"
-msgstr "Cerca nella cartella delle stanze"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Contrai %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3636,35 +3663,11 @@ msgstr "Media della stanza"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat non è in linea. Controlla la tua connessione alla rete."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Sorgente del messaggio"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Cerca messaggi"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-#| msgid "Send a message…"
-msgid "Find messages…"
-msgstr "Invia un messaggio…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, fuzzy, kde-format
-#| msgid "Enter a text to start searching"
-msgid "Enter text to start searching"
-msgstr "Inserisci un testo per iniziare la ricerca"
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgid "No messages found"
-msgstr "Nessun risultato trovato"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3814,6 +3817,22 @@ msgstr ""
 "I nuovi membri possono visualizzare la cronologia dei messaggi dal momento "
 "in cui sono entrati nella stanza virtuale."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Cerca messaggi"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Digita del testo per iniziare la ricerca"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Nessun risultato trovato"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3887,53 +3906,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Seleziona spazi"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Aggiungi nuovo server"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Server principale"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Aggiungi nuovo server"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Aggiungi server"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Server valido inserito"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "Questo server non può essere risolto o è già stato aggiunto"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Il testo digitato non è un URL valido"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Digita l'URL del server, ad es. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "URL del server"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4087,27 +4059,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Elimina la parola"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Visualizza le notifiche"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Tutte le stanze"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Amici"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Crea uno spazio"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4207,6 +4163,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Apri nuovamente URL SSO"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Chat"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Partecipa a una chat esistente"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Crea una nuova chat"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4229,22 +4200,22 @@ msgstr ""
 "Questo è l'inizio della chat. Non ci sono messaggi più datati oltre questo "
 "punto."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Passa al primo messaggio non letto"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salta all'ultimo messaggio"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Trascina qui gli elementi per condividerli"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4312,14 +4283,8 @@ msgstr "Rimuovi i messaggi"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Apri una chat privata"
-msgstr "Chat con %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Invita in chat privata"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4357,30 +4322,6 @@ msgstr "Nome utente:"
 msgid "Username unavailable"
 msgstr "None utente non disponibile"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, fuzzy, kde-format
-#| msgid "Enter a text to start searching"
-msgid "Enter text to start searching for your friends"
-msgstr "Inserisci un testo per iniziare la ricerca"
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Nessun risultato trovato"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4590,19 +4531,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Continua con un account esistente"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (caricamento)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Rimuovi questo account"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Accedi o crea con un nuovo account"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4718,38 +4665,6 @@ msgstr "Mostra"
 msgid "Quit"
 msgstr "Esci"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Avvia una chat"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Avvia una chat"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nuova chat privata…"
-
-#~ msgid "Chat"
-#~ msgstr "Chat"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Partecipa a una chat esistente"
-
-#~ msgid "Create new chat"
-#~ msgstr "Crea una nuova chat"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Stanze e chat private"
-
-#~ msgid "Separated"
-#~ msgstr "Separate"
-
-#~ msgid "Intermixed"
-#~ msgstr "Mescolate"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Messaggi diretti"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "Accesso non riuscito: token di accesso non valido o revocato"
 

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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,51 +14,61 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr ""
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1067,52 +1077,42 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr ""
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
@@ -1122,7 +1122,7 @@ msgstr ""
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1144,7 +1144,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr ""
@@ -1449,7 +1449,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr ""
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1610,27 +1610,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr ""
@@ -1653,18 +1653,18 @@ msgstr ""
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1672,26 +1672,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1743,7 +1743,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1762,7 +1762,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2069,24 +2069,22 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
@@ -2114,36 +2112,14 @@ msgstr ""
 msgid "Create New"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2151,36 +2127,19 @@ msgctxt ""
 msgid "Open File"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2460,26 +2419,41 @@ msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2516,7 +2490,7 @@ msgstr ""
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
 msgstr ""
 
 #: src/qml/GlobalMenu.qml:53
@@ -2652,17 +2626,17 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr ""
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2742,7 +2716,7 @@ msgstr ""
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2752,7 +2726,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2767,6 +2741,74 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2837,7 +2879,7 @@ msgstr ""
 msgid "Send this location"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2858,7 +2900,7 @@ msgstr ""
 msgid "Matrix ID"
 msgstr ""
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3083,7 +3125,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3425,7 +3467,7 @@ msgstr ""
 msgid "Muted room"
 msgstr ""
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3477,92 +3519,81 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3579,32 +3610,11 @@ msgstr ""
 msgid "NeoChat is offline. Please check your network connection."
 msgstr ""
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr ""
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3742,6 +3752,22 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr ""
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr ""
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3813,53 +3839,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4011,27 +3990,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr ""
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4131,6 +4094,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr ""
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4150,22 +4128,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4232,13 +4210,7 @@ msgstr ""
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
 msgstr ""
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4277,28 +4249,6 @@ msgstr ""
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr ""
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4472,19 +4422,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr ""
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 02:54+0100\n"
+"PO-Revision-Date: 2023-12-04 06:21+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <kde-i18n-doc@kde.org>\n"
 "Language: ka\n"
@@ -18,51 +18,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.3.2\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "პუშ გაფრთხილებების მიღება"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "ქსელის შეცდომა: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "წვდომის კოდი ვერ ვიპოვე"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "შეიძლება წაშლილია?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "ბრელოკთან წვდომა აკრძალულია."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "მიეცით უფლება NeoChat-ს, წვდომის კოდი წაიკითხოს"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "ბრელოკი მიუწვდომელია."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "დააყენეთ ბრელოკი, მაგალითად, ლინუქსზე KWallet ან GNOME Keyring"
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "წვდომის კოდის წაკითხვის შეცდომა"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "ფაილი გადმოსაწერად ძალიან დიდია."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "მხარდაჭერისთვის დაუკავშირდით თქვენი მატრიქსის სერვერის ადმინისტრატორს."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -458,9 +468,11 @@ msgid "Matrix client"
 msgstr "Matrix -ის კლიენტი"
 
 #: src/main.cpp:133
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "© 2018-2020 Black Hat, 2020-2023 KDE Community"
 msgid "© 2018-2020 Black Hat, 2020-2024 KDE Community"
-msgstr "© 2018-2020 Black Hat, 2020-2024 KDE -ის საზოგადოება"
+msgstr ""
+"© 2018-2020 Black Hat, 2020-2023 KDE -ის საზოგადოება, ყველა უფლება დაცულია"
 
 #: src/main.cpp:134
 #, kde-format
@@ -1076,52 +1088,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2-ის რეაქცია იყო %3"
 msgstr[1] "%2-ის რეაქცია იყო %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "მოწვეულია"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "რჩეული"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "მეგობრები"
+msgstr "პირდაპირი შეტყობინებები"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "ნორმალური"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "დაბალი პრიორიტეტი"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "სივრცეები"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "ფაილი გადმოსაწერად ძალიან დიდია."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "მხარდაჭერისთვის დაუკავშირდით თქვენი მატრიქსის სერვერის ადმინისტრატორს."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "ოთახის შექმნის შეცდომა: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "სივრცის შექმნის შეცდომა: %1"
@@ -1131,7 +1133,7 @@ msgstr "სივრცის შექმნის შეცდომა: %1"
 msgid "Report sent successfully."
 msgstr "ანგარიში წარმატებით გაიგზავნა."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1153,7 +1155,7 @@ msgid "Open NeoChat in this room"
 msgstr "ამ ოთახში NeoChat-ის გახსნა"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "პასუხი"
@@ -1458,7 +1460,7 @@ msgstr "ბუფერის გამოსახულება"
 msgid "Attachment:"
 msgstr "მიმაგრება:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1623,27 +1625,27 @@ msgstr "დარწმუნებული ბრძანდებით, რ
 msgid "Open in New Window"
 msgstr "ახალ ფანჯარაში გახსნა"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "რჩეულებიდან წაშლა"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "რჩეულებში ჩამატება"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "პრიორიტეტის აწევა"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "პრიორიტეტის დაწევა"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "მონიშნე როგორც წაკითხული"
@@ -1666,18 +1668,18 @@ msgstr "მისამართის ბუფერში კოპირე
 msgid "Notification State"
 msgstr "გაფრთხილების მდგომარეობა"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "გლობალური პარამეტრის მიყოლა"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "ყველა"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1685,26 +1687,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@ხსენებები და საკვანძო სიტყვები"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "გამორთული"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "ოთახის მორგება"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "ოთახიდან გასვლა"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1756,7 +1758,7 @@ msgid "Make this parent official"
 msgstr "ამ მშობლის გაოფიციალურება"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1775,7 +1777,7 @@ msgstr "აირჩიეთ ოთახი"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2089,25 +2091,23 @@ msgstr ""
 "გაუზიარებია."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "ოთახების დათვალიერება"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "იპოვეთ თქვენი მეგობრები"
+msgstr "საუბრის დაწყება"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "იპოვეთ თქვენი მეგობრები"
+msgstr "საუბრის დაწყება"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2134,36 +2134,14 @@ msgstr "ძებნა"
 msgid "Create New"
 msgstr "ახლის შექმნა"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "ოთახების დათვალიერება"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "შეიყვანეთ ოთახის მისამართი"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "ოთახის პოვნა…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "საჯარო ოთახი ვერ ვიპოვე"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2171,36 +2149,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "ფაილის გახსნა"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "გადმოწერის შეჩერება"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "გამძღოლი: %1, სავარძელი: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "გაგზავნა KDE Itinerary-სთვის"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2480,26 +2441,41 @@ msgstr "ავატარის განახლების მოვლე
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "ოთახები და პირადი საუბრები"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "განშორებული"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "არეული"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "რედაქტორი"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "ბოლო შეტყობინების ჩასასწორებლად s/text/replacement სინტაქსი გამოიყენეთ"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "კრეფის შეტყობინების გაგზავნა"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "დეველოპერის პარამეტრები"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "პროგრამირების ხელსაწყოების ჩართვა"
@@ -2536,8 +2512,8 @@ msgstr "ფაილი"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "იპოვეთ თქვენი მეგობრები"
+msgstr "ახალი პირადი ფანჯრის გახსნა…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2672,17 +2648,17 @@ msgstr "ამ სერვერზე რეგისტრაცია გა
 msgid "Loading"
 msgstr "იტვირთება"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "ეს შეტყობინება შემოწმებული მოწყობილობიდანაა გამოგზავნილი"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "რეაქცია"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "ნაკადში პასუხი"
@@ -2764,7 +2740,7 @@ msgstr "დასტური"
 msgid "Invite a User"
 msgstr "მომხმარებლის მოწვევა"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "მომხმარებლის პოვნა..."
@@ -2774,7 +2750,7 @@ msgstr "მომხმარებლის პოვნა..."
 msgid "Add"
 msgstr "დამატება"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "მომხმარებლები ხელმისაწვდომი არაა"
@@ -2789,6 +2765,74 @@ msgstr "მოსაწვევის გაგზავნა"
 msgid "User is either already a member or has been invited"
 msgstr "მომხმარებელი ან უკვე წევრია, ან მოწვეულია"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "ოთახების დათვალიერება"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "ოთახის პოვნა..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "ახალი სერვერის დამატება"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "სახლის სერვერი"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "ახალი სერვერის დამატება"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "სერვერის დამატება"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "შეყვანილი სერვერი სწორია"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "სერვერის ამოხსნა შეუძლებელია ან ის უკვე დამატებულია"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "შეყვანილი ტექსტი სწორ URL-ს არ წარმოადგენს"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "შეიყვანეთ სერვერის URL. მაგ: kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "სერვერის URL"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "შეიყვანეთ ოთახის მისამართი"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "საჯარო ოთახი ვერ ვიპოვე"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2859,7 +2903,7 @@ msgstr "აირჩიეთ მდებარეობა"
 msgid "Send this location"
 msgstr "ამ მდებარეობის გაგზავნა"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2880,7 +2924,7 @@ msgstr "Matrix ID:"
 msgid "Matrix ID"
 msgstr "Matrix ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3107,7 +3151,7 @@ msgstr "შეტყობინებების გამოკვეთი
 msgid "Delete keyword"
 msgstr "საკვანძო სიტყვის წაშლა"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3454,7 +3498,7 @@ msgstr "ოთახის მდგომარეობა"
 msgid "Muted room"
 msgstr "დადუმებული ოთახი"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "ოთახის მორგება"
@@ -3506,94 +3550,82 @@ msgstr "პროგრამისტის ხელსაწყოები
 msgid "Search in this room"
 msgstr "ამ ოთახში ძებნა"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "ძებნა"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "ოთახის რჩეულებიდან წაშლა"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "ოთახის რჩეულად მონიშვნა"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "ამ ოთახისთვის მდებარეობების ჩვენება"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "წევრები"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "მომხმარებლის მოწვევა"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "მომხმარებლის ოთახში მოწვევა"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 წევრი"
 msgstr[1] "%1 წევრი"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "წევრების რაოდენობის გარეშე"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "მეგობრები ვერ ვიპოვე"
+msgstr "გაფრთხილებების ნახვა"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "ოთახები ვერ ვიპოვე"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"თუ მეგობრები ჯერ არ დაგიმატებიათ, დააწკაპუნეთ ქვემოთ, რომ მოძებნოთ ისინი."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "დასაწყისისთვის შეუერთდით რომელიმე ოთახს"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "ოთახების დირექტორიაში ძებნა"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "ძებნა მეგობრების კატალოგში"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "%1-ის ჩაკეცვა"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3610,32 +3642,11 @@ msgstr "ოთახის მედია"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat გათიშულია. შეამოწმეთ ინტერნეტკავშირი."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "შეტყობინების წყარო"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "შეტყობინებების ძებნა"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "შეტყობინებების ძებნა…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "ძებნის დასაწყებად შეიყვანეთ ტექსტი"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "შეტყობინებების გარეშე"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3780,6 +3791,22 @@ msgstr ""
 "ახალ წევრებს შეტყობინებების ისტორიის ნახვა მათი ოთახში შემოსვლის მომენტის "
 "შემდეგ შეუძლიათ."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "შეტყობინებების ძებნა"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "ძებნის დასაწყებად შეიყვანეთ ტექსტი"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "შედეგების გარეშე"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3852,53 +3879,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "აირჩიეთ სივრცეები"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "ახალი სერვერის დამატება"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "სახლის სერვერი"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "ახალი სერვერის დამატება"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "სერვერის დამატება"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "შეყვანილი სერვერი სწორია"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "სერვერის ამოხსნა შეუძლებელია ან ის უკვე დამატებულია"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "შეყვანილი ტექსტი სწორ URL-ს არ წარმოადგენს"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "შეიყვანეთ სერვერის URL. მაგ: kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "სერვერის URL"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4052,27 +4032,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "სიტყვის წაშლა"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "გაფრთხილებების ნახვა"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "ყველა ოთახი"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "მეგობრები"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "სივრცის შექმნა"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4172,6 +4136,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "SSO შესვლის ბმულის ხელახლა გახსნა"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "ჩატი"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "არსებულ ჩატში შესვლა"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "ახალი ჩატის შექმნა"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4194,22 +4173,22 @@ msgid ""
 msgstr ""
 "ეს ჩატის დასაწყისია. ამ წერტილამდე, ისტორიაში, შეტყობინებები არ არსებობს."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "პირველ წაუკითხავ შეტყობინებაზე გადასვლა"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "უახლეს შეტყობინებებზე გადასვლა"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "გადმოათრიეთ საგნები აქ, მათ გასაზიარებლად"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4277,14 +4256,8 @@ msgstr "შეტყობინებების წაშლა"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "პირადი საუბრის გახსნა"
-msgstr "%1-სთან საუბარი"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "მოწვევა პირად საუბარში"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4322,28 +4295,6 @@ msgstr "მომხმარებელი:"
 msgid "Username unavailable"
 msgstr "მომხმარებელი ხელმისაწვდომი არაა"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "იპოვეთ თქვენი მეგობრები"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "იპოვეთ თქვენი მეგობრები…"
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "მეგობრების ძებნის დასაწყებად შეიყვანეთ ტექსტი"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "არაფერი მოიძებნა"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4531,19 +4482,26 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "არსებული ანგარიშით გაგრძელება"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (ჩატვირთვა)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit this account"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "ამ ანგარიშის ჩასწორება"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "შედით ან შექმენით ახალი ანგარიში"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4655,38 +4613,6 @@ msgstr "ჩვენება"
 msgid "Quit"
 msgstr "დატოვება"
 
-#~ msgid "Start a Chat"
-#~ msgstr "საუბრის დაწყება"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "საუბრის დაწყება"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "ახალი პირადი ფანჯრის გახსნა…"
-
-#~ msgid "Chat"
-#~ msgstr "ჩატი"
-
-#~ msgid "Join existing chat"
-#~ msgstr "არსებულ ჩატში შესვლა"
-
-#~ msgid "Create new chat"
-#~ msgstr "ახალი ჩატის შექმნა"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "ოთახები და პირადი საუბრები"
-
-#~ msgid "Separated"
-#~ msgstr "განშორებული"
-
-#~ msgid "Intermixed"
-#~ msgstr "არეული"
-
-#~ msgid "Direct Messages"
-#~ msgstr "პირდაპირი შეტყობინებები"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "შესვლის შეცდომა: წვდომის კოდი არასწორი ან გაუქმებულია"
 

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
 "PO-Revision-Date: 2023-02-25 01:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,51 +18,61 @@ 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/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr ""
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr ""
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1083,52 +1093,42 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr ""
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr ""
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
@@ -1138,7 +1138,7 @@ msgstr ""
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1160,7 +1160,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr ""
@@ -1465,7 +1465,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr ""
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1626,27 +1626,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr ""
@@ -1669,18 +1669,18 @@ msgstr ""
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1688,26 +1688,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1759,7 +1759,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1778,7 +1778,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2085,24 +2085,22 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
@@ -2130,36 +2128,14 @@ msgstr ""
 msgid "Create New"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2167,36 +2143,19 @@ msgctxt ""
 msgid "Open File"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr ""
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2476,26 +2435,41 @@ msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2532,7 +2506,7 @@ msgstr ""
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
 msgstr ""
 
 #: src/qml/GlobalMenu.qml:53
@@ -2668,17 +2642,17 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr ""
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2758,7 +2732,7 @@ msgstr ""
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2768,7 +2742,7 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2783,6 +2757,74 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2853,7 +2895,7 @@ msgstr ""
 msgid "Send this location"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2874,7 +2916,7 @@ msgstr ""
 msgid "Matrix ID"
 msgstr ""
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3099,7 +3141,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3443,7 +3485,7 @@ msgstr ""
 msgid "Muted room"
 msgstr ""
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3495,44 +3537,44 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
@@ -3541,49 +3583,38 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3600,32 +3631,11 @@ msgstr ""
 msgid "NeoChat is offline. Please check your network connection."
 msgstr ""
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr ""
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3763,6 +3773,22 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr ""
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr ""
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3834,53 +3860,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr ""
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4032,27 +4011,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr ""
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr ""
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4152,6 +4115,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr ""
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4171,22 +4149,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4255,13 +4233,7 @@ msgstr ""
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
 msgstr ""
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4300,28 +4272,6 @@ msgstr ""
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr ""
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4495,19 +4445,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr ""
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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,52 +20,62 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Send varsling om skriving"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Nettverksfeil: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Fann ikkje tilgangspollett"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Kanskje han er sletta?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Vart nekta tilgang til nøkkelring."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Gje NeoChat løyve til å lesa tilgangspolletten"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Ingen nøkkelring er tilgjengeleg."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Klarte ikkje lesa tilgangspollett"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Fila er for stor til å kunna lastast ned."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Ta kontakt med administratoren av Matrix-tenaren for brukarstøtte."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1096,55 +1106,45 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 reagerte med %3"
 msgstr[1] "%2 reagerte med %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Invitert"
 
 # Favorittrom.
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Favorittar"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr ""
+msgstr "Direktemeldingar"
 
 # Vanlege rom, og bør derfor vera i fleirtal.
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Vanlege"
 
 # Lågt prioriterte rom
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Lågt prioriterte"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Område"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Fila er for stor til å kunna lastast ned."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Ta kontakt med administratoren av Matrix-tenaren for brukarstøtte."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Feil ved romregistrering: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Feil ved registrering av område: %1"
@@ -1154,7 +1154,7 @@ msgstr "Feil ved registrering av område: %1"
 msgid "Report sent successfully."
 msgstr "Rapporten er no send."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1176,7 +1176,7 @@ msgid "Open NeoChat in this room"
 msgstr "Opna NeoChat i dette rommet"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Svar"
@@ -1484,7 +1484,7 @@ msgstr "Utklippstavle-bilete"
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1647,28 +1647,28 @@ msgstr "Er du sikker på at du vil logga ut?"
 msgid "Open in New Window"
 msgstr "Opna i nytt vindauge"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Fjern frå favorittar"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Merk som favoritt"
 
 # Er det motsette av nedprioritering, så «reprioriter» blir feil (det kan vera både opp og ned).
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Prioriter opp"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Prioriter ned"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Merk som lese"
@@ -1691,18 +1691,18 @@ msgstr "Kopier adressa til utklippstavla"
 msgid "Notification State"
 msgstr "Varslingsnivå"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Følg dei globale innstillingane"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Alle"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1710,26 +1710,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@-nemning og nøkkelord"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Av"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Romval"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Forlat rommet"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1788,7 +1788,7 @@ msgid "Make this parent official"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1807,7 +1807,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2120,24 +2120,22 @@ msgstr ""
 "denne eininga."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Utforsk rom"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "Start prat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
@@ -2168,40 +2166,14 @@ msgstr "Søk"
 msgid "Create New"
 msgstr "Start ny prat"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "Explore Rooms"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Utforsk rom"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Find a room..."
-msgid "Find a room…"
-msgstr "Finn eit rom …"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, fuzzy, kde-format
-#| msgctxt "@info:label"
-#| msgid "No rooms found"
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Fann ingen rom"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Last ned"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2209,38 +2181,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Opna fil"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Stopp nedlasting"
 
-#: src/qml/FileDelegate.qml:216
-#, fuzzy, kde-format
-#| msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
-#| msgid "Lat: %1, Lon: %2"
-msgid "Coach: %1, Seat: %2"
-msgstr "Breiddegr.: %1 – lengdegr.: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2527,26 +2480,41 @@ msgstr "Vis avataroppdateringar"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Rom og privatprat"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Skilde"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Blanda"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Tekstredigering"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Bruk «s/tekst/erstatning»-syntaks for å redigera førre melding"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Send varsling om skriving"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Utviklarinnstillingar"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Vis utviklarverktøy"
@@ -2583,8 +2551,8 @@ msgstr "Fil"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "Ny privat prat …"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2719,17 +2687,17 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Meldinga vart send frå ei stadfesta eining"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reager"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2812,7 +2780,7 @@ msgstr "Godta"
 msgid "Invite a User"
 msgstr "Inviter ein brukar"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Finn brukar …"
@@ -2822,7 +2790,7 @@ msgstr "Finn brukar …"
 msgid "Add"
 msgstr "Legg til"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Ingen brukarar er tilgjengelege"
@@ -2837,6 +2805,77 @@ msgstr "Send invitasjon"
 msgid "User is either already a member or has been invited"
 msgstr "Brukaren er alt medlem eller invitert"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Utforsk rom"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Finn eit rom …"
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Legg til ny tenar"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Heimetenar"
+
+#: src/qml/JoinRoomPage.qml:106
+#, fuzzy, kde-format
+#| msgid "Add new server"
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Legg til ny tenar"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Legg tenar"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Gyldig tenar"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Oppgjeven tekst er ikkje ei gyldig adresse"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Skriv inn adressa til tenaren, eks. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Tenaradresse"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, fuzzy, kde-format
+#| msgctxt "@info:label"
+#| msgid "No rooms found"
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Fann ingen rom"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2908,7 +2947,7 @@ msgstr "Vel posisjon"
 msgid "Send this location"
 msgstr "Send denne posisjonen"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2929,7 +2968,7 @@ msgstr "Matrix-ID:"
 msgid "Matrix ID"
 msgstr "Matrix-ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3158,7 +3197,7 @@ msgstr "Slå på framheving av meldingar"
 msgid "Delete keyword"
 msgstr "Slett nøkkelord"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3516,7 +3555,7 @@ msgstr ""
 msgid "Muted room"
 msgstr "Dempa rom"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Set opp rommet"
@@ -3571,95 +3610,83 @@ msgstr "Opna utviklarverktøy"
 msgid "Search in this room"
 msgstr "Søk i rommet"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Søk"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Fjern rommet frå favorittar"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Gjer rommet til favoritt"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Vis posisjonar i rommet"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Medlemmar"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Inviter ein brukar"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Inviter brukar til rommet"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 medlem"
 msgstr[1] "%1 medlemmar"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Manglar medlemstal"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, fuzzy, kde-format
-#| msgid "No rooms found"
+#| msgid "Mute notifications"
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Fann ingen rom"
+msgstr "Demp varslingar"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Fann ingen rom"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Start ved å verta med i nokre rom"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Søk i romkatalogen"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, fuzzy, kde-format
-#| msgid "Search in room directory"
-msgid "Search in friend directory"
-msgstr "Søk i romkatalogen"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Fald saman %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3676,35 +3703,11 @@ msgstr ""
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat er fråkopla. Sjå til at du er kopla til nettet."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Meldingskjelde"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Søk etter meldingar"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-#| msgid "Send a message…"
-msgid "Find messages…"
-msgstr "Send ei melding …"
-
-#: src/qml/RoomSearchPage.qml:37
-#, fuzzy, kde-format
-#| msgid "Enter a text to start searching"
-msgid "Enter text to start searching"
-msgstr "Skriv inn tekst for å starta søket"
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgid "No messages found"
-msgstr "Ingen søkjetreff"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3852,6 +3855,22 @@ msgstr ""
 "Nye medlemmar kan sjå dei meldingane i loggen som er skrivne etter at dei "
 "vart med i rommet."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Søk etter meldingar"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Skriv inn tekst for å starta søket"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Ingen søkjetreff"
+
 #: src/qml/Security.qml:17
 #, fuzzy, kde-format
 #| msgid "Security"
@@ -3935,54 +3954,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Merk alt"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Legg til ny tenar"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Heimetenar"
-
-#: src/qml/ServerComboBox.qml:67
-#, fuzzy, kde-format
-#| msgid "Add new server"
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Legg til ny tenar"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Legg tenar"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Gyldig tenar"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Oppgjeven tekst er ikkje ei gyldig adresse"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Skriv inn adressa til tenaren, eks. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Tenaradresse"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4137,29 +4108,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Fjern ord"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, fuzzy, kde-format
-#| msgid "Mute notifications"
-msgid "View notifications"
-msgstr "Demp varslingar"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Alle rom"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, fuzzy, kde-format
-#| msgid "Create a Space"
-msgid "Create a space"
-msgstr "Opprett område"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4270,6 +4223,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Prat"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Vert med i prat"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Start ny prat"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4289,22 +4257,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Gå til første ulesne melding"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Gå til nyaste melding"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Dra element her for å dela dei"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4374,14 +4342,7 @@ msgstr "Fjern meldingar"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, fuzzy, kde-format
-#| msgid "Open a private chat"
-msgid "Invite to private chat"
 msgstr "Start privat prat"
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4420,30 +4381,6 @@ msgstr ""
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, 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:82
-#, fuzzy, kde-format
-#| msgid "No results found"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Ingen søkjetreff"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4636,7 +4573,7 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Logg på registrert konto"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, fuzzy, kde-format
 #| msgctxt "Job heading, like 'Copying'"
 #| msgid "Uploading"
@@ -4644,14 +4581,21 @@ msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "Lastar opp"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit this account"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Rediger kontoen"
+
+#: src/qml/WelcomePage.qml:123
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Logg på registrert konto"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"

po/pl/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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 08:12+0100\n"
+"PO-Revision-Date: 2024-01-27 11:05+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -19,51 +19,61 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Otrzymywanie powiadomień Push"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Błąd sieciowy: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Nie znaleziono żadnego tokena dostępu"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Może został usunięty?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Odmówiono dostępu do pęku kluczy."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Zezwól NeoChatowi odczytać tokena dostępowego"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Brak pęku kluczy."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Wgraj pęk kluczy, np. KWallet lub pęk kluczy GNOME dla Linuksa"
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Nie można odczytać tokena dostępu"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Plik jest zbyt duży do pobrania."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Napisz do obsługi twojego serwera Matriksa z prośbą o pomoc."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1082,52 +1092,42 @@ msgstr[0] "%2 zareagował %3"
 msgstr[1] "%2 zareagował %3"
 msgstr[2] "%2 zareagował %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Zaproszone"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Ulubione"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Znajomi"
+msgstr "Bezpośrednie wiadomości"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Niski priorytet"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Odstępy"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Plik jest zbyt duży do pobrania."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Napisz do obsługi twojego serwera Matriksa z prośbą o pomoc."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Nie udało się utworzyć pokoju: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Nie udało się utworzyć przestrzeni: %1"
@@ -1137,7 +1137,7 @@ msgstr "Nie udało się utworzyć przestrzeni: %1"
 msgid "Report sent successfully."
 msgstr "Pomyślnie wysłano zgłoszenie."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1159,7 +1159,7 @@ msgid "Open NeoChat in this room"
 msgstr "Otwórz NeoChat w tym pokoju"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Odpowiedz"
@@ -1464,7 +1464,7 @@ msgstr "Obraz ze schowka"
 msgid "Attachment:"
 msgstr "Załącznik:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1629,27 +1629,27 @@ msgstr "Czy na pewno chcesz się wypisać?"
 msgid "Open in New Window"
 msgstr "Otwórz w nowym oknie"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Usuń z ulubionych"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Dodaj do ulubionych"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Zmień priorytet"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Obniż priorytet"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Oznacz jako przeczytane"
@@ -1672,18 +1672,18 @@ msgstr "Skopiuj adres do schowka"
 msgid "Notification State"
 msgstr "Stan powiadomienia"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Zgodnie z ustawieniami ogólnymi"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Wszystkie"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1691,26 +1691,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Wzmianki i Słowa Kluczowe"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Wył."
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Ustawienia pokoju"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Opuść pokój"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1762,7 +1762,7 @@ msgid "Make this parent official"
 msgstr "Uczyń tego podrzędnego oficjalnym"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1781,7 +1781,7 @@ msgstr "Wybierz pokój"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2099,25 +2099,23 @@ msgstr ""
 "urządzeniowi."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Przeglądaj pokoje"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Znajdź swoich znajomych"
+msgstr "Rozpocznij rozmowę"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Znajdź swoich znajomych"
+msgstr "Rozpocznij rozmowę"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2144,36 +2142,14 @@ msgstr "Poszukaj"
 msgid "Create New"
 msgstr "Utwórz nowy"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Przeglądaj pokoje"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Wpisz adres pokoju"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Znajdź pokój…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Nie znaleziono żadnego publicznego pokoju"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Pobierz"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2181,36 +2157,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Otwórz plik"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Zatrzymaj pobieranie"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Autobus: %1 Siedzenie: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Wyślij do KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2490,26 +2449,41 @@ msgstr "Pokaż uaktualnienia awatarów"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Pokoje i prywatne rozmowy"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Oddzielone"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Złączone"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Użyj składni s/tekst/zastąpienie do zmiany swojej ostatniej wiadomości"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Powiadamiaj o pisaniu"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Ustawienia programisty"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Włącz narzędzia programistów"
@@ -2546,8 +2520,8 @@ msgstr "Plik"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Znajdź swoich znajomych"
+msgstr "Nowa rozmowa prywatna..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2682,17 +2656,17 @@ msgstr "Rejestrowanie się na ten serwer jest wyłączone."
 msgid "Loading"
 msgstr "Wczytywanie"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Wiadomość tę wysłano ze sprawdzonego urządzenia"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Dodaj reakcję"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Odpowiedz w wątku"
@@ -2774,7 +2748,7 @@ msgstr "Zaakceptuj"
 msgid "Invite a User"
 msgstr "Zaproś użytkownika"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Znajdź użytkownika…"
@@ -2784,7 +2758,7 @@ msgstr "Znajdź użytkownika…"
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Brak dostępnych użytkowników"
@@ -2799,6 +2773,74 @@ msgstr "Wyślij zaproszenie"
 msgid "User is either already a member or has been invited"
 msgstr "Użytkownik jest już członkiem lub został zaproszony"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Przeglądaj pokoje"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Znajdź pokój…"
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Dodaj nowy serwer"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Serwer domowy"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Dodaj nowy serwer"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Dodawanie serwera"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Wpisano prawidłowy serwer"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "Nie można ustalić położenia tego serwera lub już został dodany"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Wpisany tekst jest nieprawidłowym adresem url"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Wpisz adres URL serwera np. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Adres URL serwera"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Wpisz adres pokoju"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Nie znaleziono żadnego publicznego pokoju"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2869,7 +2911,7 @@ msgstr "Wybierz położenie"
 msgid "Send this location"
 msgstr "Wyślij to położenie"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2890,7 +2932,7 @@ msgstr "ID Matriksa:"
 msgid "Matrix ID"
 msgstr "ID Matriksa"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3117,7 +3159,7 @@ msgstr "Włącz skróty wiadomości"
 msgid "Delete keyword"
 msgstr "Usuń słowo kluczowe"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3468,7 +3510,7 @@ msgstr "Stan pokoju"
 msgid "Muted room"
 msgstr "Wyciszony pokój"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Ustawienia pokoju"
@@ -3520,44 +3562,44 @@ msgstr "Otwórz narzędzia programistów"
 msgid "Search in this room"
 msgstr "Poszukaj w tym pokoju"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Poszukaj"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Usuń pokój z ulubionych"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Dodaj pokój do ulubionych"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Pokaż miejsca dla tego pokoju"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Członkowie"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Zaproś użytkownika"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Zaproś użytkownika do pokoju"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
@@ -3565,51 +3607,38 @@ msgstr[0] "%1 członek"
 msgstr[1] "%1 członków"
 msgstr[2] "%1 członków"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Brak liczby członków"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Nie znaleziono żadnych znajomych"
+msgstr "Obejrzyj powiadomienia"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
-msgstr "Nie znaleziono żadnych pokojów"
+msgstr "Nie znaleziono pokojów"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Nie masz jeszcze żadnych swoich znajomych, naciśnij poniżej, aby ich "
-"poszukać."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Aby rozpocząć, dołącz do dowolnego pokoju"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
-msgstr "Poszukaj w katalogu pokojów"
+msgstr "Szukaj w katalogu pokojów"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Poszukaj w katalogu znajomych"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Zwiń %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3626,32 +3655,11 @@ msgstr "Multimedia pokoju"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat jest odłączony od sieci. Sprawdź swoje połączenie sieciowe."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Źródło wiadomości"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Poszukaj wiadomości"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Znajdź wiadomości…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Wpisz tekst, aby rozpocząć wyszukiwanie"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "Nie znaleziono żadnych wiadomości"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3796,6 +3804,22 @@ msgid ""
 msgstr ""
 "Nowi członkowie mogą przeglądać historię rozmów od czasu ich dołączenia."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Poszukaj wiadomości"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Wpisz tekst, aby rozpocząć wyszukiwanie"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Nie znaleziono wyników"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3869,53 +3893,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Zaznacz przestrzenie"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Dodaj nowy serwer"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Serwer domowy"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Dodaj nowy serwer"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Dodawanie serwera"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Wpisano prawidłowy serwer"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "Nie można ustalić położenia tego serwera lub już został dodany"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Wpisany tekst jest nieprawidłowym adresem url"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Wpisz adres URL serwera np. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Adres URL serwera"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4069,27 +4046,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Usuń słowo"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Obejrzyj powiadomienia"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Wszystkie pokoje"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Znajomi"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Utwórz przestrzeń"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4189,6 +4150,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Ponownie otwórz adres URL SSO"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Rozmowa"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Dołącz do istniejącej rozmowy"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Utwórz nową rozmowę"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4209,22 +4185,22 @@ msgid ""
 msgstr ""
 "Jest to początek rozmowy. Nie ma wiadomości historycznych poza ten punkt."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Przeskocz do pierwszej nieprzeczytanej wiadomości"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Przeskocz do ostatniej wiadomości"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Przeciągnij tutaj elementy, aby je udostępnić"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4293,14 +4269,8 @@ msgstr "Usuń wiadomości"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Rozpocznij prywatną rozmowę"
-msgstr "Porozmawiaj z %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Zaproś do prywatnej rozmowy"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4338,28 +4308,6 @@ msgstr "Nazwa użytkownika:"
 msgid "Username unavailable"
 msgstr "Nazwa użytkownika jest niedostępna"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Znajdź swoich znajomych"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Znajdź swoich znajomych…"
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "Wpisz tekst, aby zacząć szukać swoich znajomych"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Nie znaleziono niczego, co by odpowiadało"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4559,19 +4507,26 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Skorzystaj z istniejącego konta"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (wczytywanie)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit this account"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Edytuj to konto"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Wejdź lub utwórz nowe konto"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4685,38 +4640,6 @@ msgstr "Pokaż"
 msgid "Quit"
 msgstr "Zakończ"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Rozpocznij rozmowę"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Rozpocznij rozmowę"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nowa rozmowa prywatna..."
-
-#~ msgid "Chat"
-#~ msgstr "Rozmowa"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Dołącz do istniejącej rozmowy"
-
-#~ msgid "Create new chat"
-#~ msgstr "Utwórz nową rozmowę"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Pokoje i prywatne rozmowy"
-
-#~ msgid "Separated"
-#~ msgstr "Oddzielone"
-
-#~ msgid "Intermixed"
-#~ msgstr "Złączone"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Bezpośrednie wiadomości"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "Nie udało się wejść: token dostępowy nieprawidłowy lub unieważniony"
 

po/sl/neochat.po

@@ -1,70 +1,80 @@
-# Copyright (C) YEAR This file is copyright:
+# Copyright (C) 2024 This file is copyright:
 # This file is distributed under the same license as the neochat package.
 #
 #
-# Matjaž Jeran <matjaz.jeran@amis.net>, 2020, 2021, 2022, 2023.
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023, 2024 Matjaž Jeran <matjaz.jeran@amis.net>
 # Martin Srebotnjak <miles@filmsi.net>, 2021,2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-23 13:19+0100\n"
+"PO-Revision-Date: 2024-02-18 06:06+0100\n"
 "Last-Translator: Matjaž Jeran <matjaz.jeran@amis.net>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100>=3 && n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100<=4 ? 2 : 3);\n"
+"%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 3.4.2\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Sprejemanje potisnih obvestil"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Napaka omrežja: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Žetona za dostop ni bilo mogoče najti"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Ali je bil mogoče izbrisan?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Dostop do verige ključev je bil zavrnjen."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Dovolite, da NeoChat prebere žeton za dostop"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Nobene verige ključev ni na voljo."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Žetona za dostop ni mogoče prebrati"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Datoteka je prevelika za prenos."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Stopite v stik za podporo z vašim skrbnikom matrixa."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1088,52 +1098,42 @@ msgstr[1] "%2 sta reagirala z %3"
 msgstr[2] "%2 so reagirali z %3"
 msgstr[3] "%2 je reagiralo z %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Povabljen"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Priljubljen"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Prijatelji"
+msgstr "Neposredna sporočila"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Nizka prednost"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Presledki"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Datoteka je prevelika za prenos."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Stopite v stik za podporo z vašim skrbnikom matrixa."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ustvarjanje sobe ni uspelo: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ustvarjanje prostora ni uspelo: %1"
@@ -1143,7 +1143,7 @@ msgstr "Ustvarjanje prostora ni uspelo: %1"
 msgid "Report sent successfully."
 msgstr "Poročilo uspešno poslano."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1165,7 +1165,7 @@ msgid "Open NeoChat in this room"
 msgstr "Odpri Neo-chat v tej sobi"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Odgovori"
@@ -1470,7 +1470,7 @@ msgstr "Slika odložišča"
 msgid "Attachment:"
 msgstr "Priloga:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1635,27 +1635,27 @@ msgstr "Ali se zares želite odjaviti?"
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Odstrani iz priljubljenih"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Dodaj med priljubljene"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Ponovno določi prednost"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Odtegni prednost"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Označi kot prebrano"
@@ -1678,18 +1678,18 @@ msgstr "Kopiraj naslov na odložišče"
 msgid "Notification State"
 msgstr "Stanje obvestil"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Sledi globalni nastavitvi"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Vse"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1697,26 +1697,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Omembe in ključne besede"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Izklopljeno"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Nastavitve sobe"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Zapusti sobo"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1768,7 +1768,7 @@ msgid "Make this parent official"
 msgstr "Določi tega nadrejenega kot uradnega"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1787,7 +1787,7 @@ msgstr "Poberite sobo"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2099,25 +2099,23 @@ msgstr ""
 "To sporočilo je šifrirano in pošiljatelj še ni delil ključa s to napravo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Razišči sobe"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Poišči vaše prijatelje"
+msgstr "Začni debato"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Poišči vaše prijatelje"
+msgstr "Začni klepet"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2144,36 +2142,14 @@ msgstr "Išči"
 msgid "Create New"
 msgstr "Ustvari nov"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Razišči sobe"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Vnesite naslov sobe"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Najdi sobo…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Nobene javne sobe ni najdene"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "Prenos"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2181,36 +2157,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Odpri datoteko"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "Ustavi prenos"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Vozilo: %1, Sedež: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "Pošlji v KDE Itinerary"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2491,27 +2450,42 @@ msgstr "Prikaži dogodke posodobitve avatarjev"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Sobe in zasebni klepeti"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Ločeno"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Zmešano"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 "Uporabi skladnjo s/besedilo/zamenjava za urejanje vašega zadnjega sporočila"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Pošlji besedilna obvestila"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Nastavitve razvoja"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Omogoči razvojna orodja"
@@ -2548,8 +2522,8 @@ msgstr "Datoteka"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Najdi vaše prijatelje"
+msgstr "Nov zasebni razgovor…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2684,17 +2658,17 @@ msgstr "Registracija je onemogočena na tem strežniku."
 msgid "Loading"
 msgstr "Nalaganje"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "To sporočilo je bilo poslano iz verificirane naprave"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Reagiraj"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "Odgovori v niti"
@@ -2776,7 +2750,7 @@ msgstr "Sprejemam"
 msgid "Invite a User"
 msgstr "Povabi uporabnika"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Najdi uporabnika..."
@@ -2786,7 +2760,7 @@ msgstr "Najdi uporabnika..."
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nobenega uporabnika ni na voljo"
@@ -2801,6 +2775,74 @@ msgstr "Pošlji povabilo"
 msgid "User is either already a member or has been invited"
 msgstr "Uporabnik je ali že član ali je bil povabljen"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Razišči sobe"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Najdi sobo..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Dodaj novi strežnik"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Domači strežnik"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Dodaj novi strežnik"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Dodaj strežnik"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Vnesen veljaven strežnik"
+
+#: src/qml/JoinRoomPage.qml:151
+#, 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/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Vneseno besedilo ni veljavni naslov url"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Vnesite strežnikov naslov url npr. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Strežnikov naslov url"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Vnesite naslov sobe"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Nobene javne sobe ni najdene"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2871,7 +2913,7 @@ msgstr "Izberi lokacijo"
 msgid "Send this location"
 msgstr "Pošlji to lokacijo"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2892,7 +2934,7 @@ msgstr "Matrixov ID:"
 msgid "Matrix ID"
 msgstr "Matrixov ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3119,7 +3161,7 @@ msgstr "Omogoči osvetljevanje obvestil"
 msgid "Delete keyword"
 msgstr "Izbriši ključno besedo"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3465,7 +3507,7 @@ msgstr "Stanje sobe"
 msgid "Muted room"
 msgstr "Utišana soba"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Nastavi sobo"
@@ -3517,44 +3559,44 @@ msgstr "Odpri razvojna orodja"
 msgid "Search in this room"
 msgstr "Išči v tej sobi"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Išči"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Odstrani sobo izmed priljubljenih"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Proglasi sobo za priljubljeno"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Pokaži lokacije za to sobo"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Člani"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Povabi uporabnika"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Povabite uporabnika v sobo"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
@@ -3563,51 +3605,38 @@ msgstr[1] "%1 člana"
 msgstr[2] "%1 člani"
 msgstr[3] "%1 članov"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Ni števila članov"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Ni najti nobenega prijatelja"
+msgstr "Poglej obvestila"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nobene sobe ni mogoče najti"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Dodali niste še nobenega od svojih prijateljev, kliknite spodaj, da jih "
-"poiščete"
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Pridruži se nekaj sobam za začetek"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Poišči v imeniku sob"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Poišči v imeniku prijateljev"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Strni %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3624,32 +3653,11 @@ msgstr "Mediji sobe"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat je brez povezave. Preverite omrežno povezavo."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "Vir sporočila"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "Išči sporočila"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "Najdi sporočila…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Vnesite besedilo za začetek iskanja"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "Ni najdenih sporočil"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3796,6 +3804,22 @@ msgstr ""
 "Novi člani lahko vidijo zgodovino sporočil od trenutka, ko so se pridružili "
 "sobi."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "Išči sporočila"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Vnesite besedilo, da začnem iskati"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Ni najdenih zadetkov"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3869,53 +3893,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Izberi prostore"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Dodaj novi strežnik"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Domači strežnik"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Dodaj novi strežnik"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Dodaj strežnik"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Vnesen veljaven strežnik"
-
-#: src/qml/ServerComboBox.qml:116
-#, 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:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Vneseno besedilo ni veljavni naslov url"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Vnesite strežnikov naslov url npr. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Strežnikov naslov url"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4069,27 +4046,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Izbriši besedo"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Poglej obvestila"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Vse sobe"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Prijatelji"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Ustvari prostor"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4189,6 +4150,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "Ponovno odpri URL za enovito prijavo"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Debata"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Pridružite se obstoječem klepetu"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Ustvari nov klepet"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4209,22 +4185,22 @@ msgid ""
 msgstr ""
 "To je začetek klepeta. Onkraj te točke ni nobenih sporočil v zgodovini."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Skoči na prvo neprebrano sporočilo"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Skoči na nedavno sporočilo"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Povleci predmete sem, da jih deliš z drugimi"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4294,14 +4270,8 @@ msgstr "Odstrani sporočila"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Odpri zasebni razgovor"
-msgstr "Klepet z %1"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Povabi na zasebni klepet"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4339,28 +4309,6 @@ msgstr "Uporabniško ime:"
 msgid "Username unavailable"
 msgstr "Uporabniško ime ni na voljo"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Poišči vaše prijatelje"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Poišči vaše prijatelje…"
-
-#: src/qml/UserSearchPage.qml:81
-#, 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:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Ni najdenih zadetkov"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4558,19 +4506,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Nadaljuj na obstoječem računu"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (nalaganje)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Odstrani ta račun"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Prijavite se ali ustvarite nov račun"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4682,38 +4636,6 @@ msgstr "Prikaži"
 msgid "Quit"
 msgstr "Zapusti"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Začni debato"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Začni klepet"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Nov zasebni razgovor…"
-
-#~ msgid "Chat"
-#~ msgstr "Debata"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Pridružite se obstoječem klepetu"
-
-#~ msgid "Create new chat"
-#~ msgstr "Ustvari nov klepet"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Sobe in zasebni klepeti"
-
-#~ msgid "Separated"
-#~ msgstr "Ločeno"
-
-#~ msgid "Intermixed"
-#~ msgstr "Zmešano"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Neposredna sporočila"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "Neuspela prijava: Žeton za dostop je neveljaven ali preklican"
 

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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+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-"
@@ -16,56 +16,68 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : 3;\n"
+"Plural-Forms: nplurals=4; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || n%10>=5 && n%10<=9 || n"
+"%100>=11 && n%100<=14 ? 2 : 3;\n"
 "X-Generator: Poedit 3.4.2\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Receiving push notifications"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "pakala linluwi: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "nanpa sijelo len li ken ala alasa"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "ken la ona li kama ala"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "poki len li pana ala e ken kepeken"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "o ken e ilo NeoChat tawa nanpa sijelo len"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "poki len li lon ala."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "mi ken ala kepeken nanpa sijelo len."
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "lipu li suli pi ken jo ala."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "o toki tawa lawa sina pi ilo Matrix."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1117,52 +1129,42 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr ""
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "lipu li suli pi ken jo ala."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "o toki tawa lawa sina pi ilo Matrix."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
@@ -1172,7 +1174,7 @@ msgstr ""
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1195,7 +1197,7 @@ msgid "Open NeoChat in this room"
 msgstr ""
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr ""
@@ -1508,7 +1510,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr "lipu:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1675,27 +1677,27 @@ msgstr ""
 msgid "Open in New Window"
 msgstr "o lukin lon lipu sin"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr ""
@@ -1718,18 +1720,18 @@ msgstr ""
 msgid "Notification State"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1737,26 +1739,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr ""
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgctxt "@title"
@@ -1812,7 +1814,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1831,7 +1833,7 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Create a Room"
@@ -2146,25 +2148,24 @@ msgid ""
 msgstr "toki ni li len. jan pana li pana ala e ken pi lukin len tawa ilo ni."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "o lon e tomo toki"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
+#, fuzzy, kde-format
-#: src/qml/RoomListPage.qml:312
+#| msgid "Start a Chat"
-#, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "o lon e tomo toki"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2194,38 +2195,14 @@ msgstr ""
 msgid "Create New"
 msgstr "o open e tomo toki pi sina tu taso"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, fuzzy, kde-format
-#| msgid "Create a Room"
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "o pali e tomo toki"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr ""
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "Find a room…"
-msgstr "o pana e toki"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "o kama jo"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2233,36 +2210,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "o open e lipu ni"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "o pini e kama jo"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2553,27 +2513,43 @@ msgstr ""
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, fuzzy, kde-format
+#| msgid "Open a private chat"
+msgid "Rooms and private chats"
+msgstr "o open e tomo toki pi sina tu taso"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr ""
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, fuzzy, kde-format
 #| msgid "Edit"
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "ante"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr ""
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr ""
@@ -2610,8 +2586,8 @@ msgstr "lipu"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "o lon e tomo toki len sin…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2748,17 +2724,17 @@ msgstr ""
 msgid "Loading"
 msgstr "mi pali…"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr ""
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr ""
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr ""
@@ -2839,7 +2815,7 @@ msgstr ""
 msgid "Invite a User"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr ""
@@ -2849,7 +2825,7 @@ msgstr ""
 msgid "Add"
 msgstr "o lon e nimi len luka"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
@@ -2864,6 +2840,75 @@ msgstr ""
 msgid "User is either already a member or has been invited"
 msgstr ""
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:99
+#, fuzzy, kde-format
+#| msgid "Homeserver:"
+msgid "Home Server"
+msgstr "nasin URL ilo:"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr ""
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr ""
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2934,7 +2979,7 @@ msgstr ""
 msgid "Send this location"
 msgstr ""
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2956,7 +3001,7 @@ msgstr "nimi pi ilo Matrix:"
 msgid "Matrix ID"
 msgstr "nimi pi ilo Matrix:"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3190,7 +3235,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3551,7 +3596,7 @@ msgstr "nimi tomo"
 msgid "Muted room"
 msgstr ""
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr ""
@@ -3603,45 +3648,45 @@ msgstr ""
 msgid "Search in this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, fuzzy, kde-format
 #| msgid "Ignore this user"
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "o len e jan ni"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
@@ -3650,50 +3695,38 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
-#, fuzzy, kde-format
+#, kde-format
-#| msgid "Send message"
+msgid "View notifications"
-msgid "No friends found"
+msgstr ""
-msgstr "o pana e toki"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr ""
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3711,35 +3744,11 @@ msgstr "nimi tomo"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "ilo NeoChat li jo ala e linluwi. o pana e ona tawa ilo."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr ""
 
-#: src/qml/RoomSearchPage.qml:25
-#, fuzzy, kde-format
-#| msgid "Edit Message"
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "o ante e toki"
-
-#: src/qml/RoomSearchPage.qml:36
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "Find messages…"
-msgstr "o pana e toki"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgid "No messages found"
-msgstr "o pana e toki"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3878,6 +3887,23 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr ""
 
+#: src/qml/SearchPage.qml:18
+#, fuzzy, kde-format
+#| msgid "Edit Message"
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "o ante e toki"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr ""
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr ""
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3952,54 +3978,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "o pana e ilo kulupu Matrix sina"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:60
-#, fuzzy, kde-format
-#| msgid "Homeserver:"
-msgid "Home Server"
-msgstr "nasin URL ilo:"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr ""
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr ""
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4154,29 +4132,12 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "o weka"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:86
 #, fuzzy, kde-format
 #| msgid "Room Name"
 msgid "All Rooms"
 msgstr "nimi tomo"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, fuzzy, kde-format
-#| msgid "Create a Room"
-msgid "Create a space"
-msgstr "o pali e tomo toki"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4281,6 +4242,22 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr ""
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr ""
+
+#: src/qml/StartChatPage.qml:115
+#, fuzzy, kde-format
+#| msgid "Open a private chat"
+msgid "Create new chat"
+msgstr "o open e tomo toki pi sina tu taso"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4300,22 +4277,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4389,14 +4366,7 @@ msgstr "o ante e toki"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, fuzzy, kde-format
-#| msgid "Open a private chat"
-msgid "Invite to private chat"
 msgstr "o open e tomo toki pi sina tu taso"
 
 #: src/qml/UserDetailDialog.qml:229
@@ -4438,29 +4408,6 @@ msgstr "o weka wawa e jan ni"
 msgid "Username unavailable"
 msgstr ""
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-#| msgid "Send message"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "o pana e toki"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4636,20 +4583,27 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, fuzzy, kde-format
 #| msgid "Loading…"
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "mi pali…"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit Message"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "o ante e toki"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr ""
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4766,29 +4720,6 @@ msgstr ""
 msgid "Quit"
 msgstr ""
 
-#~ msgid "Start a Chat"
-#~ msgstr "o lon e tomo toki"
-
-#, fuzzy
-#~| msgid "Start a Chat"
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "o lon e tomo toki"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "o lon e tomo toki len sin…"
-
-#, fuzzy
-#~| msgid "Open a private chat"
-#~ msgid "Create new chat"
-#~ msgstr "o open e tomo toki pi sina tu taso"
-
-#, fuzzy
-#~| msgid "Open a private chat"
-#~ msgid "Rooms and private chats"
-#~ msgstr "o open e tomo toki pi sina tu taso"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr "sina ken ala sijelo: nanpa len li pakala anu weka"
 
@@ -4861,5 +4792,10 @@ msgstr ""
 #~ msgid "Image View - %1"
 #~ msgstr "lukin sitelen - %1"
 
+#, fuzzy
+#~| msgid "Send message"
+#~ msgid "All messages"
+#~ msgstr "o pana e toki"
+
 #~ msgid "Write your message..."
 #~ msgstr "o sitelen e toki sina..."

po/tr/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-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 14:58+0300\n"
+"PO-Revision-Date: 2024-02-15 12:17+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -19,51 +19,61 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 24.01.95\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Anında bildirimler alınıyor"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Ağ hatası: %1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Erişim jetonu bulunamadı"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Silinmiş olabilir mi?"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Anahtar zincirine erişim reddedildi."
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Lütfen NeoChat'in erişim jetonunu okumasına izin verin"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "Kullanılabilir anahtar zinciri yok."
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Lütfen bir anahtar zinciri kurun; örn. K Cüzdan veya GNOME keyring"
 
-#: src/controller.cpp:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Erişim jetonu okunamıyor"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "Dosya, indirmek için pek büyük."
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "Destek için Matrix sunucusu yöneticisine ulaşın."
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1077,52 +1087,42 @@ msgid_plural "%2 reacted with %3"
 msgstr[0] "%2, %3 ile tepki verdi"
 msgstr[1] "%2, %3 ile tepki verdi"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "Davet Edilen"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "Sık Kullanılanlar"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr "Arkadaşlar"
+msgstr "Doğrudan İletiler"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "Normal Odalar"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "Düşük öncelik"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "Alanlar"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "Dosya, indirmek için pek büyük."
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "Destek için Matrix sunucusu yöneticisine ulaşın."
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Oda oluşturulamadı: %1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Alan oluşturma başarısız: %1"
@@ -1132,7 +1132,7 @@ msgstr "Alan oluşturma başarısız: %1"
 msgid "Report sent successfully."
 msgstr "Rapor başarıyla gönderildi."
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1154,7 +1154,7 @@ msgid "Open NeoChat in this room"
 msgstr "Bu odada NeoChat'i açın"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "Yanıtla"
@@ -1459,7 +1459,7 @@ msgstr "Pano görseli"
 msgid "Attachment:"
 msgstr "İlişik:"
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1626,27 +1626,27 @@ msgstr "Oturumu kapatmak istediğinize emin misiniz?"
 msgid "Open in New Window"
 msgstr "Yeni Pencerede Aç"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "Sık Kullanılanlardan Kaldır"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "Sık Kullanılanlara Ekle"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "Yeniden Önceliklendir"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "Önceliğini Azalt"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "Okundu Olarak İmle"
@@ -1669,18 +1669,18 @@ msgstr "Adresi Panoya Kopyala"
 msgid "Notification State"
 msgstr "Bildirim Durumu"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "Global Ayarı İzle"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "Tümü"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1688,26 +1688,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@Değinmeleri ve Anahtar Sözcükler"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "Kapalı"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "Oda Ayarları"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "Odadan Ayrıl"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1759,7 +1759,7 @@ msgid "Make this parent official"
 msgstr "Bu üst ögeyi resmi yap"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1778,7 +1778,7 @@ msgstr "Oda seç"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2090,25 +2090,23 @@ msgid ""
 msgstr "Bu ileti şifreli ve gönderen, anahtarı bu aygıt ile paylaşmadı."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Odaları Keşfet"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Arkadaşlarını bul"
+msgstr "Bir Sohbet Başlat"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr "Arkadaşlarını Bul"
+msgstr "Bir Sohbet Başlat"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2135,36 +2133,14 @@ msgstr "Ara"
 msgid "Create New"
 msgstr "Yeni Oluştur"
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "Odaları Keşfet"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "Bir oda adresi gir"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, kde-format
-msgid "Find a room…"
-msgstr "Bir Oda Bul…"
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "Genel oda bulunamadı"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "İndir"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2172,36 +2148,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "Dosya Aç"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "İndirmeyi Durdur"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr "Otobüs: %1, Koltuk: %2"
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr "KDE Yol Belgesi'ne Gönder"
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2482,26 +2441,41 @@ msgstr "Avatar güncelleme olaylarını göster"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "Odalar ve Özel Sohbetler"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "Ayrı"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "Karışık"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "Son iletiyi düzenlemek için s/metin/yenisi sözdizimini kullan"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "Yazıyor bildirimlerini gönder"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "Geliştirici Ayarları"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "Geliştirici araçlarını etkinleştir"
@@ -2538,8 +2512,8 @@ msgstr "Dosya"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr "Arkadaşlarını Bul"
+msgstr "Yeni Özel Sohbet…"
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2674,17 +2648,17 @@ msgstr "Bu sunucuda kayıt işlemi devre dışı."
 msgid "Loading"
 msgstr "Yükleniyor"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "Bu ileti, doğrulanan bir aygıttan gönderildi"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "Tepki"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "İleti dizisinde yanıtla"
@@ -2766,7 +2740,7 @@ msgstr "Kabul Et"
 msgid "Invite a User"
 msgstr "Bir Kullanıcı Davet Et"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "Bir kullanıcı bul..."
@@ -2776,7 +2750,7 @@ msgstr "Bir kullanıcı bul..."
 msgid "Add"
 msgstr "Ekle"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Kullanıcı yok"
@@ -2791,6 +2765,74 @@ msgstr "Davet gönder"
 msgid "User is either already a member or has been invited"
 msgstr "Kullanıcı halihazırda bir üye veya davet edilmiş"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "Odaları Keşfet"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "Bir oda bul..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "Yeni Sunucu Ekle"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "Ana Sunucu"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "Yeni Sunucu Ekle"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "Sunucu Ekle"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "Geçerli sunucu girildi"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "Bu sunucuya ulaşılamıyor veya önceden eklenmiş"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "Girilen metin, geçerli bir URL değil"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "Sunucu URL'si girin; örn. kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "Sunucu URL'si"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "Bir oda adresi gir"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "Genel oda bulunamadı"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2861,7 +2903,7 @@ msgstr "Konum Seç"
 msgid "Send this location"
 msgstr "Bu konumu gönder"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2882,7 +2924,7 @@ msgstr "Matrix kimliği:"
 msgid "Matrix ID"
 msgstr "Matrix Kimliği"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3109,7 +3151,7 @@ msgstr "İleti vurgularını etkinleştir"
 msgid "Delete keyword"
 msgstr "Anahtar sözcük sil"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3454,7 +3496,7 @@ msgstr "Oda Durumu"
 msgid "Muted room"
 msgstr "Sessize alınmış oda"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "Odayı yapılandır"
@@ -3506,95 +3548,82 @@ msgstr "Geliştirici araçlarını aç"
 msgid "Search in this room"
 msgstr "Bu odada ara"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "Ara"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "Odayı sık kullanılanlardan kaldır"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "Odayı sık kullanılanlara ekle"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "Bu oda için olan konumları göster"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "Üyeler"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "Kullanıcıyı Davet Et"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "Kullanıcıyı Odaya Davet Et"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 üye"
 msgstr[1] "%1 üye"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "Üye sayısı yok"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
 #, kde-format
-msgid "No friends found"
+msgid "View notifications"
-msgstr "Arkadaş bulunamadı"
+msgstr "Bildirimleri görüntüle"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Oda bulunamadı"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-"Henüz hiçbir arkadaşınızı eklemediniz; onları aramak için aşağıdaki düğmeye "
-"tıklayın."
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Başlamak için odalara katılın"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Oda Dizininde Ara"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, kde-format
-msgid "Search in friend directory"
-msgstr "Arkadaş Dizininde Ara"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Daralt: %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3611,32 +3640,11 @@ msgstr "Odadaki Ortamlar"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat, çevrimdışı. Lütfen ağ bağlantınızı denetleyin."
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "İleti Kaynağı"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "İletileri Ara"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr "İletileri bul…"
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr "Aramaya başlamak için metin gir"
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr "İleti bulunamadı"
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3782,6 +3790,22 @@ msgid ""
 msgstr ""
 "Yeni üyeler, odaya katıldıkları andan itibaren iletileri görüntüleyebilirler."
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "İletileri Ara"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "Aramaya başlamak için metin gir"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "Sonuç bulunamadı"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3854,53 +3878,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "Alanlar Seç"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "Yeni Sunucu Ekle"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "Ana Sunucu"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "Yeni Sunucu Ekle"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "Sunucu Ekle"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "Geçerli sunucu girildi"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "Bu sunucuya ulaşılamıyor veya önceden eklenmiş"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "Girilen metin, geçerli bir URL değil"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "Sunucu URL'si girin; örn. kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "Sunucu URL'si"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4054,27 +4031,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "Sözcüğü Sil"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "Bildirimleri görüntüle"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "Tüm Odalar"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr "Arkadaşlar"
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr "Bir alan oluştur"
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4174,6 +4135,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "SSO URL'sini Yeniden Aç"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "Sohbet"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "Var olan sohbete katıl"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "Yeni sohbet oluştur"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4196,22 +4172,22 @@ msgstr ""
 "Burası sohbetin başlangıcıdır. Bu noktanın gerisinde herhangi bir ileti "
 "yoktur."
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "İlk okunmayan iletiye atla"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "En son iletiye atla"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Onları paylaşmak için ögeleri buraya sürükleyin"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4279,14 +4255,8 @@ msgstr "İletileri Kaldır"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "Özel Bir Sohbet Aç"
-msgstr "%1 ile Sohbet Et"
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr "Bir özel sohbete davet et"
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4324,28 +4294,6 @@ msgstr "Kullanıcı adı:"
 msgid "Username unavailable"
 msgstr "Kullanıcı adı kullanılabilir değil"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr "Arkadaşlarını Bul"
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr "Arkadaşlarını Bul…"
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr "Arkadaşlarını aramaya başlamak için metin gir"
-
-#: src/qml/UserSearchPage.qml:82
-#, kde-format
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "Eşleşme bulunamadı"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4543,19 +4491,25 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "Var Olan Bir Hesapla Sürdür"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (yükleniyor)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, kde-format
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "Bu hesabı kaldır"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "Oturum Aç veya Hesap Oluştur"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4667,38 +4621,6 @@ msgstr "Göster"
 msgid "Quit"
 msgstr "Çık"
 
-#~ msgid "Start a Chat"
-#~ msgstr "Bir Sohbet Başlat"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "Bir Sohbet Başlat"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "Yeni Özel Sohbet…"
-
-#~ msgid "Chat"
-#~ msgstr "Sohbet"
-
-#~ msgid "Join existing chat"
-#~ msgstr "Var olan sohbete katıl"
-
-#~ msgid "Create new chat"
-#~ msgstr "Yeni sohbet oluştur"
-
-#~ msgid "Rooms and private chats"
-#~ msgstr "Odalar ve Özel Sohbetler"
-
-#~ msgid "Separated"
-#~ msgstr "Ayrı"
-
-#~ msgid "Intermixed"
-#~ msgstr "Karışık"
-
-#~ msgid "Direct Messages"
-#~ msgstr "Doğrudan İletiler"
-
 #~ msgid "Login Failed: Access Token invalid or revoked"
 #~ msgstr ""
 #~ "Oturum açma başarısız: Erişim jetonu geçersiz veya yürürlükten kaldırıldı"

po/zh_CN/neochat.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-01-21 00:37+0000\n"
+"POT-Creation-Date: 2024-02-21 02:23+0000\n"
-"PO-Revision-Date: 2024-01-21 14:11\n"
+"PO-Revision-Date: 2024-01-06 03:32\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -17,53 +17,63 @@ msgstr ""
 "X-Crowdin-File: /kf6-trunk/messages/neochat/neochat.pot\n"
 "X-Crowdin-File-ID: 44721\n"
 
-#: src/controller.cpp:121 src/controller.cpp:309
+#: src/controller.cpp:121 src/controller.cpp:329
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "正在接收推送通知"
 
-#: src/controller.cpp:188
+#: src/controller.cpp:190
 #, kde-format
 msgid "Network Error: %1"
 msgstr "网络错误：%1"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "无法找到访问令牌"
 
-#: src/controller.cpp:210
+#: src/controller.cpp:212
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "可能已被删除？"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "访问钥匙环被拒绝。"
 
-#: src/controller.cpp:214
+#: src/controller.cpp:216
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "请允许 NeoChat 读取访问令牌"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, kde-format
 msgid "No keychain available."
 msgstr "没有可用的钥匙环。"
 
-#: src/controller.cpp:217
+#: src/controller.cpp:219
 #, 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:220
+#: src/controller.cpp:222
 #, kde-format
 msgid "Unable to read access token"
 msgstr "无法读取访问令牌"
 
+#: src/controller.cpp:298
+#, kde-format
+msgid "File too large to download."
+msgstr "文件太大，无法下载。"
+
+#: src/controller.cpp:298
+#, kde-format
+msgid "Contact your matrix server administrator for support."
+msgstr "请联系 Matrix 服务器管理员寻求支持。"
+
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:530
 #: src/models/messageeventmodel.cpp:491
 #, kde-format
@@ -1076,52 +1086,42 @@ msgid "%2 reacted with %3"
 msgid_plural "%2 reacted with %3"
 msgstr[0] "%2 回应了 %3"
 
-#: src/models/roomlistmodel.cpp:415
+#: src/models/roomlistmodel.cpp:411
 #, kde-format
 msgid "Invited"
 msgstr "已邀请"
 
-#: src/models/roomlistmodel.cpp:417
+#: src/models/roomlistmodel.cpp:413
 #, kde-format
 msgid "Favorite"
 msgstr "收藏夹"
 
-#: src/models/roomlistmodel.cpp:419 src/qml/UserSearchPage.qml:73
+#: src/models/roomlistmodel.cpp:415
 #, kde-format
-msgid "Friends"
+msgid "Direct Messages"
-msgstr ""
+msgstr "私聊"
 
-#: src/models/roomlistmodel.cpp:421
+#: src/models/roomlistmodel.cpp:417
 #, kde-format
 msgid "Normal"
 msgstr "普通"
 
-#: src/models/roomlistmodel.cpp:423
+#: src/models/roomlistmodel.cpp:419
 #, kde-format
 msgid "Low priority"
 msgstr "低优先级"
 
-#: src/models/roomlistmodel.cpp:425
+#: src/models/roomlistmodel.cpp:421
 #, kde-format
 msgid "Spaces"
 msgstr "空间"
 
-#: src/neochatconnection.cpp:69
+#: src/neochatconnection.cpp:202
-#, kde-format
-msgid "File too large to download."
-msgstr "文件太大，无法下载。"
-
-#: src/neochatconnection.cpp:69
-#, kde-format
-msgid "Contact your matrix server administrator for support."
-msgstr "请联系 Matrix 服务器管理员寻求支持。"
-
-#: src/neochatconnection.cpp:240
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "聊天室创建失败：%1"
 
-#: src/neochatconnection.cpp:272
+#: src/neochatconnection.cpp:234
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "空间创建失败：%1"
@@ -1131,7 +1131,7 @@ msgstr "空间创建失败：%1"
 msgid "Report sent successfully."
 msgstr "举报成功。"
 
-#: src/neochatroom.cpp:1847 src/neochatroom.cpp:1855
+#: src/neochatroom.cpp:1843 src/neochatroom.cpp:1851
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
@@ -1153,7 +1153,7 @@ msgid "Open NeoChat in this room"
 msgstr "在此聊天室打开 NeoChat"
 
 #: src/notificationsmanager.cpp:223 src/qml/FileDelegateContextMenu.qml:59
-#: src/qml/HoverActions.qml:102 src/qml/MessageDelegateContextMenu.qml:102
+#: src/qml/HoverActions.qml:103 src/qml/MessageDelegateContextMenu.qml:102
 #, kde-format
 msgid "Reply"
 msgstr "回复"
@@ -1458,7 +1458,7 @@ msgstr "剪贴板图像"
 msgid "Attachment:"
 msgstr "附件："
 
-#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:93
+#: src/qml/AttachmentPane.qml:38 src/qml/HoverActions.qml:94
 #: src/qml/ImageEditorPage.qml:21 src/qml/MessageDelegateContextMenu.qml:93
 #, kde-format
 msgid "Edit"
@@ -1623,27 +1623,27 @@ msgstr "您确定要退出登录吗?"
 msgid "Open in New Window"
 msgstr "在新窗口中打开"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Remove from Favourites"
 msgstr "移出收藏夹"
 
-#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:186
+#: src/qml/ContextMenu.qml:42 src/qml/ContextMenu.qml:185
 #, kde-format
 msgid "Add to Favourites"
 msgstr "移入收藏夹"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Reprioritize"
 msgstr "恢复优先级"
 
-#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:200
+#: src/qml/ContextMenu.qml:48 src/qml/ContextMenu.qml:199
 #, kde-format
 msgid "Deprioritize"
 msgstr "降低优先级"
 
-#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:207
+#: src/qml/ContextMenu.qml:54 src/qml/ContextMenu.qml:206
 #, kde-format
 msgid "Mark as Read"
 msgstr "标记为已读"
@@ -1666,18 +1666,18 @@ msgstr "将地址复制到剪贴板"
 msgid "Notification State"
 msgstr "通知状态"
 
-#: src/qml/ContextMenu.qml:76
+#: src/qml/ContextMenu.qml:75
 #, kde-format
 msgid "Follow Global Setting"
 msgstr "使用全局设置"
 
-#: src/qml/ContextMenu.qml:87 src/qml/PushNotification.qml:39
+#: src/qml/ContextMenu.qml:86 src/qml/PushNotification.qml:39
 #, kde-format
 msgctxt "As in 'notify for all messages'"
 msgid "All"
 msgstr "全部"
 
-#: src/qml/ContextMenu.qml:98 src/qml/PushNotification.qml:47
+#: src/qml/ContextMenu.qml:97 src/qml/PushNotification.qml:47
 #, kde-format
 msgctxt ""
 "As in 'notify when the user is mentioned or the message contains a set "
@@ -1685,26 +1685,26 @@ msgctxt ""
 msgid "@Mentions and Keywords"
 msgstr "@提及 和关键词"
 
-#: src/qml/ContextMenu.qml:109 src/qml/PushNotification.qml:55
+#: src/qml/ContextMenu.qml:108 src/qml/PushNotification.qml:55
 #, kde-format
 msgctxt "As in 'do not notify for any messages'"
 msgid "Off"
 msgstr "关闭"
 
-#: src/qml/ContextMenu.qml:122 src/qml/ContextMenu.qml:124
+#: src/qml/ContextMenu.qml:121 src/qml/ContextMenu.qml:123
-#: src/qml/ContextMenu.qml:193 src/qml/RoomDrawer.qml:104
+#: src/qml/ContextMenu.qml:192 src/qml/RoomDrawer.qml:104
 #: src/qml/RoomDrawerPage.qml:47 src/qml/SpaceHomePage.qml:69
 #, kde-format
 msgid "Room Settings"
 msgstr "聊天室设置"
 
-#: src/qml/ContextMenu.qml:130 src/qml/ContextMenu.qml:214
+#: src/qml/ContextMenu.qml:129 src/qml/ContextMenu.qml:213
 #, kde-format
 msgid "Leave Room"
 msgstr "离开聊天室"
 
 #: src/qml/CreateRoomDialog.qml:30 src/qml/ExploreComponent.qml:51
-#: src/qml/ExploreComponentMobile.qml:151 src/qml/SpaceDrawer.qml:196
+#: src/qml/ExploreComponentMobile.qml:151
 #, kde-format
 msgctxt "@title"
 msgid "Create a Space"
@@ -1756,7 +1756,7 @@ msgid "Make this parent official"
 msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
-#: src/qml/ServerComboBox.qml:148
+#: src/qml/JoinRoomPage.qml:183
 #, kde-format
 msgctxt "@action:button"
 msgid "Ok"
@@ -1775,7 +1775,7 @@ msgstr "选择聊天室"
 
 #: src/qml/CreateRoomDialog.qml:106 src/qml/CreateRoomDialog.qml:185
 #: src/qml/ExploreComponent.qml:24 src/qml/ExploreComponentMobile.qml:55
-#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:179
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -2083,25 +2083,23 @@ msgid ""
 msgstr "此消息已加密，但发送者尚未与此设备共享密钥。"
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "探索聊天室"
 
 #: src/qml/ExploreComponent.qml:35 src/qml/ExploreComponentMobile.qml:67
 #: src/qml/GlobalMenu.qml:49 src/qml/GlobalMenu.qml:54
-#: src/qml/RoomListPage.qml:194 src/qml/RoomListPage.qml:307
+#: src/qml/StartChatPage.qml:20
 #, kde-format
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "开始聊天"
 
 #: src/qml/ExploreComponent.qml:37 src/qml/ExploreComponentMobile.qml:70
-#: src/qml/GlobalMenu.qml:50 src/qml/RoomListPage.qml:195
-#: src/qml/RoomListPage.qml:312
 #, kde-format
 msgctxt "@title"
-msgid "Find your friends"
+msgid "Start a Chat"
-msgstr ""
+msgstr "开始聊天"
 
 #: src/qml/ExploreComponent.qml:40 src/qml/ExploreComponentMobile.qml:136
 #, kde-format
@@ -2128,37 +2126,14 @@ msgstr "搜索"
 msgid "Create New"
 msgstr ""
 
-#: src/qml/ExploreRoomsPage.qml:52
+#: src/qml/FileDelegate.qml:77 src/qml/FileDelegate.qml:168
-#, kde-format
-msgctxt "@action:title"
-msgid "Explore Rooms"
-msgstr "探索聊天室"
-
-#: src/qml/ExploreRoomsPage.qml:79
-#, kde-format
-msgid "Enter a room address"
-msgstr "输入一个聊天室地址"
-
-#: src/qml/ExploreRoomsPage.qml:93
-#, fuzzy, kde-format
-#| msgid "Find a room..."
-msgid "Find a room…"
-msgstr "查找聊天室..."
-
-#: src/qml/ExploreRoomsPage.qml:94
-#, kde-format
-msgctxt "@info:label"
-msgid "No public rooms found"
-msgstr "未找到公共聊天室"
-
-#: src/qml/FileDelegate.qml:83 src/qml/FileDelegate.qml:174
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to download its file"
 msgid "Download"
 msgstr "下载"
 
-#: src/qml/FileDelegate.qml:99 src/qml/FileDelegate.qml:165
+#: src/qml/FileDelegate.qml:93 src/qml/FileDelegate.qml:159
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; offers ability to open its downloaded "
@@ -2166,36 +2141,19 @@ msgctxt ""
 msgid "Open File"
 msgstr "打开文件"
 
-#: src/qml/FileDelegate.qml:114
+#: src/qml/FileDelegate.qml:108
 #, kde-format
 msgctxt "file download progress"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: src/qml/FileDelegate.qml:119
+#: src/qml/FileDelegate.qml:113
 #, kde-format
 msgctxt ""
 "tooltip for a button on a message; stops downloading the message's file"
 msgid "Stop Download"
 msgstr "停止下载"
 
-#: src/qml/FileDelegate.qml:216
-#, kde-format
-msgid "Coach: %1, Seat: %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:258
-#, kde-format
-msgctxt "<start time> - <end time>"
-msgid "%1 - %2"
-msgstr ""
-
-#: src/qml/FileDelegate.qml:269
-#, kde-format
-msgctxt "@action"
-msgid "Send to KDE Itinerary"
-msgstr ""
-
 #: src/qml/FileDelegateContextMenu.qml:43
 #, kde-format
 msgid "Open Externally"
@@ -2475,26 +2433,41 @@ msgstr "显示头像更新事件"
 
 #: src/qml/GeneralSettingsPage.qml:144
 #, kde-format
+msgid "Rooms and private chats"
+msgstr "聊天室和私聊"
+
+#: src/qml/GeneralSettingsPage.qml:148
+#, kde-format
+msgid "Separated"
+msgstr "分离"
+
+#: src/qml/GeneralSettingsPage.qml:157
+#, kde-format
+msgid "Intermixed"
+msgstr "混合"
+
+#: src/qml/GeneralSettingsPage.qml:167
+#, kde-format
 msgctxt "Chat Editor"
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/qml/GeneralSettingsPage.qml:149
+#: src/qml/GeneralSettingsPage.qml:172
 #, kde-format
 msgid "Use s/text/replacement syntax to edit your last message"
 msgstr "使用 s/原始文本/替换文本 语法来修改你的上一条信息"
 
-#: src/qml/GeneralSettingsPage.qml:160
+#: src/qml/GeneralSettingsPage.qml:183
 #, kde-format
 msgid "Send typing notifications"
 msgstr "发送输入中状态"
 
-#: src/qml/GeneralSettingsPage.qml:170
+#: src/qml/GeneralSettingsPage.qml:193
 #, kde-format
 msgid "Developer Settings"
 msgstr "开发者设置"
 
-#: src/qml/GeneralSettingsPage.qml:174
+#: src/qml/GeneralSettingsPage.qml:197
 #, kde-format
 msgid "Enable developer tools"
 msgstr "启用开发者工具"
@@ -2531,8 +2504,8 @@ msgstr "文件"
 #: src/qml/GlobalMenu.qml:48
 #, kde-format
 msgctxt "menu"
-msgid "Find your friends"
+msgid "New Private Chat…"
-msgstr ""
+msgstr "新私聊..."
 
 #: src/qml/GlobalMenu.qml:53
 #, kde-format
@@ -2667,17 +2640,17 @@ msgstr "此服务器已禁用注册。"
 msgid "Loading"
 msgstr "加载中"
 
-#: src/qml/HoverActions.qml:74
+#: src/qml/HoverActions.qml:75
 #, kde-format
 msgid "This message was sent from a verified device"
 msgstr "此消息是从已验证的设备发送而来"
 
-#: src/qml/HoverActions.qml:87
+#: src/qml/HoverActions.qml:88
 #, kde-format
 msgid "React"
 msgstr "回应"
 
-#: src/qml/HoverActions.qml:112
+#: src/qml/HoverActions.qml:113
 #, kde-format
 msgid "Reply in Thread"
 msgstr "主题内回复"
@@ -2757,7 +2730,7 @@ msgstr "接受"
 msgid "Invite a User"
 msgstr "邀请用户"
 
-#: src/qml/InviteUserPage.qml:37
+#: src/qml/InviteUserPage.qml:37 src/qml/StartChatPage.qml:32
 #, kde-format
 msgid "Find a user..."
 msgstr "查找用户..."
@@ -2767,7 +2740,7 @@ msgstr "查找用户..."
 msgid "Add"
 msgstr "添加"
 
-#: src/qml/InviteUserPage.qml:70
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "无可用用户"
@@ -2782,6 +2755,74 @@ msgstr "发送邀请"
 msgid "User is either already a member or has been invited"
 msgstr "用户已经是成员或已被邀请"
 
+#: src/qml/JoinRoomPage.qml:40
+#, kde-format
+msgid "Explore Rooms"
+msgstr "探索聊天室"
+
+#: src/qml/JoinRoomPage.qml:58
+#, kde-format
+msgid "Find a room..."
+msgstr "查找聊天室..."
+
+#: src/qml/JoinRoomPage.qml:84
+#, kde-format
+msgid "Add New Server"
+msgstr "添加新服务器"
+
+#: src/qml/JoinRoomPage.qml:99
+#, kde-format
+msgid "Home Server"
+msgstr "主服务器"
+
+#: src/qml/JoinRoomPage.qml:106
+#, kde-format
+msgctxt "@action:button"
+msgid "Add new server"
+msgstr "添加新服务器"
+
+#: src/qml/JoinRoomPage.qml:138
+#, kde-format
+msgctxt "@title:window"
+msgid "Add server"
+msgstr "添加服务器"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Valid server entered"
+msgstr "输入的服务器可用"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "This server cannot be resolved or has already been added"
+msgstr "该服务器无法解析或已添加"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "The entered text is not a valid url"
+msgstr "输入的文本不是有效的 URL"
+
+#: src/qml/JoinRoomPage.qml:151
+#, kde-format
+msgid "Enter server url e.g. kde.org"
+msgstr "输入服务器 URL，例如 kde.org"
+
+#: src/qml/JoinRoomPage.qml:159
+#, kde-format
+msgid "Server URL"
+msgstr "服务器 URL"
+
+#: src/qml/JoinRoomPage.qml:239
+#, kde-format
+msgid "Enter a room address"
+msgstr "输入一个聊天室地址"
+
+#: src/qml/JoinRoomPage.qml:265
+#, kde-format
+msgctxt "@info:label"
+msgid "No public rooms found"
+msgstr "未找到公共聊天室"
+
 #: src/qml/KeyVerificationDialog.qml:18
 #, kde-format
 msgid "Session Verification"
@@ -2852,7 +2893,7 @@ msgstr "选择位置"
 msgid "Send this location"
 msgstr "发送此位置"
 
-#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:126
+#: src/qml/LocationsPage.qml:16 src/qml/RoomInformation.qml:127
 #, kde-format
 msgctxt "Locations on a map"
 msgid "Locations"
@@ -2873,7 +2914,7 @@ msgstr "Matrix ID："
 msgid "Matrix ID"
 msgstr "Matrix ID"
 
-#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:154
+#: src/qml/Login.qml:37 src/qml/WelcomePage.qml:196
 #, kde-format
 msgctxt "@action:button"
 msgid "Continue"
@@ -3098,7 +3139,7 @@ msgstr "启用消息高亮显示"
 msgid "Delete keyword"
 msgstr "删除关键词"
 
-#: src/qml/NotificationsView.qml:19 src/qml/SpaceDrawer.qml:68
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3440,7 +3481,7 @@ msgstr "聊天室状态"
 msgid "Muted room"
 msgstr "已静音的聊天室"
 
-#: src/qml/RoomDelegate.qml:140
+#: src/qml/RoomDelegate.qml:139
 #, kde-format
 msgid "Configure room"
 msgstr "配置聊天室"
@@ -3492,94 +3533,81 @@ msgstr "打开开发者工具"
 msgid "Search in this room"
 msgstr "在此聊天室中搜索"
 
-#: src/qml/RoomInformation.qml:101
+#: src/qml/RoomInformation.qml:102
 #, kde-format
 msgctxt "@action:title"
 msgid "Search"
 msgstr "搜索"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Remove room from favorites"
 msgstr "从收藏夹中移除聊天室"
 
-#: src/qml/RoomInformation.qml:110
+#: src/qml/RoomInformation.qml:111
 #, kde-format
 msgid "Make room favorite"
 msgstr "收藏聊天室"
 
-#: src/qml/RoomInformation.qml:121
+#: src/qml/RoomInformation.qml:122
 #, kde-format
 msgid "Show locations for this room"
 msgstr "显示此聊天室的位置"
 
-#: src/qml/RoomInformation.qml:133
+#: src/qml/RoomInformation.qml:134
 #, kde-format
 msgid "Members"
 msgstr "成员"
 
-#: src/qml/RoomInformation.qml:145 src/qml/SpaceHomePage.qml:49
+#: src/qml/RoomInformation.qml:146 src/qml/SpaceHomePage.qml:49
 #, kde-format
 msgctxt "@title"
 msgid "Invite a User"
 msgstr "邀请用户"
 
-#: src/qml/RoomInformation.qml:148
+#: src/qml/RoomInformation.qml:149
 #, kde-format
 msgid "Invite user to room"
 msgstr "邀请用户到聊天室"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "%1 member"
 msgid_plural "%1 members"
 msgstr[0] "%1 位成员"
 
-#: src/qml/RoomInformation.qml:155
+#: src/qml/RoomInformation.qml:156
 #, kde-format
 msgid "No member count"
 msgstr "无成员计数"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:134
-#, fuzzy, kde-format
+#, kde-format
-#| msgid "No rooms found"
+msgid "View notifications"
-msgid "No friends found"
+msgstr "查看通知"
-msgstr "没有找到聊天室"
 
-#: src/qml/RoomListPage.qml:164
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "没有找到聊天室"
 
-#: src/qml/RoomListPage.qml:166
+#: src/qml/RoomListPage.qml:180
-#, kde-format
-msgid ""
-"You haven't added any of your friends yet, click below to search for them."
-msgstr ""
-
-#: src/qml/RoomListPage.qml:166
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "加入聊天室，开始畅聊"
 
-#: src/qml/RoomListPage.qml:173
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "在聊天室目录中搜索"
 
-#: src/qml/RoomListPage.qml:194
+#: src/qml/RoomListPage.qml:240
-#, fuzzy, kde-format
-#| msgid "Search in room directory"
-msgid "Search in friend directory"
-msgstr "在聊天室目录中搜索"
-
-#: src/qml/RoomListPage.qml:238
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "折叠 %1"
 
-#: src/qml/RoomListPage.qml:238
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3596,32 +3624,11 @@ msgstr "聊天室媒体"
 msgid "NeoChat is offline. Please check your network connection."
 msgstr "NeoChat 处于离线状态。请检查您的网络连接。"
 
-#: src/qml/RoomPage.qml:254
+#: src/qml/RoomPage.qml:255
 #, kde-format
 msgid "Message Source"
 msgstr "消息来源"
 
-#: src/qml/RoomSearchPage.qml:25
-#, kde-format
-msgctxt "@action:title"
-msgid "Search Messages"
-msgstr "搜索消息"
-
-#: src/qml/RoomSearchPage.qml:36
-#, kde-format
-msgid "Find messages…"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:37
-#, kde-format
-msgid "Enter text to start searching"
-msgstr ""
-
-#: src/qml/RoomSearchPage.qml:38
-#, kde-format
-msgid "No messages found"
-msgstr ""
-
 #: src/qml/RoomSecurity.qml:18
 #, kde-format
 msgid ""
@@ -3759,6 +3766,22 @@ msgid ""
 "New members can view the message history from the point they joined the room."
 msgstr "新成员可以查看从其加入到聊天室后的消息历史记录。"
 
+#: src/qml/SearchPage.qml:18
+#, kde-format
+msgctxt "@action:title"
+msgid "Search Messages"
+msgstr "搜索消息"
+
+#: src/qml/SearchPage.qml:74
+#, kde-format
+msgid "Enter a text to start searching"
+msgstr "请输入文本以开始搜索"
+
+#: src/qml/SearchPage.qml:80
+#, kde-format
+msgid "No results found"
+msgstr "未找到结果"
+
 #: src/qml/Security.qml:17
 #, kde-format
 msgctxt "@title"
@@ -3830,53 +3853,6 @@ msgctxt "@title"
 msgid "Select Spaces"
 msgstr "选择空间"
 
-#: src/qml/ServerComboBox.qml:45
-#, kde-format
-msgid "Add New Server"
-msgstr "添加新服务器"
-
-#: src/qml/ServerComboBox.qml:60
-#, kde-format
-msgid "Home Server"
-msgstr "主服务器"
-
-#: src/qml/ServerComboBox.qml:67
-#, kde-format
-msgctxt "@action:button"
-msgid "Add new server"
-msgstr "添加新服务器"
-
-#: src/qml/ServerComboBox.qml:99
-#, kde-format
-msgctxt "@title:window"
-msgid "Add server"
-msgstr "添加服务器"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Valid server entered"
-msgstr "输入的服务器可用"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "This server cannot be resolved or has already been added"
-msgstr "该服务器无法解析或已添加"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "The entered text is not a valid url"
-msgstr "输入的文本不是有效的 URL"
-
-#: src/qml/ServerComboBox.qml:116
-#, kde-format
-msgid "Enter server url e.g. kde.org"
-msgstr "输入服务器 URL，例如 kde.org"
-
-#: src/qml/ServerComboBox.qml:124
-#, kde-format
-msgid "Server URL"
-msgstr "服务器 URL"
-
 #: src/qml/ServerData.qml:20
 #, kde-format
 msgid "Server Capabilities"
@@ -4028,27 +4004,11 @@ msgctxt "@action:button"
 msgid "Delete word"
 msgstr "删除单词"
 
-#: src/qml/SpaceDrawer.qml:62
+#: src/qml/SpaceDrawer.qml:63
-#, kde-format
-msgid "View notifications"
-msgstr "查看通知"
-
-#: src/qml/SpaceDrawer.qml:86
 #, kde-format
 msgid "All Rooms"
 msgstr "所有聊天室"
 
-#: src/qml/SpaceDrawer.qml:105
-#, kde-format
-msgctxt "@button View all one-on-one chats with your friends."
-msgid "Friends"
-msgstr ""
-
-#: src/qml/SpaceDrawer.qml:192
-#, kde-format
-msgid "Create a space"
-msgstr ""
-
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
@@ -4148,6 +4108,21 @@ msgctxt "@action:button"
 msgid "Re-open SSO URL"
 msgstr "重新打开 SSO URL"
 
+#: src/qml/StartChatPage.qml:40
+#, kde-format
+msgid "Chat"
+msgstr "聊天"
+
+#: src/qml/StartChatPage.qml:94
+#, kde-format
+msgid "Join existing chat"
+msgstr "加入现有聊天"
+
+#: src/qml/StartChatPage.qml:115
+#, kde-format
+msgid "Create new chat"
+msgstr "创建新聊天"
+
 #: src/qml/Terms.qml:18
 #, kde-format
 msgid "Terms & Conditions"
@@ -4167,22 +4142,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:179
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "跳转到第一条未读消息"
 
-#: src/qml/TimelineView.qml:202
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "跳转到最新消息"
 
-#: src/qml/TimelineView.qml:227
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "拖动项目到此处来分享"
 
-#: src/qml/TimelineView.qml:235
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4249,14 +4224,8 @@ msgstr "移除消息"
 
 #: src/qml/UserDetailDialog.qml:218
 #, kde-format
-msgctxt "%1 is the name of the user."
+msgid "Open a private chat"
-msgid "Chat with %1"
+msgstr "打开私聊"
-msgstr ""
-
-#: src/qml/UserDetailDialog.qml:218
-#, kde-format
-msgid "Invite to private chat"
-msgstr ""
 
 #: src/qml/UserDetailDialog.qml:229
 #, kde-format
@@ -4294,29 +4263,6 @@ msgstr "用户名："
 msgid "Username unavailable"
 msgstr "用户名不可用"
 
-#: src/qml/UserSearchPage.qml:32
-#, kde-format
-msgctxt "@action:title"
-msgid "Find Your Friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:80
-#, kde-format
-msgid "Find your friends…"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:81
-#, kde-format
-msgid "Enter text to start searching for your friends"
-msgstr ""
-
-#: src/qml/UserSearchPage.qml:82
-#, fuzzy, kde-format
-#| msgid "No rooms found"
-msgctxt "@info:label"
-msgid "No matches found"
-msgstr "没有找到聊天室"
-
 #: src/qml/VerificationCanceled.qml:21
 #, kde-format
 msgid "The session verification was canceled for unknown reason."
@@ -4493,19 +4439,26 @@ msgctxt "@title"
 msgid "Continue with an existing account"
 msgstr "使用现有账户登录"
 
-#: src/qml/WelcomePage.qml:74
+#: src/qml/WelcomePage.qml:85
 #, kde-format
 msgctxt "As in 'this account is still loading'"
 msgid "%1 (loading)"
 msgstr "%1 (加载中)"
 
-#: src/qml/WelcomePage.qml:81
+#: src/qml/WelcomePage.qml:94
+#, fuzzy, kde-format
+#| msgid "Edit this account"
+msgctxt "@action:button"
+msgid "Remove this account"
+msgstr "编辑此账户"
+
+#: src/qml/WelcomePage.qml:123
 #, kde-format
 msgctxt "@title"
 msgid "Log in or Create a New Account"
 msgstr "登录或创建一个新账户"
 
-#: src/qml/WelcomePage.qml:162
+#: src/qml/WelcomePage.qml:204
 #, kde-format
 msgctxt "@action:button"
 msgid "Go back"
@@ -4617,22 +4570,5 @@ msgstr "显示"
 msgid "Quit"
 msgstr "退出"
 
-#~ msgid "Start a Chat"
+#~ msgid "Login Failed: Access Token invalid or revoked"
-#~ msgstr "开始聊天"
+#~ msgstr "登录失败：访问令牌无效或被吊销"
-
-#~ msgctxt "@title"
-#~ msgid "Start a Chat"
-#~ msgstr "开始聊天"
-
-#~ msgctxt "menu"
-#~ msgid "New Private Chat…"
-#~ msgstr "新私聊..."
-
-#~ msgid "Chat"
-#~ msgstr "聊天"
-
-#~ msgid "Join existing chat"
-#~ msgstr "加入现有聊天"
-
-#~ msgid "Create new chat"
-#~ msgstr "创建新聊天"

src/CMakeLists.txt

@@ -144,10 +144,6 @@ add_library(neochat STATIC
     models/timelinemodel.cpp
     models/timelinemodel.h
     enums/pushrule.h
-    models/itinerarymodel.cpp
-    models/itinerarymodel.h
-    proxycontroller.cpp
-    proxycontroller.h
 )
 
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
@@ -165,10 +161,11 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/UserInfoDesktop.qml
         qml/RoomPage.qml
         qml/RoomWindow.qml
-        qml/ExploreRoomsPage.qml
+        qml/JoinRoomPage.qml
         qml/ManualRoomDialog.qml
         qml/ExplorerDelegate.qml
         qml/InviteUserPage.qml
+        qml/StartChatPage.qml
         qml/ImageEditorPage.qml
         qml/WelcomePage.qml
         qml/General.qml
@@ -270,7 +267,7 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/EmojiTonesPicker.qml
         qml/EmojiDelegate.qml
         qml/EmojiGrid.qml
-        qml/RoomSearchPage.qml
+        qml/SearchPage.qml
         qml/LocationDelegate.qml
         qml/LocationChooser.qml
         qml/TimelineView.qml
@@ -301,16 +298,11 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
         qml/NotificationsView.qml
         qml/LoadingDelegate.qml
         qml/TimelineEndDelegate.qml
-        qml/SearchPage.qml
-        qml/ServerComboBox.qml
-        qml/UserSearchPage.qml
     RESOURCES
         qml/confetti.png
         qml/glowdot.png
 )
 
-configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
-
 if(WIN32)
     set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
 endif()
@@ -324,15 +316,6 @@ ecm_qt_declare_logging_category(neochat
     EXPORT NEOCHAT
 )
 
-ecm_qt_declare_logging_category(neochat
-    HEADER "publicroomlist_logging.h"
-    IDENTIFIER "PublicRoomList"
-    CATEGORY_NAME "org.kde.neochat.publicroomlistmodel"
-    DESCRIPTION "Neochat: publicroomlistmodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
 ecm_qt_declare_logging_category(neochat
     HEADER "eventhandler_logging.h"
     IDENTIFIER "EventHandling"

src/config-neochat.h.in

@@ -1,8 +0,0 @@
-/*
-   SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-   SPDX-License-Identifier: LGPL-2.0-or-later
-*/
-
-#pragma once
-
-#define CMAKE_INSTALL_FULL_LIBEXECDIR_KF6 "${KDE_INSTALL_FULL_LIBEXECDIR_KF}"

src/controller.cpp

@@ -23,12 +23,12 @@
 #include <Quotient/csapi/logout.h>
 #include <Quotient/csapi/notifications.h>
 #include <Quotient/eventstats.h>
+#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
 
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "notificationsmanager.h"
-#include "proxycontroller.h"
 #include "roommanager.h"
 
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
@@ -46,7 +46,7 @@ Controller::Controller(QObject *parent)
 {
     Connection::setRoomType<NeoChatRoom>();
 
-    ProxyController::instance().setApplicationProxy();
+    setApplicationProxy();
 
 #ifndef Q_OS_ANDROID
     setQuitOnLastWindowClosed();
@@ -178,10 +178,12 @@ void Controller::invokeLogin()
                 }
 
                 auto connection = new NeoChatConnection(account.homeserver());
-                connect(connection, &NeoChatConnection::connected, this, [this, connection] {
+                m_connectionsLoading[accountId] = connection;
+                connect(connection, &NeoChatConnection::connected, this, [this, connection, accountId] {
                     connection->loadState();
                     addConnection(connection);
                     m_accountsLoading.removeAll(connection->userId());
+                    m_connectionsLoading.remove(accountId);
                     Q_EMIT accountsLoadingChanged();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
@@ -285,10 +287,28 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
     if (connection == m_connection) {
         return;
     }
+    if (m_connection != nullptr) {
+        disconnect(m_connection, &NeoChatConnection::syncError, this, nullptr);
+        disconnect(m_connection, &NeoChatConnection::accountDataChanged, this, nullptr);
+    }
     m_connection = connection;
+    if (connection != nullptr) {
+        connect(connection, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
+            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
+                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
+            }
+        });
+    }
+    NeoChatConfig::self()->save();
     Q_EMIT activeConnectionChanged();
 }
 
+void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
+{
+    // HACK: Workaround bug QTBUG 93281
+    connect(textDocument->textDocument(), SIGNAL(imagesLoaded()), item, SLOT(updateWholeDocument()));
+}
+
 void Controller::listenForNotifications()
 {
 #ifdef HAVE_KUNIFIEDPUSH
@@ -310,6 +330,36 @@ void Controller::listenForNotifications()
 #endif
 }
 
+void Controller::setApplicationProxy()
+{
+    NeoChatConfig *cfg = NeoChatConfig::self();
+    QNetworkProxy proxy;
+
+    // type match to ProxyType from neochatconfig.kcfg
+    switch (cfg->proxyType()) {
+    case 1: // HTTP
+        proxy.setType(QNetworkProxy::HttpProxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        break;
+    case 2: // SOCKS 5
+        proxy.setType(QNetworkProxy::Socks5Proxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        break;
+    case 0: // System Default
+    default:
+        // do nothing
+        break;
+    }
+
+    QNetworkProxy::setApplicationProxy(proxy);
+}
+
 bool Controller::isFlatpak() const
 {
 #ifdef NEOCHAT_FLATPAK
@@ -330,3 +380,13 @@ void Controller::setTestMode(bool test)
 {
     testMode = test;
 }
+
+void Controller::removeConnection(const QString &userId)
+{
+    if (m_connectionsLoading.contains(userId) && m_connectionsLoading[userId]) {
+        auto connection = m_connectionsLoading[userId];
+        m_accountsLoading.removeAll(userId);
+        Q_EMIT accountsLoadingChanged();
+        SettingsGroup("Accounts"_ls).remove(userId);
+    }
+}

src/controller.h

@@ -84,8 +84,22 @@ public:
 
     [[nodiscard]] bool supportSystemTray() const;
 
+    /**
+     * @brief Sets the QNetworkProxy for the application.
+     *
+     * @sa QNetworkProxy::setApplicationProxy
+     */
+    Q_INVOKABLE void setApplicationProxy();
+
     bool isFlatpak() const;
 
+    /**
+     * @brief Force a QQuickTextDocument to refresh when images are loaded.
+     *
+     * HACK: This is a workaround for QTBUG 93281.
+     */
+    Q_INVOKABLE void forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item);
+
     /**
      * @brief Start listening for notifications in dbus-activated mode.
      * These notifications will quit the application when closed.
@@ -96,6 +110,8 @@ public:
 
     static void setTestMode(bool testMode);
 
+    Q_INVOKABLE void removeConnection(const QString &userId);
+
 private:
     explicit Controller(QObject *parent = nullptr);
 
@@ -109,6 +125,7 @@ private:
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
+    QMap<QString, QPointer<Quotient::Connection>> m_connectionsLoading;
     QString m_endpoint;
 
 private Q_SLOTS:

src/models/itinerarymodel.cpp

@@ -1,163 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "itinerarymodel.h"
-
-#include <QProcess>
-
-#include "config-neochat.h"
-
-#ifndef Q_OS_ANDROID
-#include <KIO/ApplicationLauncherJob>
-#endif
-
-ItineraryModel::ItineraryModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-void ItineraryModel::setConnection(NeoChatConnection *connection)
-{
-    if (m_connection == connection) {
-        return;
-    }
-    m_connection = connection;
-    Q_EMIT connectionChanged();
-}
-
-NeoChatConnection *ItineraryModel::connection() const
-{
-    return m_connection;
-}
-
-QVariant ItineraryModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid()) {
-        return {};
-    }
-    auto row = index.row();
-    auto data = m_data[row];
-    if (role == NameRole) {
-        if (data[QStringLiteral("@type")] == QStringLiteral("TrainReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("trainNumber")];
-        }
-        if (data[QStringLiteral("@type")] == QStringLiteral("LodgingReservation")) {
-            return data[QStringLiteral("reservationFor")][QStringLiteral("name")];
-        }
-    }
-    if (role == TypeRole) {
-        return data[QStringLiteral("@type")];
-    }
-    if (role == DepartureStationRole) {
-        return data[QStringLiteral("reservationFor")][QStringLiteral("departureStation")][QStringLiteral("name")];
-    }
-    if (role == ArrivalStationRole) {
-        return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalStation")][QStringLiteral("name")];
-    }
-    if (role == DepartureTimeRole) {
-        const auto &time = data[QStringLiteral("reservationFor")][QStringLiteral("departureTime")];
-        auto dateTime = (time.isString() ? time : time[QStringLiteral("@value")]).toVariant().toDateTime();
-        if (const auto &timeZone = time[QStringLiteral("timezone")].toString(); timeZone.length() > 0) {
-            dateTime.setTimeZone(QTimeZone(timeZone.toLatin1().data()));
-        }
-        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
-    }
-    if (role == ArrivalTimeRole) {
-        const auto &time = data[QStringLiteral("reservationFor")][QStringLiteral("arrivalTime")];
-        auto dateTime = (time.isString() ? time : time[QStringLiteral("@value")]).toVariant().toDateTime();
-        if (const auto &timeZone = time[QStringLiteral("timezone")].toString(); timeZone.length() > 0) {
-            dateTime.setTimeZone(QTimeZone(timeZone.toLatin1().data()));
-        }
-        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
-    }
-    if (role == AddressRole) {
-        const auto &addressData = data[QStringLiteral("reservationFor")][QStringLiteral("address")];
-        return QStringLiteral("%1 - %2 %3 %4")
-            .arg(addressData[QStringLiteral("streetAddress")].toString(),
-                 addressData[QStringLiteral("postalCode")].toString(),
-                 addressData[QStringLiteral("addressLocality")].toString(),
-                 addressData[QStringLiteral("addressCountry")].toString());
-    }
-    if (role == StartTimeRole) {
-        auto dateTime = data[QStringLiteral("checkinTime")][QStringLiteral("@value")].toVariant().toDateTime();
-        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
-    }
-    if (role == EndTimeRole) {
-        auto dateTime = data[QStringLiteral("checkoutTime")][QStringLiteral("@value")].toVariant().toDateTime();
-        return dateTime.toString(QLocale::system().dateTimeFormat(QLocale::ShortFormat));
-    }
-    if (role == DeparturePlatformRole) {
-        return data[QStringLiteral("reservationFor")][QStringLiteral("departurePlatform")];
-    }
-    if (role == ArrivalPlatformRole) {
-        return data[QStringLiteral("reservationFor")][QStringLiteral("arrivalPlatform")];
-    }
-    if (role == CoachRole) {
-        return data[QStringLiteral("reservedTicket")][QStringLiteral("ticketedSeat")][QStringLiteral("seatSection")];
-    }
-    if (role == SeatRole) {
-        return data[QStringLiteral("reservedTicket")][QStringLiteral("ticketedSeat")][QStringLiteral("seatNumber")];
-    }
-    return {};
-}
-
-int ItineraryModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    return m_data.size();
-}
-
-QHash<int, QByteArray> ItineraryModel::roleNames() const
-{
-    return {
-        {NameRole, "name"},
-        {TypeRole, "type"},
-        {DepartureStationRole, "departureStation"},
-        {ArrivalStationRole, "arrivalStation"},
-        {DepartureTimeRole, "departureTime"},
-        {ArrivalTimeRole, "arrivalTime"},
-        {AddressRole, "address"},
-        {StartTimeRole, "startTime"},
-        {EndTimeRole, "endTime"},
-        {DeparturePlatformRole, "departurePlatform"},
-        {ArrivalPlatformRole, "arrivalPlatform"},
-        {CoachRole, "coach"},
-        {SeatRole, "seat"},
-    };
-}
-
-QString ItineraryModel::path() const
-{
-    return m_path;
-}
-
-void ItineraryModel::setPath(const QString &path)
-{
-    if (path == m_path) {
-        return;
-    }
-    m_path = path;
-    Q_EMIT pathChanged();
-    loadData();
-}
-
-void ItineraryModel::loadData()
-{
-    auto process = new QProcess(this);
-    process->start(QLatin1String(CMAKE_INSTALL_FULL_LIBEXECDIR_KF6) + QLatin1String("/kitinerary-extractor"), {m_path.mid(7)});
-    connect(process, &QProcess::finished, this, [this, process]() {
-        auto data = process->readAllStandardOutput();
-        beginResetModel();
-        m_data = QJsonDocument::fromJson(data).array();
-        endResetModel();
-    });
-}
-
-void ItineraryModel::sendToItinerary()
-{
-#ifndef Q_OS_ANDROID
-    auto job = new KIO::ApplicationLauncherJob(KService::serviceByDesktopName(QStringLiteral("org.kde.itinerary")));
-    job->setUrls({QUrl::fromLocalFile(m_path.mid(7))});
-    job->start();
-#endif
-}

src/models/itinerarymodel.h

@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <QAbstractListModel>
-#include <QPointer>
-#include <QQmlEngine>
-#include <QString>
-
-#include "neochatconnection.h"
-
-class ItineraryModel : public QAbstractListModel
-{
-    Q_OBJECT
-    QML_ELEMENT
-
-    Q_PROPERTY(NeoChatConnection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-
-public:
-    enum Roles {
-        NameRole = Qt::DisplayRole,
-        TypeRole,
-        DepartureStationRole,
-        ArrivalStationRole,
-        DepartureTimeRole,
-        ArrivalTimeRole,
-        AddressRole,
-        StartTimeRole,
-        EndTimeRole,
-        DeparturePlatformRole,
-        ArrivalPlatformRole,
-        CoachRole,
-        SeatRole,
-    };
-    Q_ENUM(Roles)
-    explicit ItineraryModel(QObject *parent = nullptr);
-
-    void setConnection(NeoChatConnection *connection);
-    NeoChatConnection *connection() const;
-
-    QVariant data(const QModelIndex &index, int role) const override;
-    int rowCount(const QModelIndex &parent = {}) const override;
-
-    QHash<int, QByteArray> roleNames() const override;
-
-    QString path() const;
-    void setPath(const QString &path);
-
-    Q_INVOKABLE void sendToItinerary();
-
-Q_SIGNALS:
-    void connectionChanged();
-    void pathChanged();
-
-private:
-    QPointer<NeoChatConnection> m_connection;
-    QJsonArray m_data;
-    QString m_path;
-    void loadData();
-};

src/models/publicroomlistmodel.cpp

@@ -5,8 +5,6 @@
 
 #include <Quotient/connection.h>
 
-#include "publicroomlist_logging.h"
-
 using namespace Quotient;
 
 PublicRoomListModel::PublicRoomListModel(QObject *parent)
@@ -43,7 +41,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -52,6 +50,7 @@ void PublicRoomListModel::setConnection(Connection *conn)
 
     Q_EMIT connectionChanged();
     Q_EMIT serverChanged();
+    Q_EMIT hasMoreChanged();
 }
 
 QString PublicRoomListModel::server() const
@@ -72,13 +71,14 @@ void PublicRoomListModel::setServer(const QString &value)
     nextBatch = QString();
     attempted = false;
     rooms.clear();
+    Q_EMIT loadingChanged();
 
     endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
 
     if (m_connection) {
@@ -86,30 +86,42 @@ void PublicRoomListModel::setServer(const QString &value)
     }
 
     Q_EMIT serverChanged();
+    Q_EMIT hasMoreChanged();
 }
 
-QString PublicRoomListModel::searchText() const
+QString PublicRoomListModel::keyword() const
 {
-    return m_searchText;
+    return m_keyword;
 }
 
-void PublicRoomListModel::setSearchText(const QString &value)
+void PublicRoomListModel::setKeyword(const QString &value)
 {
-    if (m_searchText == value) {
+    if (m_keyword == value) {
         return;
     }
 
-    m_searchText = value;
+    m_keyword = value;
-    Q_EMIT searchTextChanged();
+
+    beginResetModel();
 
     nextBatch = QString();
     attempted = false;
+    rooms.clear();
+
+    endResetModel();
 
     if (job) {
         job->abandon();
         job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     }
+
+    if (m_connection) {
+        next();
+    }
+
+    Q_EMIT keywordChanged();
+    Q_EMIT hasMoreChanged();
 }
 
 bool PublicRoomListModel::showOnlySpaces() const
@@ -126,28 +138,15 @@ void PublicRoomListModel::setShowOnlySpaces(bool showOnlySpaces)
     Q_EMIT showOnlySpacesChanged();
 }
 
-void PublicRoomListModel::search(int limit)
+void PublicRoomListModel::next(int count)
 {
-    if (limit < 1 || attempted) {
+    if (count < 1) {
         return;
     }
 
     if (job) {
-        qCDebug(PublicRoomList) << "Other job running, ignore";
+        qDebug() << "PublicRoomListModel: Other jobs running, ignore";
-        return;
-    }
 
-    next(limit);
-}
-
-void PublicRoomListModel::next(int limit)
-{
-    if (m_connection == nullptr || limit < 1) {
-        return;
-    }
-
-    if (job) {
-        qCDebug(PublicRoomList) << "Other job running, ignore";
         return;
     }
 
@@ -155,17 +154,11 @@ void PublicRoomListModel::next(int limit)
     if (m_showOnlySpaces) {
         roomTypes += QLatin1String("m.space");
     }
-    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, limit, nextBatch, QueryPublicRoomsJob::Filter{m_searchText, roomTypes});
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, roomTypes});
-    Q_EMIT searchingChanged();
+    Q_EMIT loadingChanged();
 
     connect(job, &BaseJob::finished, this, [this] {
-        if (!attempted) {
+        attempted = true;
-            beginResetModel();
-            rooms.clear();
-            endResetModel();
-
-            attempted = true;
-        }
 
         if (job->status() == BaseJob::Success) {
             nextBatch = job->nextBatch();
@@ -173,10 +166,14 @@ void PublicRoomListModel::next(int limit)
             this->beginInsertRows({}, rooms.count(), rooms.count() + job->chunk().count() - 1);
             rooms.append(job->chunk());
             this->endInsertRows();
+
+            if (job->nextBatch().isEmpty()) {
+                Q_EMIT hasMoreChanged();
+            }
         }
 
         this->job = nullptr;
-        Q_EMIT searchingChanged();
+        Q_EMIT loadingChanged();
     });
 }
 
@@ -187,7 +184,8 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
     }
 
     if (index.row() >= rooms.count()) {
-        qCDebug(PublicRoomList) << "something's wrong: index.row() >= rooms.count()";
+        qDebug() << "PublicRoomListModel, something's wrong: index.row() >= "
+                    "rooms.count()";
         return {};
     }
     auto room = rooms.at(index.row());
@@ -273,19 +271,12 @@ int PublicRoomListModel::rowCount(const QModelIndex &parent) const
     return rooms.count();
 }
 
-bool PublicRoomListModel::canFetchMore(const QModelIndex &parent) const
+bool PublicRoomListModel::hasMore() const
 {
-    Q_UNUSED(parent)
+    return !(attempted && nextBatch.isEmpty());
-    return !nextBatch.isEmpty();
 }
 
-void PublicRoomListModel::fetchMore(const QModelIndex &parent)
+bool PublicRoomListModel::loading() const
-{
-    Q_UNUSED(parent)
-    next();
-}
-
-bool PublicRoomListModel::searching() const
 {
     return job != nullptr;
 }

src/models/publicroomlistmodel.h

@@ -41,9 +41,9 @@ class PublicRoomListModel : public QAbstractListModel
     Q_PROPERTY(QString server READ server WRITE setServer NOTIFY serverChanged)
 
     /**
-     * @brief The text to search the public room list for.
+     * @brief The filter keyword for the list of public rooms.
      */
-    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
+    Q_PROPERTY(QString keyword READ keyword WRITE setKeyword NOTIFY keywordChanged)
 
     /**
      * @brief Whether only space rooms should be shown.
@@ -51,9 +51,14 @@ class PublicRoomListModel : public QAbstractListModel
     Q_PROPERTY(bool showOnlySpaces READ showOnlySpaces WRITE setShowOnlySpaces NOTIFY showOnlySpacesChanged)
 
     /**
-     * @brief Whether the model is searching.
+     * @brief Whether the model has more items to load.
      */
-    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+    Q_PROPERTY(bool hasMore READ hasMore NOTIFY hasMoreChanged)
+
+    /**
+     * @biref Whether the model is still loading.
+     */
+    Q_PROPERTY(bool loading READ loading NOTIFY loadingChanged)
 
 public:
     /**
@@ -100,38 +105,31 @@ public:
     [[nodiscard]] QString server() const;
     void setServer(const QString &value);
 
-    [[nodiscard]] QString searchText() const;
+    [[nodiscard]] QString keyword() const;
-    void setSearchText(const QString &searchText);
+    void setKeyword(const QString &value);
 
     [[nodiscard]] bool showOnlySpaces() const;
     void setShowOnlySpaces(bool showOnlySpaces);
 
-    [[nodiscard]] bool searching() const;
+    [[nodiscard]] bool hasMore() const;
 
-    /**
+    [[nodiscard]] bool loading() const;
-     * @brief Search the room directory.
-     *
-     * @param limit the maximum number of rooms to load.
-     */
-    Q_INVOKABLE void search(int limit = 50);
-
-private:
-    QPointer<Quotient::Connection> m_connection = nullptr;
-    QString m_server;
-    QString m_searchText;
-    bool m_showOnlySpaces = false;
 
     /**
      * @brief Load the next set of rooms.
      *
-     * @param limit the maximum number of rooms to load.
+     * @param count the maximum number of rooms to load.
      */
-    void next(int limit = 50);
+    Q_INVOKABLE void next(int count = 50);
-    bool canFetchMore(const QModelIndex &parent) const override;
+
-    void fetchMore(const QModelIndex &parent) override;
+private:
+    Quotient::Connection *m_connection = nullptr;
+    QString m_server;
+    QString m_keyword;
+    bool m_showOnlySpaces = false;
 
     bool attempted = false;
-    bool m_searching = false;
+    bool m_loading = false;
     QString nextBatch;
 
     QList<Quotient::PublicRoomsChunk> rooms;
@@ -141,7 +139,8 @@ private:
 Q_SIGNALS:
     void connectionChanged();
     void serverChanged();
-    void searchTextChanged();
+    void keywordChanged();
     void showOnlySpacesChanged();
-    void searchingChanged();
+    void hasMoreChanged();
+    void loadingChanged();
 };

src/models/reactionmodel.cpp

@@ -23,7 +23,7 @@ ReactionModel::ReactionModel(const Quotient::RoomMessageEvent *event, const NeoC
 {
     if (m_event != nullptr && m_room != nullptr) {
         connect(m_room, &NeoChatRoom::updatedEvent, this, [this](const QString &eventId) {
-            if (m_event->id() == eventId) {
+            if (m_event && m_event->id() == eventId) {
                 updateReactions();
             }
         });
@@ -80,7 +80,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                       "%2 reacted with %3",
                       reaction.authors.count(),
                       text,
-                      reactionText(reaction.reaction));
+                      m_shortcodes.contains(reaction.reaction) ? m_shortcodes[reaction.reaction] : reactionText(reaction.reaction));
         return text;
     }
 
@@ -111,6 +111,7 @@ void ReactionModel::updateReactions()
     beginResetModel();
 
     m_reactions.clear();
+    m_shortcodes.clear();
 
     const auto &annotations = m_room->relatedEvents(*m_event, Quotient::EventRelation::AnnotationType);
     if (annotations.isEmpty()) {
@@ -125,6 +126,9 @@ void ReactionModel::updateReactions()
         }
         if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) {
             reactions[e->key()].append(m_room->user(e->senderId()));
+            if (e->contentJson()[QStringLiteral("shortcode")].toString().length()) {
+                m_shortcodes[e->key()] = e->contentJson()[QStringLiteral("shortcode")].toString().toHtmlEscaped();
+            }
         }
     }
 
@@ -158,8 +162,18 @@ QHash<int, QByteArray> ReactionModel::roleNames() const
     };
 }
 
-QString ReactionModel::reactionText(const QString &text)
+QString ReactionModel::reactionText(QString text) const
 {
+    text = text.toHtmlEscaped();
+    if (text.startsWith(QStringLiteral("mxc://"))) {
+        static QFont font;
+        static int size = font.pixelSize();
+        if (size == -1) {
+            size = font.pointSizeF() * 1.333;
+        }
+        return QStringLiteral("<img src=\"%1\" width=\"%2\" height=\"%2\">")
+            .arg(m_room->connection()->makeMediaUrl(QUrl(text)).toString(), QString::number(size));
+    }
     const auto isEmoji = [](const QString &text) {
 #ifdef HAVE_ICU
         QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);

src/models/reactionmodel.h

@@ -71,8 +71,9 @@ private:
     const NeoChatRoom *m_room;
     const Quotient::RoomMessageEvent *m_event;
     QList<Reaction> m_reactions;
+    QMap<QString, QString> m_shortcodes;
 
     void updateReactions();
-    static QString reactionText(const QString &text);
+    QString reactionText(QString text) const;
 };
 Q_DECLARE_METATYPE(ReactionModel *)

src/models/roomlistmodel.cpp

@@ -368,9 +368,6 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == ReplacementIdRole) {
         return room->successorId();
     }
-    if (role == IsDirectChat) {
-        return room->isDirectChat();
-    }
 
     return QVariant();
 }
@@ -404,7 +401,6 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
     roles[IsSpaceRole] = "isSpace";
     roles[RoomIdRole] = "roomId";
     roles[IsChildSpaceRole] = "isChildSpace";
-    roles[IsDirectChat] = "isDirectChat";
     return roles;
 }
 
@@ -416,7 +412,7 @@ QString RoomListModel::categoryName(int category)
     case NeoChatRoomType::Favorite:
         return i18n("Favorite");
     case NeoChatRoomType::Direct:
-        return i18n("Friends");
+        return i18n("Direct Messages");
     case NeoChatRoomType::Normal:
         return i18n("Normal");
     case NeoChatRoomType::Deprioritized:

src/models/roomlistmodel.h

@@ -77,7 +77,6 @@ public:
         IsSpaceRole, /**< Whether the room is a space. */
         IsChildSpaceRole, /**< Whether this space is a child of a different space. */
         ReplacementIdRole, /**< The room id of the room replacing this one, if any. */
-        IsDirectChat, /**< Whether this room is a direct chat. */
     };
     Q_ENUM(EventRoles)
 

src/models/searchmodel.cpp

@@ -36,7 +36,7 @@ void SearchModel::setSearchText(const QString &searchText)
 
 void SearchModel::search()
 {
-    Q_ASSERT(m_room);
+    Q_ASSERT(m_connection);
     setSearching(true);
     if (m_job) {
         m_job->abandon();
@@ -62,7 +62,7 @@ void SearchModel::search()
 
     };
 
-    auto job = m_room->connection()->callApi<SearchJob>(SearchJob::Categories{criteria});
+    auto job = m_connection->callApi<SearchJob>(SearchJob::Categories{criteria});
     m_job = job;
     connect(job, &BaseJob::finished, this, [this, job] {
         beginResetModel();
@@ -74,6 +74,17 @@ void SearchModel::search()
     });
 }
 
+Connection *SearchModel::connection() const
+{
+    return m_connection;
+}
+
+void SearchModel::setConnection(Connection *connection)
+{
+    m_connection = connection;
+    Q_EMIT connectionChanged();
+}
+
 QVariant SearchModel::data(const QModelIndex &index, int role) const
 {
     auto row = index.row();

src/models/searchmodel.h

@@ -31,6 +31,11 @@ class SearchModel : public QAbstractListModel
      */
     Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
 
+    /**
+     * @brief The current connection that the model is using to search for messages.
+     */
+    Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
+
     /**
      * @brief The current room that the search is being done from.
      */
@@ -89,6 +94,9 @@ public:
     QString searchText() const;
     void setSearchText(const QString &searchText);
 
+    Quotient::Connection *connection() const;
+    void setConnection(Quotient::Connection *connection);
+
     NeoChatRoom *room() const;
     void setRoom(NeoChatRoom *room);
 
@@ -122,6 +130,7 @@ public:
 
 Q_SIGNALS:
     void searchTextChanged();
+    void connectionChanged();
     void roomChanged();
     void searchingChanged();
 
@@ -132,6 +141,7 @@ private:
     void setSearching(bool searching);
 
     QString m_searchText;
+    Quotient::Connection *m_connection = nullptr;
     NeoChatRoom *m_room = nullptr;
     Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
     Quotient::SearchJob *m_job = nullptr;

src/models/sortfilterroomlistmodel.cpp

@@ -83,21 +83,6 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
 {
     Q_UNUSED(source_parent);
 
-    bool acceptRoom =
-        sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
-        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;
-
-    bool isDirectChat = sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsDirectChat).toBool();
-    // In `show direct chats` mode we only care about whether or not it's a direct chat or if the filter string matches.'
-    if (m_mode == DirectChats) {
-        return isDirectChat && acceptRoom;
-    }
-
-    // When not in `show direct chats` mode, filter them out.
-    if (isDirectChat && m_mode == Rooms) {
-        return false;
-    }
-
     if (sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::JoinStateRole).toString() == QStringLiteral("upgraded")
         && dynamic_cast<RoomListModel *>(sourceModel())
                ->connection()
@@ -105,6 +90,10 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
         return false;
     }
 
+    bool acceptRoom =
+        sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::DisplayNameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
+        && sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IsSpaceRole).toBool() == false;
+
     if (m_activeSpaceId.isEmpty()) {
         return acceptRoom;
     } else {
@@ -127,20 +116,4 @@ void SortFilterRoomListModel::setActiveSpaceId(const QString &spaceId)
     invalidate();
 }
 
-SortFilterRoomListModel::Mode SortFilterRoomListModel::mode() const
-{
-    return m_mode;
-}
-
-void SortFilterRoomListModel::setMode(SortFilterRoomListModel::Mode mode)
-{
-    if (m_mode == mode) {
-        return;
-    }
-
-    m_mode = mode;
-    Q_EMIT modeChanged();
-    invalidate();
-}
-
 #include "moc_sortfilterroomlistmodel.cpp"

src/models/sortfilterroomlistmodel.h

@@ -47,11 +47,6 @@ class SortFilterRoomListModel : public QSortFilterProxyModel
      */
     Q_PROPERTY(QString activeSpaceId READ activeSpaceId WRITE setActiveSpaceId NOTIFY activeSpaceIdChanged)
 
-    /**
-     * @brief Whether only direct chats should be shown.
-     */
-    Q_PROPERTY(Mode mode READ mode WRITE setMode NOTIFY modeChanged)
-
 public:
     enum RoomSortOrder {
         Alphabetical,
@@ -60,13 +55,6 @@ public:
     };
     Q_ENUM(RoomSortOrder)
 
-    enum Mode {
-        Rooms,
-        DirectChats,
-        All,
-    };
-    Q_ENUM(Mode)
-
     explicit SortFilterRoomListModel(QObject *parent = nullptr);
 
     void setRoomSortOrder(RoomSortOrder sortOrder);
@@ -78,9 +66,6 @@ public:
     QString activeSpaceId() const;
     void setActiveSpaceId(const QString &spaceId);
 
-    Mode mode() const;
-    void setMode(Mode mode);
-
 protected:
     /**
      * @brief Returns true if the value of source_left is less than source_right.
@@ -100,11 +85,9 @@ Q_SIGNALS:
     void roomSortOrderChanged();
     void filterTextChanged();
     void activeSpaceIdChanged();
-    void modeChanged();
 
 private:
     RoomSortOrder m_sortOrder = Categories;
-    Mode m_mode = All;
     QString m_filterText;
     QString m_activeSpaceId;
 };

src/models/userdirectorylistmodel.cpp

@@ -26,6 +26,7 @@ void UserDirectoryListModel::setConnection(Connection *conn)
 
     beginResetModel();
 
+    m_limited = false;
     attempted = false;
     users.clear();
 
@@ -36,50 +37,53 @@ void UserDirectoryListModel::setConnection(Connection *conn)
     endResetModel();
 
     m_connection = conn;
+
+    if (job) {
+        job->abandon();
+        job = nullptr;
+    }
+
     Q_EMIT connectionChanged();
-
+    Q_EMIT limitedChanged();
-    if (m_job) {
-        m_job->abandon();
-        m_job = nullptr;
-        Q_EMIT searchingChanged();
-    }
 }
 
-QString UserDirectoryListModel::searchText() const
+QString UserDirectoryListModel::keyword() const
 {
-    return m_searchText;
+    return m_keyword;
 }
 
-void UserDirectoryListModel::setSearchText(const QString &value)
+void UserDirectoryListModel::setKeyword(const QString &value)
 {
-    if (m_searchText == value) {
+    if (m_keyword == value) {
         return;
     }
 
-    m_searchText = value;
+    m_keyword = value;
-    Q_EMIT searchTextChanged();
-
-    if (m_job) {
-        m_job->abandon();
-        m_job = nullptr;
-        Q_EMIT searchingChanged();
-    }
 
+    m_limited = false;
     attempted = false;
+
+    if (job) {
+        job->abandon();
+        job = nullptr;
+    }
+
+    Q_EMIT keywordChanged();
+    Q_EMIT limitedChanged();
 }
 
-bool UserDirectoryListModel::searching() const
+bool UserDirectoryListModel::limited() const
 {
-    return m_job != nullptr;
+    return m_limited;
 }
 
-void UserDirectoryListModel::search(int limit)
+void UserDirectoryListModel::search(int count)
 {
-    if (limit < 1) {
+    if (count < 1) {
         return;
     }
 
-    if (m_job) {
+    if (job) {
         qDebug() << "UserDirectoryListModel: Other jobs running, ignore";
 
         return;
@@ -89,22 +93,25 @@ void UserDirectoryListModel::search(int limit)
         return;
     }
 
-    m_job = m_connection->callApi<SearchUserDirectoryJob>(m_searchText, limit);
+    job = m_connection->callApi<SearchUserDirectoryJob>(m_keyword, count);
-    Q_EMIT searchingChanged();
 
-    connect(m_job, &BaseJob::finished, this, [this] {
+    connect(job, &BaseJob::finished, this, [this] {
         attempted = true;
 
-        if (m_job->status() == BaseJob::Success) {
+        if (job->status() == BaseJob::Success) {
-            auto users = m_job->results();
+            auto users = job->results();
 
             this->beginResetModel();
+
             this->users = users;
+            this->m_limited = job->limited();
+
             this->endResetModel();
         }
 
-        this->m_job = nullptr;
+        this->job = nullptr;
-        Q_EMIT searchingChanged();
+
+        Q_EMIT limitedChanged();
     });
 }
 
@@ -120,7 +127,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
         return {};
     }
     auto user = users.at(index.row());
-    if (role == DisplayNameRole) {
+    if (role == NameRole) {
         auto displayName = user.displayName;
         if (!displayName.isEmpty()) {
             return displayName;
@@ -135,17 +142,18 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
     }
     if (role == AvatarRole) {
         auto avatarUrl = user.avatarUrl;
-        if (avatarUrl.isEmpty() || !m_connection) {
+
-            return QUrl();
+        if (avatarUrl.isEmpty()) {
+            return QString();
         }
-        return m_connection->makeMediaUrl(avatarUrl);
+        return avatarUrl.url().remove(0, 6);
     }
     if (role == UserIDRole) {
         return user.userId;
     }
-    if (role == DirectChatExistsRole) {
+    if (role == DirectChatsRole) {
         if (!m_connection) {
-            return false;
+            return QStringList();
         };
 
         auto userObj = m_connection->user(user.userId);
@@ -154,11 +162,11 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
         if (userObj && directChats.contains(userObj)) {
             auto directChatsForUser = directChats.values(userObj);
             if (!directChatsForUser.isEmpty()) {
-                return true;
+                return QVariant::fromValue(directChatsForUser);
             }
         }
 
-        return false;
+        return QStringList();
     }
 
     return {};
@@ -168,10 +176,10 @@ QHash<int, QByteArray> UserDirectoryListModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
-    roles[DisplayNameRole] = "displayName";
+    roles[NameRole] = "name";
-    roles[AvatarRole] = "avatarUrl";
+    roles[AvatarRole] = "avatar";
-    roles[UserIDRole] = "userId";
+    roles[UserIDRole] = "userID";
-    roles[DirectChatExistsRole] = "directChatExists";
+    roles[DirectChatsRole] = "directChats";
 
     return roles;
 }

src/models/userdirectorylistmodel.h

@@ -35,24 +35,24 @@ class UserDirectoryListModel : public QAbstractListModel
     Q_PROPERTY(Quotient::Connection *connection READ connection WRITE setConnection NOTIFY connectionChanged)
 
     /**
-     * @brief The text to search the public room list for.
+     * @brief The keyword to use in the search.
      */
-    Q_PROPERTY(QString searchText READ searchText WRITE setSearchText NOTIFY searchTextChanged)
+    Q_PROPERTY(QString keyword READ keyword WRITE setKeyword NOTIFY keywordChanged)
 
     /**
-     * @brief Whether the model is searching.
+     * @brief Whether the current results have been truncated.
      */
-    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+    Q_PROPERTY(bool limited READ limited NOTIFY limitedChanged)
 
 public:
     /**
      * @brief Defines the model roles.
      */
     enum EventRoles {
-        DisplayNameRole = Qt::DisplayRole, /**< The user's display name. */
+        NameRole = Qt::DisplayRole + 1, /**< The user's display name. */
         AvatarRole, /**< The source URL for the user's avatar. */
         UserIDRole, /**< Matrix ID of the user. */
-        DirectChatExistsRole, /**< Whether there is already a direct chat with the user. */
+        DirectChatsRole, /**< A list of direct chat matrix IDs with the user. */
     };
 
     explicit UserDirectoryListModel(QObject *parent = nullptr);
@@ -60,17 +60,17 @@ public:
     [[nodiscard]] Quotient::Connection *connection() const;
     void setConnection(Quotient::Connection *conn);
 
-    [[nodiscard]] QString searchText() const;
+    [[nodiscard]] QString keyword() const;
-    void setSearchText(const QString &searchText);
+    void setKeyword(const QString &value);
 
-    [[nodiscard]] bool searching() const;
+    [[nodiscard]] bool limited() const;
 
     /**
      * @brief Get the given role value at the given index.
      *
      * @sa QAbstractItemModel::data
      */
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = NameRole) const override;
 
     /**
      * @brief Number of rows in the model.
@@ -87,23 +87,23 @@ public:
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
     /**
-     * @brief Search the user directory.
+     * @brief Start the user search.
-     *
-     * @param limit the maximum number of rooms to load.
      */
-    Q_INVOKABLE void search(int limit = 50);
+    Q_INVOKABLE void search(int count = 50);
 
 Q_SIGNALS:
     void connectionChanged();
-    void searchTextChanged();
+    void keywordChanged();
-    void searchingChanged();
+    void limitedChanged();
 
 private:
     Quotient::Connection *m_connection = nullptr;
-    QString m_searchText;
+    QString m_keyword;
+    bool m_limited = false;
 
     bool attempted = false;
+
     QList<Quotient::SearchUserDirectoryJob::User> users;
 
-    Quotient::SearchUserDirectoryJob *m_job = nullptr;
+    Quotient::SearchUserDirectoryJob *job = nullptr;
 };

src/neochat.notifyrc

@@ -188,7 +188,6 @@ Name[ie]=Nov invitation
 Name[it]=Nuovo invito
 Name[ka]=ახალი მოსაწვევი
 Name[ko]=새 초대장
-Name[lt]=Naujas pakvietimas
 Name[nl]=Nieuwe uitnodiging
 Name[nn]=Ny invitasjon
 Name[pa]=ਨਵਾਂ ਸੱਦਾ
@@ -226,7 +225,6 @@ Comment[ie]=Vu have un nov invitation a un chambre
 Comment[it]=È presente un nuovo invito a una stanza
 Comment[ka]=გაქვთ ახალი ოთახის მოსაწვევი
 Comment[ko]=새로운 대화방 초대장을 받음
-Comment[lt]=Yra naujas pakvietimas į kambarį
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
 Comment[nn]=Du har ein ny invitasjon til eit rom
 Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ

src/neochatconfig.kcfg

@@ -22,6 +22,10 @@
       <label>Background transparency value</label>
       <default>0.3</default>
     </entry>
+    <entry name="MergeRoomList" type="bool">
+      <label>Merge Room Lists</label>
+      <default>false</default>
+    </entry>
     <entry name="AllowQuickEdit" type="bool">
       <label>Use s/text/replacement syntax to edit your last message.</label>
       <default>false</default>
@@ -152,5 +156,11 @@
       <default></default>
     </entry>
   </group>
+  <group name="FeatureFlags">
+    <entry name="Threads" type="bool">
+      <label>Enable threads</label>
+      <default>false</default>
+    </entry>
+  </group>
 </kcfg>
 

src/neochatconnection.cpp

@@ -10,8 +10,6 @@
 #include "jobs/neochatdeactivateaccountjob.h"
 #include "roommanager.h"
 
-#include <Quotient/connection.h>
-#include <Quotient/quotient_common.h>
 #include <qt6keychain/keychain.h>
 
 #include <KLocalizedString>
@@ -19,9 +17,7 @@
 #include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/profile.h>
 #include <Quotient/database.h>
-#include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/room.h>
 #include <Quotient/settings.h>
 #include <Quotient/user.h>
 
@@ -36,17 +32,6 @@ using namespace Qt::StringLiterals;
 
 NeoChatConnection::NeoChatConnection(QObject *parent)
     : Connection(parent)
-{
-    connectSignals();
-}
-
-NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)
-    : Connection(server, parent)
-{
-    connectSignals();
-}
-
-void NeoChatConnection::connectSignals()
 {
     connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
         if (type == QLatin1String("org.kde.neochat.account_label")) {
@@ -64,37 +49,14 @@ void NeoChatConnection::connectSignals()
             Q_EMIT userConsentRequired(job->errorUrl());
         }
     });
-    connect(this, &NeoChatConnection::requestFailed, this, [](BaseJob *job) {
+}
-        if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"_ls].toString() == "M_TOO_LARGE"_ls) {
+
-            RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
+NeoChatConnection::NeoChatConnection(const QUrl &server, QObject *parent)
-        }
+    : Connection(server, parent)
-    });
+{
-    connect(this, &NeoChatConnection::directChatsListChanged, this, [this](DirectChatsMap additions, DirectChatsMap removals) {
+    connect(this, &NeoChatConnection::accountDataChanged, this, [this](const QString &type) {
-        Q_EMIT directChatInvitesChanged();
+        if (type == QLatin1String("org.kde.neochat.account_label")) {
-        for (const auto &chatId : additions) {
+            Q_EMIT labelChanged();
-            if (const auto chat = room(chatId)) {
-                connect(chat, &Room::unreadStatsChanged, this, [this]() {
-                    Q_EMIT directChatNotificationsChanged();
-                });
-            }
-        }
-        for (const auto &chatId : removals) {
-            if (const auto chat = room(chatId)) {
-                disconnect(chat, &Room::unreadStatsChanged, this, nullptr);
-            }
-        }
-    });
-    connect(this, &NeoChatConnection::joinedRoom, this, [this](Room *room) {
-        if (room->isDirectChat()) {
-            connect(room, &Room::unreadStatsChanged, this, [this]() {
-                Q_EMIT directChatNotificationsChanged();
-            });
-        }
-    });
-    connect(this, &NeoChatConnection::leftRoom, this, [this](Room *room, Room *prev) {
-        Q_UNUSED(room)
-        if (prev && prev->isDirectChat()) {
-            Q_EMIT directChatInvitesChanged();
         }
     });
 }
@@ -276,20 +238,6 @@ void NeoChatConnection::createSpace(const QString &name, const QString &topic, c
     });
 }
 
-bool NeoChatConnection::directChatExists(Quotient::User *user)
-{
-    return directChats().contains(user);
-}
-
-void NeoChatConnection::openOrCreateDirectChat(const QString &userId)
-{
-    if (auto user = this->user(userId)) {
-        openOrCreateDirectChat(user);
-    } 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();
@@ -304,32 +252,6 @@ void NeoChatConnection::openOrCreateDirectChat(User *user)
     requestDirectChat(user);
 }
 
-qsizetype NeoChatConnection::directChatNotifications() const
-{
-    qsizetype notifications = 0;
-    QStringList added; // The same ID can be in the list multiple times.
-    for (const auto &chatId : directChats()) {
-        if (!added.contains(chatId)) {
-            if (const auto chat = room(chatId)) {
-                notifications += chat->notificationCount();
-                added += chatId;
-            }
-        }
-    }
-    return notifications;
-}
-
-bool NeoChatConnection::directChatInvites() const
-{
-    auto inviteRooms = rooms(JoinState::Invite);
-    for (const auto inviteRoom : inviteRooms) {
-        if (inviteRoom->isDirectChat()) {
-            return true;
-        }
-    }
-    return false;
-}
-
 QCoro::Task<void> NeoChatConnection::setupPushNotifications(QString endpoint)
 {
 #ifdef HAVE_KUNIFIEDPUSH

src/neochatconnection.h

@@ -27,16 +27,6 @@ class NeoChatConnection : public Quotient::Connection
     Q_PROPERTY(QString deviceKey READ deviceKey CONSTANT)
     Q_PROPERTY(QString encryptionKey READ encryptionKey CONSTANT)
 
-    /**
-     * @brief The total number of notifications for all direct chats.
-     */
-    Q_PROPERTY(qsizetype directChatNotifications READ directChatNotifications NOTIFY directChatNotificationsChanged)
-
-    /**
-     * @brief Whether there is at least one invite to a direct chat.
-     */
-    Q_PROPERTY(bool directChatInvites READ directChatInvites NOTIFY directChatInvitesChanged)
-
     /**
      * @brief Whether NeoChat is currently able to connect to the server.
      */
@@ -90,27 +80,12 @@ public:
     Q_INVOKABLE void createSpace(const QString &name, const QString &topic, const QString &parent = {}, bool setChildParent = false);
 
     /**
-     * @brief Whether a direct chat with the user exists.
+     * @brief Join a direct chat with the given user.
-     */
-    Q_INVOKABLE bool directChatExists(Quotient::User *user);
-
-    /**
-     * @brief Join a direct chat with the given user ID.
-     *
-     * If a direct chat with the user doesn't exist one is created and then joined.
-     */
-    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);
 
-    qsizetype directChatNotifications() const;
-    bool directChatInvites() const;
-
     // note: this is intentionally a copied QString because
     // the reference could be destroyed before the task is finished
     QCoro::Task<void> setupPushNotifications(QString endpoint);
@@ -122,8 +97,6 @@ public:
 
 Q_SIGNALS:
     void labelChanged();
-    void directChatNotificationsChanged();
-    void directChatInvitesChanged();
     void isOnlineChanged();
     void passwordStatus(NeoChatConnection::PasswordStatus status);
     void userConsentRequired(QUrl url);
@@ -131,6 +104,4 @@ Q_SIGNALS:
 private:
     bool m_isOnline = true;
     void setIsOnline(bool isOnline);
-
-    void connectSignals();
 };

src/neochatroom.cpp

@@ -1826,11 +1826,7 @@ int NeoChatRoom::maxRoomVersion() const
 
 Quotient::User *NeoChatRoom::directChatRemoteUser() const
 {
-    auto users = connection()->directChatUsers(this);
+    return connection()->directChatUsers(this)[0];
-    if (users.isEmpty()) {
-        return nullptr;
-    }
-    return users[0];
 }
 
 void NeoChatRoom::sendLocation(float lat, float lon, const QString &description)

src/plasma-runner-neochat.desktop

@@ -63,7 +63,6 @@ Comment[ie]=Trovar chambres in NeoChat
 Comment[it]=Trova stanze in NeoChat
 Comment[ka]=იპოვე ოთახები NeoChat-ში
 Comment[ko]=NeoChat에서 대화방 찾기
-Comment[lt]=Rasti kambarius NeoChat
 Comment[nl]=Rooms zoeken in NeoChat
 Comment[nn]=Finn rom i NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat

src/proxycontroller.cpp

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "proxycontroller.h"
-
-#include <QNetworkProxy>
-
-#include "neochatconfig.h"
-
-void ProxyController::setApplicationProxy()
-{
-    auto cfg = NeoChatConfig::self();
-    QNetworkProxy proxy;
-
-    switch (cfg->proxyType()) {
-    case 1:
-        proxy.setType(QNetworkProxy::HttpProxy);
-        break;
-    case 2:
-        proxy.setType(QNetworkProxy::Socks5Proxy);
-        break;
-    default:
-        break;
-    }
-    proxy.setHostName(cfg->proxyHost());
-    proxy.setPort(cfg->proxyPort());
-    proxy.setUser(cfg->proxyUser());
-    proxy.setPassword(cfg->proxyPassword());
-    QNetworkProxy::setApplicationProxy(proxy);
-}
-
-ProxyController::ProxyController(QObject *parent)
-    : QObject(parent)
-{
-}

src/proxycontroller.h

@@ -1,36 +0,0 @@
-// SPDX-FileCopyrightText: 2024 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#pragma once
-
-#include <QObject>
-#include <QQmlEngine>
-
-class ProxyController : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
-
-public:
-    static ProxyController &instance()
-    {
-        static ProxyController _instance;
-        return _instance;
-    }
-    static ProxyController *create(QQmlEngine *engine, QJSEngine *)
-    {
-        engine->setObjectOwnership(&instance(), QQmlEngine::CppOwnership);
-        return &instance();
-    }
-
-    /**
-     * @brief Sets the QNetworkProxy for the application.
-     *
-     * @sa QNetworkProxy::setApplicationProxy
-     */
-    Q_INVOKABLE void setApplicationProxy();
-
-private:
-    explicit ProxyController(QObject *parent = nullptr);
-};

src/qml/AudioDelegate.qml

@@ -42,7 +42,8 @@ MessageDelegate {
     bubbleContent: ColumnLayout {
         MediaPlayer {
             id: audio
-            source: root.progressInfo.localPath
+            onErrorOccurred: (error, errorString) => console.warn("Audio playback error:" + error + errorString)
+            audioOutput: AudioOutput {}
         }
 
         states: [
@@ -53,7 +54,7 @@ MessageDelegate {
                 PropertyChanges {
                     target: playButton
                     icon.name: "media-playback-start"
-                    onClicked: root.room.downloadFile(root.eventId)
+                    onClicked: currentRoom.downloadFile(root.eventId)
                 }
             },
             State {
@@ -67,24 +68,25 @@ MessageDelegate {
                     target: playButton
                     icon.name: "media-playback-stop"
                     onClicked: {
-                        root.room.cancelFileTransfer(root.eventId)
+                        currentRoom.cancelFileTransfer(root.eventId)
                     }
                 }
             },
             State {
                 name: "paused"
-                when: root.progressInfo.completed && (audio.playbackState === Audio.StoppedState || audio.playbackState === Audio.PausedState)
+                when: root.progressInfo.completed && (audio.playbackState === MediaPlayer.StoppedState || audio.playbackState === MediaPlayer.PausedState)
                 PropertyChanges {
                     target: playButton
                     icon.name: "media-playback-start"
                     onClicked: {
-                        audio.play()
+                        audio.source = root.progressInfo.localPath;
+                        audio.play();
                     }
                 }
             },
             State {
                 name: "playing"
-                when: root.progressInfo.completed && audio.playbackState === Audio.PlayingState
+                when: root.progressInfo.completed && audio.playbackState === MediaPlayer.PlayingState
 
                 PropertyChanges {
                     target: playButton

src/qml/AvatarTabButton.qml

@@ -13,7 +13,7 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 Delegates.RoundedItemDelegate {
     id: root
 
-    property url source
+    required property url source
 
     signal contextMenuRequested()
     signal selected()

src/qml/CollapsedRoomDelegate.qml

@@ -30,7 +30,7 @@ QQC2.ItemDelegate {
     width: ListView.view.width
     height: visible ? ListView.view.width : 0
 
-    visible: root.categoryVisible || filterText.length > 0
+    visible: root.categoryVisible || filterText.length > 0 || Config.mergeRoomList
 
     contentItem: KirigamiComponents.Avatar {
         source: root.avatar ? `image://mxc/${root.avatar}` : ""

src/qml/ContextMenu.qml

@@ -70,7 +70,6 @@ Loader {
 
             QQC2.Menu {
                 title: i18n("Notification State")
-                icon.name: "notifications"
 
                 QQC2.MenuItem {
                     text: i18n("Follow Global Setting")

src/qml/CreateRoomDialog.qml

@@ -103,7 +103,7 @@ FormCard.FormCardPage {
             visible: !chosenRoomDelegate.visible
             text: i18nc("@action:button", "Pick room")
             onClicked: {
-                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     chosenRoomDelegate.roomId = roomId;
                     chosenRoomDelegate.displayName = displayName;
@@ -182,7 +182,7 @@ FormCard.FormCardPage {
             }
 
             onClicked: {
-                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     chosenRoomDelegate.roomId = roomId;
                     chosenRoomDelegate.displayName = displayName;

src/qml/EventDelegate.qml

@@ -11,12 +11,9 @@ import org.kde.neochat
 DelegateChooser {
     id: root
 
-    /**
-     * @brief The NeoChatRoom the delegate is being displayed in.
-     */
-    required property NeoChatRoom room
-
     role: "delegateType"
+    property var room
+    required property NeoChatConnection connection
 
     DelegateChoice {
         roleValue: DelegateType.State
@@ -26,63 +23,63 @@ DelegateChooser {
     DelegateChoice {
         roleValue: DelegateType.Emote
         delegate: TextDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Message
         delegate: TextDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Notice
         delegate: TextDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Image
         delegate: ImageDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Sticker
         delegate: ImageDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Audio
         delegate: AudioDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Video
         delegate: VideoDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.File
         delegate: FileDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Encrypted
         delegate: EncryptedDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
@@ -94,14 +91,14 @@ DelegateChooser {
     DelegateChoice {
         roleValue: DelegateType.Poll
         delegate: PollDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
     DelegateChoice {
         roleValue: DelegateType.Location
         delegate: LocationDelegate {
-            room: root.room
+            connection: root.connection
         }
     }
 
@@ -109,6 +106,7 @@ DelegateChooser {
         roleValue: DelegateType.LiveLocation
         delegate: LiveLocationDelegate {
             room: root.room
+            connection: root.connection
         }
     }
 

src/qml/ExploreComponent.qml

@@ -21,7 +21,7 @@ RowLayout {
         text: i18n("Explore rooms")
         icon.name: "compass"
         onTriggered: {
-            let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+            let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
             dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                 if (isJoined) {
                     RoomManager.enterRoom(root.connection.room(roomId))
@@ -32,9 +32,9 @@ RowLayout {
         }
     }
     property Kirigami.Action chatAction: Kirigami.Action {
-        text: i18n("Find your friends")
+        text: i18n("Start a Chat")
         icon.name: "list-add-user"
-        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/UserSearchPage.qml", {connection: root.connection}, {title: i18nc("@title", "Find your friends")})
+        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection}, {title: i18nc("@title", "Start a Chat")})
     }
     property Kirigami.Action roomAction: Kirigami.Action {
         text: i18n("Create a Room")

src/qml/ExploreComponentMobile.qml

@@ -52,7 +52,7 @@ ColumnLayout {
                 text: i18n("Explore rooms")
                 icon.name: "compass"
                 onTriggered: {
-                    let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+                    let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
                     dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                         if (isJoined) {
                             RoomManager.enterRoom(root.connection.room(roomId));
@@ -64,10 +64,10 @@ ColumnLayout {
                 }
             },
             Kirigami.Action {
-                text: i18n("Find your friends")
+                text: i18n("Start a Chat")
                 icon.name: "list-add-user"
                 onTriggered: {
-                    pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/UserSearchPage.qml", {connection: root.connection}, {title: i18nc("@title", "Find your friends")})
+                    pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection}, {title: i18nc("@title", "Start a Chat")})
                     exploreTabBar.currentIndex = -1;
                 }
             },

src/qml/ExploreRoomsPage.qml

@@ -1,112 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
-// SPDX-License-Identifier: GPL-3.0-only
-
-import QtQuick
-import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-import Qt.labs.qmlmodels
-
-import org.kde.kirigami as Kirigami
-import org.kde.kirigamiaddons.delegates as Delegates
-
-import org.kde.neochat
-
-/**
- * @brief Component for finding rooms for the public list.
- *
- * This component is based on a SearchPage, adding the functionality to select or
- * enter a server in the header, as well as the ability to manually type a room in
- * if the public room search cannot find it.
- *
- * @sa SearchPage
- */
-SearchPage {
-    id: root
-
-    /**
-     * @brief The connection for the current local user.
-     */
-    required property NeoChatConnection connection
-
-    /**
-     * @brief Whether results should only includes spaces.
-     */
-    property bool showOnlySpaces: false
-
-    /**
-     * @brief Signal emitted when a room is selected.
-     *
-     * The signal contains all the room's info so that it can be acted
-     * upon as required, e.g. joining or entering the room or adding the room as
-     * the child of a space.
-     */
-    signal roomSelected(string roomId,
-                        string displayName,
-                        url avatarUrl,
-                        string alias,
-                        string topic,
-                        int memberCount,
-                        bool isJoined)
-
-    title: i18nc("@action:title", "Explore Rooms")
-
-    Component.onCompleted: focusSearch()
-
-    headerTrailing: ServerComboBox {
-        id: serverComboBox
-        connection: root.connection
-    }
-
-    model: PublicRoomListModel {
-        id: publicRoomListModel
-
-        connection: root.connection
-        server: serverComboBox.server
-        showOnlySpaces: root.showOnlySpaces
-    }
-
-    modelDelegate: ExplorerDelegate {
-        onRoomSelected: (roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
-            root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
-            root.closeDialog();
-        }
-    }
-
-    listHeaderDelegate: Delegates.RoundedItemDelegate {
-        onClicked: _private.openManualRoomDialog()
-
-        text: i18n("Enter a room address")
-        icon.name: "compass"
-        icon.width: Kirigami.Units.gridUnit * 2
-        icon.height: Kirigami.Units.gridUnit * 2
-    }
-
-    listFooterDelegate: QQC2.ProgressBar {
-        width: ListView.view.width
-        leftInset: Kirigami.Units.largeSpacing
-        rightInset: Kirigami.Units.largeSpacing
-        visible: root.count !== 0 && publicRoomListModel.searching
-        indeterminate: true
-    }
-
-    searchFieldPlaceholder: i18n("Find a room…")
-    noResultPlaceholderMessage: i18nc("@info:label", "No public rooms found")
-
-    Component {
-        id: manualRoomDialog
-        ManualRoomDialog {}
-    }
-
-    QtObject {
-        id: _private
-        function openManualRoomDialog() {
-            let dialog = manualRoomDialog.createObject(applicationWindow().overlay, {connection: root.connection});
-            dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
-                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
-                root.closeDialog();
-            });
-            dialog.open();
-        }
-    }
-}

src/qml/FileDelegate.qml

@@ -5,7 +5,6 @@ import QtQuick
 import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 import Qt.labs.platform
-import Qt.labs.qmlmodels
 
 import org.kde.coreaddons
 import org.kde.kirigami as Kirigami
@@ -42,11 +41,8 @@ MessageDelegate {
      */
     property bool autoOpenFile: false
 
-    onDownloadedChanged: {
+    onDownloadedChanged: if (autoOpenFile) {
-        itineraryModel.path = root.progressInfo.localPath
+        openSavedFile();
-        if (autoOpenFile) {
-            openSavedFile();
-        }
     }
 
     onOpenContextMenu: RoomManager.viewEventMenu(eventId, author, delegateType, plainText, "", "", mediaInfo.mimeType, progressInfo)
@@ -54,224 +50,142 @@ MessageDelegate {
     function saveFileAs() {
         const dialog = fileDialog.createObject(QQC2.ApplicationWindow.overlay)
         dialog.open()
-        dialog.currentFile = dialog.folder + "/" + root.room.fileNameToDownload(root.eventId)
+        dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(root.eventId)
     }
 
     function openSavedFile() {
         UrlHelper.openUrl(root.progressInfo.localPath);
     }
 
-    bubbleContent: ColumnLayout {
+    bubbleContent: RowLayout {
         spacing: Kirigami.Units.largeSpacing
-        RowLayout {
-            spacing: Kirigami.Units.largeSpacing
 
-            states: [
+        states: [
-                State {
+            State {
-                    name: "downloadedInstant"
+                name: "downloadedInstant"
-                    when: root.progressInfo.completed && autoOpenFile
+                when: root.progressInfo.completed && autoOpenFile
 
-                    PropertyChanges {
+                PropertyChanges {
-                        target: openButton
+                    target: openButton
-                        icon.name: "document-open"
+                    icon.name: "document-open"
-                        onClicked: openSavedFile()
+                    onClicked: openSavedFile()
-                    }
-
-                    PropertyChanges {
-                        target: downloadButton
-                        icon.name: "download"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-                        onClicked: saveFileAs()
-                    }
-                },
-                State {
-                    name: "downloaded"
-                    when: root.progressInfo.completed && !autoOpenFile
-
-                    PropertyChanges {
-                        target: openButton
-                        visible: false
-                    }
-
-                    PropertyChanges {
-                        target: downloadButton
-                        icon.name: "document-open"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-                        onClicked: openSavedFile()
-                    }
-                },
-                State {
-                    name: "downloading"
-                    when: root.progressInfo.active
-
-                    PropertyChanges {
-                        target: openButton
-                        visible: false
-                    }
-
-                    PropertyChanges {
-                        target: sizeLabel
-                        text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.progressInfo.progress), Format.formatByteSize(root.progressInfo.total))
-                    }
-                    PropertyChanges {
-                        target: downloadButton
-                        icon.name: "media-playback-stop"
-                        QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                        onClicked: root.room.cancelFileTransfer(root.eventId)
-                    }
-                },
-                State {
-                    name: "raw"
-                    when: true
-
-                    PropertyChanges {
-                        target: downloadButton
-                        onClicked: root.saveFileAs()
-                    }
                 }
-            ]
 
-            Kirigami.Icon {
+                PropertyChanges {
-                source: root.mediaInfo.mimeIcon
+                    target: downloadButton
-                fallback: "unknown"
+                    icon.name: "download"
-            }
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
-
+                    onClicked: saveFileAs()
-            ColumnLayout {
-                spacing: 0
-                QQC2.Label {
-                    Layout.fillWidth: true
-                    text: root.display
-                    wrapMode: Text.Wrap
-                    elide: Text.ElideRight
                 }
-                QQC2.Label {
+            },
-                    id: sizeLabel
+            State {
-                    Layout.fillWidth: true
+                name: "downloaded"
-                    text: Format.formatByteSize(root.mediaInfo.size)
+                when: root.progressInfo.completed && !autoOpenFile
-                    opacity: 0.7
+
-                    elide: Text.ElideRight
+                PropertyChanges {
-                    maximumLineCount: 1
+                    target: openButton
+                    visible: false
+                }
+
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "document-open"
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
+                    onClicked: openSavedFile()
+                }
+            },
+            State {
+                name: "downloading"
+                when: root.progressInfo.active
+
+                PropertyChanges {
+                    target: openButton
+                    visible: false
+                }
+
+                PropertyChanges {
+                    target: sizeLabel
+                    text: i18nc("file download progress", "%1 / %2", Format.formatByteSize(root.progressInfo.progress), Format.formatByteSize(root.progressInfo.total))
+                }
+                PropertyChanges {
+                    target: downloadButton
+                    icon.name: "media-playback-stop"
+                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
+                    onClicked: currentRoom.cancelFileTransfer(root.eventId)
+                }
+            },
+            State {
+                name: "raw"
+                when: true
+
+                PropertyChanges {
+                    target: downloadButton
+                    onClicked: root.saveFileAs()
                 }
             }
+        ]
 
-            QQC2.Button {
+        Kirigami.Icon {
-                id: openButton
+            source: root.mediaInfo.mimeIcon
-                icon.name: "document-open"
+            fallback: "unknown"
-                onClicked: {
+        }
-                    autoOpenFile = true;
-                    root.room.downloadTempFile(root.eventId);
-                }
 
-                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
+        ColumnLayout {
-                QQC2.ToolTip.visible: hovered
+            spacing: 0
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            QQC2.Label {
+                Layout.fillWidth: true
+                text: root.display
+                wrapMode: Text.Wrap
+                elide: Text.ElideRight
             }
-
+            QQC2.Label {
-            QQC2.Button {
+                id: sizeLabel
-                id: downloadButton
+                Layout.fillWidth: true
-                icon.name: "download"
+                text: Format.formatByteSize(root.mediaInfo.size)
-
+                opacity: 0.7
-                QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
+                elide: Text.ElideRight
-                QQC2.ToolTip.visible: hovered
+                maximumLineCount: 1
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-            }
-
-            Component {
-                id: fileDialog
-
-                FileDialog {
-                    fileMode: FileDialog.SaveFile
-                    folder: Config.lastSaveDirectory.length > 0 ? Config.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation)
-                    onAccepted: {
-                        Config.lastSaveDirectory = folder
-                        Config.save()
-                        if (autoOpenFile) {
-                            UrlHelper.copyTo(root.progressInfo.localPath, file)
-                        } else {
-                            root.room.download(root.eventId, file);
-                        }
-                    }
-                }
-            }
-        }
-        Repeater {
-            id: itinerary
-            model: ItineraryModel {
-                id: itineraryModel
-                connection: root.room.connection
-            }
-            delegate: DelegateChooser {
-                role: "type"
-                DelegateChoice {
-                    roleValue: "TrainReservation"
-                    delegate: ColumnLayout {
-                        Kirigami.Separator {
-                            Layout.fillWidth: true
-                        }
-                        RowLayout {
-                            QQC2.Label {
-                                text: model.name
-                            }
-                            QQC2.Label {
-                                 text: model.coach ? i18n("Coach: %1, Seat: %2", model.coach, model.seat) : ""
-                                 visible: model.coach
-                                 opacity: 0.7
-                            }
-                        }
-                        RowLayout {
-                            Layout.fillWidth: true
-                            ColumnLayout {
-                                QQC2.Label {
-                                    text: model.departureStation + (model.departurePlatform ? (" [" + model.departurePlatform + "]") : "")
-                                }
-                                QQC2.Label {
-                                    text: model.departureTime
-                                    opacity: 0.7
-                                }
-                            }
-                            Item {
-                                Layout.fillWidth: true
-                            }
-                            ColumnLayout {
-                                QQC2.Label {
-                                    text: model.arrivalStation + (model.arrivalPlatform ?  (" [" + model.arrivalPlatform + "]") : "")
-                                }
-                                QQC2.Label {
-                                    text: model.arrivalTime
-                                    opacity: 0.7
-                                    Layout.alignment: Qt.AlignRight
-                                }
-                            }
-                        }
-                    }
-                }
-                DelegateChoice {
-                    roleValue: "LodgingReservation"
-                    delegate: ColumnLayout {
-                        Kirigami.Separator {
-                            Layout.fillWidth: true
-                        }
-                        QQC2.Label {
-                            text: model.name
-                        }
-                        QQC2.Label {
-                            text: i18nc("<start time> - <end time>", "%1 - %2", model.startTime, model.endTime)
-                        }
-                        QQC2.Label {
-                            text: model.address
-                        }
-                    }
-                }
             }
         }
+
         QQC2.Button {
-            icon.name: "map-globe"
+            id: openButton
-            text: i18nc("@action", "Send to KDE Itinerary")
+            icon.name: "document-open"
+            onClicked: {
+                autoOpenFile = true;
+                currentRoom.downloadTempFile(root.eventId);
+            }
+
+            QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
             QQC2.ToolTip.visible: hovered
-            QQC2.ToolTip.text: text
             QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-            onClicked: itineraryModel.sendToItinerary()
+        }
-            visible: itinerary.count > 0
+
+        QQC2.Button {
+            id: downloadButton
+            icon.name: "download"
+
+            QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to download its file", "Download")
+            QQC2.ToolTip.visible: hovered
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+        }
+
+        Component {
+            id: fileDialog
+
+            FileDialog {
+                fileMode: FileDialog.SaveFile
+                folder: Config.lastSaveDirectory.length > 0 ? Config.lastSaveDirectory : StandardPaths.writableLocation(StandardPaths.DownloadLocation)
+                onAccepted: {
+                    Config.lastSaveDirectory = folder
+                    Config.save()
+                    if (autoOpenFile) {
+                        UrlHelper.copyTo(root.progressInfo.localPath, file)
+                    } else {
+                        currentRoom.download(root.eventId, file);
+                    }
+                }
+            }
         }
     }
 }

src/qml/GeneralSettingsPage.qml

@@ -140,6 +140,29 @@ FormCard.FormCardPage {
             }
         }
     }
+    FormCard.FormHeader {
+        title: i18n("Rooms and private chats")
+    }
+    FormCard.FormCard {
+        FormCard.FormRadioDelegate {
+            text: i18n("Separated")
+            checked: !Config.mergeRoomList
+            enabled: !Config.isMergeRoomListImmutable
+            onToggled: {
+                Config.mergeRoomList = false
+                Config.save()
+            }
+        }
+        FormCard.FormRadioDelegate {
+            text: i18n("Intermixed")
+            checked: Config.mergeRoomList
+            enabled: !Config.isMergeRoomListImmutable
+            onToggled: {
+                Config.mergeRoomList = true
+                Config.save()
+            }
+        }
+    }
     FormCard.FormHeader {
         title: i18nc("Chat Editor", "Editor")
     }

src/qml/GlobalMenu.qml

@@ -45,13 +45,13 @@ Labs.MenuBar {
         title: i18nc("menu", "File")
 
         Labs.MenuItem {
-            text: i18nc("menu", "Find your friends")
+            text: i18nc("menu", "New Private Chat…")
-            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
+            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && AccountRegistry.accountCount > 0
-            onTriggered: pushReplaceLayer("qrc:/org/kde/neochat/qml/UserSearchPage.qml", {connection: root.connection}, {title: i18nc("@title", "Find your friends")})
+            onTriggered: pushReplaceLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection})
         }
         Labs.MenuItem {
             text: i18nc("menu", "New Group…")
-            enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0
+            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && AccountRegistry.accountCount > 0
             shortcut: StandardKey.New
             onTriggered: {
                 const dialog = createRoomDialog.createObject(root.overlay)
@@ -61,7 +61,7 @@ Labs.MenuBar {
         Labs.MenuItem {
             text: i18nc("menu", "Browse Chats…")
             onTriggered: {
-                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     if (isJoined) {
                         RoomManager.enterRoom(root.connection.room(roomId))

src/qml/HoverActions.qml

@@ -7,6 +7,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief A component that provides a set of actions when a message is hovered in the timeline.
@@ -108,7 +109,7 @@ QQC2.Control {
                     }
                 },
                 Kirigami.Action {
-                    visible: !root.currentRoom.readOnly
+                    visible: Config.threads && !root.currentRoom.readOnly
                     text: i18n("Reply in Thread")
                     icon.name: "dialog-messages"
                     onTriggered: {

src/qml/ImageDelegate.qml

@@ -148,7 +148,7 @@ MessageDelegate {
                 openSavedFile()
             } else {
                 openOnFinished = true
-                root.room.downloadFile(root.eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + root.eventId.replace(":", "_").replace("/", "_").replace("+", "_") + root.room.fileNameToDownload(root.eventId))
+                ListView.view.currentRoom.downloadFile(root.eventId, StandardPaths.writableLocation(StandardPaths.CacheLocation) + "/" + root.eventId.replace(":", "_").replace("/", "_").replace("+", "_") + ListView.view.currentRoom.fileNameToDownload(root.eventId))
             }
         }
 

src/qml/InviteUserPage.qml

@@ -31,7 +31,7 @@ Kirigami.ScrollablePage {
 
         Kirigami.SearchField {
             id: identifierField
-            property bool isUserId: text.match(/@(.+):(.+)/g)
+            property bool isUserID: text.match(/@(.+):(.+)/g)
             Layout.fillWidth: true
 
             placeholderText: i18n("Find a user...")
@@ -39,7 +39,7 @@ Kirigami.ScrollablePage {
         }
 
         QQC2.Button {
-            visible: identifierField.isUserId
+            visible: identifierField.isUserID
 
             text: i18n("Add")
             highlighted: true
@@ -59,7 +59,7 @@ Kirigami.ScrollablePage {
             id: userDictListModel
 
             connection: root.room.connection
-            searchText: identifierField.text
+            keyword: identifierField.text
         }
 
         Kirigami.PlaceholderMessage {
@@ -73,25 +73,25 @@ Kirigami.ScrollablePage {
         delegate: Delegates.RoundedItemDelegate {
             id: delegate
 
-            required property string userId
+            required property string userID
-            required property string displayName
+            required property string name
-            required property url avatarUrl
+            required property string avatar
 
-            property bool inRoom: room && room.containsUser(userId)
+            property bool inRoom: room && room.containsUser(userID)
 
-            text: displayName
+            text: name
 
             contentItem: RowLayout {
                 KirigamiComponents.Avatar {
                     Layout.preferredWidth: Kirigami.Units.iconSizes.medium
                     Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-                    source: delegate.avatarUrl
+                    source: delegate.avatar ? ("image://mxc/" + delegate.avatar) : ""
-                    name: delegate.displayName
+                    name: delegate.name
                 }
 
                 Delegates.SubtitleContentItem {
                     itemDelegate: delegate
-                    subtitle: delegate.userId
+                    subtitle: delegate.userID
                     labelItem.textFormat: Text.PlainText
                 }
 
@@ -107,7 +107,7 @@ Kirigami.ScrollablePage {
                         if (inRoom) {
                             checked = true
                         } else {
-                            room.inviteToRoom(delegate.userId);
+                            room.inviteToRoom(delegate.userID);
                             applicationWindow().pageStack.layers.pop();
                         }
                     }

src/qml/JoinRoomPage.qml

@@ -0,0 +1,285 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
+// SPDX-License-Identifier: GPL-3.0-only
+
+import QtQuick
+import QtQuick.Controls as QQC2
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
+
+import org.kde.kirigami as Kirigami
+import org.kde.kirigamiaddons.delegates as Delegates
+
+import org.kde.neochat
+
+Kirigami.ScrollablePage {
+    id: root
+
+    required property NeoChatConnection connection
+
+    property bool showOnlySpaces: false
+
+    property alias keyword: identifierField.text
+    property string server
+
+    /**
+     * @brief Signal emitted when a room is selected.
+     *
+     * The signal contains all the room's info so that it can be acted
+     * upon as required, e.g. joinng or entering the room or adding the room as
+     * the child of a space.
+     */
+    signal roomSelected(string roomId,
+                        string displayName,
+                        url avatarUrl,
+                        string alias,
+                        string topic,
+                        int memberCount,
+                        bool isJoined)
+
+    title: i18n("Explore Rooms")
+
+    Component.onCompleted: identifierField.forceActiveFocus()
+
+    header: QQC2.Control {
+        padding: Kirigami.Units.largeSpacing
+
+        background: Rectangle {
+            Kirigami.Theme.colorSet: Kirigami.Theme.Window
+            Kirigami.Theme.inherit: false
+
+            color: Kirigami.Theme.backgroundColor
+        }
+
+        contentItem: RowLayout {
+            Kirigami.SearchField {
+                id: identifierField
+                Layout.fillWidth: true
+                placeholderText: i18n("Find a room...")
+            }
+            QQC2.ComboBox {
+                id: serverField
+
+                // TODO: in KF6 we should be able to switch to using implicitContentWidthPolicy
+                Layout.preferredWidth: Kirigami.Units.gridUnit * 10
+
+                Component.onCompleted: currentIndex = 0
+
+                textRole: "url"
+                valueRole: "url"
+                model: ServerListModel {
+                    id: serverListModel
+                    connection: root.connection
+                }
+
+                delegate: Delegates.RoundedItemDelegate {
+                    id: serverItem
+
+                    required property int index
+                    required property string url
+                    required property bool isAddServerDelegate
+                    required property bool isHomeServer
+                    required property bool isDeletable
+
+                    text: isAddServerDelegate ? i18n("Add New Server") : url
+                    highlighted: false
+
+                    topInset: index === 0 ? Kirigami.Units.smallSpacing : Math.round(Kirigami.Units.smallSpacing / 2)
+                    bottomInset: index === ListView.view.count - 1 ? Kirigami.Units.smallSpacing : Math.round(Kirigami.Units.smallSpacing / 2)
+
+                    onClicked: if (isAddServerDelegate) {
+                        addServerSheet.open()
+                    }
+
+                    contentItem: RowLayout {
+                        spacing: Kirigami.Units.smallSpacing
+
+                        Delegates.SubtitleContentItem {
+                            itemDelegate: serverItem
+                            subtitle: serverItem.isHomeServer ? i18n("Home Server") : ""
+                            Layout.fillWidth: true
+                        }
+
+                        QQC2.ToolButton {
+                            visible: serverItem.isAddServerDelegate || serverItem.isDeletable
+                            icon.name: serverItem.isAddServerDelegate ? "list-add" : "dialog-close"
+                            text: i18nc("@action:button", "Add new server")
+                            Accessible.name: text
+                            display: QQC2.AbstractButton.IconOnly
+
+                            onClicked: {
+                                if (serverField.currentIndex === serverItem.index && serverItem.isDeletable) {
+                                    serverField.currentIndex = 0;
+                                    server = serverField.currentValue;
+                                    serverField.popup.close();
+                                }
+                                if (serverItem.isAddServerDelegate) {
+                                    addServerSheet.open();
+                                    serverItem.clicked();
+                                } else {
+                                    serverListModel.removeServerAtIndex(serverItem.index);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                onActivated: {
+                    if (currentIndex !== count - 1) {
+                        server = currentValue
+                    }
+                }
+
+                Kirigami.OverlaySheet {
+                    id: addServerSheet
+
+                    parent: applicationWindow().overlay
+
+                    title: i18nc("@title:window", "Add server")
+
+                    onOpened: if (!serverUrlField.isValidServer && !addServerSheet.opened) {
+                        serverField.currentIndex = 0
+                        server = serverField.currentValue
+                    } else if (addServerSheet.opened) {
+                        serverUrlField.forceActiveFocus()
+                    }
+
+                    contentItem: Kirigami.FormLayout {
+                        QQC2.Label {
+                            Layout.minimumWidth: Kirigami.Units.gridUnit * 20
+
+                            text: serverUrlField.length > 0 ? (serverUrlField.acceptableInput ? (serverUrlField.isValidServer ? i18n("Valid server entered") : i18n("This server cannot be resolved or has already been added")) : i18n("The entered text is not a valid url")) : i18n("Enter server url e.g. kde.org")
+                            color: serverUrlField.length > 0 ? (serverUrlField.acceptableInput ? (serverUrlField.isValidServer ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.negativeTextColor) : Kirigami.Theme.negativeTextColor) : Kirigami.Theme.textColor
+                        }
+                        QQC2.TextField {
+                            id: serverUrlField
+
+                            property bool isValidServer: false
+
+                            Kirigami.FormData.label: i18n("Server URL")
+                            onTextChanged: {
+                                if(acceptableInput) {
+                                    serverListModel.checkServer(text)
+                                }
+                            }
+
+                            validator: RegularExpressionValidator {
+                                regularExpression: /^[a-zA-Z0-9-]{1,61}\.([a-zA-Z]{2,}|[a-zA-Z0-9-]{2,}\.[a-zA-Z]{2,3})$/
+                            }
+
+                            Connections {
+                                target: serverListModel
+                                function onServerCheckComplete(url, valid) {
+                                    if (url == serverUrlField.text && valid) {
+                                        serverUrlField.isValidServer = true
+                                    }
+                                }
+                            }
+                        }
+
+                        QQC2.Button {
+                            id: okButton
+
+                            text: i18nc("@action:button", "Ok")
+                            enabled: serverUrlField.acceptableInput && serverUrlField.isValidServer
+                            onClicked: {
+                                serverListModel.addServer(serverUrlField.text)
+                                serverField.currentIndex = serverField.indexOfValue(serverUrlField.text)
+                                server = serverField.currentValue
+                                serverUrlField.text = ""
+                                addServerSheet.close();
+                            }
+                        }
+                    }
+                }
+
+            }
+        }
+
+        Kirigami.Separator {
+            z: 999
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.bottom
+            }
+        }
+    }
+
+    ListView {
+        id: publicRoomsListView
+
+        topMargin: Math.round(Kirigami.Units.smallSpacing / 2)
+        bottomMargin: Math.round(Kirigami.Units.smallSpacing / 2)
+
+        model: PublicRoomListModel {
+            id: publicRoomListModel
+
+            connection: root.connection
+            server: root.server
+            keyword: root.keyword
+            showOnlySpaces: root.showOnlySpaces
+        }
+
+        onContentYChanged: {
+            if(publicRoomListModel.hasMore && contentHeight - contentY < publicRoomsListView.height + 200)
+                publicRoomListModel.next();
+        }
+        delegate: ExplorerDelegate {
+            onRoomSelected: (roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
+                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
+                root.closeDialog();
+            }
+        }
+
+        header: Delegates.RoundedItemDelegate {
+            Layout.fillWidth: true
+            onClicked: _private.openManualRoomDialog()
+
+            text: i18n("Enter a room address")
+            icon.name: "compass"
+            icon.width: Kirigami.Units.gridUnit * 2
+            icon.height: Kirigami.Units.gridUnit * 2
+        }
+
+        footer: QQC2.ProgressBar {
+            width: parent.width
+            visible: publicRoomsListView.count !== 0 && publicRoomsListView.model.loading
+            indeterminate: true
+            padding: Kirigami.Units.largeSpacing * 2
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: Kirigami.Units.largeSpacing
+        }
+
+        Kirigami.LoadingPlaceholder {
+            anchors.centerIn: parent
+            visible: publicRoomsListView.model.loading && publicRoomsListView.count === 0
+        }
+
+        Kirigami.PlaceholderMessage {
+            anchors.centerIn: parent
+            visible: !publicRoomsListView.model.loading && publicRoomsListView.count === 0
+            text: i18nc("@info:label", "No public rooms found")
+        }
+    }
+
+    Component {
+        id: manualRoomDialog
+        ManualRoomDialog {}
+    }
+
+    QtObject {
+        id: _private
+        function openManualRoomDialog() {
+            let dialog = manualRoomDialog.createObject(applicationWindow().overlay, {connection: root.connection});
+            dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
+                root.roomSelected(roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined);
+                root.closeDialog();
+            });
+            dialog.open();
+        }
+    }
+}

src/qml/LiveLocationDelegate.qml

@@ -18,11 +18,12 @@ import org.kde.neochat
 MessageDelegate {
     id: root
 
+    property alias room: liveLocationModel.room
+
     bubbleContent: ColumnLayout {
         LiveLocationsModel {
             id: liveLocationModel
             eventId: root.eventId
-            room: root.room
         }
         MapView {
             id: mapView

src/qml/MessageDelegate.qml

@@ -29,11 +29,6 @@ import org.kde.neochat.config
 TimelineDelegate {
     id: root
 
-    /**
-     * @brief The NeoChatRoom the delegate is being displayed in.
-     */
-    required property NeoChatRoom room
-
     /**
      * @brief The index of the delegate in the model.
      */
@@ -249,6 +244,8 @@ TimelineDelegate {
      */
     readonly property alias hovered: bubble.hovered
 
+    required property NeoChatConnection connection
+
     /**
      * @brief Open the context menu for the message.
      */
@@ -329,7 +326,7 @@ TimelineDelegate {
 
             Component.onCompleted: {
                 if (root.isReply && root.replyDelegateType === DelegateType.Other) {
-                    root.room.loadReply(root.eventId, root.replyId)
+                    currentRoom.loadReply(root.eventId, root.replyId)
                 }
             }
 
@@ -440,7 +437,7 @@ TimelineDelegate {
             visible: root.showReactions
             model: root.reaction
 
-            onReactionClicked: (reaction) => root.room.toggleReaction(root.eventId, reaction)
+            onReactionClicked: (reaction) => currentRoom.toggleReaction(root.eventId, reaction)
         }
         AvatarFlow {
             Layout.alignment: Qt.AlignRight

src/qml/MessageDelegateContextMenu.qml

@@ -135,7 +135,7 @@ Loader {
         Kirigami.Action {
             text: i18n("Copy")
             icon.name: "edit-copy"
-            onTriggered: Clipboard.saveText(root.selectedText.length > 0 ? root.plainText : root.selectedText)
+            onTriggered: Clipboard.saveText(root.selectedText.length > 0 ? root.selectedText : root.plainText)
         },
         Kirigami.Action {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")

src/qml/NetworkProxyPage.qml

@@ -113,7 +113,7 @@ FormCard.FormCardPage {
                     Config.proxyPassword = passwordField.text
                     Config.save()
                     proxyConfigChanged = false
-                    ProxyController.setApplicationProxy()
+                    Controller.setApplicationProxy()
                 }
             }
         }

src/qml/PollDelegate.qml

@@ -36,7 +36,7 @@ MessageDelegate {
             delegate: RowLayout {
                 Layout.fillWidth: true
                 CheckBox {
-                    checked: root.pollHandler.answers[root.room.localUser.id] ? root.pollHandler.answers[root.room.localUser.id].includes(modelData["id"]) : false
+                    checked: root.pollHandler.answers[currentRoom.localUser.id] ? root.pollHandler.answers[currentRoom.localUser.id].includes(modelData["id"]) : false
                     onClicked: root.pollHandler.sendPollAnswer(root.eventId, modelData["id"])
                     enabled: !root.pollHandler.hasEnded
                 }

src/qml/ReactionDelegate.qml

@@ -41,6 +41,7 @@ Flow {
 
             contentItem: QQC2.Label {
                 id: reactionLabel
+                anchors.centerIn: parent
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
                 text: reactionDelegate.textContent
@@ -66,6 +67,7 @@ Flow {
 
             hoverEnabled: true
 
+            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
             QQC2.ToolTip.visible: hovered
             QQC2.ToolTip.text: reactionDelegate.toolTip
         }

src/qml/RichLabel.qml

@@ -47,6 +47,11 @@ TextEdit {
 
     persistentSelection: true
 
+    // Work around QTBUG 93281
+    Component.onCompleted: if (text.includes("<img")) {
+        Controller.forceRefreshTextDocument(root.textDocument, root)
+    }
+
     text: "<style>
 table {
     width:100%;

src/qml/RoomDelegate.qml

@@ -90,7 +90,7 @@ Delegates.RoundedItemDelegate {
                 elide: Text.ElideRight
                 font: Kirigami.Theme.smallFont
                 opacity: root.hasNotifications ? 0.9 : 0.7
-                visible: !Config.compactRoomList && text.length > 0
+                visible: !Config.compactRoomList
                 textFormat: Text.PlainText
 
                 Layout.fillWidth: true
@@ -115,7 +115,6 @@ Delegates.RoundedItemDelegate {
             visible: root.hasNotifications
             color: Kirigami.Theme.textColor
             horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
             background: Rectangle {
                 visible: notificationCount > 0
                 Kirigami.Theme.colorSet: Kirigami.Theme.Button

src/qml/RoomInformation.qml

@@ -95,8 +95,9 @@ QQC2.ScrollView {
                 Layout.fillWidth: true
 
                 onClicked: {
-                    pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/RoomSearchPage.qml", {
+                    pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/SearchPage.qml", {
-                        room: root.room
+                        currentRoom: root.room,
+                        connection: root.connection
                     }, {
                         title: i18nc("@action:title", "Search")
                     })

src/qml/RoomListPage.qml

@@ -9,7 +9,6 @@ import QtQml.Models
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
-import org.kde.kirigamiaddons.delegates as Delegates
 
 import org.kde.neochat
 import org.kde.neochat.config
@@ -130,6 +129,24 @@ Kirigami.Page {
 
                 topMargin: Math.round(Kirigami.Units.smallSpacing / 2)
 
+                KirigamiComponents.FloatingButton {
+                    icon.name: "notifications"
+                    text: i18n("View notifications")
+                    anchors.right: parent.right
+                    anchors.rightMargin: Kirigami.Units.largeSpacing
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: Kirigami.Units.largeSpacing
+                    width: Kirigami.Units.gridUnit * 2
+                    height: width
+                    visible: !root.collapsed
+                    QQC2.ToolTip.text: text
+                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+                    QQC2.ToolTip.visible: hovered
+                    onClicked: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/NotificationsView.qml", {connection: root.connection}, {
+                        title: i18nc("@title", "Notifications")
+                    });
+                }
+
                 header: QQC2.ItemDelegate {
                     width: visible ? ListView.view.width : 0
                     height: visible ? Kirigami.Units.gridUnit * 2 : 0
@@ -160,19 +177,12 @@ Kirigami.Page {
                     anchors.centerIn: parent
                     width: parent.width - (Kirigami.Units.largeSpacing * 4)
                     visible: listView.count == 0
-                    text: if (sortFilterRoomListModel.filterText.length > 0) {
+                    text: sortFilterRoomListModel.filterText.length > 0 ? i18n("No rooms found") : i18n("Join some rooms to get started")
-                        return spaceDrawer.showDirectChats ? i18n("No friends found") : i18n("No rooms found");
+                    helpfulAction: Kirigami.Action {
-                    } else {
-                        return spaceDrawer.showDirectChats ? i18n("You haven't added any of your friends yet, click below to search for them.") : i18n("Join some rooms to get started");
-                    }
-                    helpfulAction: spaceDrawer.showDirectChats ? userSearchAction : exploreRoomAction
-
-                    Kirigami.Action {
-                        id: exploreRoomAction
                         icon.name: sortFilterRoomListModel.filterText.length > 0 ? "search" : "list-add"
                         text: sortFilterRoomListModel.filterText.length > 0 ? i18n("Search in room directory") : i18n("Explore rooms")
                         onTriggered: {
-                            let dialog = pageStack.layers.push("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {
+                            let dialog = pageStack.layers.push("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {
                                 connection: root.connection,
                                 keyword: sortFilterRoomListModel.filterText
                             }, {
@@ -187,13 +197,6 @@ Kirigami.Page {
                             })
                         }
                     }
-
-                    Kirigami.Action {
-                        id: userSearchAction
-                        icon.name: sortFilterRoomListModel.filterText.length > 0 ? "search" : "list-add"
-                        text: sortFilterRoomListModel.filterText.length > 0 ? i18n("Search in friend directory") : i18n("Find your friends")
-                        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/UserSearchPage.qml", {connection: root.connection}, {title: i18nc("@title", "Find your friends")})
-                    }
                 }
 
                 ItemSelectionModel {
@@ -206,16 +209,15 @@ Kirigami.Page {
                     id: sortFilterRoomListModel
 
                     sourceModel: root.roomListModel
-                    roomSortOrder: SortFilterRoomListModel.Categories
+                    roomSortOrder: Config.mergeRoomList ? SortFilterRoomListModel.LastActivity : SortFilterRoomListModel.Categories
                     onLayoutChanged: {
                         listView.currentIndex = sortFilterRoomListModel.mapFromSource(itemSelection.currentIndex).row
                     }
                     activeSpaceId: spaceDrawer.selectedSpaceId
-                    mode: spaceDrawer.showDirectChats ? SortFilterRoomListModel.DirectChats : SortFilterRoomListModel.Rooms
                 }
 
                 section {
-                    property: "category"
+                    property: sortFilterRoomListModel.filterText.length === 0 && !Config.mergeRoomList ? "category" : null
                     delegate: root.collapsed ? foldButton : sectionHeader
                 }
 
@@ -224,8 +226,7 @@ Kirigami.Page {
                     Kirigami.ListSectionHeader {
                         height: implicitHeight
                         width: listView.width
-                        label: root.connection.localUserId == "@nicofee:matrix.org" && roomListModel.categoryName(section) == "Friends" ? i18n("People I vaguely sometimes chat with and Nate Graham") : roomListModel.categoryName(section)
+                        label: roomListModel.categoryName(section)
-                        Component.onCompleted: _contents[0].wrapMode = Text.Wrap
                         action: Kirigami.Action {
                             onTriggered: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
                         }
@@ -236,7 +237,7 @@ Kirigami.Page {
                                 width: Kirigami.Units.iconSizes.small
                                 height: Kirigami.Units.iconSizes.small
                             }
-                            text: roomListModel.categoryVisible(section) ? i18nc("Collapse <section name>", "Collapse %1", root.connection.localUserId == "@nicofee:matrix.org" && roomListModel.categoryName(section) == "Friends" ? i18n("People I vaguely sometimes chat with and Nate Graham") : roomListModel.categoryName(section)) : i18nc("Expand <section name", "Expand %1", root.connection.localUserId == "@nicofee:matrix.org" && roomListModel.categoryName(section) == "Friends" ? i18n("People I vaguely sometimes chat with and Nate Graham") : roomListModel.categoryName(section))
+                            text: roomListModel.categoryVisible(section) ? i18nc("Collapse <section name>", "Collapse %1", roomListModel.categoryName(section)) : i18nc("Expand <section name", "Expand %1", roomListModel.categoryName(section))
                             display: QQC2.Button.IconOnly
 
                             QQC2.ToolTip.text: text
@@ -294,7 +295,7 @@ Kirigami.Page {
 
                         height: visible ? implicitHeight : 0
 
-                        visible: categoryVisible || filterText.length > 0
+                        visible: categoryVisible || filterText.length > 0 || Config.mergeRoomList
 
                         onSelected: RoomManager.enterRoom(currentRoom)
 
@@ -302,16 +303,6 @@ Kirigami.Page {
                         Keys.onReturnPressed: RoomManager.enterRoom(currentRoom)
                     }
                 }
-
-                footer: Delegates.RoundedItemDelegate {
-                    visible: listView.view.count > 0 && spaceDrawer.showDirectChats
-                    text: i18n("Find your friends")
-                    icon.name: "list-add-user"
-                    icon.width: Kirigami.Units.gridUnit * 2
-                    icon.height: Kirigami.Units.gridUnit * 2
-
-                    onClicked: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/UserSearchPage.qml", {connection: root.connection}, {title: i18nc("@title", "Find your friends")})
-                }
             }
         }
     }

src/qml/RoomMedia.qml

@@ -38,6 +38,9 @@ QQC2.ScrollView {
     QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
 
     ListView {
+        // So that delegates can access current room properly.
+        readonly property NeoChatRoom currentRoom: root.currentRoom
+
         clip: true
         verticalLayoutDirection: ListView.BottomToTop
 
@@ -52,7 +55,7 @@ QQC2.ScrollView {
                     alwaysShowAuthor: true
                     alwaysMaxWidth: true
                     cardBackground: false
-                    room: root.currentRoom
+                    connection: root.connection
                 }
             }
 
@@ -62,7 +65,7 @@ QQC2.ScrollView {
                     alwaysShowAuthor: true
                     alwaysMaxWidth: true
                     cardBackground: false
-                    room: root.currentRoom
+                    connection: root.connection
                 }
             }
         }

src/qml/RoomPage.qml

@@ -128,6 +128,7 @@ Kirigami.Page {
                     chatBarLoader.item.forceActiveFocus()
                 }
             }
+            connection: root.connection
         }
     }
 

src/qml/RoomSearchPage.qml

@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick
-
-import org.kde.neochat
-
-/**
- * @brief Component for finding messages in a room.
- *
- * This component is based on a SearchPage and allows the user to enter a search
- * term into the input field and then search the room for messages with text that
- * matches the input.
- *
- * @sa SearchPage
- */
-SearchPage {
-    id: root
-
-    /**
-     * @brief The room the search is being performed in.
-     */
-    required property NeoChatRoom room
-
-    title: i18nc("@action:title", "Search Messages")
-
-    model: SearchModel {
-        id: searchModel
-        room: root.room
-    }
-
-    modelDelegate: EventDelegate {
-        room: root.room
-    }
-
-    searchFieldPlaceholder: i18n("Find messages…")
-    noSearchPlaceholderMessage: i18n("Enter text to start searching")
-    noResultPlaceholderMessage: i18n("No messages found")
-
-    listVerticalLayoutDirection: ListView.BottomToTop
-}

src/qml/SearchPage.qml

@@ -1,5 +1,5 @@
-// SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 import QtQuick
 import QtQuick.Controls as QQC2
@@ -7,87 +7,29 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 
-/**
+import org.kde.neochat
- * @brief Component for a generic search page.
+
- *
- * This component provides a header with the search field and a ListView to visualise
- * search results from the given model.
- */
 Kirigami.ScrollablePage {
     id: root
 
-    /**
+    property NeoChatRoom currentRoom
-     * @brief Any additional controls after the search button.
+    required property NeoChatConnection connection
-     */
-    property alias headerTrailing: headerContent.children
 
-    /**
+    title: i18nc("@action:title", "Search Messages")
-     * @brief The model that provides the search results.
-     *
-     * The model needs to provide the following properties:
-     *      - searchText
-     *      - searching
-     * Where searchText is the text from the searchField and is used to match results
-     * and searching is true while the model is finding results.
-     *
-     * The model must also provide a search() function to start the search if
-     * it doesn't do so when the searchText is changed.
-     */
-    property alias model: listView.model
 
-    /**
+    Kirigami.Theme.colorSet: Kirigami.Theme.Window
-     * @brief The number of delegates currently in the view.
-     */
-    property alias count: listView.count
 
-    /**
+    SearchModel {
-     * @brief The delegate to use to visualize the model data.
+        id: searchModel
-     */
+        connection: root.connection
-    property alias modelDelegate: listView.delegate
+        searchText: searchField.text
-
+        room: root.currentRoom
-    /**
-     * @brief The delegate to appear as the header of the list.
-     */
-    property alias listHeaderDelegate: listView.header
-
-    /**
-     * @brief The delegate to appear as the footer of the list.
-     */
-    property alias listFooterDelegate: listView.footer
-
-    /**
-     * @brief The placeholder text in the search field.
-     */
-    property alias searchFieldPlaceholder: searchField.placeholderText
-
-    /**
-     * @brief The text to show when no search term has been entered.
-     */
-    property alias noSearchPlaceholderMessage: noSearchMessage.text
-
-    /**
-     * @brief The text to show when no results have been found.
-     */
-    property alias noResultPlaceholderMessage: noResultMessage.text
-
-    /**
-     * @brief The verticalLayoutDirection property of the internal ListView.
-     */
-    property alias listVerticalLayoutDirection: listView.verticalLayoutDirection
-
-    /**
-     * @brief Force the search field to be focussed.
-     */
-    function focusSearch() {
-        searchField.forceActiveFocus();
     }
 
     header: QQC2.Control {
         padding: Kirigami.Units.largeSpacing
 
         background: Rectangle {
-            Kirigami.Theme.colorSet: Kirigami.Theme.Window
-            Kirigami.Theme.inherit: false
             color: Kirigami.Theme.backgroundColor
 
             Kirigami.Separator {
@@ -100,7 +42,6 @@ Kirigami.ScrollablePage {
         }
 
         contentItem: RowLayout {
-            id: headerContent
             spacing: Kirigami.Units.largeSpacing
 
             Kirigami.SearchField {
@@ -109,57 +50,44 @@ Kirigami.ScrollablePage {
                 Layout.fillWidth: true
                 Keys.onEnterPressed: searchButton.clicked()
                 Keys.onReturnPressed: searchButton.clicked()
-                onTextChanged: {
-                    searchTimer.restart()
-                    if (model) {
-                        model.searchText = text;
-                    }
-                }
             }
             QQC2.Button {
                 id: searchButton
+                onClicked: searchModel.search()
                 icon.name: "search"
-                onClicked: {
-                    if (typeof model.search === 'function') {
-                        model.search()
-                    }
-                }
-            }
-            Timer {
-                id: searchTimer
-                interval: 500
-                running: true
-                onTriggered: if (typeof model.search === 'function') {
-                    model.search()
-                }
             }
         }
     }
 
     ListView {
-        id: listView
+        id: messageListView
         Layout.fillWidth: true
         Layout.fillHeight: true
         spacing: 0
+        verticalLayoutDirection: ListView.BottomToTop
 
         section.property: "section"
 
         Kirigami.PlaceholderMessage {
-            id: noSearchMessage
             anchors.centerIn: parent
-            visible: searchField.text.length === 0 && listView.count === 0
+            visible: searchField.text.length === 0 && messageListView.count === 0
+            text: i18n("Enter a text to start searching")
         }
 
         Kirigami.PlaceholderMessage {
-            id: noResultMessage
             anchors.centerIn: parent
-            visible: searchField.text.length > 0 && listView.count === 0 && !root.model.searching
+            visible: searchField.text.length > 0 && messageListView.count === 0 && !searchModel.searching
+            text: i18n("No results found")
         }
 
         Kirigami.LoadingPlaceholder {
             anchors.centerIn: parent
-            visible: searchField.text.length > 0 && listView.count === 0 && root.model.searching
+            visible: searchModel.searching
+        }
+
+        model: searchModel
+        delegate: EventDelegate {
+            connection: root.connection
         }
     }
 }
-

src/qml/SelectParentDialog.qml

@@ -49,7 +49,7 @@ Kirigami.Dialog {
             visible: !chosenRoomDelegate.visible
             text: i18nc("@action:button", "Pick room")
             onClicked: {
-                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.room.connection, showOnlySpaces: true}, {title: i18nc("@title", "Choose Parent Space")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.room.connection, showOnlySpaces: true}, {title: i18nc("@title", "Choose Parent Space")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     chosenRoomDelegate.roomId = roomId;
                     chosenRoomDelegate.displayName = displayName;
@@ -128,7 +128,7 @@ Kirigami.Dialog {
             }
 
             onClicked: {
-                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ExploreRoomsPage.qml", {connection: root.room.connection, showOnlySpaces: true}, {title: i18nc("@title", "Explore Rooms")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.room.connection, showOnlySpaces: true}, {title: i18nc("@title", "Explore Rooms")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     chosenRoomDelegate.roomId = roomId;
                     chosenRoomDelegate.displayName = displayName;