ReactionModel doesn't need to be registered as a QML type

This isn't used or instiated by QML directly, and seems to be a leftover from long ago. This also stops Qt from complaining on startup.

.flatpak-manifest.json

@@ -2,7 +2,7 @@
     "id": "org.kde.neochat",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-22.08",
+    "runtime-version": "6.6-kf6preview",
     "sdk": "org.kde.Sdk",
     "command": "neochat",
     "tags": [
@@ -12,7 +12,7 @@
     "finish-args": [
         "--share=network",
         "--share=ipc",
-        "--socket=x11",
+        "--socket=fallback-x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=xdg-download",
@@ -31,6 +31,7 @@
         },
         {
             "name": "kquickimageeditor",
+            "config-opts": [ "-DBUILD_WITH_QT6=ON" ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
@@ -85,8 +86,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/v0.13.2.tar.gz",
-                    "sha256": "20beeb32de7c4eb0af9039b21e18370faf847ac8697ab3045906076afbc4caa5",
+                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz",
+                    "sha256": "cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 4138,
@@ -96,6 +97,7 @@
                 }
             ],
             "config-opts": [
+                "-DBUILD_WITH_QT6=ON",
                 "-DCMAKE_INSTALL_LIBDIR=/app/lib",
                 "-DLIB_INSTALL_DIR=/app/lib",
                 "-DBUILD_TRANSLATIONS=NO"
@@ -113,6 +115,7 @@
                 }
             ],
             "config-opts": [
+                "-DBUILD_WITH_QT6=ON",
                 "-DQuotient_ENABLE_E2EE=ON",
                 "-DBUILD_TESTING=OFF"
             ]

.gitlab-ci.yml

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

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "24")
 set(RELEASE_SERVICE_VERSION_MINOR "01")
-set(RELEASE_SERVICE_VERSION_MICRO "80")
+set(RELEASE_SERVICE_VERSION_MICRO "85")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

android/build.gradle

@@ -92,6 +92,7 @@ android {
         exclude 'lib/*/*_imageformats_qtga_*'
         exclude 'lib/*/*_imageformats_qtiff_*'
         exclude 'lib/*/*_qmltooling_*'
+        exclude 'lib/*/*_multimedia_ffmpeg*' // temporary qt6 android fix
     }
 
     aaptOptions {

autotests/CMakeLists.txt

@@ -46,3 +46,33 @@ ecm_add_test(
     LINK_LIBRARIES neochat Qt::Test
     TEST_NAME chatdocumenthandlertest
 )
+
+ecm_add_test(
+    messageeventmodeltest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME messageeventmodeltest
+)
+
+ecm_add_test(
+    actionshandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME actionshandlertest
+)
+
+ecm_add_test(
+    windowcontrollertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME windowcontrollertest
+)
+
+ecm_add_test(
+    pollhandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME pollhandlertest
+)
+
+ecm_add_test(
+    reactionmodeltest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME reactionmodeltest
+)

autotests/actionshandlertest.cpp

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QTest>
+
+#include "actionshandler.h"
+#include "chatbarcache.h"
+
+#include "testutils.h"
+
+class ActionsHandlerTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    Quotient::Connection *connection = Quotient::Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    ActionsHandler *actionsHandler = new ActionsHandler(this);
+
+private Q_SLOTS:
+    void nullObject();
+};
+
+void ActionsHandlerTest::nullObject()
+{
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    actionsHandler->handleMessageEvent(nullptr);
+
+    auto chatBarCache = new ChatBarCache(this);
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    actionsHandler->handleMessageEvent(chatBarCache);
+
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    actionsHandler->setRoom(room);
+    QTest::ignoreMessage(QtWarningMsg, "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    actionsHandler->handleMessageEvent(nullptr);
+
+    // The final one should throw no warning so we make sure.
+    QTest::failOnWarning("ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.");
+    actionsHandler->handleMessageEvent(chatBarCache);
+}
+
+QTEST_GUILESS_MAIN(ActionsHandlerTest)
+#include "actionshandlertest.moc"

autotests/chatbarcachetest.cpp

@@ -12,26 +12,17 @@
 #include "chatbarcache.h"
 #include "neochatroom.h"
 
+#include "testutils.h"
+
 using namespace Quotient;
 
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
 class ChatBarCacheTest : public QObject
 {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TestRoom *room = nullptr;
+    TestUtils::TestRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -47,14 +38,7 @@ private Q_SLOTS:
 void ChatBarCacheTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testMinSyncFile;
-    testMinSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-min-sync.json"));
-    testMinSyncFile.open(QIODevice::ReadOnly);
-    const auto testMinSyncJson = QJsonDocument::fromJson(testMinSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testMinSyncJson.object());
-    room->update(std::move(roomData));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
 }
 
 void ChatBarCacheTest::empty()

autotests/data/test-messageventmodel-sync.json

@@ -0,0 +1,105 @@
+{
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "displayname": "Example",
+          "membership": "join"
+        },
+        "event_id": "$exampleMember:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@example:example.org"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an example\ntext message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example<br>text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$153456789:example.org",
+        "origin_server_ts": 1,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1232
+        }
+      },
+      {
+        "content": {
+          "displayname": "Example Changed",
+          "membership": "join"
+        },
+        "event_id": "$exampleMemberChnage:example.org",
+        "origin_server_ts": 2,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@example:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "replaces_state": "$exampleMember:example.org",
+          "prev_content": {
+            "displayname": "Example",
+            "membership": "join"
+          },
+          "prev_sender": "@example:example.org",
+          "age": 1234
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+}

autotests/data/test-pending-sync.json

@@ -0,0 +1,22 @@
+{
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "New plain message",
+          "msgtype": "m.text"
+        },
+        "event_id": "$pendingmerge:example.org",
+        "origin_server_ts": 123456,
+        "room_id":"#myroom:kde.org",
+        "sender":"@bob:kde.org",
+        "type":"m.room.message",
+        "unsigned": {
+          "transaction_id": "17017181543521"
+        }
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+}

autotests/data/test-pollhandlerstart-sync.json

@@ -0,0 +1,38 @@
+{
+  "timeline": {
+    "events": [
+      {
+        "content": {
+            "org.matrix.msc1767.text": "test\n1. option1\n2. option 2",
+            "org.matrix.msc3381.poll.start": {
+                "answers": [
+                    {
+                        "id": "option1",
+                        "org.matrix.msc1767.text": "option1"
+                    },
+                    {
+                        "id": "option2",
+                        "org.matrix.msc1767.text": "option2"
+                    }
+                ],
+                "kind": "org.matrix.msc3381.poll.disclosed",
+                "max_selections": 1,
+                "question": {
+                    "body": "test",
+                    "msgtype": "m.text",
+                    "org.matrix.msc1767.text": "test"
+                }
+            }
+        },
+        "event_id": "$153456789:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "org.matrix.msc3381.poll.start",
+        "unsigned": {
+          "age": 1232
+        }
+      }
+    ]
+  }
+}

autotests/data/test-reactionmodel-extra-sync.json

@@ -0,0 +1,44 @@
+{
+  "timeline": {
+    "events": [
+      {
+        "content": {
+            "m.relates_to": {
+            "event_id": "$153456789:example.org",
+            "key": "👍",
+            "rel_type": "m.annotation"
+            }
+        },
+        "origin_server_ts": 1690322545183,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@bob:example.org",
+        "type": "m.reaction",
+        "unsigned": {
+            "age": 390159121
+        },
+        "event_id": "$163456790:example.org",
+        "age": 390159121
+      },
+      {
+        "content": {
+            "m.relates_to": {
+            "event_id": "$153456789:example.org",
+            "key": "😆",
+            "rel_type": "m.annotation"
+            }
+        },
+        "origin_server_ts": 1690322545184,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@bob:example.org",
+        "type": "m.reaction",
+        "unsigned": {
+            "age": 390159122
+        },
+        "event_id": "$163456791:example.org",
+        "age": 390159122
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+}

autotests/data/test-reactionmodel-sync.json

@@ -0,0 +1,204 @@
+{
+  "account_data": {
+    "events": [
+      {
+        "content": {
+          "tags": {
+            "u.work": {
+              "order": 0.9
+            }
+          }
+        },
+        "type": "m.tag"
+      },
+      {
+        "content": {
+          "custom_config_key": "custom_config_value"
+        },
+        "type": "org.example.custom.room.config"
+      }
+    ]
+  },
+  "ephemeral": {
+    "events": [
+      {
+        "content": {
+          "user_ids": [
+            "@alice:matrix.org",
+            "@bob:example.com"
+          ]
+        },
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "type": "m.typing"
+      },
+      {
+        "content": {
+          "$153456789:example.org": {
+            "m.read": {
+              "@alice:matrix.org": {
+                "ts": 1436451550453
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@bob:example.com": {
+                "ts": 1436451550453
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@tim:example.com": {
+                "ts": 1436451550454
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@jeff:example.com": {
+                "ts": 1436451550455
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@tina:example.com": {
+                "ts": 1436451550456
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@sally:example.com": {
+                "ts": 1436451550457
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      },
+      {
+        "content": {
+          "$1532735824654:example.org": {
+            "m.read": {
+              "@fred:example.com": {
+                "ts": 1436451550458
+              }
+            }
+          }
+        },
+        "type": "m.receipt"
+      }
+    ]
+  },
+  "state": {
+    "events": [
+      {
+        "content": {
+          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
+          "displayname": "Alice Margatroid",
+          "membership": "join",
+          "reason": "Looking for support"
+        },
+        "event_id": "$143273582443PhrSn:example.org",
+        "origin_server_ts": 1432735824653,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "state_key": "@alice:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 1234
+        }
+      },
+      {
+        "content": {
+          "displayname": "Look\nat\nme\nI\nput\nnewlines\nin\nmy\ndisplay name",
+          "membership": "join"
+        },
+        "event_id": "$143273582443PhrSh:example.org",
+        "origin_server_ts": 1432735824659,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@newline:example.org",
+        "state_key": "@newline:example.org",
+        "type": "m.room.member",
+        "unsigned": {
+          "age": 12345
+        }
+      }
+    ]
+  },
+  "summary": {
+    "m.heroes": [
+      "@alice:example.com",
+      "@bob:example.com"
+    ],
+    "m.invited_member_count": 0,
+    "m.joined_member_count": 2
+  },
+  "timeline": {
+    "events": [
+      {
+        "content": {
+          "body": "This is an example\ntext message",
+          "format": "org.matrix.custom.html",
+          "formatted_body": "<b>This is an example<br>text message</b>",
+          "msgtype": "m.text"
+        },
+        "event_id": "$153456789:example.org",
+        "origin_server_ts": 1432735824654,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@example:example.org",
+        "type": "m.room.message",
+        "unsigned": {
+          "age": 1232
+        }
+      },
+      {
+        "content": {
+            "m.relates_to": {
+            "event_id": "$153456789:example.org",
+            "key": "👍",
+            "rel_type": "m.annotation"
+            }
+        },
+        "origin_server_ts": 1690322545182,
+        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
+        "sender": "@alice:matrix.org",
+        "type": "m.reaction",
+        "unsigned": {
+            "age": 390159120
+        },
+        "event_id": "$163456789:example.org",
+        "age": 390159120
+      }
+    ],
+    "limited": true,
+    "prev_batch": "t34-23535_0_0"
+  }
+}

autotests/eventhandlertest.cpp

@@ -18,26 +18,17 @@
 #include "neochatroom.h"
 #include "utils.h"
 
+#include "testutils.h"
+
 using namespace Quotient;
 
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
 class EventHandlerTest : public QObject
 {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TestRoom *room = nullptr;
+    TestUtils::TestRoom *room = nullptr;
     EventHandler eventHandler;
     EventHandler emptyHandler;
     EventHandler noEventHandler;
@@ -70,12 +61,12 @@ private Q_SLOTS:
     void genericBody_data();
     void genericBody();
     void nullGenericBody();
+    void subtitle();
+    void nullSubtitle();
     void mediaInfo();
     void nullMediaInfo();
     void linkPreviewer();
     void nullLinkPreviewer();
-    void reactions();
-    void nullReactions();
     void hasReply();
     void nullHasReply();
     void replyId();
@@ -101,14 +92,7 @@ private Q_SLOTS:
 void EventHandlerTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testEventHandlerSyncFile;
-    testEventHandlerSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-eventhandler-sync.json"));
-    testEventHandlerSyncFile.open(QIODevice::ReadOnly);
-    const auto testEventHandlerSyncJson = QJsonDocument::fromJson(testEventHandlerSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testEventHandlerSyncJson.object());
-    room->update(std::move(roomData));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-eventhandler-sync.json"));
 
     eventHandler.setRoom(room);
     noEventHandler.setRoom(room);
@@ -364,6 +348,25 @@ void EventHandlerTest::nullGenericBody()
     QCOMPARE(noEventHandler.getGenericBody(), QString());
 }
 
+void EventHandlerTest::subtitle()
+{
+    auto event = room->messageEvents().at(0).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is an example text message"));
+
+    event = room->messageEvents().at(2).get();
+    eventHandler.setEvent(event);
+
+    QCOMPARE(eventHandler.subtitleText(), QStringLiteral("after: This is a highlight @bob:kde.org and this is a link https://kde.org"));
+}
+
+void EventHandlerTest::nullSubtitle()
+{
+    QTest::ignoreMessage(QtWarningMsg, "subtitleText called with m_event set to nullptr.");
+    QCOMPARE(noEventHandler.subtitleText(), QString());
+}
+
 void EventHandlerTest::mediaInfo()
 {
     auto event = room->messageEvents().at(4).get();
@@ -418,23 +421,6 @@ void EventHandlerTest::nullLinkPreviewer()
     QCOMPARE(noEventHandler.getLinkPreviewer(), nullptr);
 }
 
-void EventHandlerTest::reactions()
-{
-    auto event = room->messageEvents().at(0).get();
-    eventHandler.setEvent(event);
-
-    QCOMPARE(eventHandler.getReactions()->rowCount(), 1);
-}
-
-void EventHandlerTest::nullReactions()
-{
-    QTest::ignoreMessage(QtWarningMsg, "getReactions called with m_room set to nullptr.");
-    QCOMPARE(emptyHandler.getReactions(), nullptr);
-
-    QTest::ignoreMessage(QtWarningMsg, "getReactions called with m_event set to nullptr.");
-    QCOMPARE(noEventHandler.getReactions(), nullptr);
-}
-
 void EventHandlerTest::hasReply()
 {
     auto event = room->messageEvents().at(5).get();

autotests/messageeventmodeltest.cpp

@@ -0,0 +1,215 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include <Quotient/connection.h>
+#include <Quotient/quotient_common.h>
+#include <Quotient/syncdata.h>
+
+#include "enums/delegatetype.h"
+#include "models/messageeventmodel.h"
+#include "neochatroom.h"
+
+#include "testutils.h"
+
+using namespace Quotient;
+
+class MessageEventModelTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    Connection *connection = nullptr;
+    MessageEventModel *model = nullptr;
+
+private Q_SLOTS:
+    void initTestCase();
+    void init();
+
+    void switchEmptyRoom();
+    void switchSyncedRoom();
+    void simpleTimeline();
+    void syncNewEvents();
+    void pendingEvent();
+    void disconnect();
+    void idToRow();
+
+    void cleanup();
+};
+
+void MessageEventModelTest::initTestCase()
+{
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+}
+
+void MessageEventModelTest::init()
+{
+    QCOMPARE(model, nullptr);
+    model = new MessageEventModel;
+}
+
+// Make sure that basic empty rooms can be switched without crashing.
+void MessageEventModelTest::switchEmptyRoom()
+{
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"));
+
+    QSignalSpy spy(model, SIGNAL(roomChanged()));
+
+    QCOMPARE(model->room(), nullptr);
+    model->setRoom(firstRoom);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
+    model->setRoom(secondRoom);
+    QCOMPARE(spy.count(), 2);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
+    model->setRoom(nullptr);
+    QCOMPARE(spy.count(), 3);
+    QCOMPARE(model->room(), nullptr);
+}
+
+// Make sure that rooms with some events can be switched without crashing
+void MessageEventModelTest::switchSyncedRoom()
+{
+    auto firstRoom = new TestUtils::TestRoom(connection, QStringLiteral("#firstRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
+    auto secondRoom = new TestUtils::TestRoom(connection, QStringLiteral("#secondRoom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
+
+    QSignalSpy spy(model, SIGNAL(roomChanged()));
+
+    QCOMPARE(model->room(), nullptr);
+    model->setRoom(firstRoom);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(model->room()->id(), QStringLiteral("#firstRoom:kde.org"));
+    model->setRoom(secondRoom);
+    QCOMPARE(spy.count(), 2);
+    QCOMPARE(model->room()->id(), QStringLiteral("#secondRoom:kde.org"));
+    model->setRoom(nullptr);
+    QCOMPARE(spy.count(), 3);
+    QCOMPARE(model->room(), nullptr);
+}
+
+void MessageEventModelTest::simpleTimeline()
+{
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-messageventmodel-sync.json"));
+
+    model->setRoom(room);
+    QCOMPARE(model->rowCount(), 2);
+
+    QCOMPARE(model->data(model->index(0), MessageEventModel::DelegateTypeRole), DelegateType::State);
+    QCOMPARE(model->data(model->index(0)), QStringLiteral("changed their display name to Example Changed"));
+
+    QCOMPARE(model->data(model->index(1)), QStringLiteral("<b>This is an example<br>text message</b>"));
+    QCOMPARE(model->data(model->index(1), MessageEventModel::DelegateTypeRole), DelegateType::Message);
+    QCOMPARE(model->data(model->index(1), MessageEventModel::PlainText), QStringLiteral("This is an example\ntext message"));
+    QCOMPARE(model->data(model->index(1), MessageEventModel::EventIdRole), QStringLiteral("$153456789:example.org"));
+
+    QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");
+    QCOMPARE(model->data(model->index(-1)), QVariant());
+    QTest::ignoreMessage(QtWarningMsg, "Index QModelIndex(-1,-1,0x0,QObject(0x0)) is not valid (expected valid)");
+    QCOMPARE(model->data(model->index(model->rowCount())), QVariant());
+}
+
+// Sync some events into the MessageEventModel's current room and don't crash.
+void MessageEventModelTest::syncNewEvents()
+{
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    QSignalSpy spy(room, SIGNAL(aboutToAddNewMessages(Quotient::RoomEventsRange)));
+
+    model->setRoom(room);
+    QCOMPARE(model->rowCount(), 0);
+
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));
+
+    QCOMPARE(model->rowCount(), 2);
+    QCOMPARE(spy.count(), 1);
+}
+
+// Check the adding of pending events to the room doesn't cause any issues in the model.
+void MessageEventModelTest::pendingEvent()
+{
+    QSignalSpy spyInsert(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    QSignalSpy spyRemove(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)));
+    QSignalSpy spyChanged(model, SIGNAL(dataChanged(const QModelIndex, const QModelIndex, const QList<int> &)));
+
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    model->setRoom(room);
+    QCOMPARE(model->rowCount(), 0);
+
+    auto txnId = room->postPlainText("New plain message"_ls);
+    QCOMPARE(model->rowCount(), 1);
+    QCOMPARE(spyInsert.count(), 1);
+
+    room->discardMessage(txnId);
+    QCOMPARE(model->rowCount(), 0);
+    QCOMPARE(spyRemove.count(), 1);
+
+    txnId = room->postPlainText("New plain message"_ls);
+    QCOMPARE(model->rowCount(), 1);
+    QCOMPARE(spyInsert.count(), 2);
+
+    // We need to manually set the transaction ID of the new message as it will be
+    // different every time.
+    QFile testSyncFile;
+    testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-pending-sync.json"));
+    testSyncFile.open(QIODevice::ReadOnly);
+    auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
+    auto root = testSyncJson.object();
+    auto timeline = root["timeline"_ls].toObject();
+    auto events = timeline["events"_ls].toArray();
+    auto firstEvent = events[0].toObject();
+    firstEvent.insert(QLatin1String("unsigned"), QJsonObject{{QLatin1String("transaction_id"), txnId}});
+    events[0] = firstEvent;
+    timeline.insert("events"_ls, events);
+    root.insert("timeline"_ls, timeline);
+    testSyncJson.setObject(root);
+    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testSyncJson.object());
+    room->update(std::move(roomData));
+
+    QCOMPARE(model->rowCount(), 1);
+    // The model will throw multiple data changed signals we need the one that refreshes
+    // the IsPendingRole.
+    QCOMPARE(spyChanged.count() > 0, true);
+    auto isPendingChanged = false;
+    for (auto signal : spyChanged) {
+        auto roles = signal.at(2).toList();
+        if (roles.contains(MessageEventModel::IsPendingRole)) {
+            isPendingChanged = true;
+        }
+    }
+    QCOMPARE(isPendingChanged, true);
+}
+
+// Make sure that the signals are disconnecting correctly when a room is switched.
+void MessageEventModelTest::disconnect()
+{
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"));
+    model->setRoom(room);
+
+    QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+
+    model->setRoom(nullptr);
+    room->syncNewEvents(QLatin1String("test-messageventmodel-sync.json"));
+
+    QCOMPARE(spy.count(), 0);
+}
+
+void MessageEventModelTest::idToRow()
+{
+    auto room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
+    model->setRoom(room);
+
+    QCOMPARE(model->eventIdToRow(QStringLiteral("$153456789:example.org")), 0);
+}
+
+void MessageEventModelTest::cleanup()
+{
+    delete model;
+    model = nullptr;
+    QCOMPARE(model, nullptr);
+}
+
+QTEST_MAIN(MessageEventModelTest)
+#include "messageeventmodeltest.moc"

autotests/neochatroomtest.cpp

@@ -5,55 +5,30 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include "neochatroom.h"
-
 #include <Quotient/connection.h>
 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
 
+#include "testutils.h"
+
 using namespace Quotient;
 
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
 class NeoChatRoomTest : public QObject {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TestRoom *room = nullptr;
+    TestUtils::TestRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
-    void subtitleTextTest();
     void eventTest();
 };
 
 void NeoChatRoomTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    QFile testMinSyncFile;
-    testMinSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-min-sync.json"));
-    testMinSyncFile.open(QIODevice::ReadOnly);
-    const auto testMinSyncJson = QJsonDocument::fromJson(testMinSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testMinSyncJson.object());
-    room->update(std::move(roomData));
-}
-
-void NeoChatRoomTest::subtitleTextTest()
-{
-    QCOMPARE(room->timelineSize(), 1);
-    QCOMPARE(room->lastEventToString(), QStringLiteral("@example:example.org: This is an example\ntext message"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-min-sync.json"_ls);
 }
 
 void NeoChatRoomTest::eventTest()

autotests/pollhandlertest.cpp

@@ -0,0 +1,70 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include <Quotient/connection.h>
+#include <Quotient/quotient_common.h>
+#include <Quotient/syncdata.h>
+
+#include "events/pollevent.h"
+#include "pollhandler.h"
+#include "testutils.h"
+
+using namespace Quotient;
+
+class PollHandlerTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    Connection *connection = nullptr;
+    TestUtils::TestRoom *room = nullptr;
+
+private Q_SLOTS:
+    void initTestCase();
+    void nullObject();
+    void poll();
+};
+
+void PollHandlerTest::initTestCase()
+{
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), "test-pollhandlerstart-sync.json"_ls);
+}
+
+// Basically don't crash.
+void PollHandlerTest::nullObject()
+{
+    auto pollHandler = PollHandler();
+
+    QCOMPARE(pollHandler.hasEnded(), false);
+    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.question(), QString());
+    QCOMPARE(pollHandler.options(), QJsonArray());
+    QCOMPARE(pollHandler.answers(), QJsonObject());
+    QCOMPARE(pollHandler.counts(), QJsonObject());
+    QCOMPARE(pollHandler.kind(), QString());
+}
+
+void PollHandlerTest::poll()
+{
+    auto startEvent = eventCast<const PollStartEvent>(room->messageEvents().at(0).get());
+    auto pollHandler = PollHandler(room, startEvent);
+
+    auto options = QJsonArray{QJsonObject{{"id"_ls, "option1"_ls}, {"org.matrix.msc1767.text"_ls, "option1"_ls}},
+                              QJsonObject{{"id"_ls, "option2"_ls}, {"org.matrix.msc1767.text"_ls, "option2"_ls}}};
+
+    QCOMPARE(pollHandler.hasEnded(), false);
+    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.question(), QStringLiteral("test"));
+    QCOMPARE(pollHandler.options(), options);
+    QCOMPARE(pollHandler.answers(), QJsonObject());
+    QCOMPARE(pollHandler.counts(), QJsonObject());
+    QCOMPARE(pollHandler.kind(), QStringLiteral("org.matrix.msc3381.poll.disclosed"));
+}
+
+QTEST_GUILESS_MAIN(PollHandlerTest)
+#include "pollhandlertest.moc"

autotests/reactionmodeltest.cpp

@@ -0,0 +1,83 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QObject>
+#include <QSignalSpy>
+#include <QTest>
+
+#include "models/reactionmodel.h"
+
+#include <Quotient/events/roommessageevent.h>
+
+#include "testutils.h"
+
+using namespace Quotient;
+
+class ReactionModelTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    Connection *connection = nullptr;
+    TestUtils::TestRoom *room = nullptr;
+
+private Q_SLOTS:
+    void initTestCase();
+
+    void nullModel();
+    void basicReaction();
+    void newReaction();
+};
+
+void ReactionModelTest::initTestCase()
+{
+    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-reactionmodel-sync.json"));
+}
+
+void ReactionModelTest::nullModel()
+{
+    auto model = ReactionModel(nullptr, nullptr);
+
+    QCOMPARE(model.rowCount(), 0);
+    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QVariant());
+}
+
+void ReactionModelTest::basicReaction()
+{
+    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
+    auto model = ReactionModel(event, room);
+
+    QCOMPARE(model.rowCount(), 1);
+    QCOMPARE(model.data(model.index(0), ReactionModel::TextContentRole), QStringLiteral("<span style=\"font-family: 'emoji';\">👍</span>"));
+    QCOMPARE(model.data(model.index(0), ReactionModel::ReactionRole), QStringLiteral("👍"));
+    QCOMPARE(model.data(model.index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+    auto authorList = QVariantList{room->getUser(room->user(QStringLiteral("@alice:matrix.org")))};
+    QCOMPARE(model.data(model.index(0), ReactionModel::AuthorsRole), authorList);
+    QCOMPARE(model.data(model.index(0), ReactionModel::HasLocalUser), false);
+}
+
+void ReactionModelTest::newReaction()
+{
+    auto event = eventCast<const RoomMessageEvent>(room->messageEvents().at(0).get());
+    auto model = new ReactionModel(event, room);
+
+    QCOMPARE(model->rowCount(), 1);
+    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("@alice:matrix.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+
+    QSignalSpy spy(model, SIGNAL(modelReset()));
+
+    room->syncNewEvents(QLatin1String("test-reactionmodel-extra-sync.json"));
+    QCOMPARE(model->rowCount(), 2);
+    QCOMPARE(spy.count(), 2); // Once for each of the 2 new reactions.
+    QCOMPARE(model->data(model->index(1), ReactionModel::ReactionRole), QStringLiteral("😆"));
+    QCOMPARE(model->data(model->index(0), ReactionModel::ToolTipRole),
+             QStringLiteral("@alice:matrix.org and @bob:example.org reacted with <span style=\"font-family: 'emoji';\">👍</span>"));
+
+    delete model;
+}
+
+QTEST_MAIN(ReactionModelTest)
+#include "reactionmodeltest.moc"

autotests/testutils.h

@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <Quotient/syncdata.h>
+
+#include "neochatroom.h"
+
+namespace Quotient
+{
+class Connection;
+}
+
+namespace TestUtils
+{
+class TestRoom : public NeoChatRoom
+{
+public:
+    TestRoom(Quotient::Connection *connection, const QString &roomName, const QString &syncFileName = {})
+        : NeoChatRoom(connection, roomName, Quotient::JoinState::Join)
+    {
+        syncNewEvents(syncFileName);
+    }
+
+    void update(Quotient::SyncRoomData &&data, bool fromCache = false)
+    {
+        Room::updateData(std::move(data), fromCache);
+    }
+
+    void syncNewEvents(const QString &syncFileName)
+    {
+        if (!syncFileName.isEmpty()) {
+            QFile testSyncFile;
+            testSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + syncFileName);
+            testSyncFile.open(QIODevice::ReadOnly);
+            const auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll());
+            Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson.object());
+            update(std::move(roomData));
+        }
+    }
+};
+}

autotests/texthandlertest.cpp

@@ -10,28 +10,21 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>
 
+#include "models/customemojimodel.h"
+#include "neochatconnection.h"
 #include "utils.h"
 
+#include "testutils.h"
+
 using namespace Quotient;
 
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
 class TextHandlerTest : public QObject
 {
     Q_OBJECT
 
 private:
     Connection *connection = nullptr;
-    TestRoom *room = nullptr;
+    TestUtils::TestRoom *room = nullptr;
 
 private Q_SLOTS:
     void initTestCase();
@@ -48,6 +41,9 @@ private Q_SLOTS:
     void sendBadLinks();
     void sendEscapeCode();
     void sendCodeClass();
+    void sendCustomEmoji();
+    void sendCustomEmojiCode_data();
+    void sendCustomEmojiCode();
 
     void receiveStripReply();
     void receivePlainTextIn();
@@ -78,14 +74,15 @@ private Q_SLOTS:
 void TextHandlerTest::initTestCase()
 {
     connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+    connection->setAccountData("im.ponies.user_emotes"_ls,
+                               QJsonObject{{"images"_ls,
+                                            QJsonObject{{"test"_ls,
+                                                         QJsonObject{{"body"_ls, "Test custom emoji"_ls},
+                                                                     {"url"_ls, "mxc://example.org/test"_ls},
+                                                                     {"usage"_ls, QJsonArray{"emoticon"_ls}}}}}}});
+    CustomEmojiModel::instance().setConnection(static_cast<NeoChatConnection *>(connection));
 
-    QFile testTextHandlerSyncFile;
-    testTextHandlerSyncFile.setFileName(QLatin1String(DATA_DIR) + u'/' + QLatin1String("test-texthandler-sync.json"));
-    testTextHandlerSyncFile.open(QIODevice::ReadOnly);
-    const auto testTextHandlerSyncJson = QJsonDocument::fromJson(testTextHandlerSyncFile.readAll());
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, testTextHandlerSyncJson.object());
-    room->update(std::move(roomData));
+    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-texthandler-sync.json"));
 }
 
 void TextHandlerTest::allowedAttributes()
@@ -234,6 +231,39 @@ void TextHandlerTest::sendCodeClass()
     QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }
 
+void TextHandlerTest::sendCustomEmoji()
+{
+    const QString testInputString = QStringLiteral(":test:");
+    const QString testOutputString = QStringLiteral(
+        "<p><img data-mx-emoticon=\"\" src=\"mxc://example.org/test\" alt=\":test:\" title=\":test:\" height=\"32\" vertical-align=\"middle\" /></p>");
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
+}
+
+void TextHandlerTest::sendCustomEmojiCode_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QString>("testOutputString");
+
+    QTest::newRow("inline") << QStringLiteral("`:test:`") << QStringLiteral("<p><code>:test:</code></p>");
+    QTest::newRow("block") << QStringLiteral("```\n:test:\n```") << QStringLiteral("<pre><code>:test:\n</code></pre>");
+}
+
+// Custom emojis in code blocks should be left alone.
+void TextHandlerTest::sendCustomEmojiCode()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QString, testOutputString);
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
+}
+
 void TextHandlerTest::receiveStripReply()
 {
     const QString testInputString = QStringLiteral(

autotests/windowcontrollertest.cpp

@@ -0,0 +1,102 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include <QQmlApplicationEngine>
+#include <QTest>
+#include <QWindow>
+
+#include <KConfig>
+#include <KSharedConfig>
+#include <KWindowConfig>
+
+#include "windowcontroller.h"
+
+class WindowControllerTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void nullWindow();
+    void geometry();
+    void showAndRaise();
+    void toggle();
+
+    void cleanup();
+};
+
+// Basically don't crash when no window is set.
+void WindowControllerTest::nullWindow()
+{
+    auto &instance = WindowController::instance();
+    QCOMPARE(instance.window(), nullptr);
+
+    instance.restoreGeometry();
+    instance.saveGeometry();
+    instance.showAndRaiseWindow({});
+    instance.toggleWindow();
+}
+
+void WindowControllerTest::geometry()
+{
+    auto &instance = WindowController::instance();
+
+    QWindow window;
+    window.setGeometry(0, 0, 200, 200);
+    instance.setWindow(&window);
+    QCOMPARE(instance.window(), &window);
+
+    instance.saveGeometry();
+    const auto stateConfig = KSharedConfig::openStateConfig();
+    KConfigGroup windowGroup = stateConfig->group(QStringLiteral("Window"));
+    QCOMPARE(KWindowConfig::hasSavedWindowSize(windowGroup), true);
+
+    window.setGeometry(0, 0, 400, 400);
+    QCOMPARE(window.geometry(), QRect(0, 0, 400, 400));
+    instance.restoreGeometry();
+    QCOMPARE(window.geometry(), QRect(0, 0, 200, 200));
+}
+
+void WindowControllerTest::showAndRaise()
+{
+    auto &instance = WindowController::instance();
+    QWindow window;
+    instance.setWindow(&window);
+    QCOMPARE(window.isVisible(), false);
+
+    instance.showAndRaiseWindow({});
+    QCOMPARE(window.isVisible(), true);
+}
+
+void WindowControllerTest::cleanup()
+{
+    auto &instance = WindowController::instance();
+    instance.setWindow(nullptr);
+    QCOMPARE(instance.window(), nullptr);
+}
+
+void WindowControllerTest::toggle()
+{
+    auto &instance = WindowController::instance();
+    QWindow window;
+    instance.setWindow(&window);
+    QCOMPARE(window.isVisible(), false);
+    instance.toggleWindow();
+    QCOMPARE(window.isVisible(), true);
+    instance.toggleWindow();
+    QCOMPARE(window.isVisible(), false);
+
+    // A window is classed as visible by qt when minimized but to the user this is not visible.
+    // So in this case we expect to show it even though visibility is technically true.
+    window.setVisibility(QWindow::Minimized);
+    QCOMPARE(window.windowState(), Qt::WindowMinimized);
+    QCOMPARE(window.isVisible(), true);
+    instance.toggleWindow();
+    QCOMPARE(window.windowState(), Qt::WindowNoState);
+    QCOMPARE(window.isVisible(), true);
+    instance.toggleWindow();
+    QCOMPARE(window.windowState(), Qt::WindowNoState);
+    QCOMPARE(window.isVisible(), false);
+}
+
+QTEST_MAIN(WindowControllerTest)
+#include "windowcontrollertest.moc"

org.kde.neochat.appdata.xml

@@ -47,10 +47,12 @@
   <name xml:lang="uk">NeoChat</name>
   <name xml:lang="x-test">xxNeoChatxx</name>
   <name xml:lang="zh-CN">NeoChat</name>
+  <name xml:lang="zh-TW">NeoChat</name>
   <summary>Chat with your friends on matrix</summary>
   <summary xml:lang="ar">دردش مع أصدقائك على ماتركس</summary>
   <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
   <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
+  <summary xml:lang="cs">Mluvte se svými přáteli na Matrixu</summary>
   <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
   <summary xml:lang="es">Charle con sus amigos en matrix</summary>
   <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
@@ -70,6 +72,8 @@
   <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
   <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
   <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
+  <summary xml:lang="zh-CN">在 Matrix 上与朋友聊天</summary>
+  <summary xml:lang="zh-TW">在 Matrix 上與您的朋友聊天</summary>
   <description>
     <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
 to provide a convergent experience across multiple platforms.</p>
@@ -96,6 +100,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
     <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
     <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
+    <p xml:lang="zh-TW">NeoChat 是去中心化即時通訊協定 Matrix 的一個用戶端。它讓您可以傳送文字訊息、影片、音訊檔案給您的家人、同事或朋友。NeoChat 使用 KDE frameworks，尤其是 Kirigami，來提供跨平台的響應式體驗。</p>
     <p>NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
     <p xml:lang="ar">يهدف نيوتشات إلى أن يكون تطبيقًا كامل الميزات لمواصفات ماتركس. على هذا النحو يتم دعم كل شيء في المواصفات المستقرة الحالية مع الاستثناءات الملحوظة لـ VoIP والخيوط وبعض جوانب التشفير من طرف إلى طرف. هناك عدد قليل من الإغفالات الصغيرة الأخرى بسبب حقيقة أن مواصفات ماتركس تتطور باستمرار ، ولكن يبقى الهدف توفير الدعم النهائي للمواصفات بأكملها.</p>
     <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
@@ -120,6 +125,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
     <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
     <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
+    <p xml:lang="zh-TW">NeoChat 以完整支援 Matrix 標準為目標，因此目前穩定版標準除了 VoIP、對話串與端對端加密的某些部分以外的所有部分都有支援。其他部分還有一些較小的不支援的部分，這是因為 Matrix 標準隨時都在改進，但目標仍然時最終提供整個標準的完整支援。</p>
     <p>Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
     <p xml:lang="ar">نظرًا لطبيعة تطوير مواصفات ماتركس، يدعم نيوتشات أيضًا العديد من الميزات غير المستقرة وهي:</p>
     <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
@@ -145,6 +151,7 @@ to provide a convergent experience across multiple platforms.</p>
     <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
     <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
     <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
+    <p xml:lang="zh-TW">由於 Matrix 標準的開發流程的緣故，NeoChat 也支援數個非穩定版的功能。目前這些功能是：</p>
     <ul>
       <li>Polls - MSC3381</li>
       <li xml:lang="ar">التصويت - MSC3381</li>
@@ -171,6 +178,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="tr">Anketler - MSC3381</li>
       <li xml:lang="uk">Опитування - MSC3381</li>
       <li xml:lang="x-test">xxPolls - MSC3381xx</li>
+      <li xml:lang="zh-TW">投票 - MSC3381</li>
       <li>Sticker Packs - MSC2545</li>
       <li xml:lang="ar">حزم الملصقات - MSC2545</li>
       <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
@@ -196,6 +204,7 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
       <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
       <li xml:lang="x-test">xxSticker Packs - MSC2545xx</li>
+      <li xml:lang="zh-TW">貼圖包 - MSC2545</li>
       <li>Location Events - MSC3488</li>
       <li xml:lang="ar">موقع الأحداث - MSC3488</li>
       <li xml:lang="ca">Esdeveniments d'ubicació - MSC3488</li>
@@ -221,10 +230,11 @@ to provide a convergent experience across multiple platforms.</p>
       <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
       <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
       <li xml:lang="x-test">xxLocation Events - MSC3488xx</li>
+      <li xml:lang="zh-TW">位置事件 - MSC3488</li>
     </ul>
   </description>
-  <url type="homepage">https://apps.kde.org/neochat/</url>
-  <url type="bugtracker">https://bugs.kde.org/buglist.cgi?component=General&amp;product=NeoChat</url>
+  <url type="homepage">https://apps.kde.org/neochat</url>
+  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?product=NeoChat</url>
   <categories>
     <category>Network</category>
   </categories>
@@ -265,6 +275,7 @@ to provide a convergent experience across multiple platforms.</p>
   <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>
@@ -310,6 +321,7 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
       <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
       <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
+      <caption xml:lang="zh-TW">主頁面，包含聊天室列表、聊天內容，與聊天室資訊</caption>
     </screenshot>
     <screenshot environment="windows">
       <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</image>
@@ -317,6 +329,7 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="ar">شاشة الدخول</caption>
       <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
       <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
+      <caption xml:lang="cs">Přihlašovací obrazovka</caption>
       <caption xml:lang="eo">Ensaluta ekrano</caption>
       <caption xml:lang="es">Pantalla de inicio de sesión</caption>
       <caption xml:lang="eu">Saio-hasteko pantaila</caption>
@@ -337,12 +350,14 @@ to provide a convergent experience across multiple platforms.</p>
       <caption xml:lang="tr">Oturum açma ekranı</caption>
       <caption xml:lang="uk">Вікно входу</caption>
       <caption xml:lang="x-test">xxLogin screenxx</caption>
+      <caption xml:lang="zh-TW">登入畫面</caption>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <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"/>
     <release version="23.08.0" date="2023-08-24">

org.kde.neochat.desktop

@@ -42,6 +42,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 GenericName=Matrix Client
 GenericName[ar]=عميل ماتركس
 GenericName[az]=Matrix Müştərisi
@@ -81,6 +82,7 @@ GenericName[tr]=Matrix İstemcisi
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
 GenericName[zh_CN]=Matrix 客户端
+GenericName[zh_TW]=Matrix 用戶端
 Comment=Client for the Matrix protocol
 Comment[ar]=عميل لميفاق ماتركس
 Comment[az]=Matrix protokolu üçün müştəri
@@ -119,6 +121,7 @@ Comment[tr]=Matrix protokolü için istemci
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
 Comment[zh_CN]=为 Matrix 协议打造的客户端
+Comment[zh_TW]=Matrix 通訊協定的用戶端
 MimeType=x-scheme-handler/matrix;
 Exec=neochat %u
 Terminal=false

po/ar/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-08-19 22:34+0400\n"
 "Last-Translator: Zayed Al-Saidi <zayed.alsaidi@gmail.com>\n"
 "Language-Team: ar\n"
@@ -18,79 +18,79 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "أرسل إشعار الكتابة"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "فشل الولوج: رمز النفاذ غير صالحة أو سحبت"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "فشل الولوج: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "خطأ شبكي: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "رمز النفاذ غير موجود"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "ربما حذفت؟"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "رفض النفاذ إلى حَمَّالَة المَفَاتِيح"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "الرجاء السماح لنيوتشات بقراءة رمز النفاذ"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "لا تتوفر حَمَّالَة المَفَاتِيح"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "الرجاء تثبيت حَمَّالَة مَفَاتِيح مثل محفظتك من كِيدِي أو غنوم Keyring على لينكس"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "غير قادر على قراءة رقم النفاذ"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "الملف كبير جدًا لتنزيله."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "راسل مدير خادوم ماتركس للدعم."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[هذه الرسالة محذوفة]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[هذه الرسالة محذوفة: %1]</i>"
@@ -421,7 +421,7 @@ msgstr "حدث الحالة"
 msgid "started a poll"
 msgstr "بدأ استفتاء"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -432,7 +432,7 @@ msgstr[3] "%1 مستخدمين: "
 msgstr[4] " %1 مستخدماً: "
 msgstr[5] "%1 مستخدم: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -967,16 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "صورك التعبيرية"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[أفعال محظورة]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[أفعال محظورة: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1029,13 +1019,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "مكّن إشعارات هذا الحساب"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "الرسائل التي في المحادثات الفردية"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "الرسائل المعماة في الرسائل الفردية"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "الرسائل في مجموعات الدردشة"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "الرسائل المعماة في مجموعات الدردشة"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "رسائل ترقية الغرفة"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "الرسائل التي تحوي على اسم العرض الخاص بي"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "الرسائل التي تحوي على اسم العرض الخاص بي"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "كل إشعارات الغرفة (@غرفة)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "دعوات إلى غرفة"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "دعوة مكالمة"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " و "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1047,7 +1124,7 @@ msgstr[3] " و%1 أخرى"
 msgstr[4] " و%1 أخرى"
 msgstr[5] " و%1 أخرى"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1089,28 +1166,28 @@ msgstr "منخفضة الأولوية"
 msgid "Spaces"
 msgstr "الفضاءات"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "فشل إنشاء غرفة: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "فشل إنشاء فضاء: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "أرسل البلاغ بنجاح."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "عرض: %1, طول: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "رسالة معمّاة"
@@ -1136,42 +1213,42 @@ msgstr "ردّ"
 msgid "Reply..."
 msgstr "ردّ..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "‏%1 دعاك إلى غرفة"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "افتح هذه الدعوة في نيوتشات"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "اقبل"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "ارفض"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "‏%1 (‏%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1220,7 +1297,7 @@ msgid "Label:"
 msgstr "التسمية:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "احفظ"
@@ -1291,6 +1368,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "كلمة السر غيّرت بنجاح"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "أدخلت كلمة سر خاطئة"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "مشكلة غير معروفة أثناء محاولة تغيير كلمة السر"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1335,21 +1427,6 @@ msgstr "الحسابات"
 msgid "Add Account"
 msgstr "أضف حسابًا"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "كلمة السر غيّرت بنجاح"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "أدخلت كلمة سر خاطئة"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "مشكلة غير معروفة أثناء محاولة تغيير كلمة السر"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1452,19 +1529,19 @@ msgstr "ألغ إرسال المرفق"
 msgid "Ban User"
 msgstr "احظر مستخدم"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "سبب حظر هذه المستخدم"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "احظر"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1734,9 +1811,13 @@ msgid "Topic:"
 msgstr "بلا موضوع"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "اجعل هذا الاسم البديل الاسم البديل العالمي للغرفة"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1758,7 +1839,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1783,9 +1864,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "اجعل هذا الاسم البديل الاسم البديل العالمي للغرفة"
 
@@ -2059,7 +2143,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "الملصقات والصور التعبيرية"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2067,7 +2151,7 @@ msgid ""
 msgstr "هذه الرسالة مشفرة ولم يشارك المرسل المفتاح مع هذا الجهاز."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "استكشف الغرف"
@@ -2172,7 +2256,7 @@ msgid "Remove Message"
 msgstr "أزل رسالة"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2222,148 +2306,148 @@ msgstr "اسم الغرفة:"
 msgid "Room topic:"
 msgstr "موضوع الغرفة:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "رقم الغرفة"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "انسخ معرف الغرفة للحافظة"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "إصدارة الغرفة"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "رقّ الغرفة"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "الأسماء البديلة"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "لم يعين اسم بديل عالمي"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "اجعل هذا الاسم البديل الاسم البديل العالمي للغرفة"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "احذف الاسم البديل"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "أضف اسماً بديلاً جديداً"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "معاينة الرابط"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "مكّن معاينة الروابط بشكل مبدئي لأعضاء الغرفة"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "مكّن معاينة الرابط"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "مكّن معاينة الروابط بشكل مبدئي في هذه الغرفة"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "عطلت معاينة الروابط بشكل مبدئي في هذه الغرفة"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "المعرف العالمي:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "لم يعين اسم بديل عالمي"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "أزل رسالة"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "بدلت هذه الغرفة."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "لم يعين اسم بديل عالمي"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "هذه الغرفة تواصل محادثة أخرى."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "شاهد الرسائل القديمة..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "بدلت هذه الغرفة."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "شاهد الغرفة الجديد…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "رقّ الغرفة"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "حدد الإصدارة الأحدث"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "أكد"
@@ -2739,17 +2823,17 @@ msgstr "اعثر على مستخدم…"
 msgid "Add"
 msgstr "أضف"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "لا يوجد مستخدمين"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "أرسل دعوة"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "المستخدم مدعو أو أنه عضو بالفعل"
@@ -2812,12 +2896,12 @@ msgstr "أدخل رابط الخادم مثل kde.org"
 msgid "Server URL"
 msgstr "رابط الخادم"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3150,7 +3234,7 @@ msgstr "مكن إبرازات الرسالة"
 msgid "Delete keyword"
 msgstr "احذف الكلمة المفتاحية"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3322,7 +3406,7 @@ msgstr "تعيين أبناء هذا الفضاء"
 msgid "Set the parent space of this room"
 msgstr "تعيين الفضاء الأب لهذه الغرفة"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3333,7 +3417,7 @@ msgstr[3] "بالاعتماد على أصوات %1 مستخدمين"
 msgstr[4] "بالاعتماد على أصوات %1 مستخدماً"
 msgstr[5] "بالاعتماد على أصوات %1 مستخدم"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3439,17 +3523,17 @@ msgstr "أزل الرسائل"
 msgid "Remove Message"
 msgstr "أزل رسالة"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "سبب إزالة هذه آخر رسائل هذا المستخدم"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "سبب إزالة هذه الرسالة"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3466,7 +3550,7 @@ msgstr "ألغِ الرد"
 msgid "Report Message"
 msgstr "بلّغ عن الرسالة"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "سبب التبليغ عن هذه الرسالة"
@@ -3627,28 +3711,28 @@ msgstr "بلا عدد أعضاء"
 msgid "View notifications"
 msgstr "اكتم الإشعارات"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "لم يعثر على غرف"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "انضم لبعض الغرف لتبدأ"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "ابحث في دليل الغرف"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "اطوِ %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3897,6 +3981,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "اجعل هذا الاسم البديل الاسم البديل العالمي للغرفة"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4181,12 +4271,12 @@ msgstr ""
 msgid "Chat"
 msgstr "دردشة"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "انضم إلى دردشة موجودة"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "أنشئ دردشة جديدة"
@@ -4210,22 +4300,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "اقفز إلى أول رسالة غير المقروءة"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "اقفز إلى أحدث رسالة"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "اسحب عناصر هنا لتشاركهم"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4541,54 +4631,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "أضف خادمًا"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "ليس النص المُدخَل رابطا صالحا"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "بلا اسم"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "لا يوجد مستخدمين"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "تابع"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4644,16 +4734,22 @@ msgstr "تعذر على نظام تشغيلك العثور على تطبيق ل
 msgid "Could not open URL"
 msgstr "تعذر فتح الوصلة"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "أظهر"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "أنهِ"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[أفعال محظورة]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[أفعال محظورة: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "رقم التعريفي للغرفة التي تحاول الانضمام إليها غير صحيح"
 
@@ -4768,36 +4864,9 @@ msgstr "أنهِ"
 #~ msgstr ""
 #~ "هذه الغرفة مشفرة. ابنِ libQuotient مع تمكين التشفير لإرسال الرسائل المشفرة."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "الرسائل التي في المحادثات الفردية"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "الرسائل المعماة في الرسائل الفردية"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "الرسائل في مجموعات الدردشة"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "الرسائل المعماة في مجموعات الدردشة"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "رسائل ترقية الغرفة"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "الرسائل التي تحوي على اسم العرض الخاص بي"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "كل إشعارات الغرفة (@غرفة)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "الرسائل التي تحوي الكلمات المفتاحية الخاص بي"
 
-#~ msgid "Invites to a room"
-#~ msgstr "دعوات إلى غرفة"
-
-#~ msgid "Call invitation"
-#~ msgstr "دعوة مكالمة"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "صورة تعبيرية مخصصة"

po/ast/neochat.po

@@ -6,89 +6,89 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-07 21:27+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-12 01:02+0100\n"
 "Last-Translator: Enol P. <enolp@softastur.org>\n"
-"Language-Team: \n"
+"Language-Team: Asturian <alministradores@softastur.org>\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.08.2\n"
+"X-Generator: Lokalize 23.08.4\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr ""
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr ""
@@ -419,14 +419,14 @@ msgstr ""
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -960,25 +960,13 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr ""
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
-#, fuzzy, kde-format
-#| msgctxt "Optional reason for an invitation"
-#| msgid ": %1"
+#, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
 msgid " %1"
 msgid_plural " %1 %2 times"
-msgstr[0] ": %1"
-msgstr[1] ": %1"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/models/messagefiltermodel.cpp:129
 #, kde-format
@@ -1015,13 +1003,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr ""
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr ""
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1029,7 +1082,7 @@ msgid_plural " and %1 others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1067,28 +1120,28 @@ msgstr ""
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1114,40 +1167,40 @@ msgstr ""
 msgid "Reply..."
 msgstr ""
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr ""
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr ""
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr ""
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr ""
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1195,7 +1248,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr ""
@@ -1264,6 +1317,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1308,21 +1376,6 @@ msgstr ""
 msgid "Add Account"
 msgstr ""
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1425,19 +1478,19 @@ msgstr ""
 msgid "Ban User"
 msgstr ""
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr ""
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1696,6 +1749,9 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1719,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1743,8 +1799,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2015,7 +2074,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2023,7 +2082,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
@@ -2124,7 +2183,7 @@ msgid "Remove Message"
 msgstr ""
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2174,143 +2233,143 @@ msgstr ""
 msgid "Room topic:"
 msgstr ""
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr ""
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr ""
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr ""
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr ""
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -2680,17 +2739,17 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2752,12 +2811,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3079,7 +3138,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3246,14 +3305,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3354,17 +3413,17 @@ msgstr ""
 msgid "Remove Message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3381,7 +3440,7 @@ msgstr ""
 msgid "Report Message"
 msgstr ""
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3528,28 +3587,28 @@ msgstr ""
 msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3784,6 +3843,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4050,12 +4114,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr ""
@@ -4079,22 +4143,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4392,47 +4456,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4488,12 +4552,12 @@ msgstr ""
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr ""
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr ""

po/az/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2022-07-22 12:13+0400\n"
 "Last-Translator: Kheyyam <xxmn77@gmail.com>\n"
 "Language-Team: Azerbaijani <kde-i18n-doc@kde.org>\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 22.04.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Receiving push notifications"
 msgstr "\"Yazır\" bildirişi göndərilsin"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Giriş baş tutmadı: Giriş Tokeni səhvdir və ya ləğv edilib"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Giriş alınmadı: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Şəbəkə xətası: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Giriş tokeni tapılmadı"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Ola bilsin ki, o, silinib"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Açarlar bağına girişə icaz. verilmir."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "NeoChat'a giriş tokenini oxumağa icazə verin"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Açarlar bağı əlçatan deyil."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Linix'da KWallet və ya GNOME keyring kimi açarlar bağı tətbiqini quraşdırın"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Giriş nişanını oxumaq mümkün deyil"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Bu ismarıc silindi]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Bu ismarıc silindi: %1]</i>"
@@ -444,14 +444,14 @@ msgstr "%1 vəziyyəti yeniləndi"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, fuzzy, kde-format
 #| msgctxt "[action 1], [action 2 and action 3]"
 #| msgid ", "
@@ -1072,16 +1072,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Xüsusi Emoji"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[DÜZƏLİŞ_EDİLDİ]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[DÜZƏLİŞ_EDİLDİ: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1128,13 +1118,94 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Bildirişlərdə göstərmək"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "İsmarıcı göndərin"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "onların görünən adı silindi"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "onların görünən adı silindi"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Bildirişlərdə göstərmək"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "%1 invited you to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "%1,sizi otağa dəvət etdi"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Dəvət göndərmək"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " və "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1142,7 +1213,7 @@ msgid_plural " and %1 others"
 msgstr[0] " və %1 başqası"
 msgstr[1] " və %1 başqaları"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1180,31 +1251,31 @@ msgstr "Aşağı prioritet"
 msgid "Spaces"
 msgstr "Boşluqlar"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "Otaq yaradıla bilmədi: \"%1\""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "Otaq yaradıla bilmədi: \"%1\""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, fuzzy, kde-format
 #| msgid "Password changed successfully"
 msgid "Report sent successfully."
 msgstr "Şifrə uğurla dəyişdirildi"
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Encrypted Message"
@@ -1231,42 +1302,42 @@ msgstr "Cavab"
 msgid "Reply..."
 msgstr "Cavab..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1,sizi otağa dəvət etdi"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Bu dəvəti NeoChat-da açın"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Qəbul etmək"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "İmtina etmək"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1319,7 +1390,7 @@ msgid "Label:"
 msgstr "Yarlıq:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Saxlayın"
@@ -1396,6 +1467,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Şifrə uğurla dəyişdirildi"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Səhv şifrə daxil edildi"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Şifrəni dəyişdirərkən naməlum xəta baş verdi"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1444,21 +1530,6 @@ msgstr "İstifadəçi Hesabları"
 msgid "Add Account"
 msgstr "Hesab əlavə etmək"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Şifrə uğurla dəyişdirildi"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Səhv şifrə daxil edildi"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Şifrəni dəyişdirərkən naməlum xəta baş verdi"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, fuzzy, kde-format
 #| msgid "Appearance"
@@ -1570,20 +1641,20 @@ msgstr "onların görünən adı silindi"
 msgid "Ban User"
 msgstr "Bu istifadəçini əngəlləmək"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 #| msgid "Unban this user"
 msgid "Reason for banning this user"
 msgstr "Bu istifadəçini əngəlləmək"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1865,6 +1936,9 @@ msgstr "Mövzu yoxdur"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1888,7 +1962,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1913,10 +1987,14 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
-#, kde-format
+#: src/qml/CreateRoomDialog.qml:219
+#, fuzzy, kde-format
+#| msgid "No Canonical Alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr ""
+msgstr "Rəsmi adı yoxdur"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2213,7 +2291,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2221,7 +2299,7 @@ msgid ""
 msgstr "Bu ismarıc şifrələnib və göndərən açarı bu cihaz ilə paylaşmadı."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Otaqlara baxış"
@@ -2327,7 +2405,7 @@ msgid "Remove Message"
 msgstr "İsmarıca düzəliş etmək"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2381,163 +2459,163 @@ msgstr "Otağın adı:"
 msgid "Room topic:"
 msgstr "Otağın mövzusu:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Rooms"
 msgid "Room ID"
 msgstr "Otaqlar"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
 #| msgid "Copy address to clipboard"
 msgid "Copy room ID to clipboard"
 msgstr "Ünvanı mübadilə yaddaşına kopyalayın"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Room information"
 msgid "Room version"
 msgstr "Otaq haqqında"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
 msgid "Upgrade Room"
 msgstr "Otaqlara baxış"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, fuzzy, kde-format
 #| msgid "Other Aliases:"
 msgid "Aliases"
 msgstr "Alternativ adlar:"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "No canonical alias set"
 msgstr "Rəsmi adı yoxdur"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "Silmək"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are enabled by default in this room"
 msgstr "NeoChatı bu otaqla açın"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are disabled by default in this room"
 msgstr "NeoChatı bu otaqla açın"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Rəsmi adı:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Make canonical parent"
 msgstr "Rəsmi adı yoxdur"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "İsmarıca düzəliş etmək"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Bu otaq dəyişdirildi."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Rəsmi adı yoxdur"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Bu otaqda başqa bir söhbət davam edir"
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "See older messages..."
 msgid "See older messages…"
 msgstr "köhnə ismarıclara baxın..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Bu otaq dəyişdirildi."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "See new room…"
 msgstr "Yeni otağa baxın..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "otağı tərk edin"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "Select new version"
 msgstr "Yeni otağa baxın..."
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Təsdiq etmək"
@@ -2932,17 +3010,17 @@ msgstr "İstifadəçi tapın..."
 msgid "Add"
 msgstr "Əlavə etmək"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "İstifadəçilər yoxdur"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Dəvət göndərmək"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -3005,14 +3083,14 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<otaq-ünvanı>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3363,7 +3441,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "Sözü silin"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgctxt "@title"
@@ -3551,14 +3629,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "%1,sizi otağa dəvət etdi"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3665,17 +3743,17 @@ msgstr "İsmarıca düzəliş etmək"
 msgid "Remove Message"
 msgstr "İsmarıca düzəliş etmək"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3695,7 +3773,7 @@ msgstr "İmtina"
 msgid "Report Message"
 msgstr "İsmarıca düzəliş etmək"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3864,28 +3942,28 @@ msgstr "Üzv sayı yoxdur"
 msgid "View notifications"
 msgstr "Bildirişlərdə göstərmək"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Otaqlar tapılmadı"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Başlamaq üçün bəzi otaqlara qoşulun"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Otaq kataloqunda axtarın"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -4139,6 +4217,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4432,12 +4515,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Söhbət"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create new chat"
@@ -4462,22 +4545,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Birinci oxunmammış ismarıca keçin"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Sonuncu ismarıca keçin"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Elementi paylaşmaq üçün buraya atın"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4788,52 +4871,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "Əsas server:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Ad yoxdur"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "İstifadəçilər yoxdur"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Davam etmək"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4891,16 +4974,22 @@ msgstr "Əməliyyat sisteminiz keçid üçün tətbiq tapa bilmədi."
 msgid "Could not open URL"
 msgstr "URL açıla bilmir"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Göstərmək"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Çıxış"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[DÜZƏLİŞ_EDİLDİ]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[DÜZƏLİŞ_EDİLDİ: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Qoşulmağa cəhd etdiyiniz otaq İD-si doğru deyil"
 
@@ -5000,27 +5089,6 @@ msgstr "Çıxış"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Rəsmi adı yoxdur"
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "onların görünən adı silindi"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Bildirişlərdə göstərmək"
-
-#, fuzzy
-#~| msgid "%1 invited you to a room"
-#~ msgid "Invites to a room"
-#~ msgstr "%1,sizi otağa dəvət etdi"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "Dəvət göndərmək"
-
 #, fuzzy
 #~| msgid "Custom Emoji"
 #~ msgctxt "@title:window"

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 12:05+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 11:29+0100\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -20,80 +20,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Rebre les notificacions «push»"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 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"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Ha fallat l'inici de la sessió: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de la xarxa: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "No s'ha trobat el testimoni d'accés"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Potser s'ha suprimit?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "S'ha denegat l'accés al clauer."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, 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:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "No hi ha cap clauer disponible."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No s'ha pogut llegir el testimoni d'accés"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "El fitxer és massa gran per a baixar."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Aquest missatge s'ha suprimit]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Aquest missatge s'ha suprimit: %1]</i>"
@@ -425,14 +425,14 @@ msgstr "ha actualitzat l'estat"
 msgid "started a poll"
 msgstr "ha començat una enquesta"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "%1 usuari: "
 msgstr[1] "%1 usuaris: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -967,16 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emojis propis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDACTAT]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDACTAT: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1020,13 +1010,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Activa les notificacions per a aquest compte"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Missatges en xats un a un"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Missatges en xats encriptats un a un"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Missatges en xats de grups"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Missatges en xats encriptats de grups"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Missatges d'actualització de sala"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Missatges que contenen el meu nom a mostrar"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Missatges que mencionen el meu ID d'usuari Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Missatges que mencionen una sala"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Missatges que contenen la part local del meu ID de Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notificacions de tota sala (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invitacions a una sala"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Invitació de trucades"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " i "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1034,7 +1089,7 @@ msgid_plural " and %1 others"
 msgstr[0] " i %1 altre"
 msgstr[1] " i %1 altres"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1072,28 +1127,28 @@ msgstr "Prioritat baixa"
 msgid "Spaces"
 msgstr "Espais"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ha fallat la creació de la sala: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ha fallat la creació de l'espai: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "L'informe s'ha enviat correctament."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat.: %1, lon.: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Missatge encriptat"
@@ -1119,40 +1174,40 @@ msgstr "Respon"
 msgid "Reply..."
 msgstr "Respon..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 us ha convidat a la sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Obre aquesta invitació en el NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accepta"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rebutja"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rebutja i ignora l'usuari"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Obre el NeoChat"
@@ -1200,7 +1255,7 @@ msgid "Label:"
 msgstr "Etiqueta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Desa"
@@ -1269,6 +1324,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Confirmació de la desactivació del compte"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "La contrasenya s'ha canviat correctament"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "S'ha introduït una contrasenya errònia"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Problema desconegut en intentar canviar la contrasenya"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1313,21 +1383,6 @@ msgstr "Comptes"
 msgid "Add Account"
 msgstr "Afegeix un compte"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "La contrasenya s'ha canviat correctament"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "S'ha introduït una contrasenya errònia"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Problema desconegut en intentar canviar la contrasenya"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1430,19 +1485,19 @@ msgstr "Cancel·la l'enviament de l'adjunt"
 msgid "Ban User"
 msgstr "Bandeja l'usuari"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Motiu per a bandejar aquest usuari"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Bandeja"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1705,6 +1760,9 @@ msgstr "Tema:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Fes oficial aquest pare"
 
@@ -1728,7 +1786,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1755,8 +1813,11 @@ msgstr ""
 "No teniu el nivell suficient de privilegi en el fill per a establir aquest "
 "estat"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Fes que aquest espai sigui el pare canònic"
 
@@ -2034,7 +2095,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Adhesius i emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2044,7 +2105,7 @@ msgstr ""
 "aquest dispositiu."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explora les sales"
@@ -2145,7 +2206,7 @@ msgid "Remove Message"
 msgstr "Eliminació d'un missatge"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2195,149 +2256,149 @@ msgstr "Nom de la sala:"
 msgid "Room topic:"
 msgstr "Tema de la sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID de la sala"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copia l'ID de la sala al porta-retalls"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versió de la sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Actualitza una sala"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Àlies"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "No s'ha definit cap àlies canònic"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Fes que aquest àlies sigui l'àlies canònic de la sala"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Suprimeix l'àlies"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Afegeix un àlies nou"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistes prèvies dels URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activa les vistes prèvies dels URL de manera predeterminada per als membres "
 "de la sala"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activa les vistes prèvies dels URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan activades de manera predeterminada en "
 "aquesta sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan desactivades de manera predeterminada en "
 "aquesta sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espais pares oficials"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canònic"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fes que sigui pare canònic"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Elimina el pare"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Aquesta sala no té espais pares oficials."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Afegeix un pare oficial nou"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Aquesta sala continua una altra conversa."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vegeu els missatges més antics…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "S'ha substituït aquesta sala."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Vegeu la sala nova…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualitza la sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Selecciona la versió nova"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -2711,17 +2772,17 @@ msgstr "Cerca un usuari..."
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No hi ha cap usuari disponible"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Envia una invitació"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "L'usuari ja és membre o ha estat convidat"
@@ -2783,12 +2844,12 @@ msgstr "Introduïu l'URL del servidor (p. ex. kde.org)"
 msgid "Server URL"
 msgstr "URL del servidor"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduïu una adreça de sala"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3113,7 +3174,7 @@ msgstr "Activa el ressaltat de missatges"
 msgid "Delete keyword"
 msgstr "Suprimeix una paraula clau"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3286,14 +3347,14 @@ msgstr "Establir els fills d'aquest espai"
 msgid "Set the parent space of this room"
 msgstr "Establir l'espai pare d'aquesta sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basat en els vots d'%1 usuari"
 msgstr[1] "Basat en els vots de %1 usuaris"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3394,17 +3455,17 @@ msgstr "Elimina missatges"
 msgid "Remove Message"
 msgstr "Elimina un missatge"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Motiu per a eliminar els missatges recents d'aquest usuari"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Motiu per a eliminar aquest missatge"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3421,7 +3482,7 @@ msgstr "Cancel·la la resposta"
 msgid "Report Message"
 msgstr "Informa del missatge"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Motiu per a informar d'aquest missatge"
@@ -3568,28 +3629,28 @@ msgstr "No hi ha comptador de membres"
 msgid "View notifications"
 msgstr "Visualitza les notificacions"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No s'ha trobat cap sala"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Uniu-vos a diverses sales per a començar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Cerca en el directori de sales"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Redueix %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3838,6 +3899,11 @@ msgstr "La sala seleccionada no és cap espai"
 msgid "You do not have the privileges to complete this action"
 msgstr "No teniu el privilegi per a completar aquesta acció"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Fes que aquest espai sigui el pare canònic"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4106,12 +4172,12 @@ msgstr "Torna a obrir l'URL de SSO"
 msgid "Chat"
 msgstr "Xat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Uneix-te a un xat existent"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Crea un xat nou"
@@ -4138,22 +4204,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:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ves al primer missatge sense llegir"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ves al darrer missatge"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4484,47 +4550,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Enrere"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Sense servidor."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "S'està comprovant la disponibilitat del servidor."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Aquest no és un servidor vàlid."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registre en aquest servidor està desactivat."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Sense nom d'usuari."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "S'està comprovant la disponibilitat del nom d'usuari."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Aquest nom d'usuari no està disponible."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "En funcionament"
@@ -4582,15 +4648,18 @@ msgstr "El sistema operatiu no ha pogut trobar cap aplicació per a l'enllaç."
 msgid "Could not open URL"
 msgstr "No s'ha pogut obrir l'URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostra"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Surt"
 
-#~ msgid "The room id you are trying to join is not valid"
-#~ msgstr "L'ID de la sala a la qual esteu intentant unir-vos no és vàlida"
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDACTAT]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDACTAT: %1]"

po/ca@valencia/neochat.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 12:05+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 11:29+0100\n"
 "Last-Translator: Josep M. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -20,81 +20,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Rebre les notificacions «push»"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 "No s'ha pogut fer l'inici de la sessió: El testimoni d'accés no és vàlid o "
 "està revocat"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "No s'ha pogut fer l'inici de la sessió: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "S'ha produït un error de la xarxa: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "No s'ha trobat el testimoni d'accés"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Potser s'ha suprimit?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "S'ha denegat l'accés al clauer."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Permeteu que NeoChat llija el testimoni d'accés"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "No hi ha cap clauer disponible."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Instal·leu un clauer, p. ex., KWallet o l'anell de claus de GNOME a Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No s'ha pogut llegir el testimoni d'accés"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "El fitxer és massa gran per a baixar."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Per a suport, contacteu amb l'administrador del servidor de Matrix."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Este missatge s'ha suprimit]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Este missatge s'ha suprimit: %1]</i>"
@@ -425,14 +425,14 @@ msgstr "ha actualitzat l'estat"
 msgid "started a poll"
 msgstr "ha començat una enquesta"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "%1 usuari: "
 msgstr[1] "%1 usuaris: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -749,15 +749,15 @@ msgstr "Ix de la sala indicada o d'esta sala, si no se n'ha indicat cap"
 #: src/models/actionsmodel.cpp:329 src/models/actionsmodel.cpp:337
 #: src/models/actionsmodel.cpp:345
 msgid "<display name>"
-msgstr "<nom a mostrar>"
+msgstr "<nom que es mostrarà>"
 
 #: src/models/actionsmodel.cpp:330
 msgid "Changes your global display name"
-msgstr "Canvia el vostre nom a mostrar global"
+msgstr "Canvia el vostre nom que s'ha de mostrar global"
 
 #: src/models/actionsmodel.cpp:338 src/models/actionsmodel.cpp:346
 msgid "Changes your display name in this room"
-msgstr "Canvia el vostre nom a mostrar en esta sala"
+msgstr "Canvia el vostre nom que s'ha de mostrar en esta sala"
 
 #: src/models/actionsmodel.cpp:360
 #, kde-format
@@ -967,16 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emojis propis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDACTAT]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDACTAT: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1020,13 +1010,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Activa les notificacions per a este compte"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Missatges en xats un a un"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Missatges en xats encriptats un a un"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Missatges en xats de grup"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Missatges en xats de grup encriptats"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Missatges d'actualització de sala"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Missatges que contenen el meu nom que s'ha de mostrar"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Missatges que mencionen el meu ID d'usuari de Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Missatges que mencionen una sala"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Missatges que contenen la part local del meu ID de Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notificacions de tota la sala (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Convida a una sala"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Invitació de tocada"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " i "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1034,7 +1089,7 @@ msgid_plural " and %1 others"
 msgstr[0] " i %1 altre"
 msgstr[1] " i %1 altres"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1072,28 +1127,28 @@ msgstr "Prioritat baixa"
 msgid "Spaces"
 msgstr "Espais"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "No s'ha pogut crear la sala: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "No s'ha pogut crear l'espai: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "L'informe s'ha enviat correctament."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat.: %1, lon.: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Missatge encriptat"
@@ -1119,40 +1174,40 @@ msgstr "Respon"
 msgid "Reply..."
 msgstr "Respon..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 vos ha convidat a la sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Obri esta invitació en NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accepta"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rebutja"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rebutja i ignora l'usuari"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Obri NeoChat"
@@ -1200,7 +1255,7 @@ msgid "Label:"
 msgstr "Etiqueta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Guarda"
@@ -1269,6 +1324,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Confirmació de la desactivació del compte"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "La contrasenya s'ha canviat correctament"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "S'ha introduït una contrasenya errònia"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Problema desconegut en intentar canviar la contrasenya"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1313,21 +1383,6 @@ msgstr "Comptes"
 msgid "Add Account"
 msgstr "Afig un compte"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "La contrasenya s'ha canviat correctament"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "S'ha introduït una contrasenya errònia"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Problema desconegut en intentar canviar la contrasenya"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1430,19 +1485,19 @@ msgstr "Cancel·la l'enviament de l'adjunt"
 msgid "Ban User"
 msgstr "Bandeja l'usuari"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Motiu per a bandejar este usuari"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Bandeja"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1608,14 +1663,14 @@ msgstr "Marca com a llegit"
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "Copy user's Matrix ID to Clipboard"
-msgstr "Copia l'ID de Matrix de l'usuari al porta-retalls"
+msgstr "Copia l'ID de Matrix de l'usuari a dins del porta-retalls"
 
 #: src/qml/ContextMenu.qml:60 src/qml/SpaceListContextMenu.qml:36
 #: src/qml/SpaceListContextMenu.qml:116
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "Copy Address to Clipboard"
-msgstr "Copia l'adreça al porta-retalls"
+msgstr "Copia l'adreça a dins del porta-retalls"
 
 #: src/qml/ContextMenu.qml:72
 #, kde-format
@@ -1705,6 +1760,9 @@ msgstr "Tema:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Fes oficial este pare"
 
@@ -1728,7 +1786,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1755,8 +1813,11 @@ msgstr ""
 "No teniu el nivell suficient de privilegi en el fill per a establir este "
 "estat"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Fes que este espai siga el pare canònic"
 
@@ -2034,7 +2095,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Adhesius i emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2044,7 +2105,7 @@ msgstr ""
 "dispositiu."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explora les sales"
@@ -2145,7 +2206,7 @@ msgid "Remove Message"
 msgstr "Eliminació d'un missatge"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2195,149 +2256,149 @@ msgstr "Nom de la sala:"
 msgid "Room topic:"
 msgstr "Tema de la sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID de la sala"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
-msgstr "Copia l'ID de la sala al porta-retalls"
+msgstr "Copia l'ID de la sala a dins del porta-retalls"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versió de la sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Actualitza una sala"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Àlies"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "No s'ha establit cap àlies canònic"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Fes que este àlies siga l'àlies canònic de la sala"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Suprimix l'àlies"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Afig un àlies nou"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistes prèvies dels URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activa les vistes prèvies dels URL de manera predeterminada per als membres "
 "de la sala"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activa les vistes prèvies dels URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan activades de manera predeterminada en esta "
 "sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Les vistes prèvies dels URL estan desactivades de manera predeterminada en "
 "esta sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espais pares oficials"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canònic"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fes que siga pare canònic"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Elimina el pare"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Esta sala no té espais pares oficials."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Afig un pare oficial nou"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala continua una altra conversa."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vegeu els missatges més antics…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "S'ha substituït esta sala."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Vegeu la sala nova…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualitza la sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Selecciona la versió nova"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -2712,17 +2773,17 @@ msgstr "Busca un usuari..."
 msgid "Add"
 msgstr "Afig"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No hi ha cap usuari disponible"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Envia una invitació"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "L'usuari ja és membre o ha sigut convidat"
@@ -2784,12 +2845,12 @@ msgstr "Introduïu l'URL del servidor (p. ex., kde.org)"
 msgid "Server URL"
 msgstr "URL del servidor"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduïu una adreça de sala"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3114,7 +3175,7 @@ msgstr "Activa el ressaltat de missatges"
 msgid "Delete keyword"
 msgstr "Suprimix una paraula clau"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3287,14 +3348,14 @@ msgstr "Establir els fills d'este espai"
 msgid "Set the parent space of this room"
 msgstr "Establir l'espai pare d'esta sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basat en els vots d'%1 usuari"
 msgstr[1] "Basat en els vots de %1 usuaris"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3395,17 +3456,17 @@ msgstr "Elimina missatges"
 msgid "Remove Message"
 msgstr "Elimina un missatge"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Motiu per a eliminar els missatges recents d'este usuari"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Motiu per a eliminar este missatge"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3422,7 +3483,7 @@ msgstr "Cancel·la la resposta"
 msgid "Report Message"
 msgstr "Informa del missatge"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Motiu per a informar d'este missatge"
@@ -3569,28 +3630,28 @@ msgstr "No hi ha comptador de membres"
 msgid "View notifications"
 msgstr "Visualitza les notificacions"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No s'ha trobat cap sala"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Uniu-vos a diverses sales per a començar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Busca en el directori de sales"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Reduïx %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3838,6 +3899,11 @@ msgstr "La sala seleccionada no és cap espai"
 msgid "You do not have the privileges to complete this action"
 msgstr "No teniu el privilegi per a completar esta acció"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Fes que este espai siga el pare canònic"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4106,12 +4172,12 @@ msgstr "Torna a obrir l'URL de SSO"
 msgid "Chat"
 msgstr "Xat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Unix-te a un xat existent"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Crea un xat nou"
@@ -4138,22 +4204,22 @@ msgstr ""
 "Este és el començament del xat. No hi ha missatges històrics més enllà "
 "d'este punt."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ves fins al primer missatge sense llegir"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ves fins a l'últim missatge"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arrossegueu ací els elements per a compartir"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4484,47 +4550,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Arrere"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Sense servidor."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "S'està comprovant la disponibilitat del servidor."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Este no és un servidor vàlid."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registre en este servidor està desactivat."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Sense nom d'usuari."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "S'està comprovant la disponibilitat del nom d'usuari."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Este nom d'usuari no està disponible."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "En funcionament"
@@ -4582,15 +4648,18 @@ msgstr "El sistema operatiu no ha pogut trobar cap aplicació per a l'enllaç."
 msgid "Could not open URL"
 msgstr "No s'ha pogut obrir l'URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostra"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Ix"
 
-#~ msgid "The room id you are trying to join is not valid"
-#~ msgstr "L'ID de la sala a la qual esteu intentant unir-vos no és vàlida"
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDACTAT]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDACTAT: %1]"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+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,81 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 20.04.2\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Receiving push notifications"
 msgstr "Indstillinger"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Login Failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, fuzzy, kde-format
 #| msgid "Network Error"
 msgid "Network Error: %1"
 msgstr "Netværksfejl"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr ""
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr ""
@@ -425,14 +425,14 @@ msgstr ""
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -972,16 +972,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr ""
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1026,14 +1016,87 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Send besked"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Settings"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Indstillinger"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invite"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invitér"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Accept"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Acceptér"
+
+#: src/models/reactionmodel.cpp:68
 #, fuzzy, kde-format
 #| msgid " and "
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " og "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1041,7 +1104,7 @@ msgid_plural " and %1 others"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1079,30 +1142,30 @@ msgstr "Lav prioritet"
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Room creation failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Login Failed"
 msgid "Space creation failed: %1"
 msgstr "Login mislykkedes"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Encrypted Message"
@@ -1130,42 +1193,42 @@ msgstr "Svar"
 msgid "Reply..."
 msgstr "Svar"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr ""
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr ""
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Acceptér"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Afvis"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "Chat"
 msgid "Open NeoChat"
@@ -1216,7 +1279,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Gem"
@@ -1289,6 +1352,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1336,21 +1414,6 @@ msgstr "Konti"
 msgid "Add Account"
 msgstr "Redigér konto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1453,19 +1516,19 @@ msgstr ""
 msgid "Ban User"
 msgstr ""
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr ""
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1736,6 +1799,9 @@ msgstr "Emne:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1759,7 +1825,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Room Name"
@@ -1784,8 +1850,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2068,7 +2137,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2076,7 +2145,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
@@ -2180,7 +2249,7 @@ msgid "Remove Message"
 msgstr "Send besked"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2234,147 +2303,147 @@ msgstr "Værelsesnavn::"
 msgid "Room topic:"
 msgstr ""
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Room Name"
 msgid "Room ID"
 msgstr "Værelsesnavn:"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgid "Room version"
 msgstr "Indstillinger"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr ""
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "Remove parent"
 msgstr "Send besked"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "See older messages…"
 msgstr "Send besked"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr ""
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -2759,17 +2828,17 @@ msgstr ""
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2831,12 +2900,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3175,7 +3244,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Settings"
 msgctxt "@title"
@@ -3348,14 +3417,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3462,17 +3531,17 @@ msgstr "Send besked"
 msgid "Remove Message"
 msgstr "Send besked"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3492,7 +3561,7 @@ msgstr "Annullér"
 msgid "Report Message"
 msgstr "Send besked"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3649,28 +3718,28 @@ msgstr ""
 msgid "View notifications"
 msgstr "Indstillinger"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3910,6 +3979,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgid "View Source"
@@ -4189,12 +4263,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Chat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr ""
@@ -4218,22 +4292,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: 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:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4540,48 +4614,48 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Intet navn"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4637,12 +4711,12 @@ msgstr ""
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Vis"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr ""
@@ -4696,11 +4770,6 @@ msgstr ""
 #~ msgid "Password"
 #~ msgstr "Adgangskode"
 
-#, fuzzy
-#~| msgid "Accept"
-#~ msgid "Call invitation"
-#~ msgstr "Acceptér"
-
 #~ msgid "No Name"
 #~ msgstr "Intet navn"
 

po/de/neochat.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-06-05 13:08+0200\n"
 "Last-Translator: Frederik Schwarzer <schwarzer@kde.org>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -20,81 +20,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 23.07.70\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Tippbenachrichtigungen senden"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Anmeldung fehlgeschlagen: Zugangs-Token ist ungültig oder widerrufen"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Anmeldung fehlgeschlagen: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Netzwerkfehler: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Zugangs-Token kann nicht gefunden werden"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Vielleicht ist es gelöscht worden?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Der Zugriff auf das Schlüsselbund ist verweigert worden."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Bitte erlauben Sie NeoChat, das Zugangs-Token zu lesen"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Kein Schlüsselbund verfügbar."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Bitte installieren Sie ein Schlüsselbund, z. B. KWallet oder GNOME-"
 "Schlüsselbund unter Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Das Zugangs-Token kann nicht gelesen werden"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Datei zu groß für einen Download."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Diese Nachricht wurde gelöscht]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Diese Nachricht wurde gelöscht: %1]</i>"
@@ -426,14 +426,14 @@ msgstr "hat den Zustand aktualisiert"
 msgid "started a poll"
 msgstr "hat eine Abstimmung gestartet"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 Benutzer: "
 msgstr[1] "%1 Benutzer: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -979,16 +979,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emojis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[GELÖSCHT]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[GELÖSCHT: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1033,13 +1023,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Benachrichtigung für dieses Konto aktivieren"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Nachrichten in privaten Unterhaltungen"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Verschlüsselte Nachrichten in privaten Unterhaltungen"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Nachrichten in Gruppenchats"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Nachrichten in verschlüsselten Gruppenchats"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Raum-Aktualisierungsnachrichten"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Nachrichten, die meinen Anzeigenamen enthalten"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Nachrichten, die meinen Anzeigenamen enthalten"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Raum-Erwähnungen (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Einladungen in einen Raum"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Einladung zu einem Anruf"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " und "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1047,7 +1124,7 @@ msgid_plural " and %1 others"
 msgstr[0] " und %1 weiterer"
 msgstr[1] " und %1 weitere"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1085,29 +1162,29 @@ msgstr "Niedrige Priorität"
 msgid "Spaces"
 msgstr "Spaces"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Erstellen des Raums ist fehlgeschlagen: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: %1"
 msgid "Space creation failed: %1"
 msgstr "Erstellen des Raums ist fehlgeschlagen: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Meldung erfolgreich übertragen."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Breite: %1, Länge: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Verschlüsselte Nachricht"
@@ -1133,42 +1210,42 @@ msgstr "Antworten"
 msgid "Reply..."
 msgstr "Antworten ..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 hat Sie in einen Raum eingeladen"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Diese Einladung in NeoChat öffnen"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Annehmen"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1218,7 +1295,7 @@ msgid "Label:"
 msgstr "Beschriftung:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Speichern"
@@ -1289,6 +1366,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Das Passwort wurde erfolgreich geändert"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Falsches Passwort eingegeben"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Unbekanntes Problem beim Ändern des Passworts aufgetreten"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1333,21 +1425,6 @@ msgstr "Konten"
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Das Passwort wurde erfolgreich geändert"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Falsches Passwort eingegeben"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Unbekanntes Problem beim Ändern des Passworts aufgetreten"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1450,19 +1527,19 @@ msgstr "Senden des Anhangs abbrechen"
 msgid "Ban User"
 msgstr "Benutzer verbannen"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Begründung für die Verbannung dieses Benutzers"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Verbannen"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1737,9 +1814,13 @@ msgid "Topic:"
 msgstr "Kein Thema"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Diesen Alias zur Hauptadresse des Raumes machen"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1761,7 +1842,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1786,9 +1867,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Diesen Alias zur Hauptadresse des Raumes machen"
 
@@ -2070,7 +2154,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Sticker & Emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2080,7 +2164,7 @@ msgstr ""
 "mit diesem Gerät geteilt."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Räume erkunden"
@@ -2188,7 +2272,7 @@ msgid "Remove Message"
 msgstr "Nachricht löschen"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2239,152 +2323,152 @@ msgstr "Raumname:"
 msgid "Room topic:"
 msgstr "Thema des Raumes:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Raumkennung"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Raumkennung in die Zwischenablage kopieren"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Raum-Version"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Raum aktualisieren"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliasse"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Keine Hauptadresse gesetzt"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Diesen Alias zur Hauptadresse des Raumes machen"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Alias löschen"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#neuer_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Neuen Alias hinzufügen"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Adressvorschauen"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Adressvorschauen aktivieren"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are enabled by default in this room"
 msgstr "%1 ist bereits in dem Raum."
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are disabled by default in this room"
 msgstr "%1 ist bereits in dem Raum."
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Anerkannter Alias:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Keine Hauptadresse gesetzt"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Nachricht löschen"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Dieser Raum wurde ersetzt."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Keine Hauptadresse gesetzt"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Dieser Raum setzt eine andere Unterhaltung fort."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Siehe ältere Nachrichten ..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Dieser Raum wurde ersetzt."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Siehe neuen Raum ..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Den Raum aktualisieren"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Neue Version auswählen"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Bestätigen"
@@ -2766,17 +2850,17 @@ msgstr "Einen Benutzer suchen ..."
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Keine Benutzer verfügbar"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Einladung versenden"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2840,12 +2924,12 @@ msgstr "Server-URL eingeben, z. B. kde.org"
 msgid "Server URL"
 msgstr "Server-URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3182,7 +3266,7 @@ msgstr "Nachrichtenhervorhebung aktivieren"
 msgid "Delete keyword"
 msgstr "Schlüsselwort löschen"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3364,14 +3448,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "Den Nutzer in den Raum einladen"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basierend auf der Stimme von %1 Nutzer"
 msgstr[1] "Basierend auf Stimmen von %1 Nutzern"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3475,17 +3559,17 @@ msgstr "Nachrichten löschen"
 msgid "Remove Message"
 msgstr "Nachricht löschen"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Grund für die Löschung der letzten Nachrichten des Nutzers"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Grund für die Löschung der Nachricht"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3502,7 +3586,7 @@ msgstr "Antwort abbrechen"
 msgid "Report Message"
 msgstr "Nachricht melden"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Grund für das Melden der Nachricht"
@@ -3663,28 +3747,28 @@ msgstr "Keine Mitgliederanzahl"
 msgid "View notifications"
 msgstr "Benachrichtigungen stumm schalten"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Keine Räume gefunden"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Einen Raum betreten, um zu beginnen"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Raumverzeichnis durchsuchen"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3944,6 +4028,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Diesen Alias zur Hauptadresse des Raumes machen"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4228,13 +4318,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Chat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Mit bestehendem Konto anmelden"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4259,22 +4349,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Zur ersten ungelesenen Nachricht springen"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Zur neuesten Nachricht springen"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Einträge hier einfügen um sie zu teilen"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4618,54 +4708,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Server hinzufügen"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "Der eingegebene Text ist keine gültige URL"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Kein Name"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Keine Benutzer verfügbar"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4724,16 +4814,22 @@ msgstr "Ihr Betriebssystem konnte keine Anwendung für die Verknüpfung finden."
 msgid "Could not open URL"
 msgstr "Adresse kann nicht geöffnet werden"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Anzeigen"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Beenden"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[GELÖSCHT]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[GELÖSCHT: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Die Kennung des Raums, den Sie betreten möchten, ist nicht gültig"
 
@@ -4838,36 +4934,9 @@ msgstr "Beenden"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Keine Hauptadresse"
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Nachrichten in privaten Unterhaltungen"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Verschlüsselte Nachrichten in privaten Unterhaltungen"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Nachrichten in Gruppenchats"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Nachrichten in verschlüsselten Gruppenchats"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Raum-Aktualisierungsnachrichten"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Nachrichten, die meinen Anzeigenamen enthalten"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Raum-Erwähnungen (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Nachrichten, die meine Schlüsselwörter enthalten"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Einladungen in einen Raum"
-
-#~ msgid "Call invitation"
-#~ msgstr "Einladung zu einem Anruf"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Benutzerdefiniertes Emoji"

po/el/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-01-06 16:47+0200\n"
 "Last-Translator: Stelios <sstavra@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -17,81 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 21.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Αποστολή πληκτρολογημένων ειδοποιήσεων"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Αποτυχία σύνδεσης: μη έγκυρο ενδεικτικό πρόσβασης ή έχει ανακληθεί"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Αποτυχία σύνδεσης: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Σφάλμα δικτύου: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Το ενδεικτικό πρόσβασης δεν βρέθηκε"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Ίσως να έχει διαγραφεί;"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Άρνηση πρόσβασης στα κλειδιά."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Επίτρεψε στο NeoChat να διαβάσει το ενδεικτικό πρόσβασης"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Καμία διαθέσιμη αλυσίδα κλειδιών."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Εγκατέστησε μια αλυσίδα κλειδιών. π.χ. το KWallet ή το GNOME keyring στο "
 "Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Αδυναμία ανάγνωσης του ενδεικτικού πρόσβασης"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Αυτό το μήνυμα διαγράφηκε]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Αυτό το μήνυμα διαγράφηκε: %1]</i>"
@@ -444,14 +444,14 @@ msgstr "ενημερώθηκε %1 κατάσταση"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, fuzzy, kde-format
 #| msgctxt "[action 1], [action 2 and action 3]"
 #| msgid ", "
@@ -1000,16 +1000,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Χωρίς εμότζι"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ΔΙΑΓΡΑΜΜΕΝΟ]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ΔΙΑΓΡΑΜΜΕΝΟ: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1056,13 +1046,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Ενεργοποίηση των ειδοποιήσεων για αυτόν το λογαριασμό"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Μηνύματα σε ένας-προς-έναν συνομιλίες"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Κρυπτογραφημένα μηνύματα σε ένας-προς-έναν συνομιλίες"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Μηνύματα σε συνομιλίες ομάδων"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Μηνύματα σε κρυπτογραφημένες συνομιλίες ομάδων"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Μηνύματα αναβάθμισης αίθουσας"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Μηνύματα που περιέχουν το ψευδώνυμό μου"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Μηνύματα που περιέχουν το ψευδώνυμό μου"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Ειδοποιήσεις για όλη την αίθουσα (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Προσκαλεί σε μια αίθουσα"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Πρόσκληση με κλήση"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " και "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1070,7 +1147,7 @@ msgid_plural " and %1 others"
 msgstr[0] " και %1 ακόμη"
 msgstr[1] " και %1 ακόμη"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1108,30 +1185,30 @@ msgstr "Χαμηλή προτεραιότητα"
 msgid "Spaces"
 msgstr "Χώροι"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "Αποτυχία δημιουργίας αίθουσας: «%1»"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "Αποτυχία δημιουργίας αίθουσας: «%1»"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Η αναφορά εστάλη με επιτυχία."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Κρυπτογραφημένο μήνυμα"
@@ -1157,42 +1234,42 @@ msgstr "Απάντηση"
 msgid "Reply..."
 msgstr "Απάντηση..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 σε προσκάλεσε σε μία αίθουσα"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Άνοιγμα αυτής της πρόσκλησης στο NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Απόρριψη"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1242,7 +1319,7 @@ msgid "Label:"
 msgstr "Ετικέτα:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Αποθήκευση"
@@ -1313,6 +1390,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Επιτυχημένη αλλαγή κωδικού πρόσβασης"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Δόθηκε λάθος κωδικός πρόσβασης"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Άγνωστο πρόβλημα κατά την αλλαγή κωδικού πρόσβασης"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1358,21 +1450,6 @@ msgstr "Λογαριασμοί"
 msgid "Add Account"
 msgstr "Προσθήκη λογαριασμού"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Επιτυχημένη αλλαγή κωδικού πρόσβασης"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Δόθηκε λάθος κωδικός πρόσβασης"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Άγνωστο πρόβλημα κατά την αλλαγή κωδικού πρόσβασης"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1476,19 +1553,19 @@ msgstr "Ακύρωση αποστολής εικόνας"
 msgid "Ban User"
 msgstr "Αποκλεισμός χρήστη"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Αιτία αποκλεισμού αυτού του χρήστη"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Αποκλεισμός"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1764,9 +1841,13 @@ msgid "Topic:"
 msgstr "Χωρίς θέμα"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Να γίνει αυτό το συνώνυμο το κανονικό συνώνυμο της αίθουσας"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1788,7 +1869,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1813,9 +1894,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Να γίνει αυτό το συνώνυμο το κανονικό συνώνυμο της αίθουσας"
 
@@ -2106,7 +2190,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2116,7 +2200,7 @@ msgstr ""
 "κλειδί με τη συσκευή αυτή."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Εξερεύνηση αιθουσών"
@@ -2225,7 +2309,7 @@ msgid "Remove Message"
 msgstr "Αφαίρεση μηνύματος"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2276,154 +2360,154 @@ msgstr "Όνομα αίθουσας:"
 msgid "Room topic:"
 msgstr "Θέμα αίθουσας:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Room ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
 #| msgid "Copy Address to Clipboard"
 msgid "Copy room ID to clipboard"
 msgstr "Αντιγραφή διεύθυνσης στο πρόχειρο"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Έκδοση αίθουσας"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Αναβάθμιση αίθουσας"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Συνώνυμα"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Δεν ρυθμίστηκε κανονικό συνώνυμο"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Να γίνει αυτό το συνώνυμο το κανονικό συνώνυμο της αίθουσας"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Διαγραφή συνωνύμου"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Προσθήκη νέου ψευδωνύμου"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are enabled by default in this room"
 msgstr "%1 είναι ήδη σε αυτήν την αίθουσα."
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are disabled by default in this room"
 msgstr "%1 είναι ήδη σε αυτήν την αίθουσα."
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Canonical"
 msgstr "Χωρίς κανονικό συνώνυμο"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Δεν ρυθμίστηκε κανονικό συνώνυμο"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Αφαίρεση μηνύματος"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Αυτή η αίθουσα έχει αντικατασταθεί."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Δεν ρυθμίστηκε κανονικό συνώνυμο"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Σε αυτήν την αίθουσα συνεχίζεται μια άλλη συνομιλία."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Δες παλαιότερα μηνύματα…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Αυτή η αίθουσα έχει αντικατασταθεί."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Δες τη νέα αίθουσα…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Αναβάθμιση της αίθουσας"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Επιλογή νέας έκδοσης"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
@@ -2805,17 +2889,17 @@ msgstr "Εύρεση χρήστη..."
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Δεν υπάρχουν διαθέσιμοι χρήστες"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Αποστολή πρόσκλησης"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2878,12 +2962,12 @@ msgstr "Δώσε το url του εξυπηρετητή π.χ. kde.org"
 msgid "Server URL"
 msgstr "URL εξυπηρετητή"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3224,7 +3308,7 @@ msgstr "Ενεργοποίηση τονισμού μηνυμάτων"
 msgid "Delete keyword"
 msgstr "Διαγραφή λέξης κλειδιού"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3406,14 +3490,14 @@ msgstr "Ρύθμισε τα παιδιά αυτού του χώρου"
 msgid "Set the parent space of this room"
 msgstr "Ρύθμισε τον γονεϊκό χώρο αυτής της αίθουσας"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Με βάση τις ψήφους %1 χρήστη"
 msgstr[1] "Με βάση τις ψήφους %1 χρηστών"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3519,17 +3603,17 @@ msgstr "Αφαίρεση μηνυμάτων"
 msgid "Remove Message"
 msgstr "Αφαίρεση μηνύματος"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Αιτία αφαίρεσης των πρόσφατων μηνυμάτων αυτού του χρήστη"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Αιτία αφαίρεσης αυτού του μηνύματος"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3546,7 +3630,7 @@ msgstr "Ακύρωση απάντησης"
 msgid "Report Message"
 msgstr "Αναφορά μηνύματος"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Αιτία αναφοράς αυτού του μηνύματος"
@@ -3710,28 +3794,28 @@ msgstr "Δεν καταμετρήθηκαν μέλη"
 msgid "View notifications"
 msgstr "Σίγαση ειδοποιήσεων"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Δεν βρέθηκαν αίθουσες"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Μπορείς να εισέλθεις σε κάποιες αίθουσες για να ξεκινήσεις"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Αναζήτηση στον κατάλογο με τις αίθουσες"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -3989,6 +4073,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Να γίνει αυτό το συνώνυμο το κανονικό συνώνυμο της αίθουσας"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4282,13 +4372,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Συνομιλία"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Σύνδεση με υφιστάμενο λογαριασμό"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats"
 msgid "Create new chat"
@@ -4313,22 +4403,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Μετάβαση στο πρώτο μη αναγνωσμένο μήνυμα"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Μετάβαση στο τελευταίο μήνυμα"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Έλκυσε αντικείμενα εδώ για να τα μοιραστείς"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4661,54 +4751,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Προσθήκη εξυπηρετητή"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "Το δοσμένο κείμενο δεν είναι έγκυρο url"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Χωρίς όνομα"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Δεν υπάρχουν διαθέσιμοι χρήστες"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Συνέχεια"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4767,16 +4857,22 @@ msgstr "Το λειτουργικό σου σύστημα δεν βρήκε εφ
 msgid "Could not open URL"
 msgstr "Αδυναμία ανοίγματος του URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Έξοδος"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ΔΙΑΓΡΑΜΜΕΝΟ]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ΔΙΑΓΡΑΜΜΕΝΟ: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Προσπάθεια εισόδου με μη έγκυρο αναγνωριστικό αίθουσας"
 
@@ -4884,36 +4980,9 @@ msgstr "Έξοδος"
 #~ msgid "Back"
 #~ msgstr "Πίσω"
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Μηνύματα σε ένας-προς-έναν συνομιλίες"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Κρυπτογραφημένα μηνύματα σε ένας-προς-έναν συνομιλίες"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Μηνύματα σε συνομιλίες ομάδων"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Μηνύματα σε κρυπτογραφημένες συνομιλίες ομάδων"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Μηνύματα αναβάθμισης αίθουσας"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Μηνύματα που περιέχουν το ψευδώνυμό μου"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Ειδοποιήσεις για όλη την αίθουσα (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Μηνύματα που περιέχουν τις δικές μου λέξεις κλειδιά"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Προσκαλεί σε μια αίθουσα"
-
-#~ msgid "Call invitation"
-#~ msgstr "Πρόσκληση με κλήση"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Προσαρμοσμένα εμότζι"

po/en_GB/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-06-17 12:19+0100\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English\n"
@@ -17,79 +17,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 23.03.70\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Send typing notifications"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Login Failed: Access Token invalid or revoked"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Login Failed: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Network Error: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Access token wasn't found"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Maybe it was deleted?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Access to keychain was denied."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Please allow NeoChat to read the access token"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "No keychain available."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Unable to read access token"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "File too large to download."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Contact your matrix server administrator for support."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[This message was deleted]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[This message was deleted: %1]</i>"
@@ -420,14 +420,14 @@ msgstr "updated the state"
 msgid "started a poll"
 msgstr "started a poll"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 user: "
 msgstr[1] "%1 users: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -962,16 +962,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Own Emojis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDACTED]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDACTED: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1016,13 +1006,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Enable notifications for this account"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Messages in one-to-one chats"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Encrypted messages in one-to-one chats"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Messages in group chats"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Messages in encrypted group chats"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Room upgrade messages"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Messages containing my display name"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Messages containing my display name"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Whole room (@room) notifications"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invites to a room"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Call invitation"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " and "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1030,7 +1107,7 @@ msgid_plural " and %1 others"
 msgstr[0] " and %1 other"
 msgstr[1] " and %1 others"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1068,28 +1145,28 @@ msgstr "Low priority"
 msgid "Spaces"
 msgstr "Spaces"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Room creation failed: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Space creation failed: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Report sent successfully."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Encrypted Message"
@@ -1115,42 +1192,42 @@ msgstr "Reply"
 msgid "Reply..."
 msgstr "Reply..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 invited you to a room"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Open this invitation in NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accept"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Reject"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1200,7 +1277,7 @@ msgid "Label:"
 msgstr "Label:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Save"
@@ -1271,6 +1348,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Password changed successfully"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Wrong password entered"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Unknown problem while trying to change password"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1315,21 +1407,6 @@ msgstr "Accounts"
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Password changed successfully"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Wrong password entered"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Unknown problem while trying to change password"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1432,19 +1509,19 @@ msgstr "Cancel sending attachment"
 msgid "Ban User"
 msgstr "Ban User"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Reason for banning this user"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Ban"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1714,9 +1791,13 @@ msgid "Topic:"
 msgstr "Topic:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Make this alias the room's canonical alias"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1738,7 +1819,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1763,9 +1844,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Make this alias the room's canonical alias"
 
@@ -2043,7 +2127,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Stickers & Emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2053,7 +2137,7 @@ msgstr ""
 "device."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explore rooms"
@@ -2158,7 +2242,7 @@ msgid "Remove Message"
 msgstr "Remove Message"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2209,148 +2293,148 @@ msgstr "Room name:"
 msgid "Room topic:"
 msgstr "Room topic:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Room ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copy room ID to clipboard"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Room version"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Upgrade Room"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliases"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "No canonical alias set"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Make this alias the room's canonical alias"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Delete alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Add new alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL Previews"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Enable URL previews by default for room members"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Enable URL previews"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL previews are enabled by default in this room"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL previews are disabled by default in this room"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Canonical Alias:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "No canonical alias set"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Remove Message"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "This room has been replaced."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "No canonical alias set"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "This room continues another conversation."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "See older messages…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "This room has been replaced."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "See new room…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Upgrade the Room"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Select new version"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirm"
@@ -2729,17 +2813,17 @@ msgstr "Find a user..."
 msgid "Add"
 msgstr "Add"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No users available"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Send invitation"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "User is either already a member or has been invited"
@@ -2802,14 +2886,14 @@ msgstr "Enter server URL e.g. kde.org"
 msgid "Server URL"
 msgstr "Server URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<room-address>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3145,7 +3229,7 @@ msgstr "Enable message highlights"
 msgid "Delete keyword"
 msgstr "Delete keyword"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3319,14 +3403,14 @@ msgstr "Set the children of this space"
 msgid "Set the parent space of this room"
 msgstr "Set the parent space of this room"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Based on votes by %1 user"
 msgstr[1] "Based on votes by %1 users"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3432,17 +3516,17 @@ msgstr "Remove Messages"
 msgid "Remove Message"
 msgstr "Remove Message"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Reason for removing this user's recent messages"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Reason for removing this message"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3459,7 +3543,7 @@ msgstr "Cancel reply"
 msgid "Report Message"
 msgstr "Report Message"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Reason for reporting this message"
@@ -3618,28 +3702,28 @@ msgstr "No member count"
 msgid "View notifications"
 msgstr "Mute notifications"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No rooms found"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Join some rooms to get started"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Search in room directory"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3893,6 +3977,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Make this alias the room's canonical alias"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4177,13 +4267,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Chat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Log in to an existing account"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4208,22 +4298,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Jump to first unread message"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Jump to latest message"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Drag items here to share them"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4559,54 +4649,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Add server"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "The entered text is not a valid URL"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "No name"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "No users available"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Continue"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4663,16 +4753,22 @@ msgstr "Your operating system could not find an application for the link."
 msgid "Could not open URL"
 msgstr "Could not open URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Show"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Quit"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDACTED]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDACTED: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "The room ID you are trying to join is not valid"
 
@@ -4784,36 +4880,9 @@ msgstr "Quit"
 #~ "This room is encrypted. Build libQuotient with encryption enabled to send "
 #~ "encrypted messages."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Messages in one-to-one chats"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Encrypted messages in one-to-one chats"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Messages in group chats"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Messages in encrypted group chats"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Room upgrade messages"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Messages containing my display name"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Whole room (@room) notifications"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Messages containing my keywords"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Invites to a room"
-
-#~ msgid "Call invitation"
-#~ msgstr "Call invitation"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Custom Emojis"

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 20:58+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\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,79 +18,79 @@ msgstr ""
 "X-Generator: translate-po (https://github.com/zcribe/translate-po)\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Ricevante puŝ-sciigojn"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Ensaluto Malsukcesa: Aliro-Signo nevalida aŭ revokita"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Ensaluto Malsukcesis: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Reta Eraro: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Alirĵetono ne estis trovita"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Eble ĝi estis forigita?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Aliro al ŝlosilĉeno estis rifuzita."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Bonvolu permesi al NeoChat legi la alirĵetonon"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Neniu ŝlosilĉeno havebla."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Ne eblas legi alirĵetonon"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Dosiero tro granda por elŝuti."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Tiu ĉi mesaĝo estis forigita]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Ĉi tiu mesaĝo estis forigita: %1]</i>"
@@ -421,14 +421,14 @@ msgstr "ĝisdatigis la staton"
 msgid "started a poll"
 msgstr "komencis balotadon"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 uzanto:"
 msgstr[1] "%1 uzantoj:"
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -962,16 +962,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Propraj Emoĝioj"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDAKTITA]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDAKTITA: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1015,13 +1005,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Ebligi sciigojn por ĉi tiu konto"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Mesaĝoj en unu-al-unu babiloj"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Ĉifritaj mesaĝoj en unu-al-unu babiloj"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Mesaĝoj en grupaj babiloj"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Mesaĝoj en ĉifritaj grupobabiloj"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Mesaĝoj pri babileja promociiĝo"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Mesaĝoj enhavantaj mian montronomon"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Mesaĝoj kiuj mencias mian Matrix-uzantan ID"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Mesaĝoj kiuj mencias ĉambron"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Mesaĝoj enhavantaj la lokan parton de mia Matrix-uzanta ID"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Tutĉambraj (@room) sciigoj"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invitas al ĉambro"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Voka invito"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " kaj "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1029,7 +1084,7 @@ msgid_plural " and %1 others"
 msgstr[0] " kaj %1 alia"
 msgstr[1] " kaj %1 aliaj"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1067,28 +1122,28 @@ msgstr "Malalta prioritato"
 msgid "Spaces"
 msgstr "Spacoj"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Kreado de ĉambro malsukcesis: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Spackreado malsukcesis: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Raporto sukcese sendita."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Ĉifrita Mesaĝo"
@@ -1114,40 +1169,40 @@ msgstr "Respondi"
 msgid "Reply..."
 msgstr "Respondi..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 invitis vin al ĉambro"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Malfermu ĉi tiun inviton en NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Akcepti"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Malakcepti"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Malakcepti kaj Ignori Uzanton"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Malfermi NeoChat"
@@ -1195,7 +1250,7 @@ msgid "Label:"
 msgstr "Etikedo:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Konservi"
@@ -1264,6 +1319,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Konfirmi Malaktivigi Konton"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Pasvorto ŝanĝiĝis sukcese"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Malĝusta pasvorto enigita"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Nekonata problemo dum vi provas ŝanĝi pasvorton"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1308,21 +1378,6 @@ msgstr "Kontoj"
 msgid "Add Account"
 msgstr "Aldoni konton"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Pasvorto ŝanĝiĝis sukcese"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Malĝusta pasvorto enigita"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Nekonata problemo dum vi provas ŝanĝi pasvorton"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1425,19 +1480,19 @@ msgstr "Nuligi sendi aldonaĵon"
 msgid "Ban User"
 msgstr "Malpermesi Uzanton"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Kialo por malpermesi ĉi tiun uzanton"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Malpermeso"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1700,6 +1755,9 @@ msgstr "Temo:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Oficialigi tiun gepatron"
 
@@ -1723,7 +1781,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1748,10 +1806,13 @@ msgid ""
 msgstr ""
 "Vi ne havas sufiĉe altan privilegionivelon en la ido por meti ĉi tiun staton"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr "Igi ĉi tiun spacon la kanonikan gepatron"
+msgstr "Igi ĉi tiun spacon la kanonan gepatron"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2024,7 +2085,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Glumarkoj kaj Emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2034,7 +2095,7 @@ msgstr ""
 "tiu aparato."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Esplori ĉambrojn"
@@ -2135,7 +2196,7 @@ msgid "Remove Message"
 msgstr "Forigi Mesaĝon"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2185,143 +2246,143 @@ msgstr "Ĉambronomo:"
 msgid "Room topic:"
 msgstr "Ĉambra temo:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Ĉambro ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Kopii ĉambro-ID al tondujo"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Ĉambra versio"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Altgradiga Ĉambro"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Kaŝnomo"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Neniu kanonika kaŝnomo aro"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Igi ĉi tiun kaŝnomon la kanonikan kaŝnomon de la ĉambro"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Forigi kaŝnomon"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Aldoni novan kaŝnomon"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL Antaŭrigardoj"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Ebligi URL-antaŭrigardojn defaŭlte por ĉambromembroj"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Ebligi URL-antaŭrigardojn"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL-antaŭrigardoj estas ebligitaj defaŭlte en ĉi tiu ĉambro"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL-antaŭrigardoj estas defaŭlte malŝaltitaj en ĉi tiu ĉambro"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Oficialaj Gepatrejoj"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Kanonika"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Fari kanonikan gepatron"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Forigi gepatron"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Ĉi tiu ĉambro ne havas oficialajn gepatrospacojn."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Aldoni novan oficialan gepatron"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ĉi tiu ĉambro daŭrigas alian konversacion."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vidi pli malnovajn mesaĝojn…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ĉi tiu ĉambro estis anstataŭigita."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Vidi novan ĉambron…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Altrangigi la Ĉambron"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Elekti novan version"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Konfirmi"
@@ -2694,17 +2755,17 @@ msgstr "Trovi uzanton..."
 msgid "Add"
 msgstr "Aldoni"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Neniuj uzantoj disponeblaj"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Sendi inviton"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Uzanto aŭ jam estas membro aŭ estas invitita"
@@ -2766,12 +2827,12 @@ msgstr "Enigu servilan url ekz. kde.org"
 msgid "Server URL"
 msgstr "Servila URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Enigi ĉambro-adreson"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3095,7 +3156,7 @@ msgstr "Ebligi mesaĝ-emfazojn"
 msgid "Delete keyword"
 msgstr "Forigi ŝlosilvorton"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3268,14 +3329,14 @@ msgstr "Agordi la infanojn de ĉi tiu spaco"
 msgid "Set the parent space of this room"
 msgstr "Agordi la gepatran spacon de ĉi tiu ĉambro"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Bazita sur voĉdonoj de %1 uzanto"
 msgstr[1] "Bazita sur voĉdonoj de %1 uzantoj"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3305,7 +3366,7 @@ msgstr "Sekvi ĉiean agordon"
 #: src/qml/QuickFormatBar.qml:23
 #, kde-format
 msgid "Bold"
-msgstr "Aŭdaca"
+msgstr "Grasa"
 
 #: src/qml/QuickFormatBar.qml:42
 #, kde-format
@@ -3378,17 +3439,17 @@ msgstr "Forigi Mesaĝojn"
 msgid "Remove Message"
 msgstr "Forigi Mesaĝon"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Kialo por forigi la lastatempajn mesaĝojn de ĉi tiu uzanto"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Kialo por forigi ĉi tiun mesaĝon"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3405,7 +3466,7 @@ msgstr "Nuligi respondon"
 msgid "Report Message"
 msgstr "Raporti Mesaĝon"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Kialo por raporti ĉi tiun mesaĝon"
@@ -3552,28 +3613,28 @@ msgstr "Neniu membrokalkulo"
 msgid "View notifications"
 msgstr "Rigardi sciigojn"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Neniuj ĉambroj trovitaj"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Aliĝi al iuj ĉambroj por komenci"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Serĉi en ĉambra dosierujo"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Kolapsi %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3817,6 +3878,11 @@ msgstr "La elektita ĉambro ne estas spaco"
 msgid "You do not have the privileges to complete this action"
 msgstr "Vi ne havas la privilegiojn por plenumi ĉi tiun agon"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Igi ĉi tiun spacon la kanonikan gepatron"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4085,12 +4151,12 @@ msgstr "Remalfermi SSO-URL"
 msgid "Chat"
 msgstr "Babilado"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Aliĝi al ekzistanta babilejo"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Krei novan babilejon"
@@ -4117,22 +4183,22 @@ msgstr ""
 "Ĉi tio estas komenco de la babilo. Ne estas historiaj mesaĝoj preter ĉi "
 "punkto."
 
-#: src/qml/TimelineView.qml:180
+#: 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:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salti al la plej nova mesaĝo"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4444,47 +4510,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Reiri"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Neniu servilo."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Kontrolante la haveblecon de la Servilo."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Ĉi tio ne estas valida servilo."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registrado por ĉi tiu servilo estas malŝaltita."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Neniu uzantnomo."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Kontrolante uzantnoman haveblecon."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Ĉi tiu uzantnomo ne disponeblas."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Daŭrigi"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Laborante"
@@ -4541,15 +4607,21 @@ msgstr "Via operaciumo ne povis trovi aplikaĵon por la ligilo."
 msgid "Could not open URL"
 msgstr "Ne eblis malfermi URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Montri"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Forlasi"
 
+#~ 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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-22 02:42+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 21:33+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
@@ -17,70 +17,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.08.2\n"
+"X-Generator: Lokalize 23.08.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recepción de notificaciones push"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Inicio de sesión fallido: Token de acceso no válido o revocado"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "El inicio de sesión ha fallado: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de red: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "El token de acceso no se ha encontrado"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "¿Es posible que se haya borrado?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Se ha denegado el acceso a la cadena de claves."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, 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:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Ninguna cadena de claves disponible."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "No se ha podido leer el token de acceso"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Archivo demasiado grande para descargarlo."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
@@ -88,12 +88,12 @@ msgstr ""
 "asistencia."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Este mensaje ha sido borrado]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Este mensaje ha sido borrado: %1]</i>"
@@ -424,14 +424,14 @@ msgstr "ha actualizado el estado"
 msgid "started a poll"
 msgstr "ha iniciado una encuesta"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 usuario: "
 msgstr[1] "%1 usuarios: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -967,16 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emojis propios"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[CORREGIDO]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[CORREGIDO: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1020,13 +1010,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Activar notificaciones para esta cuenta"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Mensajes en chats uno-a-uno"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Mensajes cifrados en chats uno-a-uno"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Mensajes en chats de grupos"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Mensajes en chats de grupos cifrados"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Mensajes de actualización de la sala"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Mensajes que contengan mi nombre visible"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Mensajes que mencionen mi ID de usuario de Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Mensajes que mencionen una sala"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Mensajes que contengan la parte local de mi ID de Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notificaciones de toda la sala (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invita a una sala"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Invitación de llamada"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " y "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1034,7 +1089,7 @@ msgid_plural " and %1 others"
 msgstr[0] " y %1 más"
 msgstr[1] " y %1 más"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1072,28 +1127,28 @@ msgstr "Baja prioridad"
 msgid "Spaces"
 msgstr "Espacios"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "La creación de la sala ha fallado: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "La creación del espacio ha fallado: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "La denuncia se ha enviado correctamente."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Mensaje cifrado"
@@ -1119,40 +1174,40 @@ msgstr "Responder"
 msgid "Reply..."
 msgstr "Responder..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 le ha invitado a una sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Abrir esta invitación en NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rechazar"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rechazar e ignorar usuario"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Abrir NeoChat"
@@ -1200,7 +1255,7 @@ msgid "Label:"
 msgstr "Etiqueta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Guardar"
@@ -1269,6 +1324,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Confirme la desactivación de la cuenta"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "La contraseña se ha cambiado correctamente"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Se ha introducido una contraseña incorrecta"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Ha ocurrido un problema desconocido al intentar cambiar la contraseña"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1313,21 +1383,6 @@ msgstr "Cuentas"
 msgid "Add Account"
 msgstr "Añadir cuenta"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "La contraseña se ha cambiado correctamente"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Se ha introducido una contraseña incorrecta"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Ha ocurrido un problema desconocido al intentar cambiar la contraseña"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1430,19 +1485,19 @@ msgstr "Cancelar envío del adjunto"
 msgid "Ban User"
 msgstr "Inhabilitar usuario"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Motivo para inhabilitar a este usuario"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Inhabilitar"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1705,6 +1760,9 @@ msgstr "Tema:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Hacer oficial este espacio padre"
 
@@ -1728,7 +1786,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1756,8 +1814,11 @@ msgstr ""
 "No tiene el nivel de privilegio suficientemente alto en el espacio hijo para "
 "definir este estado"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Hacer que este espacio sea el espacio padre canónico"
 
@@ -2032,7 +2093,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Pegatinas y emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2042,7 +2103,7 @@ msgstr ""
 "dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar salas"
@@ -2143,7 +2204,7 @@ msgid "Remove Message"
 msgstr "Eliminar mensaje"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2193,149 +2254,149 @@ msgstr "Nombre de la sala:"
 msgid "Room topic:"
 msgstr "Tema de la sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID de la sala"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copiar ID de la sala en el portapapeles"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versión de la sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Actualizar sala"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Ningún alias canónico definido"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Hacer que este sea el alias canónico de la sala"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Borrar alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nuevo_alias:servidor.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Añadir nuevo alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistas previas de URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Activar las vistas previas de URL de forma predeterminada para los miembros "
 "de la sala"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activar vistas previas de URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Las vistas previas de URL están activadas de forma predeterminada en esta "
 "sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Las vistas previas de URL están desactivadas de forma predeterminada en esta "
 "sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espacios padre oficiales"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canónico"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Hacer que sea el padre canónico"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Eliminar padre"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Esta sala no tiene ningún espacio padre oficial."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Añadir nuevo padre oficial"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala continúa otra conversación."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Ver mensajes antiguos..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Se ha sustituido esta sala."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Ver la nueva sala..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualizar la sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Seleccionar nueva versión"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmar"
@@ -2710,17 +2771,17 @@ msgstr "Encontrar un usuario..."
 msgid "Add"
 msgstr "Añadir"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "No hay usuarios disponibles"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Enviar invitación"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "El usuario ya es miembro o ha sido invitado"
@@ -2782,12 +2843,12 @@ msgstr "Introduzca URL del servidor (por ejemplo, kde.org)"
 msgid "Server URL"
 msgstr "URL del servidor"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Introduzca la dirección de una sala"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3111,7 +3172,7 @@ msgstr "Activar resaltado de mensajes"
 msgid "Delete keyword"
 msgstr "Borrar palabra clave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3284,14 +3345,14 @@ msgstr "Definir los espacios hijos de este espacio"
 msgid "Set the parent space of this room"
 msgstr "Definir el espacio padre de esta sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Según los votos de %1 usuario"
 msgstr[1] "Según los votos de %1 usuarios"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3392,17 +3453,17 @@ msgstr "Eliminar mensajes"
 msgid "Remove Message"
 msgstr "Eliminar mensaje"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Motivo para eliminar los mensajes recientes de este usuario"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Motivo para eliminar este mensaje"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3419,7 +3480,7 @@ msgstr "Cancelar respuesta"
 msgid "Report Message"
 msgstr "Denunciar mensaje"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Motivo para denunciar este mensaje"
@@ -3566,28 +3627,28 @@ msgstr "Sin contador de miembros"
 msgid "View notifications"
 msgstr "Ver notificaciones"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "No se ha encontrado ninguna sala"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Únase a algunas salas para empezar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Buscar en el directorio de la sala"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Contraer %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3834,6 +3895,11 @@ msgstr "La sala seleccionada no es un espacio"
 msgid "You do not have the privileges to complete this action"
 msgstr "No tiene privilegios para completar esta acción"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Hacer que este espacio sea el espacio padre canónico"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4102,12 +4168,12 @@ msgstr "Volver a abrir URL de SSO"
 msgid "Chat"
 msgstr "Chatear"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Unirse a chat existente"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Crear nuevo chat"
@@ -4134,22 +4200,22 @@ msgstr ""
 "Este es el inicio del chat. No hay mensajes en el historial antes de este "
 "punto."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Saltar al primer mensaje sin leer"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Saltar al último mensaje"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arrastre elementos aquí para compartirlos"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4482,47 +4548,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Retroceder"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "No hay ningún servidor."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Comprobando disponibilidad del servidor."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Este servidor no es válido."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "El registro de este servidor está desactivado."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Sin nombre de usuario."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Comprobando disponibilidad del nombre de usuario."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Este nombre de usuario no está disponible."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Trabajando"
@@ -4580,16 +4646,22 @@ msgstr "Su sistema operativo no puede encontrar una aplicación para el enlace."
 msgid "Could not open URL"
 msgstr "No se ha podido abrir la URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Salir"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[CORREGIDO]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[CORREGIDO: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "El ID de la sala a la que está intentando unirse no es válido"
 
@@ -4703,36 +4775,9 @@ msgstr "Salir"
 #~ "Esta sala está cifrada. Compile libQuotient con el cifrado activado para "
 #~ "enviar mensajes cifrados."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Mensajes en chats uno-a-uno"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Mensajes cifrados en chats uno-a-uno"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Mensajes en chats de grupos"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Mensajes en chats de grupos cifrados"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Mensajes de actualización de la sala"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Mensajes que contengan mi nombre visible"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Notificaciones de toda la sala (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Mensajes que contengan mis palabras clave"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Invita a una sala"
-
-#~ msgid "Call invitation"
-#~ msgstr "Invitación de llamada"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Emojis personalizados"

po/fi/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-09-27 21:55+0300\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -17,79 +17,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Näytä ilmoitus kirjoittamisesta"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Kirjautuminen epäonnistui: pääsymerkki on virheellinen tai peruttu"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Kirjautuminen epäonnistui: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Verkkovirhe: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Pääsymerkkiä ei löytynyt"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Se on ehkä poistettu?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Pääsymerkin käyttö estettiin."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Salli NeoChatin lukea pääsymerkki"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Avainrenkaita ei ole saatavilla."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Asenna avainrengas, esim. Linuxissa KWallet tai Gnomen avainrengas"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Saantimerkkiä ei voida lukea"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Liian iso tiedosto ladattavaksi."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Tee tukipyyntö Matrix-palvelimesi ylläpitoon."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Tämä viesti on poistettu]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Tämä viesti on poistettu: %1]</i>"
@@ -421,14 +421,14 @@ msgstr "päivitti tilan"
 msgid "started a poll"
 msgstr "aloitti kyselyn"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 käyttäjä: "
 msgstr[1] "%1 käyttäjää: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -963,16 +963,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Omat emojit"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[MUOKATTU]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[MUOKATTU: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1017,13 +1007,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Ota ilmoitukset käyttöön tälle tilille"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Kahdenkeskisten keskustelujen viestit"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Kahdenkeskisten keskustelujen salatut viestit"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Ryhmäkeskustelujen viestit"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Salattujen ryhmäkeskustelujen viestit"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Huoneenpäivitysviestit"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Viestit, joissa on näyttönimeni"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Viestit, joissa on näyttönimeni"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Koko huoneen (@huone) ilmoitukset"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Kutsut huoneeseen"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Soittokutsu"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " ja "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1031,7 +1108,7 @@ msgid_plural " and %1 others"
 msgstr[0] " ja %1 muu"
 msgstr[1] " ja %1 muuta"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1069,28 +1146,28 @@ msgstr "Vähäinen etusijaisuus"
 msgid "Spaces"
 msgstr "Välilyönnit"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Huoneen luominen epäonnistui: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Tilan luominen epäonnistui: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Ilmoituksen lähettäminen onnistui."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lev: %1, pit: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Salattu viesti"
@@ -1116,40 +1193,40 @@ msgstr "Vastaa"
 msgid "Reply..."
 msgstr "Vastaa…"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 kutsui sinut huoneeseen"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Avaa tämä kutsu NeoChatiin"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Hylkää"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Hylkää ja sivuuta käyttäjä"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1198,7 +1275,7 @@ msgid "Label:"
 msgstr "Nimiö:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Tallenna"
@@ -1267,6 +1344,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Vahvista tilin passivoiminen"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Salasanan vaihto onnistui"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Annettiin väärä salasana"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Tuntematon ongelma yritettäessä vaihtaa salasanaa"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1311,21 +1403,6 @@ msgstr "Tilit"
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Salasanan vaihto onnistui"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Annettiin väärä salasana"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Tuntematon ongelma yritettäessä vaihtaa salasanaa"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1428,19 +1505,19 @@ msgstr "Peru liitteen lähettäminen"
 msgid "Ban User"
 msgstr "Estä käyttäjä"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Syy tämän käyttäjän estämiseen"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Estä"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1709,9 +1786,13 @@ msgid "Topic:"
 msgstr "Ei aihetta"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Tee tästä huoneen kanoninen alias"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1733,7 +1814,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1757,9 +1838,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Tee tästä huoneen kanoninen alias"
 
@@ -2036,7 +2120,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Tarrat ja emojit"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2045,7 +2129,7 @@ msgstr ""
 "Tämä viesti on salattu, eikä lähettäjä ole jakanut avainta tälle laitteelle."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Tutki huoneita"
@@ -2149,7 +2233,7 @@ msgid "Remove Message"
 msgstr "Poista viesti"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2199,149 +2283,149 @@ msgstr "Huoneen nimi:"
 msgid "Room topic:"
 msgstr "Huoneen aihe:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Huoneen tunniste"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Kopioi huoneen tunniste leikepöydälle"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Huoneen versio"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Päivitä huone"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliakset"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Kanonista aliasta ei ole asetettu"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Tee tästä huoneen kanoninen alias"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Poista alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#uusi_alias:palvelin.fi"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Lisää uusi alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Verkko-osoitteen esikatselut"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Salli huoneen jäsenille oletuksena verkko-osoitteiden esikatselu"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Käytä verkko-osoitteiden esikatselua"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Verkko-osoitteiden esikatselu on jo käytössä tässä huoneessa"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Verkko-osoitteiden esikatselu on tässä huoneessa oletuksena poissa käytöstä"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Kanoninen alias:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Kanonista aliasta ei ole asetettu"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Poista viesti"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Tämä huone on korvattu."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Kanonista aliasta ei ole asetettu"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Huone jatkaa toista keskustelua."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Katso vanhempia viestejä…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Tämä huone on korvattu."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Katso uutta huonetta…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Päivitä huone"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Valitse uusi versio"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Vahvista"
@@ -2714,17 +2798,17 @@ msgstr "Etsi käyttäjää…"
 msgid "Add"
 msgstr "Lisää"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Käyttäjiä ei ole saatavilla"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Lähetä kutsu"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Käyttäjä joko on jo jäsen tai on kutsuttu jäseneksi"
@@ -2786,14 +2870,14 @@ msgstr "Anna palvelimen verkko-osoite, esim. kde.org"
 msgid "Server URL"
 msgstr "Palvelimen verkko-osoite"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<huoneosoite>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3120,7 +3204,7 @@ msgstr "Käytä viestien korostusta"
 msgid "Delete keyword"
 msgstr "Poista hakusana"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3293,14 +3377,14 @@ msgstr "Aseta tämän tilan perilliset"
 msgid "Set the parent space of this room"
 msgstr "Aseta tämän huoneen emotila"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Perustuu 1 käyttäjän ääniin"
 msgstr[1] "Perustuu %1 käyttäjän ääniin"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3405,17 +3489,17 @@ msgstr "Poista viestit"
 msgid "Remove Message"
 msgstr "Poista viesti"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Syy tämän käyttäjän viimeisimpien viestien poistamiseen"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Syy viestin poistamiseen"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3432,7 +3516,7 @@ msgstr "Peru vastaus"
 msgid "Report Message"
 msgstr "Ilmoita viestistä"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Syy viestistä ilmoittamiseen"
@@ -3582,28 +3666,28 @@ msgstr "Ei jäsenmäärää"
 msgid "View notifications"
 msgstr "Vaimenna ilmoitukset"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Huoneita ei löytynyt"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Aloita liittymällä joihinkin huoneisiin"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Etsi huonehakemistosta"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Supista %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3850,6 +3934,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Tee tästä huoneen kanoninen alias"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4131,12 +4221,12 @@ msgstr "Avaa SSO-verkko-osoite uudelleen"
 msgid "Chat"
 msgstr "Keskustele"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Liity olemassa olevaan keskusteluun"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Luo uusi keskustelu"
@@ -4160,22 +4250,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Hyppää ensimmäiseen lukemattomaan viestiin"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Hyppää viimeisimpään viestiin"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Jaa kohteita vetämällä ne tähän"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4499,47 +4589,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Palaa takaisin"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Ei palvelinta."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Tarkistetaan palvelimen saatavuutta."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Tämä ei ole kelvollinen palvelin."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Palvelin on poistanut rekisteröitymisen käytöstä."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Ei käyttäjätunnusta."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Tarkistetaan käyttäjätunnuksen saatavuutta."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Tämä käyttäjätunnus ei ole käytettävissä."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Jatka"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Työskennellään"
@@ -4595,16 +4685,22 @@ msgstr "Käyttöjärjestelmä ei löydä linkille sovellusta."
 msgid "Could not open URL"
 msgstr "Verkko-osoitetta ei voitu avata"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Näytä"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Lopeta"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[MUOKATTU]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[MUOKATTU: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Yrität liittyä huoneeseen, jonka tunniste ei ole kelvollinen"
 
@@ -4718,36 +4814,9 @@ msgstr "Lopeta"
 #~ "Huone on salattu. Lähettääksesi salattuja viestejä koosta libQuotient "
 #~ "salaustuki käytössä."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Kahdenkeskisten keskustelujen viestit"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Kahdenkeskisten keskustelujen salatut viestit"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Ryhmäkeskustelujen viestit"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Salattujen ryhmäkeskustelujen viestit"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Huoneenpäivitysviestit"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Viestit, joissa on näyttönimeni"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Koko huoneen (@huone) ilmoitukset"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Hakusanojani sisältävät viestit"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Kutsut huoneeseen"
-
-#~ msgid "Call invitation"
-#~ msgstr "Soittokutsu"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Mukautetut emojit"

po/fr/neochat.po

@@ -1,12 +1,12 @@
-# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023 Xavier Besnard <xavier.besnard@neuf.fr>
-# Xavier BESNARD <xavier.besnard@neuf.fr>, 2022, 2023.
+# SPDX-FileCopyrightText: 2020, 2021, 2022, 2023 Xavier Besnard <xavier.besnard@kde.org>
+# Xavier Besnard <xavier.besnard@kde.org>, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-22 12:03+0100\n"
-"Last-Translator: Xavier BESNARD <xavier.besnard@neuf.fr>\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-04 11:21+0100\n"
+"Last-Translator: Xavier Besnard <xavier.besnard@kde.org>\n"
 "Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -15,81 +15,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 23.08.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Réception des notifications"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Échec de la connexion : jeton d'accès non valable ou révoqué"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "La connexion a échoué : %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Erreur du réseau : %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Il a été impossible de trouver le jeton d'accès."
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Peut-être a-t-il été supprimé ?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "L'accès au trousseau de clés a été refusé."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Veuillez autoriser NeoChat à lire le jeton d'accès."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Aucun trousseau de clés disponible."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Veuillez installer un trousseau de clés, par exemple, KWallet ou le "
 "trousseau de clés de GNOME sous Linux."
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Lecture impossible du jeton d'accès"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Fichier trop volumineux pour être téléchargé"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Veuillez contact votre administrateur du serveur « Matrix » pour de l'aide."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Ce message a été supprimé]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Ce message a été supprimé : %1]</i>"
@@ -420,14 +420,14 @@ msgstr "État mis à jour"
 msgid "started a poll"
 msgstr "a démarré un vote"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] " utilisateur %1 :"
 msgstr[1] " %1 utilisateurs :"
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -527,7 +527,7 @@ msgstr "Xavier Besnard"
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "xavier.besnard@neuf.fr"
+msgstr "xavier.besnard@kde.org"
 
 #: src/main.cpp:147
 #, kde-format
@@ -968,16 +968,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Émoticônes personnelles"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[RÉDIGÉ]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[RÉDIGÉ : %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1021,13 +1011,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Activer les notifications pour ce compte"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Messages dans des forums de discussions en tête à tête"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Messages chiffrés dans des forums de discussions en tête à tête"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Messages dans des forums de discussions de groupe"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Messages dans des forums chiffrés de discussions de groupe"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Messages de mise à jour de salon"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Messages contenant mon nom affiché"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Messages mentionnant mon identifiant d'utilisateur Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Messages mentionnant un salon"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Messages contenant la partie locale de mon identifiant Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notifications pour la totalité des salons (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invitations pour un salon"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Envoyer une invitation"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " et "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1035,7 +1090,7 @@ msgid_plural " and %1 others"
 msgstr[0] " et %1 autre"
 msgstr[1] " et %1 autres"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1073,28 +1128,28 @@ msgstr "Basse priorité"
 msgid "Spaces"
 msgstr "Espaces"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Impossible de créer le salon : %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Impossible de créer un espace : %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapport envoyé avec succès."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat : %1, Long : %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Message chiffré"
@@ -1120,40 +1175,40 @@ msgstr "Répondre"
 msgid "Reply..."
 msgstr "Répondre..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 vous a invité dans un salon"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Ouvrir cette invitation dans NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rejeter"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rejeter et ignorer un utilisateur"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Ouvrir NeoChat"
@@ -1201,7 +1256,7 @@ msgid "Label:"
 msgstr "Libellé :"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Enregistrer"
@@ -1271,6 +1326,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Confirmer la désactivation du compte"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Mot de passe changé avec succès"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Mot de passe erroné"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Problème inconnu durant la tentative de chargement de mot de passe."
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1315,21 +1385,6 @@ msgstr "Comptes"
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Mot de passe changé avec succès"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Mot de passe erroné"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Problème inconnu durant la tentative de chargement de mot de passe."
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1433,19 +1488,19 @@ msgstr "Annuler l'envoi de la pièce jointe"
 msgid "Ban User"
 msgstr "Bannir un utilisateur"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Raison pour le bannissement de cet utilisateur"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Bannir"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1710,6 +1765,9 @@ msgstr "Sujet :"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Rendre officiel ce parent"
 
@@ -1733,7 +1791,7 @@ msgstr "Sélectionner un salon"
 
 #: 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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1760,8 +1818,11 @@ msgstr ""
 "Vous ne possédez pas un niveau de privilège suffisamment élevé chez l'enfant "
 "pour définir cet état"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Faire de cet espace un parent classique"
 
@@ -2039,7 +2100,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Étiquettes auto-collantes et émoticônes"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2049,7 +2110,7 @@ msgstr ""
 "périphérique."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorer les salons"
@@ -2150,7 +2211,7 @@ msgid "Remove Message"
 msgstr "Supprimer un message"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2200,143 +2261,143 @@ msgstr "Nom du salon :"
 msgid "Room topic:"
 msgstr "Sujet du salon :"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Identifiant du salon"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copier un identifiant de salon dans le presse-papier"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Version du salon"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Mettre à jour un salon"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Aucun alias classique défini"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Faire de cet alias un alias vers le salon classique"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Supprimer un alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nouvel-alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Ajouter un nouvel alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Aperçus des URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Activer les aperçus des URL par défaut pour les membres de ce salon."
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activer les aperçus des URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Les aperçus des URL sont activés par défaut dans ce salon."
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Les aperçus des URL sont désactivés par défaut dans ce salon."
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Espaces parents officiels"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Classique"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "En faire un parent classique"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Supprimer un parent"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Ce salon n'a aucun espace parent officiel."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Ajouter un nouveau parent officiel"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ce salon poursuit sur une autre discussion."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Voir les messages plus anciens..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ce salon a été remplacé."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Voir un nouveau salon..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Mettre à jour le salon"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Sélectionner une nouvelle version"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmer"
@@ -2714,17 +2775,17 @@ msgstr "Trouver un utilisateur..."
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Aucun utilisateur disponible"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Envoyer une invitation"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "L'utilisateur est déjà membre ou a été invité"
@@ -2786,12 +2847,12 @@ msgstr "Saisissez une URL de serveur, par exemple kde.org"
 msgid "Server URL"
 msgstr "URL du serveur"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Saisir une adresse de salon"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3118,7 +3179,7 @@ msgstr "Activer les points importants dans les messages"
 msgid "Delete keyword"
 msgstr "Supprimer un mot clé"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3291,14 +3352,14 @@ msgstr "Définir les enfants de cette espace"
 msgid "Set the parent space of this room"
 msgstr "Définir un espace parent de ce salon"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Selon les votes de l'utilisateur %1"
 msgstr[1] "Selon les votes de %1 utilisateurs"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3401,17 +3462,17 @@ msgstr "Supprimer des messages"
 msgid "Remove Message"
 msgstr "Supprimer un message"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Raison pour la suppression des messages récents de cet utilisateur"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Raison pour la suppression de ce message"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3428,7 +3489,7 @@ msgstr "Annuler la réponse"
 msgid "Report Message"
 msgstr "Signaler un message"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Raison pour signaler ce message"
@@ -3575,28 +3636,28 @@ msgstr "Aucun numéro de membre"
 msgid "View notifications"
 msgstr "Afficher les notifications"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Aucun salon n'a été trouvé."
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Rejoindre certains salons pour vous lancer."
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Rechercher dans le dossier des salons"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Réduire %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3849,6 +3910,11 @@ msgstr "Le salon sélectionné n'est pas un espace"
 msgid "You do not have the privileges to complete this action"
 msgstr "Vous ne possédez pas les privilèges pour terminer cette action"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Faire de cet espace un parent classique"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4117,12 +4183,12 @@ msgstr "Ré-ouvrir l'URL « SSO »"
 msgid "Chat"
 msgstr "Discuter"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Rejoindre un compte existant"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Créer un nouveau salon"
@@ -4149,22 +4215,22 @@ msgstr ""
 "Ceci est le début de la discussion. Il n'y a aucun historique de messages "
 "avant cet instant."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Aller au premier message non lu."
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Aller au message le plus ancien."
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Faites glisser les éléments ici pour les partager"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4495,47 +4561,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Revenir en arrière"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Aucun serveur."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Vérification de la disponibilité du serveur."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Ceci n'est pas un serveur valable."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "L'enregistrement avec ce serveur est désactivé."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Aucun nom d'utilisateur."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Vérification de la disponibilité du nom d'utilisateur."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Ce nom d'utilisateur est indisponible."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continuer"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "De travail"
@@ -4594,16 +4660,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Afficher"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Quitter"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[RÉDIGÉ]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[RÉDIGÉ : %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr ""
 #~ "L'identifiant du salon que vous essayez de rejoindre est non valable."
@@ -4718,36 +4790,9 @@ msgstr "Quitter"
 #~ "Ce salon est chiffré. Veuillez compiler « libQuotient » avec le "
 #~ "chiffrement activé pour envoyer des messages chiffrés."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Messages dans des salons de discussions en tête à tête"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Messages chiffrés dans des salons de discussions en tête à tête"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Messages dans des salons de discussions de groupe"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Messages dans des salons chiffrés de discussions de groupe"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Messages de mise à jour de salon"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Messages contenant mon nom d'affichage"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Notifications pour la totalité des salons (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Messages contenant mes mots clé"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Invites pour un salon"
-
-#~ msgid "Call invitation"
-#~ msgstr "Envoyer une invitation"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Émoticônes personnalisées"

po/hu/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-05-09 22:36+0200\n"
 "Last-Translator: K. Áron <aronkvh@gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -18,84 +18,84 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Gépelési értesítések küldése"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 "Sikertelen bejelentkezés: A hozzáférést biztosító token érvénytelen vagy "
 "visszavonták"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Sikertelen bejelentkezés: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Hálózati hiba: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "A hozzáférési token  nem található"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Lehet, hogy kitörölték?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "A kulcstartóhoz való hozzáférés megtagadva."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Kérjük, adj hozzáférést a NeoChat-nek a tokenhez"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Nincs elérhető kulcstartó."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Kérjük, telepíts egy kulcstartót Linuxon: pl. a KWallet-et vagy a GNOME "
 "Keyring-et"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "A hozzáférési token olvasása nem sikerült"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "A fájl túl nagy a letöltéshez."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Segítségért vedd fel a kapcsolatot a Matrix szervered rendszergazdájával."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Törölt üzenet]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Törölt üzenet: %1]</i>"
@@ -426,14 +426,14 @@ msgstr "frissítette az állapotot"
 msgid "started a poll"
 msgstr "szavazást indított"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 felhasználó: "
 msgstr[1] "%1 felhasználó: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -972,16 +972,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emojik"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[KITAKARVA]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[KITAKARVA: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1026,13 +1016,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Értesítések engedélyezése a fióknál"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Üzenetekről kétszemélyes beszélgetésekben"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Titkosított üzenetekről kétszemélyes beszélgetésekben"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Üzenetekről csoportos csevegésekben"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Titkosított üzenetekről csoportos csevegésekben"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Szobafrissítési üzenetekről"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "A megjelenített nevemet tartalmazó üzenetek"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "A megjelenített nevemet tartalmazó üzenetek"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Az egész szobára vonatkozó (@room) értesítések"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Meghívások egy szobába"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Meghívások hívásba"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " és "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1040,7 +1117,7 @@ msgid_plural " and %1 others"
 msgstr[0] " és %1 további"
 msgstr[1] " és %1 további"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1078,30 +1155,30 @@ msgstr "Alacsony prioritás"
 msgid "Spaces"
 msgstr "Terek"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "A szoba létrehozása nem sikerült: „%1”"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "A szoba létrehozása nem sikerült: „%1”"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "A jelentést sikeresen elküldte."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Hossz.: %1, Szél.: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Titkosított üzenet"
@@ -1127,42 +1204,42 @@ msgstr "Válasz"
 msgid "Reply..."
 msgstr "Válasz..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 meghívott egy szobába"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "A meghívás megnyitása a NeoChatban"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Elutasítás"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1212,7 +1289,7 @@ msgid "Label:"
 msgstr "Címke:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Mentés"
@@ -1283,6 +1360,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "A jelszó megváltoztatása sikeres"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Hibás jelszó"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Ismeretlen hiba történt a jelszó megváltoztatásakor"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1327,21 +1419,6 @@ msgstr "Fiókok"
 msgid "Add Account"
 msgstr "Fiók hozzáadása"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "A jelszó megváltoztatása sikeres"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Hibás jelszó"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Ismeretlen hiba történt a jelszó megváltoztatásakor"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1445,19 +1522,19 @@ msgstr "A csatolmány elküldésének megszakítása"
 msgid "Ban User"
 msgstr "A felhasználó letiltása"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "A felhasználó tiltásának oka"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Letiltás"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1728,9 +1805,13 @@ msgid "Topic:"
 msgstr "Téma:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Legyen ez az alias a szoba normalizált aliasa"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1752,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1777,9 +1858,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Legyen ez az alias a szoba normalizált aliasa"
 
@@ -2074,7 +2158,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Matricák"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2084,7 +2168,7 @@ msgstr ""
 "eszközzel."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Szobák felfedezése"
@@ -2192,7 +2276,7 @@ msgid "Remove Message"
 msgstr "Az üzenet eltávolítása"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2243,150 +2327,150 @@ msgstr "A szoba neve:"
 msgid "Room topic:"
 msgstr "A szoba témája:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Szobaazonosító"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Szobaazonosító másolása a vágólapra"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "A szoba verziója"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "A szoba fejlesztése"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliasok:"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Nincs elsődleges alias"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Legyen ez az alias a szoba normalizált aliasa"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Alias törlése"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#új_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Új alias hozzáadása"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL előnézetek"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Alapértelmezés szerint engedélyezze az URL-előnézeteket a szoba tagjai "
 "számára"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL-előnézetek engedélyezése"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "A szobában alapértelmezetten engedélyezve vannak az URL-előnézetek"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "A szobában alapértelmezetten nincsenek engedélyezve az URL-előnézetek"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Elsődleges álnév:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Nincs elsődleges alias"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Az üzenet eltávolítása"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Ezt a szobát lecserélték."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Nincs elsődleges alias"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ez a szoba egy másik beszélgetést folytat."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Korábbi üzenetek..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ezt a szobát lecserélték."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Új szoba megtekintése…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "A szoba fejlesztése"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Válassza ki az új verziót"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Megerősítés"
@@ -2767,17 +2851,17 @@ msgstr "Felhasználó keresése…"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nincsenek felhasználók"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Meghívás küldése"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "A felhasználó már tag, vagy már meghívást kapott"
@@ -2840,14 +2924,14 @@ msgstr "Adja meg a szerver URL-jét, pl. kde.org"
 msgid "Server URL"
 msgstr "Szerver URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<szobacím>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3183,7 +3267,7 @@ msgstr "Az üzenetkiemelés bekapcsolása"
 msgid "Delete keyword"
 msgstr "Kulcsszó törlése"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3357,14 +3441,14 @@ msgstr "A tér gyermekeinek beállítása"
 msgid "Set the parent space of this room"
 msgstr "A szoba szülő-terének beállítása"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "%1 felhasználó szavazataiból"
 msgstr[1] "%1 felhasználó szavazataiból"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3470,17 +3554,17 @@ msgstr "Az üzenetek eltávolítása"
 msgid "Remove Message"
 msgstr "Az üzenet eltávolítása"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "A felhasználó legutóbbi üzeneteinek eltávolításának oka"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Az üzenet eltávolításának oka"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3497,7 +3581,7 @@ msgstr "Mégsem válaszolok"
 msgid "Report Message"
 msgstr "Az üzenet bejelentése"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Az üzenet bejelentésének oka"
@@ -3656,28 +3740,28 @@ msgstr "Nincs tagszám"
 msgid "View notifications"
 msgstr "Értesítések némítása"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nem található szoba"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Csatlakozz néhány szobához kezdésként"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Keresés a szobakönyvtárban"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3937,6 +4021,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Legyen ez az alias a szoba normalizált aliasa"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4224,13 +4314,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Csevegés"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Bejelentkezés meglévő fiókba"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4255,22 +4345,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ugrás az első olvasatlan üzenetre"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ugrás a legújabb üzenetre"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Húzz ide elemeket a megosztásukhoz"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4603,54 +4693,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Szerver hozzáadása"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "A beírt szöveg nem érvényes URL"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Nincs név"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Nincsenek felhasználók"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Tovább"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4708,16 +4798,22 @@ msgstr "Az operációs rendszere nem talált alkalmazást a hivatkozáshoz."
 msgid "Could not open URL"
 msgstr "Nem sikerült megyitni az URL-t"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Kilépés"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[KITAKARVA]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[KITAKARVA: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "A szobaazonosító, amelyhez csatlakozni szeretne, érvénytelen"
 
@@ -4829,36 +4925,9 @@ msgstr "Kilépés"
 #~ "Ez a szoba titkosított. Fordítsa a libQuotient-t a titkosítást "
 #~ "engedélyezve, hogy titkosított üzeneteket tudjon küldeni."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Üzenetekről kétszemélyes beszélgetésekben"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Titkosított üzenetekről kétszemélyes beszélgetésekben"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Üzenetekről csoportos csevegésekben"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Titkosított üzenetekről csoportos csevegésekben"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Szobafrissítési üzenetekről"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "A megjelenített nevemet tartalmazó üzenetek"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Az egész szobára vonatkozó (@room) értesítések"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Üzenetek, amik tartalmazzák a kulcsszavaimat"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Meghívások egy szobába"
-
-#~ msgid "Call invitation"
-#~ msgstr "Meghívások hívásba"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Egyedi emojik"

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-22 10:55+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-04 11:00+0100\n"
 "Last-Translator: giovanni <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
@@ -18,79 +18,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Recipente notificationes de push"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Accesso falleva: indicio (token) de accesso invalide o revocate"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Accesso falleva: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Error de rete: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Indicio de accesso non esseva trovate"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan il esseva delite?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesso a portaclave (keychain) esseva negate"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, 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:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Nulle portaclaves disponibile"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Incapace a leger indicio"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "File troppo grande a discargar."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Iste message ha essite delite]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Iste message esseva delite: %1]</i>"
@@ -421,14 +421,14 @@ msgstr "actualisate le stato"
 msgid "started a poll"
 msgstr "initia un inquesta"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 Usator: "
 msgstr[1] "%1 Usatores:"
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -964,16 +964,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Proprie Emojis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REAGITE]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REAGITE: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1017,13 +1007,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Habilita notificatione per iste conto"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Messages in conversationes un a un"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Messages cryptate in conversationes un a un"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Messages in conversationes de gruppo"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Messges in convesationes de gruppo cryptate"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Messages de sala actualisate"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Messages continente mi nomine de monstrar"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Messages que mention mi ID de usator de Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Messages que mention un sala"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Messages continente le parte local de mi ID de Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Complete notificationes de sala (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invita a un sala"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Appella invitation"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr "e"
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1031,7 +1086,7 @@ msgid_plural " and %1 others"
 msgstr[0] "e %1 altere"
 msgstr[1] "e %1 alteres"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1069,28 +1124,28 @@ msgstr "Basse prioritate"
 msgid "Spaces"
 msgstr "Spatios"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Creation de sala falleva: \"%1\""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Creation de spatio falleva: \"%1\""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Reporto inviate con successo."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Message Cryptate"
@@ -1116,40 +1171,40 @@ msgstr "Responde"
 msgid "Reply..."
 msgstr "Responde..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 invitava te  un sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Aperi iste invitation in NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accepta"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rejecta"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rejecta e ignora usator"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Aperi Neochat"
@@ -1197,7 +1252,7 @@ msgid "Label:"
 msgstr "Etiquetta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Salveguarda"
@@ -1266,6 +1321,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Confirma Deactivar le Conto"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Contrassigno cambiava con successo"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Insertate contrasigno errate"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Problema incognite quando il essayava a cambiar contrasigno"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1310,21 +1380,6 @@ msgstr "Contos"
 msgid "Add Account"
 msgstr "Adde conto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Contrassigno cambiava con successo"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Insertate contrasigno errate"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Problema incognite quando il essayava a cambiar contrasigno"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1429,19 +1484,19 @@ msgstr "Cancella invio de attachamento"
 msgid "Ban User"
 msgstr "Prohibi usator"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Motivation per prohiber (bannar)  iste usator"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Prohibi (Ban)"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1705,6 +1760,9 @@ msgstr "Topico:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Face iste genitor official"
 
@@ -1728,7 +1786,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1755,8 +1813,11 @@ msgstr ""
 "Tu non ha un nivello de privilegio assatis alte in le filio pro assignar "
 "iste stato"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Face iste spatio le genitor canonic"
 
@@ -2032,7 +2093,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Etiquettas Gummate (Stickers) & Emoji"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2042,7 +2103,7 @@ msgstr ""
 "dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explora salas"
@@ -2143,7 +2204,7 @@ msgid "Remove Message"
 msgstr "Remove  message"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2193,143 +2254,143 @@ msgstr "Nomine de Sala:"
 msgid "Room topic:"
 msgstr "Topico de Sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID de Sala"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copia ID de sala a area de transferentia"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Version de sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Actualisa sala"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliases"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Necun Alias canonic fixate"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Face iste alias le alias canonic de sala"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Dele alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Adde nove alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Vistas preliminar de URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Habilita vistas preliminar de URL predefinite per membros de sala"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Habilita vista preliminar de URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Viste preliminar de URL es habilitate per definition in iste sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Viste preliminar de URL es dishabilitate per definition in iste sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Spatio Official de Genitor"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canonic"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Face genitor canonic"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Remove  genitor"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Iste sala ha nulle spatios official de parente."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Adde nove genitor official"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Iste sala continua un altere conversation."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vide messages plus vetere..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Iste sala ha essite reimplaciate."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Vide nove sala..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualisa le sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Selige nove version"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirma"
@@ -2703,17 +2764,17 @@ msgstr "Trova un usator..."
 msgid "Add"
 msgstr "Adde"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nulle usatores disponibile"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Invia invitation"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Usatoir o ja es un membro o ja ha  essite invitate"
@@ -2775,12 +2836,12 @@ msgstr "Inserta usr de servitor p.ex. kde.org"
 msgid "Server URL"
 msgstr "URL de servitor"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Inserta adresse de sala"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3105,7 +3166,7 @@ msgstr "Habilita evidentias de message"
 msgid "Delete keyword"
 msgstr "Dele parola clave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3274,14 +3335,14 @@ msgstr "Assigna le filios de iste spatio"
 msgid "Set the parent space of this room"
 msgstr "Fixa lespatio genitor de iste sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basate sur votos per %1 usator"
 msgstr[1] "Basate sur votos per %1 usatores"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3384,17 +3445,17 @@ msgstr "Remove messages"
 msgid "Remove Message"
 msgstr "Remove  message"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Motivo per remover messages recente de iste usator"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Motivo per remover iste message"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3411,7 +3472,7 @@ msgstr "Cancella responsa"
 msgid "Report Message"
 msgstr "Reporta Message"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Motivo per reportar iste message"
@@ -3558,28 +3619,28 @@ msgstr "Necun computo de membro"
 msgid "View notifications"
 msgstr "Vide notificationes"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nulle salas trovat"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Uni alcun salas per initiar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "cerca in directorio de sala"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Plica %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3826,6 +3887,11 @@ msgstr "Le sala selectionate non es un spatio"
 msgid "You do not have the privileges to complete this action"
 msgstr "Tu non ha le privilegios pro completar iste action"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Face iste spatio le genitor canonic"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4094,12 +4160,12 @@ msgstr "Re-aperi SSO URL"
 msgid "Chat"
 msgstr "Conversation in directo"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Unite a conversation in directo existente "
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Crea nove conversation"
@@ -4127,22 +4193,22 @@ msgstr ""
 "Isto es le initio del conversation in directo (chat). Il non ha alcun "
 "messages historic ultra iste puncto."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Salta al prime message non legite"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salta al ultime message"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4474,47 +4540,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Vade retro"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Nulle servitor."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Verificante disponibilitate de Servitor."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Isto non es un valide servitor."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registration per iste servitor es dishabilitate."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Necun nomine de usator."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Verificante disponibilitate de nomine de usator."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Iste nomine de usator non es disponibile."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "travaliante"
@@ -4572,16 +4638,22 @@ msgstr "Tu systema operative non poteva trovar un application per le ligamine."
 msgid "Could not open URL"
 msgstr "Non pote aperir URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Monstra "
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Quita"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[REAGITE]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REAGITE: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Iste id de sala que tu es essayante a unir non es valid"
 
@@ -4687,36 +4759,9 @@ msgstr "Quita"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Necun Alias canonic"
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Messages in conversationes un a un"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Messages cryptate in conversationes un a un"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Messages in conversationes de gruppo"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Messges in convesationes de gruppo cryptate"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Messages de sala actualisate"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Messages continente mi nomine de monstrar"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Complete notificationes de sala (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Messages continente mi parolas clave"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Invita a un sala"
-
-#~ msgid "Call invitation"
-#~ msgstr "Appella invitation"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Emojis personalisate"

po/id/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-06-16 19:31+0700\n"
 "Last-Translator: Linerly <linerly@protonmail.com>\n"
 "Language-Team: Indonesian <kde-i18n-doc@kde.org>\n"
@@ -18,80 +18,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Kirim notifikasi pengetikan"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Pemasukan Gagal: Token Pengaksesan tidak absah atau dicabut"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Pemasukan Gagal: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Kesalahan Jaringan: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Token pengaksesan tidak ditemukan"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Mungkin terhapus?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Akses ke rantai kunci ditolak."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Mohon izinkan NeoChat untuk membaca token pengaksesan"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Tidak ada keychain yang tersedia."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Mohon instal sebuah rantai kunci, seperti KWallet atau GNOME Keyring di Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Tidak dapat membaca token pengaksesan"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Berkas terlalu besar untuk diunduh."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Hubungi administrator server Matrix Anda untuk dukungan."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Pesan ini telah dihapus]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Pesan ini telah dihapus: %1]</i>"
@@ -422,14 +422,14 @@ msgstr "memperbarui keadaan"
 msgid "started a poll"
 msgstr "memulai pemungutan suara"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "%1 pengguna: "
 msgstr[1] "%1 pengguna"
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -967,16 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emoji Sendiri"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[DIHAPUS]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[DIHAPUS: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1021,13 +1011,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Aktifkan notifikasi untuk akun ini"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Pesan dalam obrolan satu ke satu"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Pesan terenkripsi dalam obrolan satu ke satu"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Pesan dalam obrolan grup"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Pesan dalam obrolan grup terenkripsi"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Pesan peningkatan ruangan"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Pesan berisi nama tampilan saya"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Pesan berisi nama tampilan saya"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notifikasi seluruh ruangan (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Mengundang ke ruangan"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Undangan panggilan"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " dan "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1035,7 +1112,7 @@ msgid_plural " and %1 others"
 msgstr[0] " dan %1 lainnya"
 msgstr[1] " dan %1 lainnya"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1073,28 +1150,28 @@ msgstr "Prioritas rendah"
 msgid "Spaces"
 msgstr "Space"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Pembuatan ruangan gagal: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Pembuatan space gagal: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Laporan berhasil dikirim."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lintang: %1, Bujur: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Pesan Terenkripsi"
@@ -1120,42 +1197,42 @@ msgstr "Balas"
 msgid "Reply..."
 msgstr "Balas..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 mengundang Anda ke sebuah ruangan"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Buka undangan ini di NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Terima"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Tolak"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1205,7 +1282,7 @@ msgid "Label:"
 msgstr "Label:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Simpan"
@@ -1276,6 +1353,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Kata sandi berhasil diubah"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Kata sandi salah"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Terjadi masalah yang tidak diketahui saat mengubah kata sandi"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1320,21 +1412,6 @@ msgstr "Akun"
 msgid "Add Account"
 msgstr "Tambahkan Akun"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Kata sandi berhasil diubah"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Kata sandi salah"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Terjadi masalah yang tidak diketahui saat mengubah kata sandi"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1437,19 +1514,19 @@ msgstr "Batalkan pengiriman lampiran"
 msgid "Ban User"
 msgstr "Cekal Pengguna"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Alasan mencekal pengguna ini"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Cekal"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1719,9 +1796,13 @@ msgid "Topic:"
 msgstr "Tidak Ada Topik"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Buat alias ini sebagai alias kanonik ruangan"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1743,7 +1824,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1768,9 +1849,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Buat alias ini sebagai alias kanonik ruangan"
 
@@ -2050,7 +2134,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Stiker & Emoji"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2059,7 +2143,7 @@ msgstr ""
 "Pesan ini terenkripsi dan pengirim belum membagikan kuncinya ke peranti ini."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Jelajahi ruangan"
@@ -2164,7 +2248,7 @@ msgid "Remove Message"
 msgstr "Hapus Pesan"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2215,148 +2299,148 @@ msgstr "Nama ruangan:"
 msgid "Room topic:"
 msgstr "Topik ruangan:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID Ruangan"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Salin ID ruangan ke papan klip"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versi ruangan"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Tingkatkan Ruangan"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "TIdak ada alias kanonik yang ditetapkan"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Buat alias ini sebagai alias kanonik ruangan"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Hapus alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#alias_baru:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Tambahkan alias baru"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Pratinjau URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Aktifkan pratinjau URL secara bawaan untuk anggota ruangan"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Aktifkan pratinjau URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Pratinjau URL telah diaktifkan secara bawaan dalam ruangan ini"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Pratinjau URL telah dinonaktifkan secara bawaan dalam ruangan ini"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Alias Kanonik:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "TIdak ada alias kanonik yang ditetapkan"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Hapus Pesan"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Ruangan ini telah diganti."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "TIdak ada alias kanonik yang ditetapkan"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ruangan ini melanjutkan sebuah percakapan."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Lihat pesan lama..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ruangan ini telah diganti."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Lihat ruangan baru..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Tingkatkan Ruangan"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Pilih versi baru"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Konfirmasi"
@@ -2735,17 +2819,17 @@ msgstr "Temukan sebuah pengguna..."
 msgid "Add"
 msgstr "Tambahkan"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Tidak ada pengguna yang tersedia"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Kirim undangan"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Pengguna sudah menjadi anggota atau telah diundang"
@@ -2808,12 +2892,12 @@ msgstr "Masukkan URL server mis. kde.org"
 msgid "Server URL"
 msgstr "URL Server"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3149,7 +3233,7 @@ msgstr "Aktifkan sorotan pesan"
 msgid "Delete keyword"
 msgstr "Hapus kata kunci"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3326,14 +3410,14 @@ msgstr "Tetapkan anak dari space ini"
 msgid "Set the parent space of this room"
 msgstr "Tetapkan space induk dari ruangan ini"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Berdasarkan pemungutan suara dari %1 pengguna"
 msgstr[1] "Berdasarkan pemungutan suara dari %1 pengguna"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3439,17 +3523,17 @@ msgstr "Hapus Pesan"
 msgid "Remove Message"
 msgstr "Hapus Pesan"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Alasan untuk menghapus pesan terkini pengguna ini"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Alasan untuk menghapus pesan ini"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3466,7 +3550,7 @@ msgstr "Batalkan balasan"
 msgid "Report Message"
 msgstr "Laporkan Pesan"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Alasan untuk melaporkan pesan ini"
@@ -3625,28 +3709,28 @@ msgstr "Tidak ada hitungan anggota"
 msgid "View notifications"
 msgstr "Bisukan notifikasi"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Tidak ada ruangan yang ditemukan"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Bergabung ke beberapa ruangan untuk memulai"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Cari di direktori ruangan"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3905,6 +3989,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Buat alias ini sebagai alias kanonik ruangan"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4189,13 +4279,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Masuk ke akun yang sudah ada"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4220,22 +4310,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Pergi ke pesan pertama yang belum dibaca"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Pergi ke pesan terkini"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Seret item ke sini untuk membagikannya"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4564,54 +4654,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Tambahkan server"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "Teks yang dimasukkan bukan sebuah URL yang valid"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Tidak ada nama"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Tidak ada pengguna yang tersedia"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Lanjut"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4668,16 +4758,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Tidak dapat membuka URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Keluar"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[DIHAPUS]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[DIHAPUS: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "ID ruangan yang Anda coba bergabung tidak absah"
 
@@ -4789,36 +4885,9 @@ msgstr "Keluar"
 #~ "Ruangan ini terenkripsi. Bangun libQuotient dengan enkripsi diaktifkan "
 #~ "untuk mengirim pesan terenkripsi."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Pesan dalam obrolan satu ke satu"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Pesan terenkripsi dalam obrolan satu ke satu"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Pesan dalam obrolan grup"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Pesan dalam obrolan grup terenkripsi"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Pesan peningkatan ruangan"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Pesan berisi nama tampilan saya"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Notifikasi seluruh ruangan (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Pesan berisi kata kunci saya"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Mengundang ke ruangan"
-
-#~ msgid "Call invitation"
-#~ msgstr "Undangan panggilan"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Emoji Kustom"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+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,79 +18,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Receiving push notifications"
 msgstr "Inviar notificationes pri li tippada"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, fuzzy, kde-format
 msgid "Login Failed: %1"
 msgstr "Ne successat inregistrar: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Errore de rete: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, fuzzy, kde-format
 msgid "Access token wasn't found"
 msgstr "Li plugin necessi por accesse al files MP3 ne esset trovat"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forsan it esset removet?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, fuzzy, kde-format
 msgid "Access to keychain was denied."
 msgstr "Accesse a %1 es refusat."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Null porta-clave disponibil."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, fuzzy, kde-format
 msgid "Unable to read access token"
 msgstr "Ne posset acessar «%s»"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Ti missage esset removet]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Ti missage esset removet: %1]</i>"
@@ -428,14 +428,14 @@ msgstr "actualisat %1 statu"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, fuzzy, kde-format
 #| msgctxt "[action 1], [action 2 and action 3]"
 #| msgid ", "
@@ -1018,16 +1018,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Converter smileys a emojis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[CENSURAT]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[CENSURAT: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1074,13 +1064,89 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Monstrar notificationes"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Inviar li missage"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Visibil nómine"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Visibil nómine"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Monstrar notificationes"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Invitar un usator"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Inviar un invitation"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " e "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1088,7 +1154,7 @@ msgid_plural " and %1 others"
 msgstr[0] " e %1 plu"
 msgstr[1] " e %1 plu"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1126,28 +1192,28 @@ msgstr "Bass prioritá"
 msgid "Spaces"
 msgstr "Spacies"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ne successat crear un contextu OpenGL"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Raport sta inviat successosimen."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Ciffrat missage"
@@ -1173,42 +1239,42 @@ msgstr "Responder"
 msgid "Reply..."
 msgstr "Responder..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, fuzzy, kde-format
 msgid "%1 invited you to a room"
 msgstr "%s invitat vos a(l) %s"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, fuzzy, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Aperter NeoChat in ti chambre"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Acceptar"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rejecter"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1258,7 +1324,7 @@ msgid "Label:"
 msgstr "Etiquette:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Gardar"
@@ -1331,6 +1397,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Li contrasigne sta cambiat successosimen"
+
+#: src/qml/AccountEditorPage.qml:225
+#, fuzzy, kde-format
+msgid "Wrong password entered"
+msgstr "Contrasigne es ínvalid."
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, fuzzy, kde-format
 msgid "Edit this account"
@@ -1376,21 +1457,6 @@ msgstr "Contos"
 msgid "Add Account"
 msgstr "Adjunter un conto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Li contrasigne sta cambiat successosimen"
-
-#: src/qml/AccountsPage.qml:117
-#, fuzzy, kde-format
-msgid "Wrong password entered"
-msgstr "Contrasigne es ínvalid."
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1499,19 +1565,19 @@ msgstr "Anullar emission del image"
 msgid "Ban User"
 msgstr "Bannir ti usator"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 msgid "Reason for banning this user"
 msgstr "Raportante spam..."
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1784,6 +1850,9 @@ msgstr "Sin tema"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1807,7 +1876,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1832,10 +1901,13 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
-#, kde-format
+#: src/qml/CreateRoomDialog.qml:219
+#, fuzzy, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr ""
+msgstr "Pseudonim"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2119,7 +2191,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2127,7 +2199,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar chambres"
@@ -2234,7 +2306,7 @@ msgid "Remove Message"
 msgstr "Raportar li missage"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2287,157 +2359,157 @@ msgstr "Nómine del chambre:"
 msgid "Room topic:"
 msgstr "Tema del chambre:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Rooms"
 msgid "Room ID"
 msgstr "Chambres"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
 #| msgid "Copy Address to Clipboard"
 msgid "Copy room ID to clipboard"
 msgstr "Copiar li adresse al Paperiere"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Room information"
 msgid "Room version"
 msgstr "Information pri li chambre"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
 msgid "Upgrade Room"
 msgstr "Explorar chambres"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, fuzzy, kde-format
 #| msgid "Other Aliases:"
 msgid "Aliases"
 msgstr "Altri pseudonimes:"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, fuzzy, kde-format
 msgid "No canonical alias set"
 msgstr "Pseudonim"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "Remover"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are enabled by default in this room"
 msgstr "%1 ja es in ti chambre."
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgctxt "<user> is already in this room."
 #| msgid "%1 is already in this room."
 msgid "URL previews are disabled by default in this room"
 msgstr "%1 ja es in ti chambre."
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 msgid "Canonical"
 msgstr "Pseudonim"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 msgid "Make canonical parent"
 msgstr "Pseudonim"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Report Message"
 msgid "Remove parent"
 msgstr "Raportar li missage"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Missage esset respondet"
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Pseudonim"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 msgid "See older messages…"
 msgstr "(o plu old)"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, fuzzy, kde-format
 msgid "This room has been replaced."
 msgstr "Missage esset respondet"
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, fuzzy, kde-format
 msgid "See new room…"
 msgstr "Vu have un nov invitation a un chambre"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "forlassat li chambre"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, fuzzy, kde-format
 msgid "Select new version"
 msgstr "Vu have un nov invitation a un chambre"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmar"
@@ -2820,17 +2892,17 @@ msgstr "Trovar un usator..."
 msgid "Add"
 msgstr "Adjunter"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Null usatores disponibil"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Inviar un invitation"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2893,12 +2965,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3241,7 +3313,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "Remover li parol"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3419,14 +3491,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "Invitar li usator al ti chambre"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3531,17 +3603,17 @@ msgstr "Raportar li missage"
 msgid "Remove Message"
 msgstr "Raportar li missage"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, fuzzy, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Raportante spam..."
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, fuzzy, kde-format
 msgid "Reason for removing this message"
 msgstr "Raportante spam..."
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3559,7 +3631,7 @@ msgstr "Anullar li response"
 msgid "Report Message"
 msgstr "Raportar li missage"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, fuzzy, kde-format
 msgid "Reason for reporting this message"
 msgstr "Raportante spam..."
@@ -3720,28 +3792,28 @@ msgstr "Sin númere de membres"
 msgid "View notifications"
 msgstr "Monstrar notificationes"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, fuzzy, kde-format
 msgid "No rooms found"
 msgstr "Chambres"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, fuzzy, kde-format
 msgid "Search in room directory"
 msgstr "DIRECTORIA"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -3988,6 +4060,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4275,12 +4352,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create new chat"
@@ -4305,22 +4382,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ear al prim ínleet missage"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ear al ultim missage"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4630,52 +4707,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "Hem-servitor:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Sin nómine"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Null usatores disponibil"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4731,16 +4808,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Ne succesat monstrar ti-ci URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Monstrar"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Surtir"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[CENSURAT]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[CENSURAT: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Li ID de chambre a quel vu vole adherer vos es ínvalid"
 
@@ -4843,24 +4926,6 @@ msgstr "Surtir"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Pseudonim"
 
-#, fuzzy
-#~ msgid "Messages containing my display name"
-#~ msgstr "Visibil nómine"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Monstrar notificationes"
-
-#, fuzzy
-#~ msgid "Invites to a room"
-#~ msgstr "Invitar un usator"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "Inviar un invitation"
-
 #, fuzzy
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 14:08+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-05 06:23+0100\n"
 "Last-Translator: Vincenzo Reale <smart2128vr@gmail.com>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -17,79 +17,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 23.08.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Ricezione delle notifiche push"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Accesso non riuscito: token di accesso non valido o revocato"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Accesso non riuscito: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Errore di rete: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Il token di accesso non è stato trovato"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Forse è stato eliminato?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "L'accesso al portachiavi è stato negato."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Consenti a Neochat di leggere il token di accesso"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Nessun portachiavi trovato."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Impossibile leggere il token di accesso"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "File troppo grande per essere scaricato."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Questo messaggio è stato eliminato]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Questo messaggio è stato eliminato: %1]</i>"
@@ -420,14 +420,14 @@ msgstr "ha aggiornato lo stato"
 msgid "started a poll"
 msgstr "ha avviato un sondaggio"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 utente: "
 msgstr[1] "%1 utenti: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -964,16 +964,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "I propri emoji"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDATTO]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDATTO: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1017,13 +1007,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Abilita le notifiche per questo account"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Messaggi nelle chat uno a uno"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Messaggi cifrati nelle chat uno a uno"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Messaggi nelle chat di gruppo"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Messaggi nelle chat di gruppo cifrate"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Messaggi di aggiornamento della stanza"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Messaggi contenenti il mio nome visualizzato"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Messaggi che menzionano il mio ID utente Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Messaggi che menzionano una stanza"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Messaggi contenenti la parte locale del mio ID Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notifiche alla stanza intera (@stanza)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Inviti a una stanza"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Invito a chiamata"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " e "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1031,7 +1086,7 @@ msgid_plural " and %1 others"
 msgstr[0] " e %1 altro"
 msgstr[1] " e %1 altri"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1069,28 +1124,28 @@ msgstr "Bassa priorità"
 msgid "Spaces"
 msgstr "Spazi"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Creazione della stanza non riuscita: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Creazione dello spazio non riuscita: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Segnalazione inviata correttamente."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Messaggio cifrato"
@@ -1116,40 +1171,40 @@ msgstr "Rispondi"
 msgid "Reply..."
 msgstr "Rispondi..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 ti ha invitato in una stanza"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Apri questo invito in NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accetta"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Rifiuta e ignora utente"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Apri NeoChat"
@@ -1197,7 +1252,7 @@ msgid "Label:"
 msgstr "Etichetta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Salva"
@@ -1266,6 +1321,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Conferma la disattivazione dell'account"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Password modificata correttamente"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "È stata digitata una password errata"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Problema sconosciuto durante il tentativo di cambiare la password"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1310,21 +1380,6 @@ msgstr "Account"
 msgid "Add Account"
 msgstr "Aggiungi account"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Password modificata correttamente"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "È stata digitata una password errata"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Problema sconosciuto durante il tentativo di cambiare la password"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1427,19 +1482,19 @@ msgstr "Annulla l'invio dell'allegato"
 msgid "Ban User"
 msgstr "Bandisci utente"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Motivo per bandire questo utente"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Bando"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1703,6 +1758,9 @@ msgstr "Argomento:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Rendi ufficiale questa genitore"
 
@@ -1726,7 +1784,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1754,8 +1812,11 @@ msgstr ""
 "Non disponi di un livello di privilegio sufficientemente elevato nel figlio "
 "per impostare questo stato"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Rendi questo spazio il genitore canonico"
 
@@ -2033,7 +2094,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Adesivi ed emoji"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2043,7 +2104,7 @@ msgstr ""
 "questo dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Esplora le stanze"
@@ -2144,7 +2205,7 @@ msgid "Remove Message"
 msgstr "Rimuovi il messaggio"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2194,149 +2255,149 @@ msgstr "Nome stanza:"
 msgid "Room topic:"
 msgstr "Argomento della stanza:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID stanza"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copia l'ID della stanza negli appunti"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versione della stanza"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Aggiorna stanza"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Nessun alias canonico impostato"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Rendi questo alias l'alias canonico della stanza"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Elimina alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nuovo_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Aggiungi nuovo alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Anteprime URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Abilita le anteprime degli URL per impostazione predefinita per i membri "
 "della stanza"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Abilita le anteprime degli URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Le anteprime degli URL sono abilitate per impostazione predefinita in questa "
 "stanza virtuale"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Le anteprime degli URL sono disattivate per impostazione predefinita in "
 "questa stanza virtuale"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Spazi genitori ufficiali"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canonico"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Crea genitore canonico"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Rimuovi genitore"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Questa stanza non ha spazi genitori ufficiali."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Aggiungi un nuovo genitore ufficiale"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Questa stanza continua un'altra conversazione."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vedi i messaggi più datati..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Questa stanza è stata sostituita."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Vedi la nuova stanza…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Aggiorna la stanza"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Seleziona la nuova versione"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Conferma"
@@ -2711,17 +2772,17 @@ msgstr "Trova un utente..."
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nessun utente disponibile"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Invia l'invito"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "L'utente è già membro o è stato invitato"
@@ -2783,12 +2844,12 @@ msgstr "Digita l'URL del server, ad es. kde.org"
 msgid "Server URL"
 msgstr "URL del server"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Digita l'indirizzo di una stanza"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3112,7 +3173,7 @@ msgstr "Abilita le evidenziazioni dei messaggi"
 msgid "Delete keyword"
 msgstr "Elimina la parola chiave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3285,14 +3346,14 @@ msgstr "Imposta i figli di questo spazio"
 msgid "Set the parent space of this room"
 msgstr "Imposta lo spazio principale di questa stanza"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basato sui voti di %1 utente"
 msgstr[1] "Basato sui voti di %1 utenti"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3395,17 +3456,17 @@ msgstr "Rimuovi i messaggi"
 msgid "Remove Message"
 msgstr "Rimuovi il messaggio"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Motivo per la rimozione dei messaggi recenti di questo utente"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Motivo per la rimozione di questo messaggio"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3422,7 +3483,7 @@ msgstr "Annulla la risposta"
 msgid "Report Message"
 msgstr "Messaggio della segnalazione"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Motivo della segnalazione di questo messaggio"
@@ -3569,28 +3630,28 @@ msgstr "Nessun conteggio dei membri"
 msgid "View notifications"
 msgstr "Visualizza le notifiche"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nessuna stanza trovata"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Entra in qualche stanza per iniziare"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Cerca nella cartella delle stanze"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Contrai %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3839,6 +3900,11 @@ msgstr "La stanza selezionata non è uno spazio"
 msgid "You do not have the privileges to complete this action"
 msgstr "Non disponi dei privilegi per completare questa azione"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Rendi questo spazio il genitore canonico"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4107,12 +4173,12 @@ msgstr "Apri nuovamente URL SSO"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Partecipa a una chat esistente"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Crea una nuova chat"
@@ -4139,22 +4205,22 @@ msgstr ""
 "Questo è l'inizio della chat. Non ci sono messaggi più datati oltre questo "
 "punto."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Passa al primo messaggio non letto"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Salta all'ultimo messaggio"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4488,47 +4554,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Indietro"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Nessun server."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Verifica della disponibilità del server."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Questo non è un server valido."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "La registrazione per questo server è disabilitata."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Nessun nome utente."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Verifica della disponibilità del nome utente."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Il nome utente non è disponibile."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Continua"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Attivo"
@@ -4588,16 +4654,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Impossibile aprire l'URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostra"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Esci"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDATTO]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDATTO: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "L'ID della stanza che stai tentando di entrare non è valida"
 
@@ -4711,36 +4783,9 @@ msgstr "Esci"
 #~ "Questa stanza è cifrata. Compila libQuotient con la cifratura abilitata "
 #~ "per inviare messaggi cifrati."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Messaggi nelle chat uno a uno"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Messaggi cifrati nelle chat uno a uno"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Messaggi nelle chat di gruppo"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Messaggi nelle chat di gruppo cifrate"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Messaggi di aggiornamento della stanza"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Messaggi contenenti il mio nome visualizzato"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Notifiche alla stanza intera (@stanza)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Messaggi contenenti le mie parole chiave"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Inviti a una stanza"
-
-#~ msgid "Call invitation"
-#~ msgstr "Invito a chiamata"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Emoji personalizzati"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+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,78 +14,78 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr ""
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr ""
@@ -416,13 +416,13 @@ msgstr ""
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -956,16 +956,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr ""
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1007,20 +997,85 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr ""
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr ""
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
 msgid_plural " and %1 others"
 msgstr[0] ""
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1057,28 +1112,28 @@ msgstr ""
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1104,40 +1159,40 @@ msgstr ""
 msgid "Reply..."
 msgstr ""
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr ""
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr ""
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr ""
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr ""
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1185,7 +1240,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr ""
@@ -1254,6 +1309,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1298,21 +1368,6 @@ msgstr ""
 msgid "Add Account"
 msgstr ""
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1415,19 +1470,19 @@ msgstr ""
 msgid "Ban User"
 msgstr ""
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr ""
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1686,6 +1741,9 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1709,7 +1767,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1733,8 +1791,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2005,7 +2066,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2013,7 +2074,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
@@ -2114,7 +2175,7 @@ msgid "Remove Message"
 msgstr ""
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2164,143 +2225,143 @@ msgstr ""
 msgid "Room topic:"
 msgstr ""
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr ""
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr ""
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr ""
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr ""
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -2670,17 +2731,17 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2742,12 +2803,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3069,7 +3130,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3236,13 +3297,13 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3343,17 +3404,17 @@ msgstr ""
 msgid "Remove Message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3370,7 +3431,7 @@ msgstr ""
 msgid "Report Message"
 msgstr ""
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3516,28 +3577,28 @@ msgstr ""
 msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3772,6 +3833,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4038,12 +4104,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr ""
@@ -4067,22 +4133,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4379,47 +4445,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4475,12 +4541,12 @@ msgstr ""
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr ""
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr ""

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 16:27+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\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,78 +18,78 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.3.2\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "პუშ გაფრთხილებების მიღება"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "შესვლის შეცდომა: წვდომის კოდი არასწორი ან გაუქმებულია"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "შესვლის შეცდომა: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "ქსელის შეცდომა: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "წვდომის კოდი ვერ ვიპოვე"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "შეიძლება წაშლილია?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "ბრელოკთან წვდომა აკრძალულია."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "მიეცით უფლება NeoChat-ს, წვდომის კოდი წაიკითხოს"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "ბრელოკი მიუწვდომელია."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "დააყენეთ ბრელოკი, მაგალითად, ლინუქსზე KWallet ან GNOME Keyring"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "წვდომის კოდის წაკითხვის შეცდომა"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "ფაილი გადმოსაწერად ძალიან დიდია."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "მხარდაჭერისთვის დაუკავშირდით თქვენი მატრიქსის სერვერის ადმინისტრატორს."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[ეს შეტყობინება წაშლილია]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[ეს შეტყობინება წაშლილია: %1]</i>"
@@ -420,14 +420,14 @@ msgstr "განაახლა მდგომარეობა"
 msgid "started a poll"
 msgstr "დაიწყო გამოკითხვა"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 მომხმარებელი: "
 msgstr[1] "%1 მომხმარებელი: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -962,16 +962,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "საკუთარი ემოჯიები"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ჩასწორებული]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ჩასწორებულია: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1015,13 +1005,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "ამ ანგარიშისთვის გაფრთხილებების ჩართვა"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "შეტყობინებები ერთი-ერთზე საუბრებში"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "დაშიფრული შეტყობინებები ერთი-ერთზე საუბრებში"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "შეტყობინებები ჯგუფურ საუბრებში"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "შეტყობინებები დაშიფრულ ჯგუფურ საუბრებში"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "ოთახის დონის აწევის შეტყობინებები"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "ჩემი საჩვენებელი სახელის შემცველი შეტყობინებები"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "შეტყობინებები, სადაც ჩემს Matrix-ის მომხმარებლის ID-ს ახსენებენ"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "შეტყობინებები, სადაც ოთახს ახსენებენ"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "ჩემი Matrix ID-ის ლოკალური ნაწილის შემცველი შეტყობინებები"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "მთლიანი ოთახის (@ოთახი) გაფრთხილებები"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "მოიწვევს ოთახში"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "ზარის მოსაწვევი"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " და "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1029,7 +1084,7 @@ msgid_plural " and %1 others"
 msgstr[0] " და კიდევ %1"
 msgstr[1] " და კიდევ %1"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1067,28 +1122,28 @@ msgstr "დაბალი პრიორიტეტი"
 msgid "Spaces"
 msgstr "სივრცეები"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "ოთახის შექმნის შეცდომა: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "სივრცის შექმნის შეცდომა: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "ანგარიში წარმატებით გაიგზავნა."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "გან: %1, გრძ: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "დაშიფრული შეტყობინება"
@@ -1114,40 +1169,40 @@ msgstr "პასუხი"
 msgid "Reply..."
 msgstr "პასუხი…"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 -მა ოთახში მოგიწვიათ"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "ამ მოსაწვევის NeoChat-ში გახსნა"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "დასტური"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "უარყოფა"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "მომხმარებლის უარყოფა და იგნორი"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "NeoChat-ის გახსნა"
@@ -1195,7 +1250,7 @@ msgid "Label:"
 msgstr "ჭდე:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "შენახვა"
@@ -1264,6 +1319,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "დაადასტურეთ ანგარიშის დეაქტივაცია"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "პაროლი წარმატებით შეიცვალა"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "შეყვანილი პაროლი არასწორია"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "უცნობი პრობლემა პაროლის შეცვლილსას"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1308,21 +1378,6 @@ msgstr "ანგარიშები"
 msgid "Add Account"
 msgstr "ანგარიშის დამატება"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "პაროლი წარმატებით შეიცვალა"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "შეყვანილი პაროლი არასწორია"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "უცნობი პრობლემა პაროლის შეცვლილსას"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1425,19 +1480,19 @@ msgstr "მიმაგრებული ფაილის გაგზავ
 msgid "Ban User"
 msgstr "მომხმარებლის ბანი"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "ამ მომხმარებლის ბანის მიზეზი"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "ბანი"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1700,6 +1755,9 @@ msgstr "თემა:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "ამ მშობლის გაოფიციალურება"
 
@@ -1723,7 +1781,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1748,8 +1806,11 @@ msgid ""
 msgstr ""
 "ამ მდგომარეობის დასაყენებლად შვილში საჭირო პრივილეგიის დონეები არ გაგაჩნიათ"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "ამ სივრცის კანონიკურ მშობლად დაყენება"
 
@@ -2024,7 +2085,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "ემოჯიები და სტიკერები"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2034,7 +2095,7 @@ msgstr ""
 "გაუზიარებია."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "ოთახების დათვალიერება"
@@ -2135,7 +2196,7 @@ msgid "Remove Message"
 msgstr "შეტყობინების წაშლა"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2185,143 +2246,143 @@ msgstr "ოთახის სახელი:"
 msgid "Room topic:"
 msgstr "ოთახის თემა:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ოთახის ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "ოთახის ID-ის ბუფერში კოპირება"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "ოთახის ვერსია"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "ოთახის გაუმჯობესება"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "მეტსახელები"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "კანონიკური მეტსახელი დაყენებული არაა"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "ამ მეტსახელის ოთახის კანონიკურ მეტსახელად დაყენება"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "მეტსახელის წაშლა"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "ახალი მეტსახელის დამატება"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "ბმულის მინიატურები"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "ოთახის წევრებისთვის ბმულების მინიატურების ნაგულისხმევად ჩართვა"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "ბმულის მინიატურების ჩართვა"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "ამ ოთახში ბმულების ავტომატური მინიატურები ნაგულისხმევადაა ჩართული"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "ამ ოთახში ბმულების ავტომატური მინიატურები ნაგულისხმევად გამორთულია"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "ოფიციალური მშობელი სივრცეები"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "კანონიკური"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "კანონიკურ მშობლად დაყენება"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "მშობლის წაშლა"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "ამ ოთახს ოფიციალური მშობელი სივრცეები არ გააჩნია."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "ოფიციალური მშობლის დამატება"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "ოთახი საუბრის შემდეგ გრძელდება."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "ძველი შეტყობინებების ნახვა…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "ეს ოთახი გამოცვლილია."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "ახალი ოთახის ნახვა…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "ოთახის გაუმჯობესება"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "აირჩიეთ ახალი ვერსია"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "დადასტურება"
@@ -2693,17 +2754,17 @@ msgstr "მომხმარებლის პოვნა..."
 msgid "Add"
 msgstr "დამატება"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "მომხმარებლები ხელმისაწვდომი არაა"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "მოსაწვევის გაგზავნა"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "მომხმარებელი ან უკვე წევრია, ან მოწვეულია"
@@ -2765,12 +2826,12 @@ msgstr "შეიყვანეთ სერვერის URL. მაგ: kde
 msgid "Server URL"
 msgstr "სერვერის URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "შეიყვანეთ ოთახის მისამართი"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3094,7 +3155,7 @@ msgstr "შეტყობინებების გამოკვეთი
 msgid "Delete keyword"
 msgstr "საკვანძო სიტყვის წაშლა"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3265,14 +3326,14 @@ msgstr "ამ სივრცის შვილების დაყენე
 msgid "Set the parent space of this room"
 msgstr "ამ ოთახის მშობელი სივრცის დაყენება"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "ეფუძნება %1 მომხმარებლის არჩევანს"
 msgstr[1] "ეფუძნება %1 მომხმარებლის არჩევანს"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3373,17 +3434,17 @@ msgstr "შეტყობინებების წაშლა"
 msgid "Remove Message"
 msgstr "შეტყობინების წაშლა"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "ამ მომხმარებლის უახლესი მომხმარებლების წაშლის მიზეზი"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "ამ შეტყობინების წაშლის მიზეზი"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3400,7 +3461,7 @@ msgstr "პასუხის გაუქმება"
 msgid "Report Message"
 msgstr "შეტყობინების შესახებ ანგარიშის გაგზავნა"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "ამ შეტყობინების შესახებ ანგარიშის გაგზავნის მიზეზი"
@@ -3547,28 +3608,28 @@ msgstr "წევრების რაოდენობის გარეშ
 msgid "View notifications"
 msgstr "გაფრთხილებების ნახვა"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "ოთახები ვერ ვიპოვე"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "დასაწყისისთვის შეუერთდით რომელიმე ოთახს"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "ოთახების დირექტორიაში ძებნა"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "%1-ის ჩაკეცვა"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3811,6 +3872,11 @@ msgstr "არჩეული ოთახი სივრცე არაა"
 msgid "You do not have the privileges to complete this action"
 msgstr "ამ ქმედების დასასრულებლად საკმარისი პრივილეგიები არ გაქვთ"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "ამ სივრცის კანონიკურ მშობლად დაყენება"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4079,12 +4145,12 @@ msgstr "SSO შესვლის ბმულის ხელახლა გ
 msgid "Chat"
 msgstr "ჩატი"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "არსებულ ჩატში შესვლა"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "ახალი ჩატის შექმნა"
@@ -4111,22 +4177,22 @@ msgid ""
 msgstr ""
 "ეს ჩატის დასაწყისია. ამ წერტილამდე, ისტორიაში, შეტყობინებები არ არსებობს."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "პირველ წაუკითხავ შეტყობინებაზე გადასვლა"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "უახლეს შეტყობინებებზე გადასვლა"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "გადმოათრიეთ საგნები აქ, მათ გასაზიარებლად"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4438,47 +4504,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "უკან დაბრუნება"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "სერვერის გარეშე."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "სერვერის წვდომადობის შემოწმება."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "ეს სწორი სერვერი არაა."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "ამ სერვერისთვის რეგისტრაცია გამორთულია."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "მომხმარებლის სახელის გარეშე."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "მომხმარებლის სახელის წვდომადობის შემოწმება."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "ეს მომხმარებლის სახელი ხელმისაწვდომი არაა."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "გაგრძელება"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "მუშაობს"
@@ -4534,16 +4600,22 @@ msgstr "თქვენმა ოპერაციულმა სისტე
 msgid "Could not open URL"
 msgstr "URL-ის გახსნის შეცდომა"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "ჩვენება"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "დატოვება"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ჩასწორებული]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ჩასწორებულია: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "ოთახის ID, რომელშიც შესვლასაც ცდილობთ, არასწორია"
 
@@ -4654,36 +4726,9 @@ msgstr "დატოვება"
 #~ "ოთახი დაშიფრულია. დაშიფრული შეტყობინებების გასაგზავნად libQuotient "
 #~ "შიფრაციის მხარდაჭერით უნდა ააგოთ."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "შეტყობინებები ერთი-ერთზე საუბრებში"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "დაშიფრული შეტყობინებები ერთი-ერთზე საუბრებში"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "შეტყობინებები ჯგუფურ საუბრებში"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "შეტყობინებები დაშიფრულ ჯგუფურ საუბრებში"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "ოთახის დონის აწევის შეტყობინებებები"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "ჩემი საჩვენებელი სახელის შემცველი შეტყობინებები"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "მთლიანი ოთახის (@ოთახი) გაფრთხილებები"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "ჩემი საკვანძო სიტყვების შემცველი შეტყობინებები"
 
-#~ msgid "Invites to a room"
-#~ msgstr "მოიწვევს ოთახში"
-
-#~ msgid "Call invitation"
-#~ msgstr "ზარის მოსაწვევი"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "მორგებული ემოჯიები"

po/ko/neochat.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-10-09 00:17+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -17,79 +17,79 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "입력 알림 보내기"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "로그인 실패: 접근 토큰이 잘못되었거나 취소됨"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "로그인 실패: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "네트워크 오류: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "접근 토큰을 찾을 수 없음"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "삭제되었을 수도 있습니다."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "키체인 접근이 거부되었습니다."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "NeoChat에서 접근 토큰 사용을 허용하십시오"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "키체인을 사용할 수 없습니다."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "키체인을 설치하십시오. 리눅스라면 KWallet, 그놈 키 모음 등이 있습니다"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "접근 토큰을 읽을 수 없음"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "파일이 다운로드하기에 너무 큽니다."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Matrix 서버 관리자에게 연락하십시오."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[이 메시지가 삭제됨]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[이 메시지가 삭제됨: %1]</i>"
@@ -422,13 +422,13 @@ msgstr "님이 상태를 업데이트함"
 msgid "started a poll"
 msgstr "님이 투표를 시작함"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "사용자 %1명: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -963,16 +963,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "내 이모지"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[검열됨]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[검열됨: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1015,20 +1005,101 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "이 계정의 알림 활성화"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Show deleted messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "삭제된 메시지 표시"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "님이 표시 이름을 지움"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "님이 표시 이름을 지움"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "알림 표시"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "%1 invited you to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "%1 님이 대화방에 초대함"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "초대 보내기"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " 그리고 "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
 msgid_plural " and %1 others"
 msgstr[0] " 그리고 %1명 더"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1065,28 +1136,28 @@ msgstr "낮은 우선 순위"
 msgid "Spaces"
 msgstr "스페이스"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "대화방 생성 실패: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "스페이스 생성 실패: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "신고했습니다."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "위도: %1, 경도: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "암호화된 메시지"
@@ -1112,40 +1183,40 @@ msgstr "답장"
 msgid "Reply..."
 msgstr "답장..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 님이 대화방에 초대함"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "NeoChat에서 이 초대장 열기"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "수락"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "거부"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "거부하고 사용자 무시"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1(%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1194,7 +1265,7 @@ msgid "Label:"
 msgstr "이름표:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "저장"
@@ -1263,6 +1334,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "계정 비활성화 확인"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "암호가 변경됨"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "암호가 잘못됨"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "암호를 변경하는 중 알 수 없는 오류 발생"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1307,21 +1393,6 @@ msgstr "계정"
 msgid "Add Account"
 msgstr "계정 추가"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "암호가 변경됨"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "암호가 잘못됨"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "암호를 변경하는 중 알 수 없는 오류 발생"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1424,19 +1495,19 @@ msgstr "첨부 전송 취소"
 msgid "Ban User"
 msgstr "사용자 차단"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "사용자를 차단하는 이유"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "차단"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1699,7 +1770,11 @@ msgid "Topic:"
 msgstr "주제:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this parent official"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "이 부모를 공식으로 설정"
 
@@ -1723,7 +1798,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1747,9 +1822,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr "이 상태를 설정하기에 자식 대화방에서 충분한 권한 수준이 없음"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "이 별명을 대화방의 주 별명으로 설정"
 
@@ -2023,7 +2101,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "스티커와 이모지"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2033,7 +2111,7 @@ msgstr ""
 "다."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "대화방 탐색"
@@ -2137,7 +2215,7 @@ msgid "Remove Message"
 msgstr "메시지 삭제"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2187,146 +2265,146 @@ msgstr "대화방 이름:"
 msgid "Room topic:"
 msgstr "대화방 주제:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "대화방 ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "클립보드에 대화방 ID 복사"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "대화방 버전"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "대화방 업그레이드"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "별칭"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "주 별명이 설정되지 않음"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "이 별명을 대화방의 주 별명으로 설정"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "별명 삭제"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "새 별명 추가"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL 미리 보기"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "기본값으로 대화방 구성원에 대하여 URL 미리 보기 활성화"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL 미리 보기 활성화"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "이 대화방에는 URL 미리 보기가 기본값으로 활성화되어 있음"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "이 대화방에는 URL 미리 보기가 기본값으로 비활성화되어 있음"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "공식 부모 스페이스"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "주 별명:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "주 별명이 설정되지 않음"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "부모 삭제"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "이 대화방에는 공식 부모 스페이스가 없습니다."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "Add Official Parent Space"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "공식 부모 스페이스 추가"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "이 대화방에서 다른 대화가 진행 중입니다."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "이전 메시지 보기…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "이 대화방이 대체되었습니다."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "새 대화방 보기…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "대화방 업그레이드"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "새 버전 선택"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "확인"
@@ -2698,17 +2776,17 @@ msgstr "사용자 찾기..."
 msgid "Add"
 msgstr "추가"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "사용자를 찾을 수 없음"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "초대 보내기"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "사용자가 이미 대화방에 소속되어 있거나 초대됨"
@@ -2770,12 +2848,12 @@ msgstr "서버 URL 입력(예: kde.org)"
 msgid "Server URL"
 msgstr "서버 URL"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgctxt "@info:label"
 #| msgid "No rooms found"
@@ -3103,7 +3181,7 @@ msgstr "메시지 강조 사용"
 msgid "Delete keyword"
 msgstr "키워드 삭제"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3274,13 +3352,13 @@ msgstr "이 스페이스의 하위 항목 설정"
 msgid "Set the parent space of this room"
 msgstr "이 대화방의 상위 스페이스 설정"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "사용자 %1명의 투표에 의함"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3384,17 +3462,17 @@ msgstr "메시지 삭제"
 msgid "Remove Message"
 msgstr "메시지 삭제"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "이 사용자의 최근 메시지를 삭제하는 이유"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "이 메시지를 삭제하는 이유"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3411,7 +3489,7 @@ msgstr "답장 취소"
 msgid "Report Message"
 msgstr "메시지 신고"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "이 메시지를 신고하는 이유"
@@ -3558,28 +3636,28 @@ msgstr "구성원 집계 없음"
 msgid "View notifications"
 msgstr "알림 음소거"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "대화방을 찾을 수 없음"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "시작하려면 대화방에 입장하십시오"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "대화방 디렉터리에서 검색"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "%1 접기"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3825,6 +3903,12 @@ msgstr "선택한 대화방이 스페이스가 아님"
 msgid "You do not have the privileges to complete this action"
 msgstr "이 작업을 수행하기에 충분한 권한이 없음"
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "이 별명을 대화방의 주 별명으로 설정"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgid "Select type"
@@ -4094,12 +4178,12 @@ msgstr "SSO URL 다시 열기"
 msgid "Chat"
 msgstr "채팅"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "기존 대화에 참가"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "새 대화 만들기"
@@ -4123,22 +4207,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "첫 읽지 않은 메시지로 이동"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "최신 메시지로 이동"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "공유할 항목을 여기에 드래그"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4446,47 +4530,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "뒤로 가기"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "서버가 없습니다."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "서버를 확인하고 있습니다."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "올바른 서버가 아닙니다."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "이 서버에 등록이 비활성화되어 있습니다."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "사용자 이름이 없습니다."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "사용자 이름 사용 가능 여부를 확인하고 있습니다."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "이 사용자 이름을 사용할 수 없습니다."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "계속"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "작업 중"
@@ -4542,16 +4626,22 @@ msgstr "운영 체제에서 링크를 열 수 있는 앱을 찾을 수 없습니
 msgid "Could not open URL"
 msgstr "URL을 열 수 없음"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "표시"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "끝내기"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[검열됨]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[검열됨: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "입장하려는 대화방의 ID가 잘못됨"
 
@@ -4659,27 +4749,6 @@ msgstr "끝내기"
 #~ msgid "No Canonical Alias"
 #~ msgstr "주 별명 없음"
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "님이 표시 이름을 지움"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "알림 표시"
-
-#, fuzzy
-#~| msgid "%1 invited you to a room"
-#~ msgid "Invites to a room"
-#~ msgstr "%1 님이 대화방에 초대함"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "초대 보내기"
-
 #, fuzzy
 #~| msgid "Custom Emoji"
 #~ msgctxt "@title:window"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-02-25 01:00+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,78 +18,78 @@ 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:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr ""
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr ""
@@ -420,7 +420,7 @@ msgstr ""
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -429,7 +429,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -963,16 +963,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr ""
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1019,13 +1009,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr ""
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr ""
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1034,7 +1089,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1073,28 +1128,28 @@ msgstr ""
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr ""
@@ -1120,40 +1175,40 @@ msgstr ""
 msgid "Reply..."
 msgstr ""
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr ""
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr ""
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr ""
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr ""
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr ""
@@ -1201,7 +1256,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr ""
@@ -1270,6 +1325,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1314,21 +1384,6 @@ msgstr ""
 msgid "Add Account"
 msgstr ""
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1431,19 +1486,19 @@ msgstr ""
 msgid "Ban User"
 msgstr ""
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr ""
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1702,6 +1757,9 @@ msgstr ""
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1725,7 +1783,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1749,8 +1807,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2021,7 +2082,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2029,7 +2090,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
@@ -2130,7 +2191,7 @@ msgid "Remove Message"
 msgstr ""
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2180,143 +2241,143 @@ msgstr ""
 msgid "Room topic:"
 msgstr ""
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr ""
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr ""
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr ""
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr ""
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr ""
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr ""
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr ""
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr ""
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -2686,17 +2747,17 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2758,12 +2819,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3085,7 +3146,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3252,7 +3313,7 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3260,7 +3321,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3361,17 +3422,17 @@ msgstr ""
 msgid "Remove Message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3388,7 +3449,7 @@ msgstr ""
 msgid "Report Message"
 msgstr ""
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3537,28 +3598,28 @@ msgstr ""
 msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3793,6 +3854,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4059,12 +4125,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr ""
@@ -4088,22 +4154,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4402,47 +4468,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4498,12 +4564,12 @@ msgstr ""
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr ""
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr ""

po/nl/neochat.po

@@ -2,94 +2,95 @@
 # This file is distributed under the same license as the neochat package.
 #
 # SPDX-FileCopyrightText: 2020, 2021, 2022, 2023 Freek de Kruijf <freekdekruijf@kde.nl>
+# Freek de Kruijf <f.de.kruijf@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 10:47+0100\n"
-"Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 14:26+0100\n"
+"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 23.08.3\n"
+"X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Push-meldingen ontvangen"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Aanmelden is mislukt: toegangstoken ongeldig of ingetrokken"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Aanmelden mislukt: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Netwerkfout: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Toegangstoken is niet gevonden"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Misschien is het verwijderd?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Toegang tot sleutelring is geweigerd."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "laat NeoChat het toegangstoken lezen"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Geen sleutelring beschikbaar"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Installeer een sleutelring, bijv. KWallet of GNOME sleutelring op Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Lezen van toegangstoken lukt niet"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Bestand is te groot om te downloaden."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Neem contact op met uw matrix-serverbeheerder voor ondersteuning."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Dit bericht is verwijderd]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Dit bericht is verwijderd: %1]</i>"
@@ -420,14 +421,14 @@ msgstr "heeft de status bijgewerkt"
 msgid "started a poll"
 msgstr "heeft een raadpleging (poll) gestart"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 gebruiker: "
 msgstr[1] "%1 gebruikers "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -961,16 +962,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Eigen emoji's"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[GEREDIGEERD]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[GEREDIGEERD: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1014,13 +1005,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>een {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Meldingen voor dit account inschakelen"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Berichten in een-op-een chats"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Versleutelde berichten in een-op-een chats"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Berichten in groeps-chats"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Berichten in versleutelde groeps-chats"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Berichten over opwaarderen van room"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Berichten die mijn schermnaam bevatten"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Berichten die mijn Matrix gebruikers-ID noemen"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Berichten die een room noemen"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Berichten die het lokale deel van mijn Matrix-ID bevatten"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Meldingen van gehele room (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Uitnodigen aan een room"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Uitnodigingsoproep"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " en "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1028,7 +1084,7 @@ msgid_plural " and %1 others"
 msgstr[0] " en %1 andere"
 msgstr[1] " en %1 anderen"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1066,28 +1122,28 @@ msgstr "Lage prioriteit"
 msgid "Spaces"
 msgstr "Spaties"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Aanmaken van room is mislukt: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ruimte aanmaken is mislukt: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapport met succes verzonden."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Bte: %1, Lte: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Versleuteld bericht"
@@ -1113,40 +1169,40 @@ msgstr "Beantwoorden"
 msgid "Reply..."
 msgstr "Beantwoorden..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 heeft u uitgenodigd naar de room"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Deze uitnodiging in NeoChat openen"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Accepteren"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Gebruiker afwijzen en negeren"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Neochat openen"
@@ -1194,7 +1250,7 @@ msgid "Label:"
 msgstr "Label:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Opslaan"
@@ -1263,6 +1319,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Deactiveren van account bevestigen"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Wachtwoord is met succes gewijzigd"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Verkeerde wachtwoord ingevoerd"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Onbekend probleem bij poging het wachtwoord te wijzigen"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1307,21 +1378,6 @@ msgstr "Accounts"
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Wachtwoord is met succes gewijzigd"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Verkeerde wachtwoord ingevoerd"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Onbekend probleem bij poging het wachtwoord te wijzigen"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1424,19 +1480,19 @@ msgstr "Verzenden van bijlage annuleren"
 msgid "Ban User"
 msgstr "Gebruiker verbannen"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Reden om deze gebruiker te verbannen"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Verbannen"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1701,6 +1757,9 @@ msgstr "Onderwerp:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Deze ouder officieel maken"
 
@@ -1724,7 +1783,7 @@ msgstr "Room kiezen"
 
 #: 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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1751,8 +1810,11 @@ msgstr ""
 "U hebt niet het vereiste rechtenniveau in het kind om deze status in te "
 "stellen"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Deze ruimte de canonieke ouder maken"
 
@@ -2027,7 +2089,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Stickers & Emoji's"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2037,7 +2099,7 @@ msgstr ""
 "dit apparaat."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Rooms verkennen"
@@ -2138,7 +2200,7 @@ msgid "Remove Message"
 msgstr "Bericht verwijderen"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2188,143 +2250,143 @@ msgstr "Naam van room:"
 msgid "Room topic:"
 msgstr "Onderwerp van room:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Room-id"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Room-ID kopiëren naar klembord"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versie van room"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Room opwaarderen"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliassen"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Geen canonieke alias ingesteld"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Deze alias de canonieke alias van de room maken"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Alias verwijderen"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Nieuwe alias toevoegen"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL voorbeelden"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "URL voorbeelden standaard inschakelen voor roomleden"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL voorbeelden inschakelen"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL voorbeelden zijn ingeschakeld voor dit room"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL voorbeelden zijn uitgeschakeld voor dit room"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Officiële ruimten voor ouders"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Canoniek"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Canonieke ouder maken"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Ouder verwijderen"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Deze room heeft geen officiële ouderruimten."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Nieuwe officiële ouderruimte toevoegen"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Deze room laat een andere conversatie verdergaan."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Zie oudere berichten…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Deze room is vervangen."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Zie nieuwe room…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "De room opwaarderen"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Nieuwe versie selecteren"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Bevestigen"
@@ -2699,17 +2761,17 @@ msgstr "Een gebruiker zoeken..."
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Geen gebruikers beschikbaar"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Uitnodiging versturen"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Gebruiker is of al een lid of is uitgenodigd"
@@ -2771,12 +2833,12 @@ msgstr "Server-URL invoeren bijv. kde.org"
 msgid "Server URL"
 msgstr "URL-adres server"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Een room-adres invoeren"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3100,7 +3162,7 @@ msgstr "Accentueringen van berichten inschakelen"
 msgid "Delete keyword"
 msgstr "Trefwoord verwijderen"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3272,14 +3334,14 @@ msgstr "De kinderen van deze ruimte instellen"
 msgid "Set the parent space of this room"
 msgstr "De ouderruimte van deze room instellen"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Gebaseerd op stem van %1 gebruiker"
 msgstr[1] "Gebaseerd op stemmen van %1 gebruikers"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3382,17 +3444,17 @@ msgstr "Berichten verwijderen"
 msgid "Remove Message"
 msgstr "Bericht verwijderen"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Reden om deze recente berichten van de gebruiker te verwijderen"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Reden om dit bericht te verwijderen"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3409,7 +3471,7 @@ msgstr "Antwoord annuleren"
 msgid "Report Message"
 msgstr "Bericht rapporteren"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Reden om dit bericht te rapporteren"
@@ -3556,28 +3618,28 @@ msgstr "Geen aantal leden"
 msgid "View notifications"
 msgstr "Meldingen bekijken"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Geen rooms gevonden"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Doe mee met sommige rooms om te beginnen"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "In map van room zoeken"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "%1 invouwen"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3825,6 +3887,11 @@ msgstr "De geselecteerde room is geen ruimte"
 msgid "You do not have the privileges to complete this action"
 msgstr "U hebt niet de vereiste rechten om deze actie te voltooien"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Deze ruimte de canonieke ouder maken"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4093,12 +4160,12 @@ msgstr "SSO URL opnieuw openen"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Meedoen met bestaande chat"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Nieuwe chat aanmaken"
@@ -4125,22 +4192,22 @@ msgid ""
 msgstr ""
 "Dit is het begin van de chat. Er zijn geen historische berichten na dit punt."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Naar het eerste ongelezen bericht gaan"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Naar het laatste bericht gaan"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Items hierheen verslepen om ze te delen"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4471,47 +4538,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Ga terug"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Geen server."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Beschikbaarheid van server controleren."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Dit is geen geldige server."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registratie voor deze server is uitgeschakeld."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Geen gebruikersnaam."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Beschikbaarheid van gebruikersnaam controleren."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Deze gebruikersnaam is niet beschikbaar."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Werkend"
@@ -4569,16 +4636,22 @@ msgstr "Uw besturingssysteem kon geen toepassing vinden voor de koppeling."
 msgid "Could not open URL"
 msgstr "Kon de URL niet openen"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Tonen"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Afsluiten"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[GEREDIGEERD]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[GEREDIGEERD: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Het room-id waaraan u mee wilt doen is niet geldig"
 
@@ -4692,36 +4765,9 @@ msgstr "Afsluiten"
 #~ "Deze room is versleuteld. Bouw libQuotient met versleuteling ingeschakeld "
 #~ "en verzend versleutelde berichten."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Berichten in een-op-een chats"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Versleutelde berichten in een-op-een chats"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Berichten in groeps-chats"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Berichten in versleutelde groeps-chats"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Berichten over opwaarderen van room"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Berichten die mijn schermnaam bevatten"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Meldingen van gehele room (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Berichten die mijn trefwoorden bevatten"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Uitnodigen in een room"
-
-#~ msgid "Call invitation"
-#~ msgstr "Uitnodigingsoproep"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Aangepaste emoji's"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+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,79 +20,79 @@ msgstr ""
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Send varsling om skriving"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Feil ved innlogging: Ugyldig eller tilbaketrekt tilgangspollett"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Feil ved innlogging: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Nettverksfeil: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Fann ikkje tilgangspollett"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Kanskje han er sletta?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Vart nekta tilgang til nøkkelring."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Gje NeoChat løyve til å lesa tilgangspolletten"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Ingen nøkkelring er tilgjengeleg."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Klarte ikkje lesa tilgangspollett"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Fila er for stor til å kunna lastast ned."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Denne meldinga er sletta]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Denne meldinga er sletta: %1]</i>"
@@ -424,14 +424,14 @@ msgstr "oppdaterte tilstanden"
 msgid "started a poll"
 msgstr "starta ei avstemming"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 brukar: "
 msgstr[1] "%1 brukarar: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -967,17 +967,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Eigne emojiar"
 
-# Eller «SENSURERT»?
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[TREKT TILBAKE]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[TREKT TILBAKE: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1022,13 +1011,90 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Slå på varslingar for kontoen"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Show deleted messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Vis sletta meldingar"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Cancel editing display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Avbryt redigering av visingsnamn"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Room Notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Romvarslingar"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invite user to room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Inviter brukar til rommet"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Send invitasjon"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " og "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1036,7 +1102,7 @@ msgid_plural " and %1 others"
 msgstr[0] " og %1 annan"
 msgstr[1] " og %1 andre"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1077,28 +1143,28 @@ msgstr "Lågt prioriterte"
 msgid "Spaces"
 msgstr "Område"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Feil ved romregistrering: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Feil ved registrering av område: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapporten er no send."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Breiddegr.: %1 – lengdegr.: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Kryptert melding"
@@ -1124,42 +1190,42 @@ msgstr "Svar"
 msgid "Reply..."
 msgstr "Svar …"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 inviterte deg til eit rom"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Opna invitasjonen i NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Godta"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Avvis"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1208,7 +1274,7 @@ msgid "Label:"
 msgstr "Merkelapp:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Lagra"
@@ -1277,6 +1343,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Passordet er no endra"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Du skreiv inn feil passord"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Ukjent problem ved endring av passord"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1321,21 +1402,6 @@ msgstr "Kontoar"
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Passordet er no endra"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Du skreiv inn feil passord"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Ukjent problem ved endring av passord"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1438,19 +1504,19 @@ msgstr "Avbryt sending av vedlegg"
 msgid "Ban User"
 msgstr "Utesteng brukar"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Grunngjeving for utestenging av brukaren"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Utesteng"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1717,9 +1783,13 @@ msgid "Topic:"
 msgstr "Manglar emne"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Gjer aliaset til kanonisk alias for rommet"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1741,7 +1811,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1765,9 +1835,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
@@ -2041,7 +2114,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2051,7 +2124,7 @@ msgstr ""
 "denne eininga."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Utforsk rom"
@@ -2155,7 +2228,7 @@ msgid "Remove Message"
 msgstr "Fjern melding"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2205,150 +2278,150 @@ msgstr "Namn på rommet:"
 msgid "Room topic:"
 msgstr "Emne for rommet:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Rom-ID"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Kopier rom-ID til utklippstavla"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Romversjon"
 
 # Namn på knapp for å oppdatera det valde rommet. Bør derfor vera i bunden form.
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Oppgrader rommet"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Gjer aliaset til kanonisk alias for rommet"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Slett aliaset"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nytt_alias:tenar.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Registrer nytt alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Førehandsvising av nettadresser"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Slå på førehandsvising av nettadresser for rommedlemmar"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Slå på førehandsvising av nettadresser"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Førehandsvising av nettadresser er som standard slått på for dette rommet"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Førehandsvising av nettadresser er som standard slått av for dette rommet"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Fjern melding"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Rommet er bytt ut."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Ikkje noko kanonisk alias registrert"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Rommet er framhald av ein tidlegare samtale."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Vis eldre meldingar …"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Rommet er bytt ut."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Sjå det nye rommet …"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Oppgrader rommet"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Vel ny versjon"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Stadfest"
@@ -2721,17 +2794,17 @@ msgstr "Finn brukar …"
 msgid "Add"
 msgstr "Legg til"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Ingen brukarar er tilgjengelege"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Send invitasjon"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Brukaren er alt medlem eller invitert"
@@ -2794,12 +2867,12 @@ msgstr "Skriv inn adressa til tenaren, eks. kde.org"
 msgid "Server URL"
 msgstr "Tenaradresse"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgctxt "@info:label"
 #| msgid "No rooms found"
@@ -3128,7 +3201,7 @@ msgstr "Slå på framheving av meldingar"
 msgid "Delete keyword"
 msgstr "Slett nøkkelord"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3307,14 +3380,14 @@ msgstr "Definera underrom til området"
 msgid "Set the parent space of this room"
 msgstr "Definera forelderområdet til rommet"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Basert på avstemming for %1 brukar"
 msgstr[1] "Basert på avstemming blant %1 brukarar"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3418,17 +3491,17 @@ msgstr "Fjern meldingar"
 msgid "Remove Message"
 msgstr "Fjern melding"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Grunngjeving for fjerning av brukaren sine nylege meldingar"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Grunngjeving for fjerning av meldinga"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3445,7 +3518,7 @@ msgstr "Avbryt svar"
 msgid "Report Message"
 msgstr "Rapporter melding"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Grunngjeving for rapportering av meldinga"
@@ -3596,28 +3669,28 @@ msgstr "Manglar medlemstal"
 msgid "View notifications"
 msgstr "Demp varslingar"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Fann ingen rom"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Start ved å verta med i nokre rom"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Søk i romkatalogen"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Fald saman %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3871,6 +3944,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Gjer aliaset til kanonisk alias for rommet"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4153,12 +4232,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Prat"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Vert med i prat"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Start ny prat"
@@ -4182,22 +4261,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Gå til første ulesne melding"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Gå til nyaste melding"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4519,47 +4598,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr ""
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr ""
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr ""
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4617,15 +4696,19 @@ msgstr "Operativsystemet fann ikkje noko program som kan opna lenkja."
 msgid "Could not open URL"
 msgstr "Klarte ikkje opna lenkja"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Vis"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#~ msgid "The room id you are trying to join is not valid"
-#~ msgstr "Rom-ID-en du prøver å bruka, er ikkje gyldig"
+# Eller «SENSURERT»?
+#~ msgid "[REDACTED]"
+#~ msgstr "[TREKT TILBAKE]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[TREKT TILBAKE: %1]"

po/pa/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2021-12-31 11:06-0800\n"
 "Last-Translator: A S Alam <aalam@satluj.org>\n"
 "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
@@ -17,81 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 21.04.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgid "Receiving push notifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "ਲਾਗਇਨ ਫ਼ੇਲ੍ਹ ਹੈ: ਪਹੁੰਚ ਟੋਕਨ ਗੈਰ-ਵਾਜਬ ਜਾਂ ਮਨਸੂਖ ਕੀਤਾ ਹੈ"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "ਲਾਗਇਨ ਫੇਲ੍ਹ ਹੈ: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "ਨੈੱਟਵਰਕ ਗ਼ਲਤੀ: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, fuzzy, kde-format
 #| msgid "Access Token (Optional)"
 msgid "Access token wasn't found"
 msgstr "ਪਹੁੰਚ ਟੋਕਨ (ਚੋਣਵਾਂ)"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "No keychain available."
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[ਇਹ ਸੁਨੇਹਾ ਹਟਾਇਆ ਗਿਆ ਸੀ]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[ਇਹ ਸੁਨੇਹਾ ਹਟਾਇਆ ਗਿਆ ਸੀ: %1]</i>"
@@ -440,14 +440,14 @@ msgstr "%1 ਹਾਲਤ ਅੱਪਡੇਟ ਕੀਤੀ"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -1048,16 +1048,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "ਕਸਟਮ"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1103,13 +1093,94 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "ਸੁਨੇਹਾ ਭੇਜੋ"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "ਆਪਣੇ ਵੇਖਾਉਣ ਵਾਲੇ ਨਾਂ ਮਿਟਾਏ"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "ਆਪਣੇ ਵੇਖਾਉਣ ਵਾਲੇ ਨਾਂ ਮਿਟਾਏ"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "%1 invited you to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "%1 ਨੇ ਤੁਹਾਨੂੰ ਰੂਮ ਲਈ ਸੱਦਾ ਦਿੱਤਾ"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "ਸੱਦਾ ਭੇਜੋ"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " ਅਤੇ "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1117,7 +1188,7 @@ msgid_plural " and %1 others"
 msgstr[0] " ਅਤੇ %1 ਹੋਰ"
 msgstr[1] " ਅਤੇ %1 ਹੋਰ"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1155,31 +1226,31 @@ msgstr "ਘੱਟ ਤਰਜੀਹ"
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "ਰੂਮ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: \"%1\""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "ਰੂਮ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: \"%1\""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, fuzzy, kde-format
 #| msgid "Password changed successfully"
 msgid "Report sent successfully."
 msgstr "ਪਾਸਵਰਡ ਕਾਮਯਾਬੀ ਨਾਲ ਬਦਲਿਆ ਹੈ"
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Encrypted Message"
@@ -1206,42 +1277,42 @@ msgstr "ਜਵਾਬ ਦਿਓ"
 msgid "Reply..."
 msgstr "...ਜਵਾਬ ਦਿਓ"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 ਨੇ ਤੁਹਾਨੂੰ ਰੂਮ ਲਈ ਸੱਦਾ ਦਿੱਤਾ"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "ਇਹ ਸੱਦਾ ਨਿਓ-ਚੈਟ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ ਕਰੋ"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1294,7 +1365,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
@@ -1371,6 +1442,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "ਪਾਸਵਰਡ ਕਾਮਯਾਬੀ ਨਾਲ ਬਦਲਿਆ ਹੈ"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "ਪਾਸਵਰਡ ਬਦਲਣ ਦੇ ਦੌਰਾਨ ਅਣਪਛਾਤੀ ਗਲਤੀ ਆਈ"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1420,21 +1506,6 @@ msgstr "ਖਾਤੇ"
 msgid "Add Account"
 msgstr "ਖਾਤਾ ਜੋੜੋ"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "ਪਾਸਵਰਡ ਕਾਮਯਾਬੀ ਨਾਲ ਬਦਲਿਆ ਹੈ"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "ਗਲਤ ਪਾਸਵਰਡ ਦਿੱਤਾ"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "ਪਾਸਵਰਡ ਬਦਲਣ ਦੇ ਦੌਰਾਨ ਅਣਪਛਾਤੀ ਗਲਤੀ ਆਈ"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, fuzzy, kde-format
 #| msgid "Appearance"
@@ -1546,20 +1617,20 @@ msgstr "ਆਪਣੇ ਵੇਖਾਉਣ ਵਾਲੇ ਨਾਂ ਮਿਟਾਏ"
 msgid "Ban User"
 msgstr "ਇਹ ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 #| msgid "Unban this user"
 msgid "Reason for banning this user"
 msgstr "ਇਹ ਵਰਤੋਂਕਾਰ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1844,6 +1915,9 @@ msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1867,7 +1941,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1892,8 +1966,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2188,7 +2265,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2196,7 +2273,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "ਰੂਮ ਛਾਣੋ"
@@ -2302,7 +2379,7 @@ msgid "Remove Message"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੋਧੋ"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2356,158 +2433,158 @@ msgstr "ਰੂਮ ਦਾ ਨਾਂ:"
 msgid "Room topic:"
 msgstr "ਰੂਮ ਦਾ ਵਿਸ਼ਾ:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Rooms"
 msgid "Room ID"
 msgstr "ਰੂਮ"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
 #| msgid "Copy address to clipboard"
 msgid "Copy room ID to clipboard"
 msgstr "ਸਿਰਨਾਵਾਂ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Room information"
 msgid "Room version"
 msgstr "ਰੂਮ ਦੀ ਜਾਣਕਾਰੀ"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
 msgid "Upgrade Room"
 msgstr "ਰੂਮ ਛਾਣੋ"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "ਹਟਾਓ"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are enabled by default in this room"
 msgstr "ਇਸ ਰੂਮ ਵਿੱਚ ਨਿਓ-ਚੈਟ ਖੋਲ੍ਹੋ"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are disabled by default in this room"
 msgstr "ਇਸ ਰੂਮ ਵਿੱਚ ਨਿਓ-ਚੈਟ ਖੋਲ੍ਹੋ"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੋਧੋ"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "ਇਸ ਰੂਮ ਨੂੰ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "ਇਹ ਰੂਮ ਹੋਰ ਗੱਲਬਾਤ ਜਾਰੀ ਰੱਖਦਾ ਹੈ।"
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "See older messages..."
 msgid "See older messages…"
 msgstr "...ਪੁਰਾਣੇ ਸੁਨੇਹੇ ਵੇਖੋ"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "ਇਸ ਰੂਮ ਨੂੰ ਬਦਲਿਆ ਗਿਆ ਹੈ।"
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "See new room…"
 msgstr "ਨਵਾਂ ਰੂਮ ਵੇਖੋ..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "ਰੂਮ ਛੱਡਿਆ"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "Select new version"
 msgstr "ਨਵਾਂ ਰੂਮ ਵੇਖੋ..."
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "ਤਸਦੀਕ ਕਰੋ"
@@ -2897,17 +2974,17 @@ msgstr "...ਵਰਤੋਂਕਾਰ ਲੱਭੋ"
 msgid "Add"
 msgstr "ਜੋੜੋ"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "ਸੱਦਾ ਭੇਜੋ"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2970,14 +3047,14 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<room-address>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3326,7 +3403,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "ਸ਼ਬਦ ਹਟਾਓ"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgctxt "@title"
@@ -3511,14 +3588,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "%1 ਨੇ ਤੁਹਾਨੂੰ ਰੂਮ ਲਈ ਸੱਦਾ ਦਿੱਤਾ"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3625,17 +3702,17 @@ msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੋਧੋ"
 msgid "Remove Message"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੋਧੋ"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3655,7 +3732,7 @@ msgstr "ਰੱਦ ਕਰੋ"
 msgid "Report Message"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਸੋਧੋ"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3824,28 +3901,28 @@ msgstr "ਕੋਈ ਮੈਂਬਰ ਗਿਣਤੀ ਨਹੀਂ"
 msgid "View notifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "ਕੋਈ ਰੂਮ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੁਝ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "ਰੂਮ ਦੀ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਖੋਜੋ"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -4099,6 +4176,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4387,12 +4469,12 @@ msgstr ""
 msgid "Chat"
 msgstr "ਚੈਟ"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create new chat"
@@ -4417,22 +4499,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "ਪਹਿਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "ਸਭ ਤੋਂ ਨਵੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4742,52 +4824,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "ਹੋਮ-ਸਰਵਰ:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "ਕੋਈ ਨਾਂ ਨਹੀਂ"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "ਕੋਈ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "ਜਾਰੀ ਰੱਖੋ"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4845,12 +4927,12 @@ msgstr "ਤੁਹਾਡਾ ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਲਿੰਕ
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "ਵੇਖਾਓ"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "ਬਾਹਰ"
@@ -4932,27 +5014,6 @@ msgstr "ਬਾਹਰ"
 #~ msgid "Back"
 #~ msgstr "ਪਿੱਛੇ"
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "ਆਪਣੇ ਵੇਖਾਉਣ ਵਾਲੇ ਨਾਂ ਮਿਟਾਏ"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਓ"
-
-#, fuzzy
-#~| msgid "%1 invited you to a room"
-#~ msgid "Invites to a room"
-#~ msgstr "%1 ਨੇ ਤੁਹਾਨੂੰ ਰੂਮ ਲਈ ਸੱਦਾ ਦਿੱਤਾ"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "ਸੱਦਾ ਭੇਜੋ"
-
 #, fuzzy
 #~| msgid "Custom"
 #~ msgctxt "@title:window"

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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-11 13:59+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-16 11:13+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmai.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 23.08.1\n"
+"X-Generator: Lokalize 23.08.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Otrzymywanie powiadomień Push"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Nie udało się wejść: token dostępowy nieprawidłowy lub unieważniony"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Nie udało się wejść: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Błąd sieciowy: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Nie znaleziono żadnego tokena dostępu"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Może został usunięty?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Odmówiono dostępu do pęku kluczy."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Zezwól NeoChatowi odczytać tokena dostępowego"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Brak pęku kluczy."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Nie można odczytać tokena dostępu"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Plik jest zbyt duży do pobrania."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Wiadomość została usunięta]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Wiadomość została usunięta: %1]</i>"
@@ -421,7 +421,7 @@ msgstr "uaktualnił(a) stan"
 msgid "started a poll"
 msgstr "rozpoczął(ęła) głosowanie"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -429,7 +429,7 @@ msgstr[0] "1 użytkownik: "
 msgstr[1] "%1 użytkowników: "
 msgstr[2] "%1 użytkowników: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -560,7 +560,7 @@ msgstr "Pomijaj wszystkie błędy SSL, np. o niepodpisanych certyfikatach."
 #: src/main.cpp:179
 #, kde-format
 msgid "Only used for autotests"
-msgstr ""
+msgstr "Tylko dla samosprawdzania"
 
 #: src/main.cpp:184
 #, kde-format
@@ -963,25 +963,14 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Własne emoji"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ZREDAGOWANO]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ZREDAGOWANO: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
-#, fuzzy, kde-format
-#| msgid ": %1"
+#, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
 msgid " %1"
 msgid_plural " %1 %2 times"
-msgstr[0] ": %1"
-msgstr[1] ": %1"
-msgstr[2] ": %1"
+msgstr[0] " %1"
+msgstr[1] " %1 %2 razy"
+msgstr[2] " %1 %2 razy"
 
 #: src/models/messagefiltermodel.cpp:129
 #, kde-format
@@ -1017,15 +1006,80 @@ msgctxt ""
 "states or n users if they were sent by multiple users.chunksText (%2) is a "
 "list of comma separated actions for each of the state events in the group."
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
-msgstr ""
+msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Włącz powiadomienia dla tego konta"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Wiadomości w rozmowach jeden na jednego"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Zaszyfrowane wiadomości w rozmowach jeden na jednego"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Wiadomości w rozmowach grupowych"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Wiadomości w zaszyfrowanych rozmowach grupowych"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Wiadomości uaktualnień pokoju"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Wiadomości zawierające moją wyświetlaną nazwę"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Wiadomości, które wspominają moje ID Matriksa"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Wiadomości, które wspominają pokój"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Wiadomości, zawierające lokalną część mojego ID Matriksa"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Powiadomienia w całym pokoju (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Zaprasza do pokoju"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Zaproszenie do rozmowy"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " oraz "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1034,7 +1088,7 @@ msgstr[0] " i %1 inny"
 msgstr[1] " i %1 innych"
 msgstr[2] " i %1 innych"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1073,28 +1127,28 @@ msgstr "Niski priorytet"
 msgid "Spaces"
 msgstr "Odstępy"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Nie udało się utworzyć pokoju: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Nie udało się utworzyć przestrzeni: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Pomyślnie wysłano zgłoszenie."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Szer.: %1, Dł.: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Zaszyfrowana wiadomość"
@@ -1120,44 +1174,43 @@ msgstr "Odpowiedz"
 msgid "Reply..."
 msgstr "Odpowiedz..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 zaprosił cię do pokoju"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Otwórz to zaproszenie w NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Przyjmij"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Odrzuć lub pomijaj użytkownika"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
-#, fuzzy, kde-format
-#| msgid "NeoChat"
+#: src/notificationsmanager.cpp:331
+#, kde-format
 msgid "Open NeoChat"
-msgstr "NeoChat"
+msgstr "Otwórz NeoChat"
 
 #: src/qml/About.qml:11
 #, kde-format
@@ -1202,7 +1255,7 @@ msgid "Label:"
 msgstr "Etykieta:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Zapisz"
@@ -1271,6 +1324,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Potwierdź wyłączenie konta"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Hasło zmieniono pomyślnie"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Wpisano złe hasło"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Wystąpił nieznany problem podczas próby zmiany hasła"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1315,21 +1383,6 @@ msgstr "Konta"
 msgid "Add Account"
 msgstr "Dodaj konto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Hasło zmieniono pomyślnie"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Wpisano złe hasło"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Wystąpił nieznany problem podczas próby zmiany hasła"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1432,19 +1485,19 @@ msgstr "Wyłącz wysyłanie załączników"
 msgid "Ban User"
 msgstr "Zbanuj użytkownika"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Powód zbanowania tego użytkownika"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Zbanuj"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1707,6 +1760,9 @@ msgstr "Temat:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Uczyń tego podrzędnego oficjalnym"
 
@@ -1730,7 +1786,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1758,8 +1814,11 @@ msgstr ""
 "Nie masz wystarczającego poziomu uprawnień w przestrzeni podrzędnej, aby "
 "ustawić ten stan"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Uczyń tę przestrzeń kanoniczną nadrzędną"
 
@@ -2035,7 +2094,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Naklejki i emoji"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2045,7 +2104,7 @@ msgstr ""
 "urządzeniowi."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Przeglądaj pokoje"
@@ -2146,7 +2205,7 @@ msgid "Remove Message"
 msgstr "Usuń wiadomość"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2196,143 +2255,143 @@ msgstr "Nazwa pokoju:"
 msgid "Room topic:"
 msgstr "Temat pokoju:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID pokoju"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Skopiuj ID pokoju do schowka"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Wersja pokoju"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Uaktualnij pokój"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Aliasy"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Nie ustawiono kanonicznego aliasu"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Uczyń ten alias kanonicznym aliasem pokoju"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Usuń alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Dodaj nowy alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Podglądy adresów URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Domyślnie włącz podglądy URL dla członków pokoju"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Włącz podglądy adresów URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Podglądy URL są domyślnie włączone w tym pokoju"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Podglądy URL są domyślnie wyłączone w tym pokoju"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Oficjalne przestrzenie nadrzędne"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Kanoniczny"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Uczyń kanoniczną nadrzędną"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Usuń nadrzędnego"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
-msgstr "Ten pokój ne ma żadnej oficjalnej przestrzeni nadrzędnej."
+msgstr "Ten pokój nie ma żadnej oficjalnej przestrzeni nadrzędnej."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Dodaj nową oficjalną nadrzędną"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "W tym pokoju nadal toczona jest rozmowa."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Zobacz starsze wiadomości…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ten pokój został zastąpiony."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Zobacz nowy pokój…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Uaktualnij pokój"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Wybierz nową wersję"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Potwierdź"
@@ -2704,17 +2763,17 @@ msgstr "Znajdź użytkownika…"
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Brak dostępnych użytkowników"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Wyślij zaproszenie"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Użytkownik jest już członkiem lub został zaproszony"
@@ -2776,12 +2835,12 @@ msgstr "Wpisz adres URL serwera np. kde.org"
 msgid "Server URL"
 msgstr "Adres URL serwera"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Wpisz adres pokoju"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3105,18 +3164,16 @@ msgstr "Włącz skróty wiadomości"
 msgid "Delete keyword"
 msgstr "Usuń słowo kluczowe"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
-#, fuzzy, kde-format
-#| msgid "Notifications"
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
+#, kde-format
 msgctxt "@title"
 msgid "Notifications"
 msgstr "Powiadomienia"
 
 #: src/qml/NotificationsView.qml:34
-#, fuzzy, kde-format
-#| msgid "Notifications"
+#, kde-format
 msgid "No Notifications"
-msgstr "Powiadomienia"
+msgstr "Bez powiadomień"
 
 #: src/qml/OpenFileDialog.qml:12
 #, kde-format
@@ -3280,7 +3337,7 @@ msgstr "Ustaw przestrzeń podrzędną dla tej przestrzeni"
 msgid "Set the parent space of this room"
 msgstr "Ustaw przestrzeń nadrzędną dla tego pokoju"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3288,24 +3345,22 @@ msgstr[0] "Na podstawie głosu %1 użytkownika"
 msgstr[1] "Na podstawie głosów %1 użytkowników"
 msgstr[2] "Na podstawie głosów %1 użytkowników"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
 msgstr "(Zakończone)"
 
 #: src/qml/PowerLevelDialog.qml:15
-#, fuzzy, kde-format
-#| msgid "Edit user power level"
+#, kde-format
 msgctxt "@title"
 msgid "Edit User Power Level"
-msgstr "Zmień uprawnienia użytkownika"
+msgstr "Zmień poziom uprawnień użytkownika"
 
 #: src/qml/PowerLevelDialog.qml:35
-#, fuzzy, kde-format
-#| msgid "Set user power level"
+#, kde-format
 msgid "New power level"
-msgstr "Ustaw poziom uprawnień użytkownika"
+msgstr "Nowy poziom uprawnień"
 
 #: src/qml/PushNotification.qml:26
 #, kde-format
@@ -3392,17 +3447,17 @@ msgstr "Usuń wiadomości"
 msgid "Remove Message"
 msgstr "Usuń wiadomość"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Powód usunięcia ostatnich wiadomości tego użytkownika"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Powód usunięcia tej wiadomości"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3419,7 +3474,7 @@ msgstr "Przerwij odpowiadanie"
 msgid "Report Message"
 msgstr "Zgłoś wiadomość"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Powód zgłoszenia tej wiadomości"
@@ -3563,33 +3618,32 @@ msgid "No member count"
 msgstr "Brak liczby członków"
 
 #: src/qml/RoomListPage.qml:134
-#, fuzzy, kde-format
-#| msgid "Mute notifications"
+#, kde-format
 msgid "View notifications"
-msgstr "Wycisz powiadomienia"
+msgstr "Obejrzyj powiadomienia"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nie znaleziono pokojów"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Aby rozpocząć, dołącz do dowolnego pokoju"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Szukaj w katalogu pokojów"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Zwiń %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3833,6 +3887,11 @@ msgstr "Wybrany pokój nie jest przestrzenią"
 msgid "You do not have the privileges to complete this action"
 msgstr "Nie masz uprawnień, aby ukończyć to działanie"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Uczyń tę przestrzeń kanoniczną nadrzędną"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4000,7 +4059,7 @@ msgstr "Wszystkie pokoje"
 #: src/qml/SpaceHierarchyDelegate.qml:84
 #, kde-format
 msgid "Suggested"
-msgstr ""
+msgstr "Sugerowane"
 
 #: src/qml/SpaceHierarchyDelegate.qml:93
 #, kde-format
@@ -4030,13 +4089,13 @@ msgstr "Usuń"
 #, kde-format
 msgctxt "@button"
 msgid "Don't Make Suggested"
-msgstr ""
+msgstr "Nie czyń sugerowanym"
 
 #: src/qml/SpaceHierarchyDelegate.qml:133
 #, kde-format
 msgctxt "@button"
 msgid "Make Suggested"
-msgstr ""
+msgstr "Uczyń sugerowanym"
 
 #: src/qml/SpaceHomePage.qml:47
 #, kde-format
@@ -4101,12 +4160,12 @@ msgstr "Ponownie otwórz adres URL SSO"
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Dołącz do istniejącej rozmowy"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Utwórz nową rozmowę"
@@ -4129,23 +4188,24 @@ msgid ""
 "This is the beginning of the chat. There are no historical messages beyond "
 "this point."
 msgstr ""
+"Jest to początek rozmowy. Nie ma wiadomości historycznych poza ten punkt."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Przeskocz do pierwszej nieprzeczytanej wiadomości"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Przeskocz do ostatniej wiadomości"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4155,9 +4215,7 @@ msgstr[1] "%2 piszą"
 msgstr[2] "%2 pisze"
 
 #: src/qml/UserDetailDialog.qml:32
-#, fuzzy, kde-format
-#| msgctxt "@title:menu Account detail dialog"
-#| msgid "Account detail"
+#, kde-format
 msgctxt "@title:menu Account details dialog"
 msgid "Account Details"
 msgstr "Szczegóły konta"
@@ -4472,47 +4530,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Przejdź wstecz"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Nie ma żadnego serwera."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Sprawdzanie dostępności serwera."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "To nie jest poprawny serwer."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Rejestrowanie się na ten serwer jest wyłączone."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Brak nazwy użytkownika."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Sprawdzanie dostępności nazwy użytkownika."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Ta nazwa użytkownika jest niedostępna."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Pracuje"
@@ -4570,16 +4628,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Nie można otworzyć adresu URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Zakończ"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ZREDAGOWANO]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ZREDAGOWANO: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Id pokoju, do którego próbujesz dołączyć, jest nieprawidłowy"
 
@@ -4692,36 +4756,9 @@ msgstr "Zakończ"
 #~ "Ten pokój jest zaszyfrowany. Zbuduj libQuotient z włączonym szyfrowaniem, "
 #~ "aby móc wysyłać szyfrowane wiadomości."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Wiadomości w rozmowach jeden na jednego"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Zaszyfrowane wiadomości w rozmowach jeden na jednego"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Wiadomości w rozmowach grupowych"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Wiadomości w zaszyfrowanych rozmowach grupowych"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Wiadomości uaktualnień pokoju"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Wiadomości zawierające moją wyświetlaną nazwę"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Powiadomienia w całym pokoju (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Wiadomości zawierające moje słowa kluczowe"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Zaprasza do pokoju"
-
-#~ msgid "Call invitation"
-#~ msgstr "Zaproszenie do rozmowy"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Własne emoji"

po/pt/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-06-24 10:17+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -19,82 +19,82 @@ msgstr ""
 "X-POFile-SpellExtra: Rusakov Quotient gif webp novaalcunha libQuotient\n"
 "X-POFile-SpellExtra: push Lat Lon\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Enviar as notificações de escrita"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Autenticação sem Sucesso: Código de Acesso inválido ou revogado"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Autenticação sem Sucesso: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Erro de Rede: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "O código de acesso não foi encontrado"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Talvez tenha sido removido?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Foi negado o sucesso ao porta-chaves."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Por favor permita ao NeoChat ler o código de acesso"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Sem sistemas de armazenamento de códigos disponíveis."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Instale por favor um sistema de chaves, p.ex. o KWallet ou o Gnome Keyring "
 "no Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Não é possível ler o código de acesso"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "O ficheiro é demasiado grande para ser transferido."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Contacte o administrador do seu servidor de Matrix para obter algum suporte."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Esta mensagem foi removida]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Esta mensagem foi removida: %1]</i>"
@@ -425,14 +425,14 @@ msgstr "actualizou o estado"
 msgid "started a poll"
 msgstr "iniciou uma sondagem"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 utilizador: "
 msgstr[1] "%1 utilizadores: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -970,16 +970,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Próprios Emojis"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REDIGIDO]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REDIGIDO: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1024,13 +1014,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Activar as notificações desta conta"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Mensagens nas conversas de um-para-um"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Mensagens codificadas nas conversas de um-para-um"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Mensagens nas conversas em grupo"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Mensagens nas conversas em grupo codificadas"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Mensagens de actualização da sala"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Mensagens que contêm o meu nome visível"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Mensagens que contêm o meu nome visível"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Notificações completas da sala (@sala)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Convites para uma sala"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Convite para chamada"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " e "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1038,7 +1115,7 @@ msgid_plural " and %1 others"
 msgstr[0] "e mais %1"
 msgstr[1] "e mais %1"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1076,28 +1153,28 @@ msgstr "Prioridade baixa"
 msgid "Spaces"
 msgstr "Espaços"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Não foi possível criar a sala: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Não foi possível criar o espaço: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "O relatório foi enviado com sucesso."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Lat: %1, Lon: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Mensagem Encriptada"
@@ -1123,42 +1200,42 @@ msgstr "Responder"
 msgid "Reply..."
 msgstr "Responder..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 convidou-o para uma sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Abrir este convite no NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1208,7 +1285,7 @@ msgid "Label:"
 msgstr "Nome:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Gravar"
@@ -1279,6 +1356,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "A senha foi mudada com sucesso"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Foi introduzida uma senha errada"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Ocorreu um problema desconhecido ao tentar mudar a senha"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1323,21 +1415,6 @@ msgstr "Contas"
 msgid "Add Account"
 msgstr "Adicionar uma Conta"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "A senha foi mudada com sucesso"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Foi introduzida uma senha errada"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Ocorreu um problema desconhecido ao tentar mudar a senha"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1440,19 +1517,19 @@ msgstr "Cancelar o envio do anexo"
 msgid "Ban User"
 msgstr "Banir o Utilizador"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Razão para banir este utilizador"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Banir"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1721,9 +1798,13 @@ msgid "Topic:"
 msgstr "Sem Tópico"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Torna este nome a alcunha canónica da sala"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1745,7 +1826,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1770,9 +1851,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Torna este nome a alcunha canónica da sala"
 
@@ -2053,7 +2137,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Autocolantes & Emojis"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2063,7 +2147,7 @@ msgstr ""
 "dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar as salas"
@@ -2168,7 +2252,7 @@ msgid "Remove Message"
 msgstr "Remover a Mensagem"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2218,148 +2302,148 @@ msgstr "Nome da sala:"
 msgid "Room topic:"
 msgstr "Tópico da sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID da Sala"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Copiar o ID da sala para a área de transferência"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Versão da sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Actualizar a Sala"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alcunhas"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Sem alcunha canónica definida"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Torna este nome a alcunha canónica da sala"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Apagar a alcunha"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nova_alcunha:servidor.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Adicionar uma nova alcunha"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Antevisões dos URL's"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Activar as antevisões dos URL's por omissão nos membros da sala"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Activar as antevisões dos URL's"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "As antevisões dos URL's estão activas por omissão nesta sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "As antevisões dos URL's estão desactivadas por omissão nesta sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Canonical"
 msgstr "Sem Código Canónico"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Sem alcunha canónica definida"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Remover a Mensagem"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Esta sala foi substituída."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Sem alcunha canónica definida"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala prossegue com outra conversa."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Ver as mensagens mais antigas…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Esta sala foi substituída."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Ver a sala nova…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Actualizar a Sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Seleccionar a nova versão"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmação"
@@ -2737,17 +2821,17 @@ msgstr "Procurar um utilizador..."
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Sem utilizadores disponíveis"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Enviar um convite"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "O utilizador já é um membro ou foi convidado"
@@ -2810,12 +2894,12 @@ msgstr "Indique o URL do servidor, p.ex. kde.org"
 msgid "Server URL"
 msgstr "URL do Servidor"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3149,7 +3233,7 @@ msgstr "Activar os realces das mensagens"
 msgid "Delete keyword"
 msgstr "Apagar a palavra-chave"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3326,14 +3410,14 @@ msgstr "Definir os filhos deste espaço"
 msgid "Set the parent space of this room"
 msgstr "Definir o espaço-pai desta sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Com base nos votos de %1 utilizador"
 msgstr[1] "Com base nos votos de %1 utilizadores"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3439,17 +3523,17 @@ msgstr "Remover as Mensagens"
 msgid "Remove Message"
 msgstr "Remover a Mensagem"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Razão para remover as mensagens recentes deste utilizador"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Razão para remover esta mensagem"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3466,7 +3550,7 @@ msgstr "Cancelar a resposta"
 msgid "Report Message"
 msgstr "Mensagem de Relatório"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Razão para comunicar esta mensagem"
@@ -3624,28 +3708,28 @@ msgstr "Sem número de membros"
 msgid "View notifications"
 msgstr "Silenciar as notificações"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Não foram encontradas salas"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Junte-se a algumas salas para começar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Procurar na lista de salas"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3901,6 +3985,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Torna este nome a alcunha canónica da sala"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4185,13 +4275,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Conversar"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Autenticar-se numa conta existente"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4216,22 +4306,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ir para a primeira mensagem não-lida"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ir para a última mensagem"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arraste os itens para aqui para os partilhar"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4570,54 +4660,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Adicionar um servidor"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "O texto introduzido não é um URL válido"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Sem nome"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Sem utilizadores disponíveis"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4674,16 +4764,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Não foi possível abrir o URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Sair"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[REDIGIDO]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REDIGIDO: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "O ID da sala a se que está a tentar ligar não é válido"
 
@@ -4792,32 +4888,5 @@ msgstr "Sair"
 #~ "Esta sala está encriptada. Compile a libQuotient com a encriptação activa "
 #~ "para enviar mensagens encriptadas."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Mensagens nas conversas de um-para-um"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Mensagens codificadas nas conversas de um-para-um"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Mensagens nas conversas em grupo"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Mensagens nas conversas em grupo codificadas"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Mensagens de actualização da sala"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Mensagens que contêm o meu nome visível"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Notificações completas da sala (@sala)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Mensagens que contêm as minhas palavras-chave"
-
-#~ msgid "Invites to a room"
-#~ msgstr "Convites para uma sala"
-
-#~ msgid "Call invitation"
-#~ msgstr "Convite para chamada"

po/pt_BR/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-07-05 18:06-0300\n"
 "Last-Translator: Luiz Fernando Ranghetti <elchevive@opensuse.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@kde.org>\n"
@@ -18,79 +18,79 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 22.12.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send Typing Notifications"
 msgid "Receiving push notifications"
 msgstr "Mostrar notificações de digitação"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "O login falhou: Chave de acesso inválida ou revogada"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Falha ao entrar: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Erro de rede: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "O token de acesso não foi encontrado"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Talvez ele foi excluído?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "O acesso ao chaveiro foi negado."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Permita que o NeoChat leia o token de acesso"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Nenhum chaveiro disponível."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr "Instale um chaveiro, como o KWallet ou GNOME Keyring no Linux."
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Não foi possível ler o token de acesso"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Esta mensagem foi excluída]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Esta mensagem foi excluída: %1]</i>"
@@ -444,14 +444,14 @@ msgstr "atualizou o estado %1"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, fuzzy, kde-format
 #| msgctxt "[action 1], [action 2 and action 3]"
 #| msgid ", "
@@ -1048,16 +1048,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Emoji personalizado"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[CENSURADO]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[CENSURADO: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1104,13 +1094,94 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Mostrar notificações"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Enviar mensagem"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "limpou seu nome de exibição"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "limpou seu nome de exibição"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Mostrar notificações"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "%1 invited you to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "%1 convidou você para uma sala"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Enviar convite"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " e "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1118,7 +1189,7 @@ msgid_plural " and %1 others"
 msgstr[0] " e %1 outro"
 msgstr[1] " e %1 outros"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1156,31 +1227,31 @@ msgstr "Prioridade baixa"
 msgid "Spaces"
 msgstr "Espaços"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "Criação de sala falhou: \"%1\""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "Criação de sala falhou: \"%1\""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, fuzzy, kde-format
 #| msgid "Password changed successfully"
 msgid "Report sent successfully."
 msgstr "Senha alterada com sucesso"
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Mensagem criptografada"
@@ -1206,42 +1277,42 @@ msgstr "Responder"
 msgid "Reply..."
 msgstr "Responder..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 convidou você para uma sala"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Abrir este convite no NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1294,7 +1365,7 @@ msgid "Label:"
 msgstr "Legenda:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Salvar"
@@ -1371,6 +1442,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Senha alterada com sucesso"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Senha digitada errada"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Erro desconhecido ao alterar a senha"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1419,21 +1505,6 @@ msgstr "Contas"
 msgid "Add Account"
 msgstr "Adicionar uma conta"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Senha alterada com sucesso"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Senha digitada errada"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Erro desconhecido ao alterar a senha"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, fuzzy, kde-format
 #| msgid "Appearance"
@@ -1546,20 +1617,20 @@ msgstr "limpou seu nome de exibição"
 msgid "Ban User"
 msgstr "Banir este usuário"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 #| msgid "Unban this user"
 msgid "Reason for banning this user"
 msgstr "Desbanir este usuário"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1841,6 +1912,9 @@ msgstr "Nenhum assunto"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1864,7 +1938,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1889,10 +1963,14 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
-#, kde-format
+#: src/qml/CreateRoomDialog.qml:219
+#, fuzzy, kde-format
+#| msgid "No Canonical Alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr ""
+msgstr "Sem apelido canônico"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2189,7 +2267,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2199,7 +2277,7 @@ msgstr ""
 "este dispositivo."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Explorar salas"
@@ -2305,7 +2383,7 @@ msgid "Remove Message"
 msgstr "Editar mensagem"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2359,163 +2437,163 @@ msgstr "Nome da sala:"
 msgid "Room topic:"
 msgstr "Assunto da sala:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Rooms"
 msgid "Room ID"
 msgstr "Salas"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu"
 #| msgid "Copy address to clipboard"
 msgid "Copy room ID to clipboard"
 msgstr "Copiar endereço para a área de transferência"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Room information"
 msgid "Room version"
 msgstr "Informação da sala"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
 msgid "Upgrade Room"
 msgstr "Explorar salas"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, fuzzy, kde-format
 #| msgid "Other Aliases:"
 msgid "Aliases"
 msgstr "Outros apelidos:"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "No canonical alias set"
 msgstr "Sem apelido canônico"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "Excluir"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are enabled by default in this room"
 msgstr "Abrir o NeoChat nesta sala"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are disabled by default in this room"
 msgstr "Abrir o NeoChat nesta sala"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Apelido canônico:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Make canonical parent"
 msgstr "Sem apelido canônico"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "Editar mensagem"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Esta sala foi substituída."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Sem apelido canônico"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Esta sala dá continuidade a outra conversa."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "See older messages..."
 msgid "See older messages…"
 msgstr "Ver mensagens antigas..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Esta sala foi substituída."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "See new room…"
 msgstr "Ver nova sala..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "saiu da sala"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "Select new version"
 msgstr "Ver nova sala..."
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Confirmar"
@@ -2908,17 +2986,17 @@ msgstr "Encontrar um usuário..."
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nenhum usuário disponível"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Enviar convite"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2981,14 +3059,14 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<room-address>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3339,7 +3417,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "Excluir palavra"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgctxt "@title"
@@ -3527,14 +3605,14 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "%1 convidou você para uma sala"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3641,17 +3719,17 @@ msgstr "Editar mensagem"
 msgid "Remove Message"
 msgstr "Editar mensagem"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3671,7 +3749,7 @@ msgstr "Cancelar"
 msgid "Report Message"
 msgstr "Editar mensagem"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3840,28 +3918,28 @@ msgstr "Sem contagem de membros"
 msgid "View notifications"
 msgstr "Mostrar notificações"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nenhuma sala encontrada"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Entre em algumas salas para começar"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Pesquisar na lista de salas"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -4116,6 +4194,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4409,12 +4492,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Bate-papo"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create new chat"
@@ -4439,22 +4522,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Ir para primeira mensagem não lida"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Ir para a mensagem mais antiga"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Arraste itens aqui para compartilhar"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4766,52 +4849,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "Servidor doméstico:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Sem nome"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Nenhum usuário disponível"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Continuar"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4872,16 +4955,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Não foi possível abrir a URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Sair"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[CENSURADO]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[CENSURADO: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "O id da sala em que você está tentando entrar não é válido"
 
@@ -4981,27 +5070,6 @@ msgstr "Sair"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Sem apelido canônico"
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "limpou seu nome de exibição"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Mostrar notificações"
-
-#, fuzzy
-#~| msgid "%1 invited you to a room"
-#~ msgid "Invites to a room"
-#~ msgstr "%1 convidou você para uma sala"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "Enviar convite"
-
 #, fuzzy
 #~| msgid "Custom Emoji"
 #~ msgctxt "@title:window"

po/ru/neochat.po

@@ -1,99 +1,99 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the neochat package.
 #
-# Alexander Yavorsky <kekcuha@gmail.com>, 2022.
+# Alexander Yavorsky <kekcuha@gmail.com>, 2022, 2024.
 # Olesya Gerasimenko <translation-team@basealt.ru>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-04-27 15:01+0300\n"
-"Last-Translator: Olesya Gerasimenko <translation-team@basealt.ru>\n"
-"Language-Team: Basealt Translation Team\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2024-01-04 15:41+0300\n"
+"Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\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==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 22.12.3\n"
+"X-Generator: Lokalize 21.08.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Отправлять уведомления о наборе текста"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Ошибка входа в систему: токен доступа недействителен или отозван"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Ошибка входа в систему: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Ошибка сети: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Не найден токен доступа"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Возможно, он был удалён."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Не удалось получить доступ к связке ключей."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Разрешите приложению NeoChat прочитать токен доступа"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Нет ни одной доступной связки ключей."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Установите приложение, предоставляющее службу связки ключей, например "
 "KWallet или Gnome Keyring."
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Не удалось прочитать токен доступа"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Слишком большой файл для загрузки."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Обратитесь за помощью к администратору сервера Matrix."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Это сообщение было удалено]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Cообщение было удалено: %1]</i>"
@@ -424,7 +424,7 @@ msgstr "обновил(а) состояние"
 msgid "started a poll"
 msgstr "запустил(а) голосование"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -433,7 +433,7 @@ msgstr[1] "%1 пользователя: "
 msgstr[2] "%1 пользователей: "
 msgstr[3] "1 пользователь: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -975,16 +975,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Не найдено ни одного эмодзи"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ОТРЕДАКТИРОВАНО]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ОТРЕДАКТИРОВАНО: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1033,13 +1023,100 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Включить уведомления для этой учётной записи"
+
+#: src/models/pushrulemodel.cpp:22
+#, fuzzy
+#| msgid "Messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Сообщения в личных чатах"
+
+#: src/models/pushrulemodel.cpp:23
+#, fuzzy
+#| msgid "Encrypted messages in one-to-one chats"
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Зашифрованные сообщения в личных чатах"
+
+#: src/models/pushrulemodel.cpp:24
+#, fuzzy
+#| msgid "Messages in group chats"
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Сообщения в групповых чатах"
+
+#: src/models/pushrulemodel.cpp:25
+#, fuzzy
+#| msgid "Messages in encrypted group chats"
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Сообщения в зашифрованных групповых чатах"
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Room upgrade messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Сообщения об обновлении комнаты"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Сообщения, содержащие моё отображаемое имя"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgid "Messages containing my display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Сообщения, содержащие моё отображаемое имя"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Whole room (@room) notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Уведомления для всех в комнате (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invites to a room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Приглашения в комнату"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Call invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Приглашение на вызов"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " и "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1049,7 +1126,7 @@ msgstr[1] " и ещё %1"
 msgstr[2] " и ещё %1"
 msgstr[3] " и ещё %1"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1089,30 +1166,30 @@ msgstr "С низким приоритетом"
 msgid "Spaces"
 msgstr "Пространства"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "Не удалось создать комнату: «%1»"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "Не удалось создать комнату: «%1»"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Жалоба отправлена."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Зашифрованное сообщение"
@@ -1138,46 +1215,43 @@ msgstr "Ответить"
 msgid "Reply..."
 msgstr "Ответить…"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 пригласил вас в комнату"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Открыть это приглашение в NeoChat"
 
-#: src/notificationsmanager.cpp:254
-#, fuzzy, kde-format
-#| msgid "Accept"
+#: src/notificationsmanager.cpp:258
+#, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Принять"
 
-#: src/notificationsmanager.cpp:255
-#, fuzzy, kde-format
-#| msgid "Reject"
+#: src/notificationsmanager.cpp:259
+#, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Отклонить"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
-msgstr ""
+msgstr "Отклонить и игнорировать пользователя"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
-#, fuzzy, kde-format
-#| msgid "NeoChat"
+#: src/notificationsmanager.cpp:331
+#, kde-format
 msgid "Open NeoChat"
-msgstr "NeoChat"
+msgstr "Открыть NeoChat"
 
 #: src/qml/About.qml:11
 #, kde-format
@@ -1197,10 +1271,9 @@ msgid "Edit Account"
 msgstr "Редактировать учётную запись"
 
 #: src/qml/AccountEditorPage.qml:61
-#, fuzzy, kde-format
-#| msgid "Update avatar"
+#, kde-format
 msgid "Upload new avatar"
-msgstr "Изменить изображение"
+msgstr "Отправить новое изображение"
 
 #: src/qml/AccountEditorPage.qml:78
 #, kde-format
@@ -1223,7 +1296,7 @@ msgid "Label:"
 msgstr "Метка:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Сохранить"
@@ -1276,11 +1349,10 @@ msgid "Homeserver url"
 msgstr "Адрес домашнего сервера"
 
 #: src/qml/AccountEditorPage.qml:209
-#, fuzzy, kde-format
-#| msgid "Account editor"
+#, kde-format
 msgctxt "@title"
 msgid "Account Management"
-msgstr "Редактирование учётной записи"
+msgstr "Управление учётной "
 
 #: src/qml/AccountEditorPage.qml:214
 #, fuzzy, kde-format
@@ -1294,6 +1366,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Пароль успешно изменён"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Введён неверный пароль"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "При попытке сменить пароль произошла ошибка"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1338,21 +1425,6 @@ msgstr "Учётные записи"
 msgid "Add Account"
 msgstr "Добавить учётную запись"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Пароль успешно изменён"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Введён неверный пароль"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "При попытке сменить пароль произошла ошибка"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1455,19 +1527,19 @@ msgstr "Отменить отправку вложения"
 msgid "Ban User"
 msgstr "Заблокировать пользователя"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Причина для блокировки этого пользователя"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Заблокировать"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1739,9 +1811,13 @@ msgid "Topic:"
 msgstr "Тема не задана"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Назначить этот псевдоним каноническим псевдонимом комнаты"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1763,7 +1839,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1788,9 +1864,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Назначить этот псевдоним каноническим псевдонимом комнаты"
 
@@ -2085,7 +2164,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2095,7 +2174,7 @@ msgstr ""
 "устройством."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Просмотреть комнаты"
@@ -2203,7 +2282,7 @@ msgid "Remove Message"
 msgstr "Удаление сообщения"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2253,152 +2332,152 @@ msgstr "Название комнаты:"
 msgid "Room topic:"
 msgstr "Тема комнаты:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Идентификатор комнаты"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Скопировать идентификатор комнаты в буфер обмена"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Версия комнаты"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Обновить комнату"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Псевдонимы"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Канонический псевдоним не задан"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Назначить этот псевдоним каноническим псевдонимом комнаты"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Удалить псевдоним"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#новый_псевдоним:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Создать псевдоним"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Предпросмотр содержимого по ссылкам"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "По умолчанию включить предпросмотр содержимого по ссылкам для участников "
 "комнат"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Включить предпросмотр содержимого по ссылкам"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 "Для этой комнаты по умолчанию включён предпросмотр содержимого по ссылкам"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Для этой комнаты по умолчанию отключён предпросмотр содержимого по ссылкам"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Canonical"
 msgstr "Канонический псевдоним не задан"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Канонический псевдоним не задан"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Удалить сообщение"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Эта комната была заменена."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Канонический псевдоним не задан"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "В этой комнате продолжается другой разговор."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Посмотреть более старые сообщения…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Эта комната была заменена."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Посмотреть новую комнату…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Обновление комнаты"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Выберите новую версию"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Подтвердить"
@@ -2779,17 +2858,17 @@ msgstr "Введите имя пользователя…"
 msgid "Add"
 msgstr "Добавить"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Нет ни одного пользователя"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Отправить приглашение"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2854,12 +2933,12 @@ msgstr "Введите адрес сервера, например: kde.org"
 msgid "Server URL"
 msgstr "Адрес сервера"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3196,7 +3275,7 @@ msgstr "Включить подсветку сообщений"
 msgid "Delete keyword"
 msgstr "Удалить ключевое слово"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3375,7 +3454,7 @@ msgstr "Устанавливать дочерние элементы этого
 msgid "Set the parent space of this room"
 msgstr "Устанавливать родительское пространство этой комнаты"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3384,7 +3463,7 @@ msgstr[1] "Основано на голосах %1 пользователей"
 msgstr[2] "Основано на голосах %1 пользователей"
 msgstr[3] "Основано на голосе %1 пользователя"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3490,17 +3569,17 @@ msgstr "Удалить сообщения"
 msgid "Remove Message"
 msgstr "Удалить сообщение"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Причина удаления последних сообщений этого пользователя"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Причина удаления этого сообщения"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3517,7 +3596,7 @@ msgstr "Отменить ответ"
 msgid "Report Message"
 msgstr "Жалоба на сообщение"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Причина жалобы на это сообщение"
@@ -3679,28 +3758,28 @@ msgstr "Количество участников не подсчитывает
 msgid "View notifications"
 msgstr "Отключить звук уведомлений"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Не найдено ни одной комнаты"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Чтобы начать, войдите в комнату"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Искать в каталоге комнат"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "Expand preview"
 msgctxt "Expand <section name"
@@ -3962,6 +4041,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Назначить этот псевдоним каноническим псевдонимом комнаты"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4246,13 +4331,13 @@ msgstr ""
 msgid "Chat"
 msgstr "Чат"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, fuzzy, kde-format
 #| msgid "Log in to an existing account"
 msgid "Join existing chat"
 msgstr "Войти в существующую учётную запись"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Create rooms and chats"
 msgid "Create new chat"
@@ -4277,22 +4362,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Перейти к первому непрочитанному сообщению"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Перейти к последнему сообщению"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Чтобы опубликовать файла, перетащите их сюда"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4609,54 +4694,54 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgctxt "@title:window"
 #| msgid "Add server"
 msgid "No server."
 msgstr "Добавление сервера"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, fuzzy, kde-format
 #| msgid "The entered text is not a valid url"
 msgid "This is not a valid server."
 msgstr "Введённый текст не является допустимым URL"
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Без имени"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Нет ни одного пользователя"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Продолжить"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4713,16 +4798,22 @@ msgstr "Системе не удалось найти приложение, по
 msgid "Could not open URL"
 msgstr "Не удалось открыть адрес"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Показать"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Выход"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ОТРЕДАКТИРОВАНО]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ОТРЕДАКТИРОВАНО: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Недействительный идентификатор комнаты, в которую вы хотите войти"
 
@@ -4833,36 +4924,9 @@ msgstr "Выход"
 #~ "В этой комнате используется шифрование. Чтобы отправлять зашифрованные "
 #~ "сообщения, соберите libQuotient с поддержкой шифрования."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Сообщения в личных чатах"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Зашифрованные сообщения в личных чатах"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Сообщения в групповых чатах"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Сообщения в зашифрованных групповых чатах"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Сообщения об обновлении комнаты"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Сообщения, содержащие моё отображаемое имя"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Уведомления для всех в комнате (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Сообщения, содержащие заданные ключевые слова"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Приглашения в комнату"
-
-#~ msgid "Call invitation"
-#~ msgstr "Приглашение на вызов"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Пользовательские эмодзи"

po/sk/neochat.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2022-04-18 17:58+0200\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -16,81 +16,81 @@ msgstr ""
 "X-Generator: Lokalize 21.12.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgid "Receiving push notifications"
 msgstr "Zobraziť upozornenia"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Prihlásenie zlyhalo: Prístupový token je neplatný alebo odvolaný"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Prihlásenie zlyhalo: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Chyba siete: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, fuzzy, kde-format
 #| msgid "Access Token (Optional)"
 msgid "Access token wasn't found"
 msgstr "Prístupový token (voliteľný)"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "No keychain available."
 msgstr "Nie sú k dispozícii žiadni používatelia"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Táto správa bola odstránená]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Táto správa bola odstránená: %1]</i>"
@@ -440,7 +440,7 @@ msgstr "aktualizoval %1 stav"
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -448,7 +448,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, fuzzy, kde-format
 #| msgctxt "[action 1], [action 2 and action 3]"
 #| msgid ", "
@@ -1068,16 +1068,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Vlastné"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[REVIDOVANÉ]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[REVIDOVANÉ: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1126,13 +1116,94 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Zobraziť upozornenia"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Odoslať správu"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "vymazali svoje zobrazované meno"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "vymazali svoje zobrazované meno"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Zobraziť upozornenia"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "invited %1 to the room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "pozval %1 do miestnosti"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Odoslať pozvanie"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " a "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1141,7 +1212,7 @@ msgstr[0] " a %1 ďalší"
 msgstr[1] " a %1 ďalší"
 msgstr[2] " a %1 ďalších"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1180,31 +1251,31 @@ msgstr "Nízka priorita"
 msgid "Spaces"
 msgstr "Medzery"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Room creation failed: %1"
 msgstr "Vytvorenie miestnosti zlyhalo: \"%1\""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, fuzzy, kde-format
 #| msgid "Room creation failed: \"%1\""
 msgid "Space creation failed: %1"
 msgstr "Vytvorenie miestnosti zlyhalo: \"%1\""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, fuzzy, kde-format
 #| msgid "Password changed successfully"
 msgid "Report sent successfully."
 msgstr "Heslo úspešne zmenené"
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Encrypted Message"
@@ -1231,44 +1302,44 @@ msgstr "Odpovedať"
 msgid "Reply..."
 msgstr "Odpovedať..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, fuzzy, kde-format
 #| msgid "invited %1 to the room"
 msgid "%1 invited you to a room"
 msgstr "pozval %1 do miestnosti"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, fuzzy, kde-format
 #| msgid "Open a private chat"
 msgid "Open this invitation in NeoChat"
 msgstr "Otvoriť súkromný chat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Prijať"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Odmietnuť"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1322,7 +1393,7 @@ msgid "Label:"
 msgstr "Popis:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Uložiť"
@@ -1399,6 +1470,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Heslo úspešne zmenené"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Zadané nesprávne heslo"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Neznámy problém pri pokuse o zmenu hesla"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1447,21 +1533,6 @@ msgstr "Kontá"
 msgid "Add Account"
 msgstr "Pridať konto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Heslo úspešne zmenené"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Zadané nesprávne heslo"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Neznámy problém pri pokuse o zmenu hesla"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, fuzzy, kde-format
 #| msgid "Appearance"
@@ -1572,20 +1643,20 @@ msgstr "vymazali svoje zobrazované meno"
 msgid "Ban User"
 msgstr "Zakázať tomuto používateľovi prístup"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 #| msgid "Unban this user"
 msgid "Reason for banning this user"
 msgstr "Povoliť tomuto používateľovi prístup"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1865,6 +1936,9 @@ msgstr "Žiadna téma"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1888,7 +1962,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
@@ -1913,10 +1987,14 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
-#, kde-format
+#: src/qml/CreateRoomDialog.qml:219
+#, fuzzy, kde-format
+#| msgid "No Canonical Alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr ""
+msgstr "Žiadny kanonický alias"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2208,7 +2286,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2216,7 +2294,7 @@ msgid ""
 msgstr ""
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Prehliadať miestnosti"
@@ -2322,7 +2400,7 @@ msgid "Remove Message"
 msgstr "Upraviť správu"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2378,161 +2456,161 @@ msgstr "Názov miestnosti:"
 msgid "Room topic:"
 msgstr "Téma miestnosti:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Rooms"
 msgid "Room ID"
 msgstr "Miestnosti"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, fuzzy, kde-format
 #| msgid "Room information"
 msgid "Room version"
 msgstr "Informácie o miestnosti"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Explore Rooms"
 msgid "Upgrade Room"
 msgstr "Prehliadať miestnosti"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, fuzzy, kde-format
 #| msgid "Alt Aliases"
 msgid "Aliases"
 msgstr "Alternatívne aliasy"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "No canonical alias set"
 msgstr "Žiadny kanonický alias"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "Vymazať"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are enabled by default in this room"
 msgstr "Otvoriť NeoChat v tejto miestnosti"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, fuzzy, kde-format
 #| msgid "Open NeoChat in this room"
 msgid "URL previews are disabled by default in this room"
 msgstr "Otvoriť NeoChat v tejto miestnosti"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Kanonický alias:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgid "Make canonical parent"
 msgstr "Žiadny kanonický alias"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "Upraviť správu"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Táto miestnosť bola nahradená."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No Canonical Alias"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Žiadny kanonický alias"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Táto miestnosť pokračuje v ďalšej konverzácii."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "See older messages..."
 msgid "See older messages…"
 msgstr "Zobraziť staršie správy"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Táto miestnosť bola nahradená."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "See new room…"
 msgstr "Zobraziť novú miestnosť..."
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "left the room"
 msgid "Upgrade the Room"
 msgstr "opustil miestnosť"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, fuzzy, kde-format
 #| msgid "See new room..."
 msgid "Select new version"
 msgstr "Zobraziť novú miestnosť..."
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Potvrdiť"
@@ -2928,17 +3006,17 @@ msgstr "Nájsť používateľa..."
 msgid "Add"
 msgstr "Pridať"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nie sú k dispozícii žiadni používatelia"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Odoslať pozvanie"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -3001,14 +3079,14 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<room-address>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgid "No rooms found"
 msgctxt "@info:label"
@@ -3361,7 +3439,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr "Vymazať"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Show notifications"
 msgctxt "@title"
@@ -3546,7 +3624,7 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr "pozval %1 do miestnosti"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3554,7 +3632,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3661,17 +3739,17 @@ msgstr "Upraviť správu"
 msgid "Remove Message"
 msgstr "Upraviť správu"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, fuzzy, kde-format
 #| msgid "Remove"
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
@@ -3691,7 +3769,7 @@ msgstr "Zrušiť"
 msgid "Report Message"
 msgstr "Upraviť správu"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3860,28 +3938,28 @@ msgstr "Žiadny počet členov"
 msgid "View notifications"
 msgstr "Zobraziť upozornenia"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Žiadne miestnosti neboli nájdené"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Pripojte sa k niektorým miestnostiam a začnite"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Vyhľadajte v adresári miestnosti"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, fuzzy, kde-format
 #| msgid "unbanned %1"
 msgctxt "Expand <section name"
@@ -4134,6 +4212,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4424,12 +4507,12 @@ msgstr ""
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Rooms and private chats:"
 msgid "Create new chat"
@@ -4454,22 +4537,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Skočiť na prvú neprečítanú správu"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Prejsť na najnovšiu správu"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Presuňte položky sem na zdieľanie"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4780,52 +4863,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "Domáci server:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgid "No name"
 msgid "No username."
 msgstr "Žiadne meno"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, fuzzy, kde-format
 #| msgid "No users available"
 msgid "This username is not available."
 msgstr "Nie sú k dispozícii žiadni používatelia"
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4884,16 +4967,22 @@ msgstr "Váš operačný systém nemohol nájsť aplikáciu pre odkaz."
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Zobraziť"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Ukončiť"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[REVIDOVANÉ]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[REVIDOVANÉ: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Miestnosť, do ktorej sa pokúšate pripojiť, je neplatná"
 
@@ -4995,27 +5084,6 @@ msgstr "Ukončiť"
 #~ msgid "No Canonical Alias"
 #~ msgstr "Žiadny kanonický alias"
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "vymazali svoje zobrazované meno"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Zobraziť upozornenia"
-
-#, fuzzy
-#~| msgid "invited %1 to the room"
-#~ msgid "Invites to a room"
-#~ msgstr "pozval %1 do miestnosti"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "Odoslať pozvanie"
-
 #, fuzzy
 #~| msgid "Custom"
 #~ msgctxt "@title:window"

po/sl/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: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 07:21+0100\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 09:13+0100\n"
 "Last-Translator: Matjaž Jeran <matjaz.jeran@amis.net>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
@@ -20,78 +20,78 @@ msgstr ""
 "%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 3.4.1\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Sprejemanje potisnih obvestil"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Neuspela prijava: Žeton za dostop je neveljaven ali preklican"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Prijava je spodletela: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Napaka omrežja: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Žetona za dostop ni bilo mogoče najti"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Ali je bil mogoče izbrisan?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Dostop do verige ključev je bil zavrnjen."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Dovolite, da NeoChat prebere žeton za dostop"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Nobene verige ključev ni na voljo."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Žetona za dostop ni mogoče prebrati"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Datoteka je prevelika za prenos."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[To sporočilo je bilo izbrisano]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[To sporočilo je bilo izbrisano: %1]</i>"
@@ -422,7 +422,7 @@ msgstr "je posodobil stanje"
 msgid "started a poll"
 msgstr "je začel glasovanje"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -431,7 +431,7 @@ msgstr[1] "%1 uporabnika: "
 msgstr[2] "%1 uporabniki: "
 msgstr[3] "%1 uporabnikov: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -965,16 +965,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Lastni čustvenčki"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[PREKRIVANJE PODATKOV]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[PREKRIVANJE PODATKOV: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1022,13 +1012,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Omogoči obvestila za ta račun"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Sporočila v klepetih iz oči v oči"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Šifrirana sporočila pri klepetih iz oči v oči"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Sporočila v skupinskih klepetih"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Sporočila v šifriranih skupinskih klepetih"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Sporočila o posodabljanju sob"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Sporočila, ki vsebujejo moje ime zaslona"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Sporočila, ki omenjajo moj Matrix uporabniški določilnik"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Sporočila, ki omenjajo sobo"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Sporočila, ki vsebujejo moj lokalni del Matrix določilnika"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Obvestila za celotno sobo (@room)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Povabila v sobo"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Povabilo za klic"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " in "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1038,7 +1093,7 @@ msgstr[1] " in %1 ostala"
 msgstr[2] " in %1 ostali"
 msgstr[3] " in %1 ostalih"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1078,28 +1133,28 @@ msgstr "Nizka prednost"
 msgid "Spaces"
 msgstr "Presledki"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Ustvarjanje sobe ni uspelo: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Ustvarjanje prostora ni uspelo: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Poročilo uspešno poslano."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Širina: %1, Dolžina: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Šifrirano sporočilo"
@@ -1125,40 +1180,40 @@ msgstr "Odgovori"
 msgid "Reply..."
 msgstr "Odgovori..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 vas je povabil v sobo"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Odprite to povabilo v NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Zavrni"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Zavrni in prezri uporabnika"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Odpri NeoChat"
@@ -1206,7 +1261,7 @@ msgid "Label:"
 msgstr "Oznaka:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Shrani"
@@ -1275,6 +1330,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Potrdi deaktiviranje računa"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Uspešno zamenjano geslo"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Vneseno napačno geslo"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Neznana težava ob poskusu zamenjave gesla"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1319,21 +1389,6 @@ msgstr "Računi"
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Uspešno zamenjano geslo"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Vneseno napačno geslo"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Neznana težava ob poskusu zamenjave gesla"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1436,19 +1491,19 @@ msgstr "Prekliči pošiljanje priloge"
 msgid "Ban User"
 msgstr "Prepovej uporabnika"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Razlog za prepoved za tega uporabnika"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Prepoved"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1711,8 +1766,11 @@ msgstr "Tema:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr "Naj bo to uradni nadrejeni"
+msgstr "Določi tega nadrejenega kot uradnega"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1734,7 +1792,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1758,10 +1816,13 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr "Nimate dovolj pravic odvisnega, da nastavite to stanje"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
-msgstr "Nastavi ta prostor kanonično nadrejeni"
+msgstr "Določi ta prostor kot kanonično nadrejenega"
 
 #: src/qml/DeviceDelegate.qml:50
 #, kde-format
@@ -2034,7 +2095,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Nalepke in čustvenčki"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2043,7 +2104,7 @@ 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:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Razišči sobe"
@@ -2144,7 +2205,7 @@ msgid "Remove Message"
 msgstr "Odstrani sporočilo"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2194,143 +2255,143 @@ msgstr "Ime sobe:"
 msgid "Room topic:"
 msgstr "Tema debate sobe:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "ID sobe"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Kopiraj ID sobe na odložišče"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Različica sobe"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Nadgradi sobo"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Vzdevki"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Ni nastavljenega kanoničnega vzdevka"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Nastavi ta vzdevek kot kanonični vzdevek sobe"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Zbriši vzdevek"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#new_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Dodaj novi vzdevek"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Predogledi URL"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Privzeto omogoči predoglede URL za člane sobe"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Omogoči predoglede URL"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Predogledi URL so privzeto omogočeni v tej sobi"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "Predogledi URL so privzeto onemogočeni v tej sobi"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Uradni nadrejeni prostori"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Kanonični"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Naredi kanonično nadrejenega"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Odstrani nadrejenega"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Ta soba nima uradnih nadrejenih prostorov."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Dodaj novega uradno nadrejenega"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Ta soba nadaljuje z drugo debato."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Poglej starejša sporočila…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Ta soba je bila zamenjana."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Poglej novo sobo…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Nadgradi sobo"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Izberi novo različico"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Potrdi"
@@ -2704,17 +2765,17 @@ msgstr "Najdi uporabnika..."
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Nobenega uporabnika ni na voljo"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Pošlji povabilo"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Uporabnik je ali že član ali je bil povabljen"
@@ -2776,12 +2837,12 @@ msgstr "Vnesite strežnikov naslov url npr. kde.org"
 msgid "Server URL"
 msgstr "Strežnikov naslov url"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Vnesite naslov sobe"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3105,7 +3166,7 @@ msgstr "Omogoči osvetljevanje obvestil"
 msgid "Delete keyword"
 msgstr "Izbriši ključno besedo"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3273,7 +3334,7 @@ msgstr "Nastavi odvisne tega prostora"
 msgid "Set the parent space of this room"
 msgstr "Nastavi nadrejeni prostor te sobe"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3282,7 +3343,7 @@ msgstr[1] "Glede na glasova %1 uporabnikov"
 msgstr[2] "Glede na glasove %1 uporabnikov"
 msgstr[3] "Glede na glasove %1 uporabnikov"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3383,17 +3444,17 @@ msgstr "Odstrani sporočila"
 msgid "Remove Message"
 msgstr "Odstrani sporočilo"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Razlog za odstranjevanje nedavnih sporočil tega uporabnika"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Razlog za odstranjevanje tega sporočila"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3410,7 +3471,7 @@ msgstr "Prekliči odgovor"
 msgid "Report Message"
 msgstr "Poročaj sporočilo"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Razlog za poročanje tega sporočila"
@@ -3559,28 +3620,28 @@ msgstr "Ni števila članov"
 msgid "View notifications"
 msgstr "Poglej obvestila"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Nobene sobe ni mogoče najti"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Pridruži se nekaj sobam za začetek"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Poišči v imeniku sob"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Strni %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3826,6 +3887,11 @@ msgstr "Izbrana sobi ni prostor"
 msgid "You do not have the privileges to complete this action"
 msgstr "Nimate pravic za dokončanje tega dejanja"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Nastavi ta prostor kanonično nadrejeni"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4094,12 +4160,12 @@ msgstr "Ponovno odpri URL za enovito prijavo"
 msgid "Chat"
 msgstr "Debata"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Pridružite se obstoječem klepetu"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Ustvari nov klepet"
@@ -4124,22 +4190,22 @@ msgid ""
 msgstr ""
 "To je začetek klepeta. Onkraj te točke ni nobenih sporočil v zgodovini."
 
-#: src/qml/TimelineView.qml:180
+#: 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:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Skoči na nedavno sporočilo"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4463,47 +4529,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Ni strežnika."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Preverjanje razpoložljivosti strežnika."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "To ni veljavni strežnik."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registracija za ta strežnik je onemogočena."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Ni uporabniškega imena."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Preverjanje razpoložljivosti uporabniškega imena."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Tega uporabniškega imena ni na voljo."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "V delovanju"
@@ -4559,16 +4625,22 @@ msgstr "Vaš operacijski sistem ni mogel najti aplikacije za povezavo."
 msgid "Could not open URL"
 msgstr "Ni bilo mogoče odpreti URL"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Prikaži"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Zapusti"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[PREKRIVANJE PODATKOV]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[PREKRIVANJE PODATKOV: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Identifikacija sobe, kamor se poskušate pridružiti, ni veljavna"
 
@@ -4681,36 +4753,9 @@ msgstr "Zapusti"
 #~ "Ta soba je šifrirana. Izgradite libQuotient z omogočenim šifriranjem za "
 #~ "pošiljanje šifriranih sporočil."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Sporočila v klepetih iz oči v oči"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Šifrirana sporočila pri klepetih iz oči v oči"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Sporočila v skupinskih klepetih"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Sporočila v šifriranih skupinskih klepetih"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Sporočila o posodabljanju sob"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Sporočila, ki vsebujejo moje prikaza"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Obvestila za celotno sobo (@room)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Sporočila, ki vsebujejo moje ključne besede"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Povabila v sobo"
-
-#~ msgid "Call invitation"
-#~ msgstr "Pošlji povabilo"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Emodžiji po meri"

po/sv/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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2023-09-04 20:33+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -17,80 +17,80 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 23.04.3\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, fuzzy, kde-format
 #| msgid "Send typing notifications"
 msgid "Receiving push notifications"
 msgstr "Skicka skrivunderrättelser"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Inloggning misslyckades: Åtkomstsymbol ogiltig eller återkallad"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Inloggning misslyckades: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Nätverksfel: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Åtkomstsymbol hittades inte"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Kanske har den tagits bort?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Åtkomst till nyckelkedja nekades."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Ge NeoChat tillåtelse att läsa åtkomstsymbolen"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Ingen nyckelkedja tillgänglig."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Installera en nyckelkedja, t.ex. plånboken eller GNOME-nyckelring på Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Kan inte läsa åtkomstsymbol"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Filen är för stor att ladda ner"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr "Kontakta matrix-serveradministratören för support."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Meddelandet har tagits bort]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Meddelandet har tagits bort: %1]</i>"
@@ -421,14 +421,14 @@ msgstr "uppdaterade tillståndet"
 msgid "started a poll"
 msgstr "startade en opinionsundersökning"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "1 användare: "
 msgstr[1] "%1 användare: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -963,16 +963,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Egna emoji"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ÄNDRAD]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ÄNDRAD: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, fuzzy, kde-format
 #| msgid ": %1"
@@ -1017,13 +1007,94 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+#, fuzzy
+#| msgid "Enable notifications for this account"
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Aktivera underrättelser för kontot"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Show deleted messages"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Visa borttagna meddelanden"
+
+#: src/models/pushrulemodel.cpp:27
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "tog bort sitt visningsnamn"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+#, fuzzy
+#| msgctxt "their refers to a singular user"
+#| msgid "cleared their display name"
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "tog bort sitt visningsnamn"
+
+#: src/models/pushrulemodel.cpp:31
+#, fuzzy
+#| msgid "Show notifications"
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Visa underrättelser"
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Invite user to room"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Bjöd in användare till ett rum"
+
+#: src/models/pushrulemodel.cpp:33
+#, fuzzy
+#| msgid "Send invitation"
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Skicka inbjudan"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " och "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1031,7 +1102,7 @@ msgid_plural " and %1 others"
 msgstr[0] " och %1 annan"
 msgstr[1] " och %1 andra"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1069,28 +1140,28 @@ msgstr "Låg prioritet"
 msgid "Spaces"
 msgstr "Utrymmen"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Misslyckades skapa rum: \"%1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Misslyckades skapa utrymme: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapport skickades med lyckat resultat."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Latitud: %1, Longitud: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Krypterat meddelande"
@@ -1116,42 +1187,42 @@ msgstr "Svara"
 msgid "Reply..."
 msgstr "Svara..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1 bjöd in dig till ett rum"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Öppna inbjudan i NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, fuzzy, kde-format
 #| msgid "Accept"
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Acceptera"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, fuzzy, kde-format
 #| msgid "Reject"
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Avslå"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgid "NeoChat"
 msgid "Open NeoChat"
@@ -1200,7 +1271,7 @@ msgid "Label:"
 msgstr "Beteckning:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Spara"
@@ -1269,6 +1340,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Bekräfta inaktivering av konto"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Lösenord ändrat med lyckat resultat"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Felaktigt lösenord inmatat"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Okänt problem vid försök att ändra lösenord"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1313,21 +1399,6 @@ msgstr "Konton"
 msgid "Add Account"
 msgstr "Lägg till konto"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Lösenord ändrat med lyckat resultat"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Felaktigt lösenord inmatat"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Okänt problem vid försök att ändra lösenord"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1430,19 +1501,19 @@ msgstr "Avbryt sändning av bilaga"
 msgid "Ban User"
 msgstr "Bannlys användare"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Anledning att bannlysa användaren"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Bannlys"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1710,9 +1781,13 @@ msgid "Topic:"
 msgstr "Ämne:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
-msgstr ""
+msgstr "Gör detta alias till rummets normala alias"
 
 #: src/qml/CreateRoomDialog.qml:83 src/qml/CreateRoomDialog.qml:225
 #: src/qml/JoinRoomPage.qml:183
@@ -1734,7 +1809,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1758,9 +1833,12 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, fuzzy, kde-format
 #| msgid "Make this alias the room's canonical alias"
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Gör detta alias till rummets normala alias"
 
@@ -2034,7 +2112,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Klistermärken och emoji"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2044,7 +2122,7 @@ msgstr ""
 "enheten."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Utforska rum"
@@ -2148,7 +2226,7 @@ msgid "Remove Message"
 msgstr "Ta bort meddelande"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2198,150 +2276,150 @@ msgstr "Rummets namn:"
 msgid "Room topic:"
 msgstr "Rummets ämne:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Rumsidentifierare"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Kopiera rumsidentifierare till klippbordet"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Rumsversion"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Uppgradera rum"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Alias"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Inget normalt alias angivet"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Gör detta alias till rummets normala alias"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Ta bort alias"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#nytt_alias:server.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Lägg till nytt alias"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Förhandsgranskningar av webbadresser"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Aktivera förhandsgranskningar av webbadresser som förval för rumsmedlemmar"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Aktivera förhandsgranskningar av webbadresser"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "Förhandsgranskningar av webbadresser är aktiverade i rummet som förval"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 "Förhandsgranskningar av webbadresser är inaktiverade i rummet som förval"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, fuzzy, kde-format
 #| msgid "Canonical Alias:"
 msgid "Canonical"
 msgstr "Normalt alias:"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgid "Make canonical parent"
 msgstr "Inget normalt alias angivet"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Remove Message"
 msgid "Remove parent"
 msgstr "Ta bort meddelande"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, fuzzy, kde-format
 #| msgid "This room has been replaced."
 msgid "This room has no official parent spaces."
 msgstr "Rummet har ersatts."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, fuzzy, kde-format
 #| msgid "No canonical alias set"
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Inget normalt alias angivet"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Rummet fortsätter ett annat samtal."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Visa äldre meddelanden..."
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Rummet har ersatts."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Visa nytt rum…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Uppgradera rummet"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Välj ny version"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Bekräfta"
@@ -2716,17 +2794,17 @@ msgstr "Sök efter en användare..."
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Inga användare tillgängliga"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Skicka inbjudan"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Användaren är antingen redan en medlem eller har blivit inbjuden"
@@ -2789,14 +2867,14 @@ msgstr "Skriv in serverwebbadress t.ex. kde.org"
 msgid "Server URL"
 msgstr "Serverwebbadress"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, fuzzy, kde-format
 #| msgctxt "@label Parameter of a command"
 #| msgid "<room-address>"
 msgid "Enter a room address"
 msgstr "<rumadress>"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, fuzzy, kde-format
 #| msgctxt "@info:label"
 #| msgid "No rooms found"
@@ -3125,7 +3203,7 @@ msgstr "Aktivera meddelandefärgläggning"
 msgid "Delete keyword"
 msgstr "Ta bort nyckelord"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, fuzzy, kde-format
 #| msgid "Notifications"
 msgctxt "@title"
@@ -3298,14 +3376,14 @@ msgstr "Ange utrymmets underliggande rum"
 msgid "Set the parent space of this room"
 msgstr "Ange rummets överliggande utrymme"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "Baserat på röster av %1 användare"
 msgstr[1] "Baserat på röster av %1 användare"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3409,17 +3487,17 @@ msgstr "Ta bort meddelanden"
 msgid "Remove Message"
 msgstr "Ta bort meddelande"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Anledning att ta bort användarens senaste meddelanden"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Anledning att ta bort meddelandet"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3436,7 +3514,7 @@ msgstr "Avbryt svar"
 msgid "Report Message"
 msgstr "Rapportera meddelande"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Anledning att meddelandet rapporteras"
@@ -3586,28 +3664,28 @@ msgstr "Ingen medlemsräkning"
 msgid "View notifications"
 msgstr "Tysta underrättelser"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Inga rum hittades"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Gå med i några rum för att komma igång"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Sök i rumkatalog"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Dra ihop %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3863,6 +3941,12 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, fuzzy, kde-format
+#| msgid "Make this alias the room's canonical alias"
+msgid "Make this space the canonical parent"
+msgstr "Gör detta alias till rummets normala alias"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
@@ -4146,12 +4230,12 @@ msgstr "Öppna SSO-webbadress igen"
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Gå med i befintlig chatt"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Skapa ny chatt"
@@ -4177,22 +4261,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Gå till första olästa meddelande"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Gå till sista meddelande"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Dra objekt hit för att dela dem"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4523,47 +4607,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Gå tillbaka"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Ingen server."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Kontrollerar serverns tillgänglighet."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Det är inte en giltig server."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Registrering för servern är inaktiverad."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Inget användarnamn."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Kontrollerar användarnamnets tillgänglighet."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Användarnamnet är inte tillgängligt."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Arbetar"
@@ -4621,16 +4705,22 @@ msgstr "Ditt operativsystem kunde inte hitta något program för länken."
 msgid "Could not open URL"
 msgstr "Kunde inte öppna  webbadress"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Visa"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Avsluta"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ÄNDRAD]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ÄNDRAD: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Identifikationen för rummet som du försöker gå med i är inte giltig"
 
@@ -4744,27 +4834,6 @@ msgstr "Avsluta"
 #~ "Rummet är krypterat. Bygg libQuotient med kryptering aktiverad för att "
 #~ "skicka krypterade meddelanden."
 
-#, fuzzy
-#~| msgctxt "their refers to a singular user"
-#~| msgid "cleared their display name"
-#~ msgid "Messages containing my display name"
-#~ msgstr "tog bort sitt visningsnamn"
-
-#, fuzzy
-#~| msgid "Show notifications"
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Visa underrättelser"
-
-#, fuzzy
-#~| msgid "Invite user to room"
-#~ msgid "Invites to a room"
-#~ msgstr "Bjöd in användare till ett rum"
-
-#, fuzzy
-#~| msgid "Send invitation"
-#~ msgid "Call invitation"
-#~ msgstr "Skicka inbjudan"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Egna emoji"

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: 2023-11-28 01:36+0000\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
 "PO-Revision-Date: 2022-06-20 03:30+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Toki Pona <http://weblate.blackquill.cc/projects/ante-toki-pi-"
@@ -21,78 +21,78 @@ msgstr ""
 "%100>=11 && n%100<=14 ? 2 : 3;\n"
 "X-Generator: Weblate 4.10.1\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr ""
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr ""
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr ""
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr ""
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr ""
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr ""
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr ""
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr ""
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
 msgid "started a poll"
 msgstr ""
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -438,7 +438,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -990,16 +990,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "sitelen Emosi sina"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr ""
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr ""
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1047,13 +1037,82 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr ""
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:26
+#, fuzzy
+#| msgid "Send message"
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "o pana e toki"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr ""
+
+#: src/models/pushrulemodel.cpp:32
+#, fuzzy
+#| msgid "Ignore this user"
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "o len e jan ni"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr ""
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " en "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1063,7 +1122,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1103,28 +1162,28 @@ msgstr ""
 msgid "Spaces"
 msgstr ""
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr ""
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr ""
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr ""
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr ""
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Encrypted Message"
@@ -1151,40 +1210,40 @@ msgstr ""
 msgid "Reply..."
 msgstr ""
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr ""
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr ""
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr ""
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr ""
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr ""
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, fuzzy, kde-format
 #| msgctxt "menu"
 #| msgid "NeoChat"
@@ -1236,7 +1295,7 @@ msgid "Label:"
 msgstr ""
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "o awen sona"
@@ -1308,6 +1367,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr ""
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr ""
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr ""
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1352,21 +1426,6 @@ msgstr ""
 msgid "Add Account"
 msgstr ""
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr ""
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr ""
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, fuzzy, kde-format
 #| msgid "Appearance"
@@ -1471,20 +1530,20 @@ msgstr ""
 msgid "Ban User"
 msgstr "o weka wawa e jan ni"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, fuzzy, kde-format
 #| msgid "Unban this user"
 msgid "Reason for banning this user"
 msgstr "o weka e weka pi jan ni"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr ""
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1751,6 +1810,9 @@ msgstr "nasin tomo"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr ""
 
@@ -1774,7 +1836,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, fuzzy, kde-format
 #| msgid "Create a Room"
@@ -1799,8 +1861,11 @@ msgid ""
 "You do not have a high enough privilege level in the child to set this state"
 msgstr ""
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr ""
 
@@ -2078,7 +2143,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr ""
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2086,7 +2151,7 @@ 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:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr ""
@@ -2192,7 +2257,7 @@ msgid "Remove Message"
 msgstr "o ante e toki"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2244,150 +2309,150 @@ msgstr "nimi tomo"
 msgid "Room topic:"
 msgstr ""
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, fuzzy, kde-format
 #| msgid "Room Name"
 msgid "Room ID"
 msgstr "nimi tomo"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr ""
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr ""
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgid "Upgrade Room"
 msgstr "o pali e tomo toki"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr ""
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr ""
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr ""
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, fuzzy, kde-format
 #| msgctxt "text editing menu action"
 #| msgid "Delete"
 msgid "Delete alias"
 msgstr "o weka"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr ""
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr ""
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr ""
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr ""
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr ""
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr ""
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr ""
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, fuzzy, kde-format
 #| msgid "Edit Message"
 msgid "Remove parent"
 msgstr "o ante e toki"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr ""
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr ""
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr ""
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, fuzzy, kde-format
 #| msgid "Send message"
 msgid "See older messages…"
 msgstr "o pana e toki"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr ""
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr ""
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, fuzzy, kde-format
 #| msgid "Create a Room"
 msgid "Upgrade the Room"
 msgstr "o pali e tomo toki"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr ""
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr ""
@@ -2763,17 +2828,17 @@ msgstr ""
 msgid "Add"
 msgstr "o lon e nimi len luka"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr ""
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr ""
@@ -2836,12 +2901,12 @@ msgstr ""
 msgid "Server URL"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr ""
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3173,7 +3238,7 @@ msgstr ""
 msgid "Delete keyword"
 msgstr ""
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3347,7 +3412,7 @@ msgstr ""
 msgid "Set the parent space of this room"
 msgstr ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3356,7 +3421,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3461,17 +3526,17 @@ msgstr "o ante e toki"
 msgid "Remove Message"
 msgstr "o ante e toki"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr ""
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3490,7 +3555,7 @@ msgstr "o ala"
 msgid "Report Message"
 msgstr "o ante e toki"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr ""
@@ -3643,28 +3708,28 @@ msgstr ""
 msgid "View notifications"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr ""
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3903,6 +3968,11 @@ msgstr ""
 msgid "You do not have the privileges to complete this action"
 msgstr ""
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr ""
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, fuzzy, kde-format
 #| msgctxt "@title"
@@ -4180,12 +4250,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr ""
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, fuzzy, kde-format
 #| msgid "Open a private chat"
 msgid "Create new chat"
@@ -4210,22 +4280,22 @@ msgid ""
 "this point."
 msgstr ""
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr ""
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr ""
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4535,52 +4605,52 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr ""
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, fuzzy, kde-format
 #| msgid "Homeserver:"
 msgid "No server."
 msgstr "nasin URL ilo:"
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr ""
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr ""
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr ""
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, fuzzy, kde-format
 #| msgctxt "NAME OF TRANSLATORS"
 #| msgid "Your names"
 msgid "No username."
 msgstr "kulupu pi ante toki pi toki pona"
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr ""
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr ""
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, fuzzy, kde-format
 #| msgctxt "@action:button"
 #| msgid "Continue"
 msgid "Continue"
 msgstr "o awen tawa"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr ""
@@ -4636,12 +4706,12 @@ msgstr ""
 msgid "Could not open URL"
 msgstr ""
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr ""
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr ""

po/tr/neochat.po

@@ -1,15 +1,15 @@
 # Copyright (C) 2023 This file is copyright:
 # This file is distributed under the same license as the neochat package.
 #
-# SPDX-FileCopyrightText: 2022, 2023 Emir SARI <emir_sari@icloud.com>
+# SPDX-FileCopyrightText: 2022, 2023, 2024 Emir SARI <emir_sari@icloud.com>
 # Volkan Gezer <volkangezer@gmail.com>, 2021.
 # Emir SARI <emir_sari@icloud.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 11:36+0300\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2024-01-01 23:01+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
 "Language: tr\n"
@@ -17,81 +17,81 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 23.11.70\n"
+"X-Generator: Lokalize 24.01.85\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Anında bildirimler alınıyor"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 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ı"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Oturum açma başarısız: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Ağ hatası: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Erişim jetonu bulunamadı"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Silinmiş olabilir mi?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Anahtar zincirine erişim reddedildi."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, 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:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Kullanılabilir anahtar zinciri yok."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, 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:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Erişim jetonu okunamıyor"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Dosya, indirmek için pek büyük."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, 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:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Bu ileti silindi]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Bu ileti silindi: %1]</i>"
@@ -131,13 +131,13 @@ msgstr ": %1"
 #, kde-format
 msgctxt "their refers to a singular user"
 msgid "cleared their display name"
-msgstr "ekran adını sildi"
+msgstr "görüntü adını sildi"
 
 #: src/eventhandler.cpp:382
 #, kde-format
 msgctxt "their refers to a singular user"
 msgid "changed their display name to %1"
-msgstr "ekran adını %1 olarak değiştirdi"
+msgstr "görüntü adını %1 olarak değiştirdi"
 
 #: src/eventhandler.cpp:387 src/eventhandler.cpp:568
 #, kde-format
@@ -350,7 +350,7 @@ msgstr "birisini odaya davet etti"
 #, kde-format
 msgctxt "their refers to a singular user"
 msgid "changed their display name"
-msgstr "ekran adını değiştirdi"
+msgstr "görüntü adını değiştirdi"
 
 #: src/eventhandler.cpp:585
 #, kde-format
@@ -422,14 +422,14 @@ msgstr "durumu güncelledi"
 msgid "started a poll"
 msgstr "bir anket başlattı"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
 msgstr[0] "%1 kullanıcı: "
 msgstr[1] "%1 kullanıcı: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -745,15 +745,15 @@ msgstr "Verilen odadan veya bir tane verilmemişse bu odadan ayrılır"
 #: src/models/actionsmodel.cpp:329 src/models/actionsmodel.cpp:337
 #: src/models/actionsmodel.cpp:345
 msgid "<display name>"
-msgstr "<ekran adı>"
+msgstr "<görüntü adı>"
 
 #: src/models/actionsmodel.cpp:330
 msgid "Changes your global display name"
-msgstr "Global ekran adınızı değiştirir"
+msgstr "Global görüntü adınızı değiştirir"
 
 #: src/models/actionsmodel.cpp:338 src/models/actionsmodel.cpp:346
 msgid "Changes your display name in this room"
-msgstr "Bu odadaki ekran adınızı değiştirir"
+msgstr "Bu odada görüntülenen adınızı değiştirir"
 
 #: src/models/actionsmodel.cpp:360
 #, kde-format
@@ -963,16 +963,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Kendi Emojileriniz"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[DEĞİŞTİRİLDİ]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[DEĞİŞTİRİLDİ: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1016,13 +1006,78 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Bu hesap için bildirimleri etkinleştir"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Birebir sohbetlerdeki iletiler"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Birebir sohbetlerdeki şifreli iletiler"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Grup sohbetlerdeki iletiler"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Şifreli grup sohbetlerindeki iletiler"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Oda yükseltme iletileri"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Görüntü adımı içeren iletiler"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Matrik kullanıcı kimliğimi belirten iletiler"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Bir odayı belirten iletiler"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr "Matrix kimliğimin yerel kısmını içeren iletiler"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Tüm oda (@oda) bildirimleri"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Bir odaya olan davetler"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Çağrı daveti"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " ve"
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1030,7 +1085,7 @@ msgid_plural " and %1 others"
 msgstr[0] " ve %1 başkası"
 msgstr[1] " ve %1 başkası"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1068,28 +1123,28 @@ msgstr "Düşük öncelik"
 msgid "Spaces"
 msgstr "Alanlar"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Oda oluşturulamadı: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Alan oluşturma başarısız: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Rapor başarıyla gönderildi."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Enlem: %1, Boylam: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Şifreli İleti"
@@ -1115,40 +1170,40 @@ msgstr "Yanıtla"
 msgid "Reply..."
 msgstr "Yanıtla..."
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "%1, sizi bir odaya davet etti"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Bu daveti NeoChat'te aç"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Kabul Et"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Reddet"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Kullanıcı Reddet ve Yok Say"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Aç: NeoChat"
@@ -1196,7 +1251,7 @@ msgid "Label:"
 msgstr "Etiket:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Kaydet"
@@ -1265,6 +1320,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Hesabı Devre Dışı Bırakmayı Onayla"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Parola başarıyla değiştirildi"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Yanlış parola girildi"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Parolayı değiştirmeye çalışırken bilinmeyen sorun"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1309,21 +1379,6 @@ msgstr "Hesaplar"
 msgid "Add Account"
 msgstr "Hesap Ekle"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Parola başarıyla değiştirildi"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Yanlış parola girildi"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Parolayı değiştirmeye çalışırken bilinmeyen sorun"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1426,19 +1481,19 @@ msgstr "İlişik göndermeyi iptal et"
 msgid "Ban User"
 msgstr "Kullanıcıyı Yasakla"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Kullanıcıyı yasaklama gerekçesi"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Yasakla"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1703,6 +1758,9 @@ msgstr "Konu:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Bu üst ögeyi resmi yap"
 
@@ -1726,7 +1784,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1751,8 +1809,11 @@ msgid ""
 msgstr ""
 "Bu durumu ayarlamak için alt ögede yeterli izin düzeyine sahip değilsiniz"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Bu alanı resmi üst öge yap"
 
@@ -1770,12 +1831,12 @@ msgstr "Yeni aygıt adı"
 #: src/qml/DeviceDelegate.qml:68
 #, kde-format
 msgid "Cancel editing display name"
-msgstr "Ekran adını düzenlemeyi iptal et"
+msgstr "Görüntü adını düzenlemeyi iptal et"
 
 #: src/qml/DeviceDelegate.qml:75
 #, kde-format
 msgid "Confirm new display name"
-msgstr "Yeni ekran adını onayla"
+msgstr "Yeni görüntü adını onayla"
 
 #: src/qml/DeviceDelegate.qml:90
 #, kde-format
@@ -1938,7 +1999,8 @@ msgstr "Yapışkanlar"
 msgid ""
 "Confirm the emoji below are displayed on both devices, in the same order."
 msgstr ""
-"Aşağıdaki emojinin her iki aygıtta da aynı sırada gösterildiğini onaylayın."
+"Aşağıdaki emojinin her iki aygıtta da aynı sırada görüntülendiğini "
+"doğrulayın."
 
 #: src/qml/EmojiSas.qml:41
 #, kde-format
@@ -2026,7 +2088,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Yapışkanlar ve Emojiler"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2034,7 +2096,7 @@ 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:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Odaları Keşfet"
@@ -2135,7 +2197,7 @@ msgid "Remove Message"
 msgstr "İletiyi Kaldır"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2185,143 +2247,143 @@ msgstr "Oda adı:"
 msgid "Room topic:"
 msgstr "Oda konusu:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Oda kimliği"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Oda kimliğini panoya kopyala"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Oda sürümü"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Odayı Yükselt"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Armalar"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Resmi arma ayarlanmamış"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Bu armayı, odanın resmi arması yap"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Armayı sil"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#yeni_arma:sunucu.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Yeni arma ekle"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "URL Önizlemeleri"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr "Oda üyeleri için URL önizlemelerini öntanımlı olarak etkinleştir"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "URL önizlemelerini etkinleştir"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "URL önizlemeleri, bu odada öntanımlı olarak etkin"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "URL önizlemeleri, bu odada öntanımlı olarak devre dışı"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Resmi Üst Alanlar"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Resmi"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Resmi üst öge yap"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Üst ögeyi kaldır"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "Bu odanın resmi üst alanı yok."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Yeni Resmi Üst Alan Ekle"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "Bu oda, başka bir konuşmayı sürdürüyor."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Daha eski iletileri gör…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Bu oda, başkasıyla değiştirildi."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Yeni odayı gör…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Odayı Yükselt"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Yeni sürüm seç"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Onayla"
@@ -2555,7 +2617,7 @@ msgstr "Anahtar Sözcükler"
 #: src/qml/GlobalNotificationsPage.qml:97 src/qml/PushNotification.qml:100
 #, kde-format
 msgid "Keyword…"
-msgstr "Anahtar Sözcük…"
+msgstr "Anahtar sözcük…"
 
 #: src/qml/GlobalNotificationsPage.qml:116 src/qml/PushNotification.qml:119
 #, kde-format
@@ -2694,17 +2756,17 @@ msgstr "Bir kullanıcı bul..."
 msgid "Add"
 msgstr "Ekle"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Kullanıcı yok"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Davet gönder"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Kullanıcı halihazırda bir üye veya davet edilmiş"
@@ -2766,12 +2828,12 @@ msgstr "Sunucu URL'si girin; örn. kde.org"
 msgid "Server URL"
 msgstr "Sunucu URL'si"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Bir oda adresi gir"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3001,7 +3063,7 @@ msgstr "Düzenlemeyi onayla"
 #, kde-format
 msgctxt "@action:button"
 msgid "Cancel edit"
-msgstr "Düzenlemeyi İptal Et"
+msgstr "Düzenlemeyi iptal et"
 
 #: src/qml/MessageSourceSheet.qml:21 src/qml/RoomData.qml:69
 #: src/qml/RoomData.qml:95
@@ -3095,7 +3157,7 @@ msgstr "İleti vurgularını etkinleştir"
 msgid "Delete keyword"
 msgstr "Anahtar sözcük sil"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3264,14 +3326,14 @@ msgstr "Bu alanın alt ögelerini ayarla"
 msgid "Set the parent space of this room"
 msgstr "Odanın üst alanını ayarla"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
 msgstr[0] "%1 kullanıcı tarafından verilen oylara istinaden"
 msgstr[1] "%1 kullanıcı tarafından verilen oylara istinaden"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3291,7 +3353,7 @@ msgstr "Yeni Güç Düzeyi"
 #: src/qml/PushNotification.qml:26
 #, kde-format
 msgid "Room notifications setting"
-msgstr "Oda bildirimleri ayarı"
+msgstr "Oda Bildirimleri Ayarı"
 
 #: src/qml/PushNotification.qml:31
 #, kde-format
@@ -3372,17 +3434,17 @@ msgstr "İletileri Kaldır"
 msgid "Remove Message"
 msgstr "İletiyi Kaldır"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Bu kullanıcının son iletisini kaldırma gerekçesi"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Bu iletiyi kaldırma gerekçesi"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3399,7 +3461,7 @@ msgstr "Yanıtı İptal Et"
 msgid "Report Message"
 msgstr "İletiyi Bildir"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Bu iletiyi bildirme nedeni"
@@ -3546,28 +3608,28 @@ msgstr "Üye sayısı yok"
 msgid "View notifications"
 msgstr "Bildirimleri görüntüle"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Oda bulunamadı"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Başlamak için odalara katılın"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
-msgstr "Oda dizininde ara"
+msgstr "Oda Dizininde Ara"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Daralt: %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3577,7 +3639,7 @@ msgstr "Genişlet: %1"
 #, kde-format
 msgctxt "@action:title"
 msgid "Room Media"
-msgstr "Oda Ortamı"
+msgstr "Odadaki Ortamlar"
 
 #: src/qml/RoomPage.qml:100
 #, kde-format
@@ -3618,7 +3680,7 @@ msgstr "Etkinleştirildiğinde, şifreleme devre dışı bırakılamaz."
 #, kde-format
 msgctxt "@option:check"
 msgid "Access"
-msgstr "Eriş"
+msgstr "Erişim"
 
 #: src/qml/RoomSecurity.qml:44
 #, kde-format
@@ -3676,7 +3738,7 @@ msgstr "Herkes bulabilir ve katılabilir."
 #, kde-format
 msgctxt "@option:check"
 msgid "Message history visibility"
-msgstr "İleti geçmişi görünürlüğü"
+msgstr "İleti Geçmişi Görünürlüğü"
 
 #: src/qml/RoomSecurity.qml:108
 #, kde-format
@@ -3811,6 +3873,11 @@ msgstr "Seçili oda bir alan değil"
 msgid "You do not have the privileges to complete this action"
 msgstr "Bu eylemi tamamlamak için yeterli izin düzeyine sahip değilsiniz"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Bu alanı resmi üst öge yap"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4079,12 +4146,12 @@ msgstr "SSO URL'sini Yeniden Aç"
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Var olan sohbete katıl"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Yeni sohbet oluştur"
@@ -4111,22 +4178,22 @@ msgstr ""
 "Burası sohbetin başlangıcıdır. Bu noktanın gerisinde herhangi bir ileti "
 "yoktur."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "İlk okunmayan iletiye atla"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "En son iletiye atla"
 
-#: src/qml/TimelineView.qml:228
+#: 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:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4205,7 +4272,7 @@ msgstr "Bağlantıyı Kopyala"
 #: src/qml/UserInfo.qml:96
 #, kde-format
 msgid "Switch User"
-msgstr "Kullanıcıyı Değiştir"
+msgstr "Kullanıcı Değiştir"
 
 #: src/qml/UserInfo.qml:124
 #, kde-format
@@ -4448,47 +4515,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Geri Git"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Sunucu yok."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Sunucu kullanılabilirliği denetleniyor."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Bu, geçerli bir sunucu değil."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Bu sunucu için kayıt işlemi devre dışı."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Kullanıcı adı yok."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Kullanıcı adı kullanılabilirliği denetleniyor."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Bu kullanıcı adı kullanılamıyor."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Sürdür"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Çalışıyor"
@@ -4544,16 +4611,22 @@ msgstr "İşletim sisteminiz, bu bağlantı için bir uygulama bulamadı."
 msgid "Could not open URL"
 msgstr "URL açılamadı"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Göster"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Çık"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[DEĞİŞTİRİLDİ]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[DEĞİŞTİRİLDİ: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Katılmaya çalıştığınız oda geçerli değil"
 

po/uk/neochat.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: neochat\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-11-28 01:36+0000\n"
-"PO-Revision-Date: 2023-11-21 08:10+0200\n"
+"POT-Creation-Date: 2024-01-07 01:54+0000\n"
+"PO-Revision-Date: 2023-12-03 08:55+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -20,81 +20,81 @@ msgstr ""
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 20.12.0\n"
 
-#: src/controller.cpp:128 src/controller.cpp:388
+#: src/controller.cpp:127 src/controller.cpp:369
 #, kde-format
 msgid "Receiving push notifications"
 msgstr "Отримання імпульсних сповіщень"
 
-#: src/controller.cpp:230
+#: src/controller.cpp:209
 #, kde-format
 msgid "Login Failed: Access Token invalid or revoked"
 msgstr "Невдала спроба увійти: жетон доступу є некоректним або його відкликано"
 
-#: src/controller.cpp:233 src/controller.cpp:238 src/login.cpp:93
+#: src/controller.cpp:212 src/controller.cpp:217 src/login.cpp:93
 #, kde-format
 msgid "Login Failed: %1"
 msgstr "Невдала спроба увійти: %1"
 
-#: src/controller.cpp:244
+#: src/controller.cpp:222
 #, kde-format
 msgid "Network Error: %1"
 msgstr "Помилка у мережі: %1"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Access token wasn't found"
 msgstr "Не знайдено жетона доступу"
 
-#: src/controller.cpp:269
+#: src/controller.cpp:244
 #, kde-format
 msgid "Maybe it was deleted?"
 msgstr "Можливо, його вилучено?"
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Access to keychain was denied."
 msgstr "Відмовлено у доступі до засобу керування ключами."
 
-#: src/controller.cpp:273
+#: src/controller.cpp:248
 #, kde-format
 msgid "Please allow NeoChat to read the access token"
 msgstr "Будь ласка, дозвольте NeoChat читання жетона доступу"
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "No keychain available."
 msgstr "Немає доступних засобів керування ключами."
 
-#: src/controller.cpp:276
+#: src/controller.cpp:251
 #, kde-format
 msgid "Please install a keychain, e.g. KWallet or GNOME keyring on Linux"
 msgstr ""
 "Будь ласка, встановіть засіб керування ключами, наприклад KWallet або GNOME "
 "keyring у Linux"
 
-#: src/controller.cpp:279
+#: src/controller.cpp:254
 #, kde-format
 msgid "Unable to read access token"
 msgstr "Не вдалося прочитати жетон доступу"
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "File too large to download."
 msgstr "Файл є надто великим для отримання."
 
-#: src/controller.cpp:358
+#: src/controller.cpp:331
 #, kde-format
 msgid "Contact your matrix server administrator for support."
 msgstr ""
 "Зв'яжіться із адміністратором вашого сервера matrix, щоб отримати допомогу."
 
 #: src/eventhandler.cpp:325 src/eventhandler.cpp:527
-#: src/models/messageeventmodel.cpp:459
+#: src/models/messageeventmodel.cpp:485
 #, kde-format
 msgid "<i>[This message was deleted]</i>"
 msgstr "<i>[Це повідомлення було вилучено]</i>"
 
-#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:460
+#: src/eventhandler.cpp:325 src/models/messageeventmodel.cpp:486
 #, kde-format
 msgid "<i>[This message was deleted: %1]</i>"
 msgstr "<i>[Це повідомлення було вилучено: %1]</i>"
@@ -425,7 +425,7 @@ msgstr "оновив стан"
 msgid "started a poll"
 msgstr "почав голосування"
 
-#: src/eventhandler.cpp:1133
+#: src/eventhandler.cpp:1088
 #, kde-format
 msgid "1 user: "
 msgid_plural "%1 users: "
@@ -434,7 +434,7 @@ msgstr[1] "%1 користувачі: "
 msgstr[2] "%1 користувачів: "
 msgstr[3] "%1 користувач: "
 
-#: src/eventhandler.cpp:1136
+#: src/eventhandler.cpp:1091
 #, kde-format
 msgctxt "list separator"
 msgid ", "
@@ -971,16 +971,6 @@ msgctxt "As in 'The user's own emojis"
 msgid "Own Emojis"
 msgstr "Власні емоційки"
 
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED]"
-msgstr "[ЗМІНЕНО]"
-
-#: src/models/messageeventmodel.cpp:484
-#, kde-format
-msgid "[REDACTED: %1]"
-msgstr "[ЗМІНЕНО: %1]"
-
 #: src/models/messagefiltermodel.cpp:125
 #, kde-format
 msgctxt "%1: What's being done; %2: How often it is done."
@@ -1028,13 +1018,79 @@ msgctxt ""
 msgid "<style>a {text-decoration: none;}</style>%1 %2"
 msgstr "<style>a {text-decoration: none;}</style>%1 %2"
 
-#: src/models/reactionmodel.cpp:85
+#: src/models/pushrulemodel.cpp:21
+msgctxt "Notification type"
+msgid "Enable notifications for this account"
+msgstr "Увімкнути сповіщення для цього облікового запису"
+
+#: src/models/pushrulemodel.cpp:22
+msgctxt "Notification type"
+msgid "Messages in one-to-one chats"
+msgstr "Повідомлення у спілкуванні один на один"
+
+#: src/models/pushrulemodel.cpp:23
+msgctxt "Notification type"
+msgid "Encrypted messages in one-to-one chats"
+msgstr "Зашифровані повідомлення у спілкуваннях один на один"
+
+#: src/models/pushrulemodel.cpp:24
+msgctxt "Notification type"
+msgid "Messages in group chats"
+msgstr "Повідомлення у групових спілкуваннях"
+
+#: src/models/pushrulemodel.cpp:25
+msgctxt "Notification type"
+msgid "Messages in encrypted group chats"
+msgstr "Повідомлення у зашифрованих групових спілкуваннях"
+
+#: src/models/pushrulemodel.cpp:26
+msgctxt "Notification type"
+msgid "Room upgrade messages"
+msgstr "Повідомлення щодо оновлення кімнат"
+
+#: src/models/pushrulemodel.cpp:27
+msgctxt "Notification type"
+msgid "Messages containing my display name"
+msgstr "Повідомлення, що містять ваше показане ім'я"
+
+#: src/models/pushrulemodel.cpp:28
+msgctxt "Notification type"
+msgid "Messages which mention my Matrix user ID"
+msgstr "Повідомлення, у яких згадують ваш ідентифікатор користувача Matrix"
+
+#: src/models/pushrulemodel.cpp:29
+msgctxt "Notification type"
+msgid "Messages which mention a room"
+msgstr "Повідомлення, у яких згадують кімнату"
+
+#: src/models/pushrulemodel.cpp:30
+msgctxt "Notification type"
+msgid "Messages containing the local part of my Matrix ID"
+msgstr ""
+"Повідомлення, у яких міститься локальна частина вашого ідентифікатора Matrix"
+
+#: src/models/pushrulemodel.cpp:31
+msgctxt "Notification type"
+msgid "Whole room (@room) notifications"
+msgstr "Усі сповіщення кімнати (@кімната)"
+
+#: src/models/pushrulemodel.cpp:32
+msgctxt "Notification type"
+msgid "Invites to a room"
+msgstr "Запрошує до кімнати"
+
+#: src/models/pushrulemodel.cpp:33
+msgctxt "Notification type"
+msgid "Call invitation"
+msgstr "Запрошення до дзвінка"
+
+#: src/models/reactionmodel.cpp:68
 #, kde-format
 msgctxt "Separate the usernames of users"
 msgid " and "
 msgstr " і "
 
-#: src/models/reactionmodel.cpp:92
+#: src/models/reactionmodel.cpp:75
 #, kde-format
 msgctxt "%1 is the number of other users"
 msgid " and %1 other"
@@ -1044,7 +1100,7 @@ msgstr[1] " і %1 інші"
 msgstr[2] " і %1 інших"
 msgstr[3] " і %1 інший"
 
-#: src/models/reactionmodel.cpp:96
+#: src/models/reactionmodel.cpp:79
 #, kde-format
 msgctxt "%2 is the users who reacted and %3 the emoji that was given"
 msgid "%2 reacted with %3"
@@ -1084,28 +1140,28 @@ msgstr "Низький пріоритет"
 msgid "Spaces"
 msgstr "Простори"
 
-#: src/neochatconnection.cpp:198
+#: src/neochatconnection.cpp:197
 #, kde-format
 msgid "Room creation failed: %1"
 msgstr "Не вдалося створити кімнату: %1"
 
-#: src/neochatconnection.cpp:230
+#: src/neochatconnection.cpp:229
 #, kde-format
 msgid "Space creation failed: %1"
 msgstr "Не вдалося створити простір: %1"
 
-#: src/neochatroom.cpp:1594 src/neochatroom.cpp:1595
+#: src/neochatroom.cpp:1575 src/neochatroom.cpp:1576
 #, kde-format
 msgid "Report sent successfully."
 msgstr "Скаргу успішно надіслано."
 
-#: src/neochatroom.cpp:1854 src/neochatroom.cpp:1862
+#: src/neochatroom.cpp:1846 src/neochatroom.cpp:1854
 #, kde-format
 msgctxt "'Lat' and 'Lon' as in Latitude and Longitude"
 msgid "Lat: %1, Lon: %2"
 msgstr "Шир: %1, Довг: %2"
 
-#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:323
+#: src/notificationsmanager.cpp:132 src/notificationsmanager.cpp:327
 #, kde-format
 msgid "Encrypted Message"
 msgstr "Зашифроване повідомлення"
@@ -1131,40 +1187,40 @@ msgstr "Відповісти"
 msgid "Reply..."
 msgstr "Відповісти…"
 
-#: src/notificationsmanager.cpp:243
+#: src/notificationsmanager.cpp:244
 #, kde-format
 msgid "%1 invited you to a room"
 msgstr "Вас запрошено до кімнати %1"
 
-#: src/notificationsmanager.cpp:247
+#: src/notificationsmanager.cpp:248
 #, kde-format
 msgid "Open this invitation in NeoChat"
 msgstr "Відкрити це запрошення у NeoChat"
 
-#: src/notificationsmanager.cpp:254
+#: src/notificationsmanager.cpp:258
 #, kde-format
 msgctxt "@action:button The thing being accepted is an invitation to chat"
 msgid "Accept"
 msgstr "Прийняти"
 
-#: src/notificationsmanager.cpp:255
+#: src/notificationsmanager.cpp:259
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject"
 msgstr "Відмовити"
 
-#: src/notificationsmanager.cpp:256
+#: src/notificationsmanager.cpp:260
 #, kde-format
 msgctxt "@action:button The thing being rejected is an invitation to chat"
 msgid "Reject and Ignore User"
 msgstr "Відмовити та ігнорувати користувача"
 
-#: src/notificationsmanager.cpp:316
+#: src/notificationsmanager.cpp:320
 #, kde-format
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: src/notificationsmanager.cpp:327
+#: src/notificationsmanager.cpp:331
 #, kde-format
 msgid "Open NeoChat"
 msgstr "Відкрити NeoChat"
@@ -1212,7 +1268,7 @@ msgid "Label:"
 msgstr "Мітка:"
 
 #: src/qml/AccountEditorPage.qml:117 src/qml/AccountEditorPage.qml:170
-#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:106
+#: src/qml/EmoticonEditorPage.qml:110 src/qml/General.qml:107
 #, kde-format
 msgid "Save"
 msgstr "Зберегти"
@@ -1281,6 +1337,21 @@ msgctxt "@title"
 msgid "Confirm Deactivating Account"
 msgstr "Підтвердження деактивації облікового запису"
 
+#: src/qml/AccountEditorPage.qml:223
+#, kde-format
+msgid "Password changed successfully"
+msgstr "Пароль успішно змінено"
+
+#: src/qml/AccountEditorPage.qml:225
+#, kde-format
+msgid "Wrong password entered"
+msgstr "Введено помилковий пароль"
+
+#: src/qml/AccountEditorPage.qml:227
+#, kde-format
+msgid "Unknown problem while trying to change password"
+msgstr "Невідома проблема під час спроби змінити пароль"
+
 #: src/qml/AccountMenu.qml:21 src/qml/UserInfo.qml:63
 #, kde-format
 msgid "Edit this account"
@@ -1325,21 +1396,6 @@ msgstr "Облікові записи"
 msgid "Add Account"
 msgstr "Додати обліковий запис"
 
-#: src/qml/AccountsPage.qml:115
-#, kde-format
-msgid "Password changed successfully"
-msgstr "Пароль успішно змінено"
-
-#: src/qml/AccountsPage.qml:117
-#, kde-format
-msgid "Wrong password entered"
-msgstr "Введено помилковий пароль"
-
-#: src/qml/AccountsPage.qml:119
-#, kde-format
-msgid "Unknown problem while trying to change password"
-msgstr "Невідома проблема під час спроби змінити пароль"
-
 #: src/qml/AppearanceSettingsPage.qml:19
 #, kde-format
 msgctxt "@title:window"
@@ -1442,19 +1498,19 @@ msgstr "Скасувати надсилання долучення"
 msgid "Ban User"
 msgstr "Заблокувати користувача"
 
-#: src/qml/BanSheet.qml:22
+#: src/qml/BanSheet.qml:27
 #, kde-format
 msgid "Reason for banning this user"
 msgstr "Причина блокування цього користувача"
 
-#: src/qml/BanSheet.qml:34
+#: src/qml/BanSheet.qml:43
 #, kde-format
 msgctxt "@action:button 'Ban' as in 'Ban this user'"
 msgid "Ban"
 msgstr "Заблокувати"
 
-#: src/qml/BanSheet.qml:43 src/qml/InviteUserPage.qml:24
-#: src/qml/RemoveSheet.qml:49 src/qml/ReportSheet.qml:43
+#: src/qml/BanSheet.qml:52 src/qml/InviteUserPage.qml:24
+#: src/qml/RemoveSheet.qml:57 src/qml/ReportSheet.qml:52
 #, kde-format
 msgctxt "@action"
 msgid "Cancel"
@@ -1718,6 +1774,9 @@ msgstr "Тема:"
 
 #: src/qml/CreateRoomDialog.qml:78 src/qml/CreateRoomDialog.qml:201
 #, kde-format
+msgctxt ""
+"@option:check As in make the space from which this dialog was created an "
+"official parent."
 msgid "Make this parent official"
 msgstr "Зробити цей батьківський запис офіційним"
 
@@ -1741,7 +1800,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:188
+#: src/qml/GlobalMenu.qml:64 src/qml/RoomListPage.qml:189
 #: src/qml/SelectParentDialog.qml:131
 #, kde-format
 msgctxt "@title"
@@ -1769,8 +1828,11 @@ msgstr ""
 "У вас недостатньо високий рівень прав доступу у дочірньому записів для "
 "встановлення цього стану"
 
-#: src/qml/CreateRoomDialog.qml:219 src/qml/SelectParentDialog.qml:159
+#: src/qml/CreateRoomDialog.qml:219
 #, kde-format
+msgctxt ""
+"@option:check The canonical parent is the default one if a room has multiple "
+"parent spaces."
 msgid "Make this space the canonical parent"
 msgstr "Зробити цей простір канонічним батьківським"
 
@@ -2048,7 +2110,7 @@ msgctxt "@title"
 msgid "Stickers & Emojis"
 msgstr "Наліпки та емоційки"
 
-#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:200
+#: src/qml/EncryptedDelegate.qml:20 src/qml/ReplyComponent.qml:191
 #, kde-format
 msgid ""
 "This message is encrypted and the sender has not shared the key with this "
@@ -2058,7 +2120,7 @@ msgstr ""
 "пристроєм."
 
 #: src/qml/ExploreComponent.qml:21 src/qml/ExploreComponentMobile.qml:52
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Explore rooms"
 msgstr "Ознайомитися з кімнатами"
@@ -2159,7 +2221,7 @@ msgid "Remove Message"
 msgstr "Вилучення повідомлення"
 
 #: src/qml/FileDelegateContextMenu.qml:85
-#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:34
+#: src/qml/MessageDelegateContextMenu.qml:141 src/qml/ReportSheet.qml:43
 #, kde-format
 msgctxt ""
 "@action:button 'Report' as in 'Report this event to the administrators'"
@@ -2209,144 +2271,144 @@ msgstr "Назва кімнати:"
 msgid "Room topic:"
 msgstr "Тема кімнати:"
 
-#: src/qml/General.qml:121
+#: src/qml/General.qml:122
 #, kde-format
 msgid "Room ID"
 msgstr "Ід. кімнати"
 
-#: src/qml/General.qml:126
+#: src/qml/General.qml:127
 #, kde-format
 msgid "Copy room ID to clipboard"
 msgstr "Копіювати ідентифікатор кімнати до буфера обміну"
 
-#: src/qml/General.qml:140
+#: src/qml/General.qml:141
 #, kde-format
 msgid "Room version"
 msgstr "Версія кімнати"
 
-#: src/qml/General.qml:146
+#: src/qml/General.qml:147
 #, kde-format
 msgid "Upgrade Room"
 msgstr "Оновити кімнату"
 
-#: src/qml/General.qml:165
+#: src/qml/General.qml:166
 #, kde-format
 msgid "Aliases"
 msgstr "Альтернативи"
 
-#: src/qml/General.qml:170
+#: src/qml/General.qml:171
 #, kde-format
 msgid "No canonical alias set"
 msgstr "Не встановлено канонічної альтернативи"
 
-#: src/qml/General.qml:183
+#: src/qml/General.qml:184
 #, kde-format
 msgid "Make this alias the room's canonical alias"
 msgstr "Зробити цю альтернативу основною альтернативою кімнати"
 
-#: src/qml/General.qml:198
+#: src/qml/General.qml:199
 #, kde-format
 msgid "Delete alias"
 msgstr "Вилучити альтернативу"
 
-#: src/qml/General.qml:223
+#: src/qml/General.qml:224
 #, kde-format
 msgid "#new_alias:server.org"
 msgstr "#нова_альтернатива:сервер.org"
 
-#: src/qml/General.qml:240
+#: src/qml/General.qml:241
 #, kde-format
 msgid "Add new alias"
 msgstr "Додати новий псевдонім"
 
-#: src/qml/General.qml:260
+#: src/qml/General.qml:261
 #, kde-format
 msgid "URL Previews"
 msgstr "Перегляд вмісту адрес"
 
-#: src/qml/General.qml:264
+#: src/qml/General.qml:265
 #, kde-format
 msgid "Enable URL previews by default for room members"
 msgstr ""
 "Увімкнути типовий попередній перегляд вмісту адрес для учасників кімнати"
 
-#: src/qml/General.qml:272
+#: src/qml/General.qml:273
 #, kde-format
 msgid "Enable URL previews"
 msgstr "Увімкнути перегляд вмісту адрес"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are enabled by default in this room"
 msgstr "У цій кімнаті типово увімкнено попередній перегляд вмісту адрес"
 
-#: src/qml/General.qml:274
+#: src/qml/General.qml:275
 #, kde-format
 msgid "URL previews are disabled by default in this room"
 msgstr "У цій кімнаті типово вимкнено попередній перегляд вмісту адрес"
 
-#: src/qml/General.qml:282
+#: src/qml/General.qml:283
 #, kde-format
 msgid "Official Parent Spaces"
 msgstr "Офіційні батьківські простори"
 
-#: src/qml/General.qml:315
+#: src/qml/General.qml:316
 #, kde-format
 msgid "Canonical"
 msgstr "Канонічний"
 
-#: src/qml/General.qml:322
+#: src/qml/General.qml:323
 #, kde-format
 msgid "Make canonical parent"
 msgstr "Зробити канонічним батьківським"
 
-#: src/qml/General.qml:336
+#: src/qml/General.qml:337
 #, kde-format
 msgid "Remove parent"
 msgstr "Вилучити батьківський"
 
-#: src/qml/General.qml:350
+#: src/qml/General.qml:351
 #, kde-format
 msgid "This room has no official parent spaces."
 msgstr "У цієї кімнати немає офіційних батьківських просторів."
 
-#: src/qml/General.qml:354
+#: src/qml/General.qml:355
 #, kde-format
 msgctxt "@action:button"
 msgid "Add new official parent"
 msgstr "Додати новий офіційний батьківський простір"
 
-#: src/qml/General.qml:369
+#: src/qml/General.qml:370
 #, kde-format
 msgid "This room continues another conversation."
 msgstr "У цій кімнаті продовжується інше спілкування."
 
-#: src/qml/General.qml:373
+#: src/qml/General.qml:374
 #, kde-format
 msgid "See older messages…"
 msgstr "Переглянути старі повідомлення…"
 
-#: src/qml/General.qml:383
+#: src/qml/General.qml:384
 #, kde-format
 msgid "This room has been replaced."
 msgstr "Цю кімнат було замінено."
 
-#: src/qml/General.qml:387
+#: src/qml/General.qml:388
 #, kde-format
 msgid "See new room…"
 msgstr "Переглянути нову кімнату…"
 
-#: src/qml/General.qml:408
+#: src/qml/General.qml:409
 #, kde-format
 msgid "Upgrade the Room"
 msgstr "Оновити кімнату"
 
-#: src/qml/General.qml:412
+#: src/qml/General.qml:413
 #, kde-format
 msgid "Select new version"
 msgstr "Виберіть нову версію"
 
-#: src/qml/General.qml:418 src/qml/PowerLevelDialog.qml:52
+#: src/qml/General.qml:419 src/qml/PowerLevelDialog.qml:52
 #, kde-format
 msgid "Confirm"
 msgstr "Підтвердити"
@@ -2721,17 +2783,17 @@ msgstr "Знайти користувача…"
 msgid "Add"
 msgstr "Додати"
 
-#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:134
+#: src/qml/InviteUserPage.qml:70 src/qml/StartChatPage.qml:135
 #, kde-format
 msgid "No users available"
 msgstr "Немає доступних користувачів"
 
-#: src/qml/InviteUserPage.qml:100
+#: src/qml/InviteUserPage.qml:101
 #, kde-format
 msgid "Send invitation"
 msgstr "Надіслати запрошення"
 
-#: src/qml/InviteUserPage.qml:114
+#: src/qml/InviteUserPage.qml:115
 #, kde-format
 msgid "User is either already a member or has been invited"
 msgstr "Користувач або вже є учасником або його вже запрошено"
@@ -2793,12 +2855,12 @@ msgstr "Введіть адресу сервера. Приклад: kde.org"
 msgid "Server URL"
 msgstr "Адреса сервера"
 
-#: src/qml/JoinRoomPage.qml:240
+#: src/qml/JoinRoomPage.qml:239
 #, kde-format
 msgid "Enter a room address"
 msgstr "Введіть адресу кімнати"
 
-#: src/qml/JoinRoomPage.qml:266
+#: src/qml/JoinRoomPage.qml:265
 #, kde-format
 msgctxt "@info:label"
 msgid "No public rooms found"
@@ -3123,7 +3185,7 @@ msgstr "Увімкнути підсвічування повідомлень"
 msgid "Delete keyword"
 msgstr "Вилучити ключове слово"
 
-#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:145
+#: src/qml/NotificationsView.qml:19 src/qml/RoomListPage.qml:146
 #, kde-format
 msgctxt "@title"
 msgid "Notifications"
@@ -3295,7 +3357,7 @@ msgstr "Встановити простір дітей"
 msgid "Set the parent space of this room"
 msgstr "Встановити простір батьків цієї кімнати"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgid "Based on votes by %1 user"
 msgid_plural "Based on votes by %1 users"
@@ -3304,7 +3366,7 @@ msgstr[1] "На основі голосів %1 користувачів"
 msgstr[2] "На основі голосів %1 користувачів"
 msgstr[3] "На основі голосу %1 користувача"
 
-#: src/qml/PollDelegate.qml:62
+#: src/qml/PollDelegate.qml:57
 #, kde-format
 msgctxt "as in 'this vote has ended'"
 msgid "(Ended)"
@@ -3406,17 +3468,17 @@ msgstr "Вилучити повідомлення"
 msgid "Remove Message"
 msgstr "Вилучити повідомлення"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this user's recent messages"
 msgstr "Причина вилучення нещодавніх повідомлень цього користувача"
 
-#: src/qml/RemoveSheet.qml:24
+#: src/qml/RemoveSheet.qml:29
 #, kde-format
 msgid "Reason for removing this message"
 msgstr "Причина вилучення цього повідомлення"
 
-#: src/qml/RemoveSheet.qml:36
+#: src/qml/RemoveSheet.qml:44
 #, kde-format
 msgctxt "@action:button 'Remove' as in 'Remove this message'"
 msgid "Remove"
@@ -3433,7 +3495,7 @@ msgstr "Скасувати відповідь"
 msgid "Report Message"
 msgstr "Поскаржитися на повідомлення"
 
-#: src/qml/ReportSheet.qml:22
+#: src/qml/ReportSheet.qml:27
 #, kde-format
 msgid "Reason for reporting this message"
 msgstr "Причина скарги на це повідомлення"
@@ -3582,28 +3644,28 @@ msgstr "Немає лічильника учасників"
 msgid "View notifications"
 msgstr "Переглянути сповіщення"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "No rooms found"
 msgstr "Не знайдено кімнат"
 
-#: src/qml/RoomListPage.qml:179
+#: src/qml/RoomListPage.qml:180
 #, kde-format
 msgid "Join some rooms to get started"
 msgstr "Спочатку, приєднайтеся до кімнат"
 
-#: src/qml/RoomListPage.qml:182
+#: src/qml/RoomListPage.qml:183
 #, kde-format
 msgid "Search in room directory"
 msgstr "Шукати у каталозі кімнат"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Collapse <section name>"
 msgid "Collapse %1"
 msgstr "Згорнути %1"
 
-#: src/qml/RoomListPage.qml:239
+#: src/qml/RoomListPage.qml:240
 #, kde-format
 msgctxt "Expand <section name"
 msgid "Expand %1"
@@ -3852,6 +3914,11 @@ msgstr "Вибрана кімната не є простором"
 msgid "You do not have the privileges to complete this action"
 msgstr "У вас недостатні привілеї для виконання цієї дії"
 
+#: src/qml/SelectParentDialog.qml:159
+#, kde-format
+msgid "Make this space the canonical parent"
+msgstr "Зробити цей простір канонічним батьківським"
+
 #: src/qml/SelectSpacesDialog.qml:35
 #, kde-format
 msgctxt "@title"
@@ -4120,12 +4187,12 @@ msgstr "Повторно відкрити адресу SSO"
 msgid "Chat"
 msgstr "Спілкування"
 
-#: src/qml/StartChatPage.qml:93
+#: src/qml/StartChatPage.qml:94
 #, kde-format
 msgid "Join existing chat"
 msgstr "Долучитися до наявного обговорення"
 
-#: src/qml/StartChatPage.qml:114
+#: src/qml/StartChatPage.qml:115
 #, kde-format
 msgid "Create new chat"
 msgstr "Створити обговорення"
@@ -4149,22 +4216,22 @@ msgid ""
 "this point."
 msgstr "Це початок спілкування. У журналі немає повідомлень за цим пунктом."
 
-#: src/qml/TimelineView.qml:180
+#: src/qml/TimelineView.qml:183
 #, kde-format
 msgid "Jump to first unread message"
 msgstr "Перейти до першого непрочитаного повідомлення"
 
-#: src/qml/TimelineView.qml:203
+#: src/qml/TimelineView.qml:206
 #, kde-format
 msgid "Jump to latest message"
 msgstr "Перейти до останнього повідомлення"
 
-#: src/qml/TimelineView.qml:228
+#: src/qml/TimelineView.qml:231
 #, kde-format
 msgid "Drag items here to share them"
 msgstr "Перетягніть пункти сюди, щоб оприлюднити їх"
 
-#: src/qml/TimelineView.qml:236
+#: src/qml/TimelineView.qml:239
 #, kde-format
 msgctxt "Message displayed when some users are typing"
 msgid "%2 is typing"
@@ -4490,47 +4557,47 @@ msgctxt "@action:button"
 msgid "Go back"
 msgstr "Назад"
 
-#: src/registration.cpp:301
+#: src/registration.cpp:300
 #, kde-format
 msgid "No server."
 msgstr "Немає сервера."
 
-#: src/registration.cpp:303
+#: src/registration.cpp:302
 #, kde-format
 msgid "Checking Server availability."
 msgstr "Перевірка доступності сервера."
 
-#: src/registration.cpp:305
+#: src/registration.cpp:304
 #, kde-format
 msgid "This is not a valid server."
 msgstr "Цей сервер є некоректним."
 
-#: src/registration.cpp:307
+#: src/registration.cpp:306
 #, kde-format
 msgid "Registration for this server is disabled."
 msgstr "Реєстрацію на цьому сервері вимкнено."
 
-#: src/registration.cpp:309
+#: src/registration.cpp:308
 #, kde-format
 msgid "No username."
 msgstr "Немає імені користувача."
 
-#: src/registration.cpp:311
+#: src/registration.cpp:310
 #, kde-format
 msgid "Checking username availability."
 msgstr "Перевірка доступності імені користувача."
 
-#: src/registration.cpp:313
+#: src/registration.cpp:312
 #, kde-format
 msgid "This username is not available."
 msgstr "Це ім’я користувача є недоступним."
 
-#: src/registration.cpp:315
+#: src/registration.cpp:314
 #, kde-format
 msgid "Continue"
 msgstr "Продовжити"
 
-#: src/registration.cpp:317
+#: src/registration.cpp:316
 #, kde-format
 msgid "Working"
 msgstr "Працюємо"
@@ -4590,16 +4657,22 @@ msgstr ""
 msgid "Could not open URL"
 msgstr "Не вдається відкрити адресу"
 
-#: src/trayicon.cpp:17
+#: src/trayicon.cpp:19
 #, kde-format
 msgid "Show"
 msgstr "Показати"
 
-#: src/trayicon.cpp:30
+#: src/trayicon.cpp:34
 #, kde-format
 msgid "Quit"
 msgstr "Вийти"
 
+#~ msgid "[REDACTED]"
+#~ msgstr "[ЗМІНЕНО]"
+
+#~ msgid "[REDACTED: %1]"
+#~ msgstr "[ЗМІНЕНО: %1]"
+
 #~ msgid "The room id you are trying to join is not valid"
 #~ msgstr "Ідентифікатор кімнати, до якої ви хочете приєднатися, є некоректним"
 
@@ -4715,36 +4788,9 @@ msgstr "Вийти"
 #~ "Повідомлення у цій кімнаті зашифровано. Зберіть libQuotient з підтримкою "
 #~ "шифрування, щоб надсилати зашифровані повідомлення."
 
-#~ msgid "Messages in one-to-one chats"
-#~ msgstr "Повідомлення у спілкуванні один на один"
-
-#~ msgid "Encrypted messages in one-to-one chats"
-#~ msgstr "Зашифровані повідомлення у спілкуваннях один на один"
-
-#~ msgid "Messages in group chats"
-#~ msgstr "Повідомлення у групових спілкуваннях"
-
-#~ msgid "Messages in encrypted group chats"
-#~ msgstr "Повідомлення у зашифрованих групових спілкуваннях"
-
-#~ msgid "Room upgrade messages"
-#~ msgstr "Повідомлення щодо оновлення кімнат"
-
-#~ msgid "Messages containing my display name"
-#~ msgstr "Повідомлення, що містять ваше показане ім'я"
-
-#~ msgid "Whole room (@room) notifications"
-#~ msgstr "Усі сповіщення кімнати (@кімната)"
-
 #~ msgid "Messages containing my keywords"
 #~ msgstr "Повідомлення, які містять ваші ключові слова"
 
-#~ msgid "Invites to a room"
-#~ msgstr "Запрошує до кімнати"
-
-#~ msgid "Call invitation"
-#~ msgstr "Запрошення до дзвінка"
-
 #~ msgctxt "@title:window"
 #~ msgid "Custom Emojis"
 #~ msgstr "Нетипові емодзі"

src/CMakeLists.txt

@@ -143,6 +143,7 @@ add_library(neochat STATIC
     models/notificationsmodel.h
     models/timelinemodel.cpp
     models/timelinemodel.h
+    enums/pushrule.h
 )
 
 qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN
@@ -475,6 +476,20 @@ if(ANDROID)
         "computer-symbolic"
         "gps"
         "system-users-symbolic"
+        "map-flat"
+        "documentinfo"
+        "view-list-details"
+        "go-previous"
+        "mail-forward-symbolic"
+        "dialog-warning-symbolic"
+        "object-rotate-left"
+        "object-rotate-right"
+        "add-subtitle"
+        "security-low"
+        "security-low-symbolic"
+        "kde"
+        "list-remove-symbolic"
+        "edit-delete"
     )
     ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
 else()

src/actionshandler.cpp

@@ -12,7 +12,6 @@
 #include <QStringBuilder>
 
 #include "models/actionsmodel.h"
-#include "models/customemojimodel.h"
 #include "neochatconfig.h"
 #include "texthandler.h"
 
@@ -40,7 +39,8 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
 
 void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
 {
-    if (!chatBarCache) {
+    if (!m_room || !chatBarCache) {
+        qWarning() << "ActionsHandler::handleMessageEvent - called with m_room and/or chatBarCache set to nullptr.";
         return;
     }
 
@@ -61,10 +61,6 @@ void ActionsHandler::handleMessageEvent(ChatBarCache *chatBarCache)
 
 QString ActionsHandler::handleMentions(QString handledText, QList<Mention> *mentions)
 {
-    if (!m_room) {
-        return QString();
-    }
-
     std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
         return a.cursor.anchor() > b.cursor.anchor();
     });
@@ -135,7 +131,6 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, Cha
         }
     }
 
-    handledText = CustomEmojiModel::instance().preprocessText(handledText);
     TextHandler textHandler;
     textHandler.setData(handledText);
     handledText = textHandler.handleSendText();

src/controller.cpp

@@ -68,7 +68,6 @@ Controller::Controller(QObject *parent)
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
-            Q_EMIT initiated();
         });
     }
 
@@ -137,23 +136,6 @@ Controller &Controller::instance()
     return _instance;
 }
 
-void Controller::toggleWindow()
-{
-    auto &instance = WindowController::instance();
-    auto window = instance.window();
-    if (window->isVisible()) {
-        if (window->windowStates() & Qt::WindowMinimized) {
-            window->showNormal();
-            window->requestActivate();
-        } else {
-            window->close();
-        }
-    } else {
-        instance.showAndRaiseWindow({});
-        instance.window()->requestActivate();
-    }
-}
-
 void Controller::addConnection(NeoChatConnection *c)
 {
     Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
@@ -163,8 +145,6 @@ void Controller::addConnection(NeoChatConnection *c)
     c->setLazyLoading(true);
 
     connect(c, &NeoChatConnection::syncDone, this, [this, c] {
-        Q_EMIT syncDone();
-
         c->sync(30000);
         c->saveState();
     });
@@ -222,34 +202,29 @@ void Controller::invokeLogin()
                     Q_EMIT accountsLoadingChanged();
                     if (connection->userId() == id) {
                         setActiveConnection(connection);
-                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
                     }
                 });
                 connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
                     if (error == "Unrecognised access token"_ls) {
-                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
+                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"), {});
                         connection->logout(false);
                     } else if (error == "Connection closed"_ls) {
-                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error), {});
                         // Failed due to network connection issue. This might happen when the homeserver is
                         // temporary down, or the user trying to re-launch NeoChat in a network that cannot
                         // connect to the homeserver. In this case, we don't want to do logout().
                     } else {
-                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error), {});
                         connection->logout(true);
                     }
-                    Q_EMIT initiated();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
-                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                    Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
                 });
                 connection->assumeIdentity(account.userId(), accessToken);
             });
         }
     }
-    if (accounts.isEmpty()) {
-        Q_EMIT initiated();
-    }
 }
 
 QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
@@ -266,17 +241,17 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
 
         switch (job->error()) {
         case QKeychain::EntryNotFound:
-            Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
+            Q_EMIT errorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
             break;
         case QKeychain::AccessDeniedByUser:
         case QKeychain::AccessDenied:
-            Q_EMIT globalErrorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
+            Q_EMIT errorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
             break;
         case QKeychain::NoBackendAvailable:
-            Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            Q_EMIT errorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
             break;
         case QKeychain::OtherError:
-            Q_EMIT globalErrorOccured(i18n("Unable to read access token"), job->errorString());
+            Q_EMIT errorOccured(i18n("Unable to read access token"), job->errorString());
             break;
         default:
             break;
@@ -322,10 +297,8 @@ void Controller::setQuitOnLastWindowClosed()
     if (NeoChatConfig::self()->systemTray()) {
         m_trayIcon = new TrayIcon(this);
         m_trayIcon->show();
-        connect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
     } else {
         if (m_trayIcon) {
-            disconnect(m_trayIcon, &TrayIcon::toggleWindow, this, &Controller::toggleWindow);
             delete m_trayIcon;
             m_trayIcon = nullptr;
         }
@@ -381,10 +354,18 @@ void Controller::listenForNotifications()
 #ifdef HAVE_KUNIFIEDPUSH
     auto connector = new KUnifiedPush::Connector(QStringLiteral("org.kde.neochat"));
 
-    connect(connector, &KUnifiedPush::Connector::messageReceived, [](const QByteArray &data) {
+    auto timer = new QTimer();
+    connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
+
+    connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
         NotificationsManager::instance().postPushNotification(data);
+        timer->stop();
     });
 
+    // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.
+    // Otherwise, messageReceived is never activated, and this daemon could stick around forever.
+    timer->start(5000);
+
     connector->registerClient(i18n("Receiving push notifications"));
 #endif
 }

src/controller.h

@@ -9,23 +9,15 @@
 
 #include "neochatconnection.h"
 #include <Quotient/accountregistry.h>
-#include <Quotient/jobs/basejob.h>
 #include <Quotient/settings.h>
 
 #ifdef HAVE_KUNIFIEDPUSH
 #include <kunifiedpush/connector.h>
 #endif
 
-class NeoChatRoom;
 class TrayIcon;
 class QQuickTextDocument;
 
-namespace Quotient
-{
-class Room;
-class User;
-}
-
 namespace QKeychain
 {
 class ReadPasswordJob;
@@ -65,16 +57,6 @@ class Controller : public QObject
     Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
 
 public:
-    /**
-     * @brief Defines the status after an attempt to change the password on an account.
-     */
-    enum PasswordStatus {
-        Success, /**< The password was successfully changed. */
-        Wrong, /**< The current password entered was wrong. */
-        Other, /**< An unknown problem occurred. */
-    };
-    Q_ENUM(PasswordStatus)
-
     static Controller &instance();
     static Controller *create(QQmlEngine *engine, QJSEngine *)
     {
@@ -138,7 +120,6 @@ private:
 
     void loadSettings();
     void saveSettings() const;
-    QMap<Quotient::Room *, int> m_notificationCounts;
 
     Quotient::AccountRegistry m_accountRegistry;
     QStringList m_accountsLoading;
@@ -146,23 +127,13 @@ private:
 
 private Q_SLOTS:
     void invokeLogin();
-    void toggleWindow();
     void setQuitOnLastWindowClosed();
 
 Q_SIGNALS:
-    /// Error occurred because of user inputs
-    void errorOccured(const QString &error);
-
-    /// Error occurred because of server or bug in NeoChat
-    void globalErrorOccured(QString error, QString detail);
-    void syncDone();
+    void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
-    void initiated();
-    void quitOnLastWindowClosedChanged();
-    void unreadCountChanged();
     void activeConnectionChanged();
-    void passwordStatus(Controller::PasswordStatus status);
     void userConsentRequired(QUrl url);
     void accountsLoadingChanged();
 

src/enums/pushrule.h

@@ -0,0 +1,186 @@
+// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+#include <QQmlEngine>
+
+/**
+ * @class PushRuleKind
+ *
+ * A class with the Kind enum for push notifications and helper functions.
+ *
+ * The kind relates to the kinds of push rule defined in the matrix spec, see
+ * https://spec.matrix.org/v1.7/client-server-api/#push-rules for full details.
+ */
+class PushRuleKind : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Defines the different kinds of push rule.
+     */
+    enum Kind {
+        Override = 0, /**< The highest priority rules. */
+        Content, /**< These configure behaviour for messages that match certain patterns. */
+        Room, /**< These rules change the behaviour of all messages for a given room. */
+        Sender, /**< These rules configure notification behaviour for messages from a specific Matrix user ID. */
+        Underride, /**< These are identical to override rules, but have a lower priority than content, room and sender rules. */
+    };
+    Q_ENUM(Kind)
+
+    /**
+     * @brief Translate the Kind enum value to a human readable string.
+     *
+     * @sa Kind
+     */
+    static QString kindString(Kind kind)
+    {
+        switch (kind) {
+        case Kind::Override:
+            return QLatin1String("override");
+        case Kind::Content:
+            return QLatin1String("content");
+        case Kind::Room:
+            return QLatin1String("room");
+        case Kind::Sender:
+            return QLatin1String("sender");
+        case Kind::Underride:
+            return QLatin1String("underride");
+        default:
+            return {};
+        }
+    };
+};
+
+/**
+ * @class PushRuleAction
+ *
+ * A class with the Action enum for push notifications.
+ *
+ * The action relates to the actions of push rule defined in the matrix spec, see
+ * https://spec.matrix.org/v1.7/client-server-api/#push-rules for full details.
+ */
+class PushRuleAction : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Defines the global push notification actions.
+     */
+    enum Action {
+        Unknown = 0, /**< The action has not yet been obtained from the server. */
+        Off, /**< No push notifications are to be sent. */
+        On, /**< Push notifications are on. */
+        Noisy, /**< Push notifications are on, also trigger a notification sound. */
+        Highlight, /**< Push notifications are on, also the event should be highlighted in chat. */
+        NoisyHighlight, /**< Push notifications are on, also trigger a notification sound and highlight in chat. */
+    };
+    Q_ENUM(Action)
+};
+
+/**
+ * @class PushNotificationState
+ *
+ * A class with the State enum for room push notification state.
+ *
+ * The state define whether the room adheres to the global push rule states for the
+ * account or is overridden for a room.
+ *
+ * @note This is different to the PushRuleAction which defines the type of notification
+ *       for an individual rule.
+ *
+ * @sa PushRuleAction
+ */
+class PushNotificationState : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Describes the push notification state for the room.
+     */
+    enum State {
+        Unknown, /**< The state has not yet been obtained from the server. */
+        Default, /**< The room follows the globally configured rules for the local user. */
+        Mute, /**< No notifications for messages in the room. */
+        MentionKeyword, /**< Notifications only for local user mentions and keywords. */
+        All, /**< Notifications for all messages. */
+    };
+    Q_ENUM(State)
+};
+
+/**
+ * @class PushRuleSection
+ *
+ * A class with the Section enum for push notifications and helper functions.
+ *
+ * @note This is different from the PushRuleKind and instead is used for sorting
+ *       in the settings page which is not necessarily by Kind.
+ *
+ * @sa PushRuleKind
+ */
+class PushRuleSection : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
+public:
+    /**
+     * @brief Defines the sections to sort push rules into.
+     */
+    enum Section {
+        Master = 0, /**< The master push rule */
+        Room, /**< Push rules relating to all rooms. */
+        Mentions, /**< Push rules relating to user mentions. */
+        Keywords, /**< Global Keyword push rules. */
+        RoomKeywords, /**< Keyword push rules that only apply to a specific room. */
+        Invites, /**< Push rules relating to invites. */
+        Unknown, /**< New default push rules that have not been added to the model yet. */
+        /**
+         * @brief Push rules that should never be shown.
+         *
+         * There are numerous rules that get set that shouldn't be shown in the general
+         * list e.g. The array of rules used to override global settings in individual
+         * rooms.
+         *
+         * This is specifically different to unknown which are just new default push
+         * rule that haven't been added to the model yet.
+         */
+        Undefined,
+    };
+    Q_ENUM(Section)
+
+    /**
+     * @brief Translate the Section enum value to a human readable string.
+     *
+     * @sa Section
+     */
+    static QString sectionString(Section section)
+    {
+        switch (section) {
+        case Section::Master:
+            return QLatin1String("Master");
+        case Section::Room:
+            return QLatin1String("Room Notifications");
+        case Section::Mentions:
+            return QLatin1String("@Mentions");
+        case Section::Keywords:
+            return QLatin1String("Keywords");
+        case Section::Invites:
+            return QLatin1String("Invites");
+        default:
+            return {};
+        }
+    };
+};

src/eventhandler.cpp

@@ -181,7 +181,7 @@ QString EventHandler::singleLineAuthorDisplayname(bool isPending) const
     }
 
     const auto author = isPending ? m_room->localUser() : m_room->user(m_event->senderId());
-    auto displayName = m_room->htmlSafeMemberName(author->id());
+    auto displayName = m_room->safeMemberName(author->id());
     displayName.replace(QStringLiteral("<br>\n"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br>"), QStringLiteral(" "));
     displayName.replace(QStringLiteral("<br />\n"), QStringLiteral(" "));
@@ -645,6 +645,15 @@ QString EventHandler::getGenericBody() const
         i18n("Unknown event"));
 }
 
+QString EventHandler::subtitleText() const
+{
+    if (m_event == nullptr) {
+        qCWarning(EventHandling) << "subtitleText called with m_event set to nullptr.";
+        return {};
+    }
+    return singleLineAuthorDisplayname() + (m_event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + getPlainBody(true);
+}
+
 QVariantMap EventHandler::getMediaInfo() const
 {
     if (m_room == nullptr) {
@@ -802,60 +811,6 @@ QSharedPointer<LinkPreviewer> EventHandler::getLinkPreviewer() const
     }
 }
 
-QSharedPointer<ReactionModel> EventHandler::getReactions() const
-{
-    if (m_room == nullptr) {
-        qCWarning(EventHandling) << "getReactions called with m_room set to nullptr.";
-        return nullptr;
-    }
-    if (m_event == nullptr) {
-        qCWarning(EventHandling) << "getReactions called with m_event set to nullptr.";
-        return nullptr;
-    }
-    if (!m_event->is<RoomMessageEvent>()) {
-        qCWarning(EventHandling) << "getReactions called with on a non-message event.";
-        return nullptr;
-    }
-
-    auto eventId = m_event->id();
-    const auto &annotations = m_room->relatedEvents(eventId, EventRelation::AnnotationType);
-    if (annotations.isEmpty()) {
-        return nullptr;
-    };
-
-    QMap<QString, QList<User *>> reactions = {};
-    for (const auto &a : annotations) {
-        if (a->isRedacted()) { // Just in case?
-            continue;
-        }
-        if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->key()].append(m_room->user(e->senderId()));
-        }
-    }
-
-    if (reactions.isEmpty()) {
-        return nullptr;
-    }
-
-    QList<ReactionModel::Reaction> res;
-    auto i = reactions.constBegin();
-    while (i != reactions.constEnd()) {
-        QVariantList authors;
-        for (const auto &author : i.value()) {
-            authors.append(m_room->getUser(author));
-        }
-
-        res.append(ReactionModel::Reaction{i.key(), authors});
-        ++i;
-    }
-
-    if (res.size() > 0) {
-        return QSharedPointer<ReactionModel>(new ReactionModel(nullptr, res, m_room->localUser()));
-    } else {
-        return nullptr;
-    }
-}
-
 bool EventHandler::hasReply() const
 {
     if (m_event == nullptr) {

src/eventhandler.h

@@ -206,6 +206,14 @@ public:
      */
     QString getGenericBody() const;
 
+    /**
+     * @brief Output a string for the event to be used as  a RoomList subtitle.
+     *
+     * The output includes the username followed by the plain message, all with no
+     * line breaks.
+     */
+    QString subtitleText() const;
+
     /**
      * @brief Return the media info for the event.
      *
@@ -233,15 +241,6 @@ public:
      */
     QSharedPointer<LinkPreviewer> getLinkPreviewer() const;
 
-    /**
-     * @brief Return a ReactionModel object for the event.
-     *
-     * A nullptr will be returned for any event that doesn't have any links so the
-     * return should be null checked and an empty QVariantList (or other suitable
-     * empty mode) provided if null.
-     */
-    QSharedPointer<ReactionModel> getReactions() const;
-
     /**
      * @brief Whether the event is a reply to another in the timeline.
      */

src/login.cpp

@@ -82,7 +82,7 @@ void LoginHelper::init()
         m_connection = nullptr;
     });
     connect(m_connection, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
-        Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
+        Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
         m_isLoggingIn = false;
         Q_EMIT isLoggingInChanged();
     });
@@ -97,12 +97,11 @@ void LoginHelper::init()
     });
 
     connect(m_connection, &Connection::resolveError, this, [](QString error) {
-        Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
+        Q_EMIT Controller::instance().errorOccured(i18n("Network Error"), std::move(error));
     });
 
     connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
         Q_EMIT loaded();
-        Q_EMIT Controller::instance().initiated();
     });
 }
 

src/models/accountemoticonmodel.cpp

@@ -24,6 +24,10 @@ int AccountEmoticonModel::rowCount(const QModelIndex &index) const
 
 QVariant AccountEmoticonModel::data(const QModelIndex &index, int role) const
 {
+    if (m_connection == nullptr) {
+        return {};
+    }
+
     const auto &row = index.row();
     const auto &image = m_images->images[row];
     if (role == UrlRole) {
@@ -92,6 +96,10 @@ void AccountEmoticonModel::setConnection(Connection *connection)
 
 void AccountEmoticonModel::reloadEmoticons()
 {
+    if (m_connection == nullptr) {
+        return;
+    }
+
     QJsonObject json;
     if (m_connection->hasAccountData("im.ponies.user_emotes"_ls)) {
         json = m_connection->accountData("im.ponies.user_emotes"_ls)->contentJson();
@@ -104,6 +112,10 @@ void AccountEmoticonModel::reloadEmoticons()
 
 void AccountEmoticonModel::deleteEmoticon(int index)
 {
+    if (m_connection == nullptr) {
+        return;
+    }
+
     QJsonObject data;
     m_images->images.removeAt(index);
     m_images->fillJson(&data);
@@ -112,6 +124,10 @@ void AccountEmoticonModel::deleteEmoticon(int index)
 
 void AccountEmoticonModel::setEmoticonBody(int index, const QString &text)
 {
+    if (m_connection == nullptr) {
+        return;
+    }
+
     m_images->images[index].body = text;
     QJsonObject data;
     m_images->fillJson(&data);
@@ -120,6 +136,10 @@ void AccountEmoticonModel::setEmoticonBody(int index, const QString &text)
 
 void AccountEmoticonModel::setEmoticonShortcode(int index, const QString &shortcode)
 {
+    if (m_connection == nullptr) {
+        return;
+    }
+
     m_images->images[index].shortcode = shortcode;
     QJsonObject data;
     m_images->fillJson(&data);
@@ -128,6 +148,9 @@ void AccountEmoticonModel::setEmoticonShortcode(int index, const QString &shortc
 
 void AccountEmoticonModel::setEmoticonImage(int index, const QUrl &source)
 {
+    if (m_connection == nullptr) {
+        return;
+    }
     doSetEmoticonImage(index, source);
 }
 
@@ -166,6 +189,9 @@ QCoro::Task<void> AccountEmoticonModel::doAddEmoticon(QUrl source, QString short
 
 void AccountEmoticonModel::addEmoticon(const QUrl &source, const QString &shortcode, const QString &description, const QString &type)
 {
+    if (m_connection == nullptr) {
+        return;
+    }
     doAddEmoticon(source, shortcode, description, type);
 }
 

src/models/customemojimodel.cpp

@@ -188,22 +188,14 @@ QHash<int, QByteArray> CustomEmojiModel::roleNames() const
     };
 }
 
-QString CustomEmojiModel::preprocessText(const QString &text)
+QString CustomEmojiModel::preprocessText(QString text)
 {
-    auto parts = text.split("```"_ls);
-    bool skip = true;
-    for (auto &part : parts) {
-        skip = !skip;
-        if (skip) {
-            continue;
-        }
-        for (const auto &emoji : std::as_const(m_emojis)) {
-            part.replace(
-                emoji.regexp,
-                QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
-        }
+    for (const auto &emoji : std::as_const(m_emojis)) {
+        text.replace(
+            emoji.regexp,
+            QStringLiteral(R"(<img data-mx-emoticon="" src="%1" alt="%2" title="%2" height="32" vertical-align="middle" />)").arg(emoji.url, emoji.name));
     }
-    return parts.join("```"_ls);
+    return text;
 }
 
 QVariantList CustomEmojiModel::filterModel(const QString &filter)

src/models/customemojimodel.h

@@ -85,7 +85,7 @@ public:
     /**
      * @brief Substitute any custom emojis for an image in the input text.
      */
-    Q_INVOKABLE QString preprocessText(const QString &it);
+    Q_INVOKABLE QString preprocessText(QString text);
 
     /**
      * @brief Return a list of custom emojis where the name contains the filter text.

src/models/messageeventmodel.cpp

@@ -20,6 +20,7 @@
 
 #include "enums/delegatetype.h"
 #include "eventhandler.h"
+#include "events/pollevent.h"
 #include "models/reactionmodel.h"
 
 using namespace Quotient;
@@ -34,7 +35,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[TimeStringRole] = "timeString";
     roles[SectionRole] = "section";
     roles[AuthorRole] = "author";
-    roles[ContentRole] = "content";
     roles[HighlightRole] = "isHighlighted";
     roles[SpecialMarksRole] = "marks";
     roles[ProgressInfoRole] = "progressInfo";
@@ -65,12 +65,19 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[LatitudeRole] = "latitude";
     roles[LongitudeRole] = "longitude";
     roles[AssetRole] = "asset";
+    roles[PollHandlerRole] = "pollHandler";
     return roles;
 }
 
 MessageEventModel::MessageEventModel(QObject *parent)
     : QAbstractListModel(parent)
 {
+    connect(this, &MessageEventModel::modelAboutToBeReset, this, [this]() {
+        resetting = true;
+    });
+    connect(this, &MessageEventModel::modelReset, this, [this]() {
+        resetting = false;
+    });
 }
 
 NeoChatRoom *MessageEventModel::room() const
@@ -92,6 +99,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
     }
 
     m_currentRoom = room;
+    Q_EMIT roomChanged();
     if (room) {
         m_lastReadEventIndex = QPersistentModelIndex(QModelIndex());
         room->setDisplayed();
@@ -100,6 +108,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
             if (const auto &roomMessageEvent = &*event->viewAs<RoomMessageEvent>()) {
                 createEventObjects(roomMessageEvent);
             }
+            if (event->event()->is<PollStartEvent>()) {
+                m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event->event()));
+            }
         }
 
         if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) {
@@ -150,6 +161,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                         }
                     }
                 }
+                if (event->is<PollStartEvent>()) {
+                    m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event.get()));
+                }
             }
             m_initialized = true;
             beginInsertRows({}, timelineBaseIndex(), timelineBaseIndex() + int(events.size()) - 1);
@@ -159,6 +173,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                 if (const auto &roomMessageEvent = dynamic_cast<RoomMessageEvent *>(event.get())) {
                     createEventObjects(roomMessageEvent);
                 }
+                if (event->is<PollStartEvent>()) {
+                    m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(event.get()));
+                }
             }
             if (rowCount() > 0) {
                 rowBelowInserted = rowCount() - 1; // See #312
@@ -230,8 +247,11 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
                 if (const auto &event = dynamic_cast<const RoomMessageEvent *>(&**eventIt)) {
                     createEventObjects(event);
                 }
+                if (eventIt->event()->is<PollStartEvent>()) {
+                    m_currentRoom->createPollHandler(eventCast<const PollStartEvent>(eventIt->event()));
+                }
             }
-            refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole, Qt::DisplayRole});
+            refreshEventRoles(eventId, {Qt::DisplayRole});
         });
         connect(m_currentRoom, &Room::changed, this, [this]() {
             for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
@@ -252,6 +272,12 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         lastReadEventId.clear();
     }
     endResetModel();
+
+    // After reset put a read marker in if required.
+    // This is needed when changing back to a room that has already loaded messages.
+    if (room) {
+        moveReadMarker(m_currentRoom->lastFullyReadEventId());
+    }
 }
 
 int MessageEventModel::refreshEvent(const QString &eventId)
@@ -478,28 +504,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return eventHandler.getAuthor(isPending);
     }
 
-    if (role == ContentRole) {
-        if (evt.isRedacted()) {
-            auto reason = evt.redactedBecause()->reason();
-            return (reason.isEmpty()) ? i18n("[REDACTED]") : i18n("[REDACTED: %1]").arg(evt.redactedBecause()->reason());
-        }
-
-        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (e->msgtype() == Quotient::MessageEventType::Location) {
-                return e->contentJson();
-            }
-            // Cannot use e.contentJson() here because some
-            // EventContent classes inject values into the copy of the
-            // content JSON stored in EventContent::Base
-            return e->hasFileContent() ? QVariant::fromValue(e->content()->originalJson) : QVariant();
-        };
-
-        if (auto e = eventCast<const StickerEvent>(&evt)) {
-            return QVariant::fromValue(e->image().originalJson);
-        }
-        return evt.contentJson();
-    }
-
     if (role == HighlightRole) {
         return eventHandler.isHighlighted();
     }
@@ -608,7 +612,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
             if (data(i, SpecialMarksRole) != EventStatus::Hidden && !itemData(i).empty()) {
                 return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, DelegateTypeRole) == DelegateType::State
                     || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
-                    || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day();
+                    || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day()
+                    // FIXME: This should not be necessary; the proper fix is to calculate this role in MessageFilterModel with the knowledge about the filtered
+                    // events.
+                    || data(i, IsRedactedRole).toBool();
             }
         }
 
@@ -692,6 +699,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return row < static_cast<int>(m_currentRoom->pendingEvents().size());
     }
 
+    if (role == PollHandlerRole) {
+        return QVariant::fromValue<PollHandler *>(m_currentRoom->poll(evt.id()));
+    }
+
     return {};
 }
 
@@ -718,10 +729,28 @@ void MessageEventModel::createEventObjects(const Quotient::RoomMessageEvent *eve
     } else {
         m_linkPreviewers.remove(eventId);
     }
-    if (auto reactionModel = eventHandler.getReactions()) {
-        m_reactionModels[eventId] = reactionModel;
+
+    // ReactionModel handles updates to add and remove reactions, we only need to
+    // handle adding and removing whole models here.
+    if (m_reactionModels.contains(eventId)) {
+        // If a model already exists but now has no reactions remove it
+        if (m_reactionModels[eventId]->rowCount() <= 0) {
+            m_reactionModels.remove(eventId);
+            if (!resetting) {
+                refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
+            }
+        }
     } else {
-        m_reactionModels.remove(eventId);
+        if (m_currentRoom->relatedEvents(*event, Quotient::EventRelation::AnnotationType).count() > 0) {
+            // If a model doesn't exist and there are reactions add it.
+            auto reactionModel = QSharedPointer<ReactionModel>(new ReactionModel(event, m_currentRoom));
+            if (reactionModel->rowCount() > 0) {
+                m_reactionModels[eventId] = reactionModel;
+                if (!resetting) {
+                    refreshEventRoles(eventId, {ReactionRole, ShowReactionsRole});
+                }
+            }
+        }
     }
 }
 

src/models/messageeventmodel.h

@@ -9,6 +9,7 @@
 
 #include "linkpreviewer.h"
 #include "neochatroom.h"
+#include "pollhandler.h"
 
 class ReactionModel;
 
@@ -45,7 +46,6 @@ public:
         TimeStringRole, /**< The timestamp for when the event was sent as a string (in QLocale::ShortFormat). */
         SectionRole, /**< The date of the event as a string. */
         AuthorRole, /**< The author of the event. */
-        ContentRole, /**< The full message content. */
         HighlightRole, /**< Whether the event should be highlighted. */
         SpecialMarksRole, /**< Whether the event is hidden or not. */
         ProgressInfoRole, /**< Progress info when downloading files. */
@@ -83,6 +83,7 @@ public:
         LatitudeRole, /**< Latitude for a location event. */
         LongitudeRole, /**< Longitude for a location event. */
         AssetRole, /**< Type of location event, e.g. self pin of the user location. */
+        PollHandlerRole, /**< The PollHandler for the event, if any. */
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)
@@ -130,6 +131,7 @@ private:
     QString lastReadEventId;
     QPersistentModelIndex m_lastReadEventIndex;
     int rowBelowInserted = -1;
+    bool resetting = false;
     bool movingEvent = false;
     KFormat m_format;
 

src/models/notificationsmodel.cpp

@@ -85,7 +85,7 @@ void NotificationsModel::setConnection(NeoChatConnection *connection)
     }
     m_connection = connection;
     Q_EMIT connectionChanged();
-    connect(connection, &Connection::syncDone, this, [=]() {
+    connect(connection, &Connection::syncDone, this, [this]() {
         loadData();
     });
     loadData();

src/models/pushrulemodel.cpp

@@ -14,43 +14,45 @@
 #include "controller.h"
 #include "neochatconfig.h"
 
+#include <KLazyLocalizedString>
+
 // Alternate name text for default rules.
-static const QHash<QString, QString> defaultRuleNames = {
-    {QStringLiteral(".m.rule.master"), QStringLiteral("Enable notifications for this account")},
-    {QStringLiteral(".m.rule.room_one_to_one"), QStringLiteral("Messages in one-to-one chats")},
-    {QStringLiteral(".m.rule.encrypted_room_one_to_one"), QStringLiteral("Encrypted messages in one-to-one chats")},
-    {QStringLiteral(".m.rule.message"), QStringLiteral("Messages in group chats")},
-    {QStringLiteral(".m.rule.encrypted"), QStringLiteral("Messages in encrypted group chats")},
-    {QStringLiteral(".m.rule.tombstone"), QStringLiteral("Room upgrade messages")},
-    {QStringLiteral(".m.rule.contains_display_name"), QStringLiteral("Messages containing my display name")},
-    {QStringLiteral(".m.rule.is_user_mention"), QStringLiteral("Messages which mention my Matrix user ID.")},
-    {QStringLiteral(".m.rule.is_room_mention"), QStringLiteral("Messages which mention a room.")},
-    {QStringLiteral(".m.rule.contains_user_name"), QStringLiteral("Messages containing the local part of my Matrix ID.")},
-    {QStringLiteral(".m.rule.roomnotif"), QStringLiteral("Whole room (@room) notifications")},
-    {QStringLiteral(".m.rule.invite_for_me"), QStringLiteral("Invites to a room")},
-    {QStringLiteral(".m.rule.call"), QStringLiteral("Call invitation")},
+static const QHash<QString, KLazyLocalizedString> defaultRuleNames = {
+    {QStringLiteral(".m.rule.master"), kli18nc("Notification type", "Enable notifications for this account")},
+    {QStringLiteral(".m.rule.room_one_to_one"), kli18nc("Notification type", "Messages in one-to-one chats")},
+    {QStringLiteral(".m.rule.encrypted_room_one_to_one"), kli18nc("Notification type", "Encrypted messages in one-to-one chats")},
+    {QStringLiteral(".m.rule.message"), kli18nc("Notification type", "Messages in group chats")},
+    {QStringLiteral(".m.rule.encrypted"), kli18nc("Notification type", "Messages in encrypted group chats")},
+    {QStringLiteral(".m.rule.tombstone"), kli18nc("Notification type", "Room upgrade messages")},
+    {QStringLiteral(".m.rule.contains_display_name"), kli18nc("Notification type", "Messages containing my display name")},
+    {QStringLiteral(".m.rule.is_user_mention"), kli18nc("Notification type", "Messages which mention my Matrix user ID")},
+    {QStringLiteral(".m.rule.is_room_mention"), kli18nc("Notification type", "Messages which mention a room")},
+    {QStringLiteral(".m.rule.contains_user_name"), kli18nc("Notification type", "Messages containing the local part of my Matrix ID")},
+    {QStringLiteral(".m.rule.roomnotif"), kli18nc("Notification type", "Whole room (@room) notifications")},
+    {QStringLiteral(".m.rule.invite_for_me"), kli18nc("Notification type", "Invites to a room")},
+    {QStringLiteral(".m.rule.call"), kli18nc("Notification type", "Call invitation")},
 };
 
 // Sections for default rules.
-static const QHash<QString, PushNotificationSection::Section> defaultSections = {
-    {QStringLiteral(".m.rule.master"), PushNotificationSection::Master},
-    {QStringLiteral(".m.rule.room_one_to_one"), PushNotificationSection::Room},
-    {QStringLiteral(".m.rule.encrypted_room_one_to_one"), PushNotificationSection::Room},
-    {QStringLiteral(".m.rule.message"), PushNotificationSection::Room},
-    {QStringLiteral(".m.rule.encrypted"), PushNotificationSection::Room},
-    {QStringLiteral(".m.rule.tombstone"), PushNotificationSection::Room},
-    {QStringLiteral(".m.rule.contains_display_name"), PushNotificationSection::Mentions},
-    {QStringLiteral(".m.rule.is_user_mention"), PushNotificationSection::Mentions},
-    {QStringLiteral(".m.rule.is_room_mention"), PushNotificationSection::Mentions},
-    {QStringLiteral(".m.rule.contains_user_name"), PushNotificationSection::Mentions},
-    {QStringLiteral(".m.rule.roomnotif"), PushNotificationSection::Mentions},
-    {QStringLiteral(".m.rule.invite_for_me"), PushNotificationSection::Invites},
-    {QStringLiteral(".m.rule.call"), PushNotificationSection::Undefined}, // TODO: make invites when VOIP added.
-    {QStringLiteral(".m.rule.suppress_notices"), PushNotificationSection::Undefined},
-    {QStringLiteral(".m.rule.member_event"), PushNotificationSection::Undefined},
-    {QStringLiteral(".m.rule.reaction"), PushNotificationSection::Undefined},
-    {QStringLiteral(".m.rule.room.server_acl"), PushNotificationSection::Undefined},
-    {QStringLiteral(".im.vector.jitsi"), PushNotificationSection::Undefined},
+static const QHash<QString, PushRuleSection::Section> defaultSections = {
+    {QStringLiteral(".m.rule.master"), PushRuleSection::Master},
+    {QStringLiteral(".m.rule.room_one_to_one"), PushRuleSection::Room},
+    {QStringLiteral(".m.rule.encrypted_room_one_to_one"), PushRuleSection::Room},
+    {QStringLiteral(".m.rule.message"), PushRuleSection::Room},
+    {QStringLiteral(".m.rule.encrypted"), PushRuleSection::Room},
+    {QStringLiteral(".m.rule.tombstone"), PushRuleSection::Room},
+    {QStringLiteral(".m.rule.contains_display_name"), PushRuleSection::Mentions},
+    {QStringLiteral(".m.rule.is_user_mention"), PushRuleSection::Mentions},
+    {QStringLiteral(".m.rule.is_room_mention"), PushRuleSection::Mentions},
+    {QStringLiteral(".m.rule.contains_user_name"), PushRuleSection::Mentions},
+    {QStringLiteral(".m.rule.roomnotif"), PushRuleSection::Mentions},
+    {QStringLiteral(".m.rule.invite_for_me"), PushRuleSection::Invites},
+    {QStringLiteral(".m.rule.call"), PushRuleSection::Undefined}, // TODO: make invites when VOIP added.
+    {QStringLiteral(".m.rule.suppress_notices"), PushRuleSection::Undefined},
+    {QStringLiteral(".m.rule.member_event"), PushRuleSection::Undefined},
+    {QStringLiteral(".m.rule.reaction"), PushRuleSection::Undefined},
+    {QStringLiteral(".m.rule.room.server_acl"), PushRuleSection::Undefined},
+    {QStringLiteral(".im.vector.jitsi"), PushRuleSection::Undefined},
 };
 
 // Default rules that don't have a highlight option as it would lead to all messages
@@ -65,7 +67,7 @@ static const QStringList noHighlight = {
 PushRuleModel::PushRuleModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    m_defaultKeywordAction = static_cast<PushNotificationAction::Action>(NeoChatConfig::self()->keywordPushRuleDefault());
+    m_defaultKeywordAction = static_cast<PushRuleAction::Action>(NeoChatConfig::self()->keywordPushRuleDefault());
 }
 
 void PushRuleModel::updateNotificationRules(const QString &type)
@@ -81,11 +83,11 @@ void PushRuleModel::updateNotificationRules(const QString &type)
     m_rules.clear();
 
     // Doing this 5 times because PushRuleset is a struct.
-    setRules(ruleData.override, PushNotificationKind::Override);
-    setRules(ruleData.content, PushNotificationKind::Content);
-    setRules(ruleData.room, PushNotificationKind::Room);
-    setRules(ruleData.sender, PushNotificationKind::Sender);
-    setRules(ruleData.underride, PushNotificationKind::Underride);
+    setRules(ruleData.override, PushRuleKind::Override);
+    setRules(ruleData.content, PushRuleKind::Content);
+    setRules(ruleData.room, PushRuleKind::Room);
+    setRules(ruleData.sender, PushRuleKind::Sender);
+    setRules(ruleData.underride, PushRuleKind::Underride);
 
     Q_EMIT globalNotificationsEnabledChanged();
     Q_EMIT globalNotificationsSetChanged();
@@ -93,7 +95,7 @@ void PushRuleModel::updateNotificationRules(const QString &type)
     endResetModel();
 }
 
-void PushRuleModel::setRules(QList<Quotient::PushRule> rules, PushNotificationKind::Kind kind)
+void PushRuleModel::setRules(QList<Quotient::PushRule> rules, PushRuleKind::Kind kind)
 {
     for (const auto &rule : rules) {
         QString roomId;
@@ -126,7 +128,7 @@ int PushRuleModel::getRuleIndex(const QString &ruleId) const
     return -1;
 }
 
-PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule rule)
+PushRuleSection::Section PushRuleModel::getSection(Quotient::PushRule rule)
 {
     auto ruleId = rule.ruleId;
 
@@ -134,7 +136,7 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
         return defaultSections.value(ruleId);
     } else {
         if (rule.ruleId.startsWith(u'.')) {
-            return PushNotificationSection::Unknown;
+            return PushRuleSection::Unknown;
         }
         /**
          * If the rule name resolves to a matrix id for a room that the user is part
@@ -144,7 +146,7 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
          * Rooms that the user hasn't joined shouldn't have a rule.
          */
         if (m_connection->room(ruleId) != nullptr) {
-            return PushNotificationSection::Undefined;
+            return PushRuleSection::Undefined;
         }
         /**
          * If the rule name resolves to a matrix id for a user  it shouldn't appear
@@ -158,26 +160,26 @@ PushNotificationSection::Section PushRuleModel::getSection(Quotient::PushRule ru
             testUserId.prepend(u'@');
         }
         if (testUserId.startsWith(u'@') && !Quotient::serverPart(testUserId).isEmpty() && m_connection->user(testUserId) != nullptr) {
-            return PushNotificationSection::Undefined;
+            return PushRuleSection::Undefined;
         }
         // If the rule has push conditions and one is a room ID it is a room only keyword.
         if (!rule.conditions.isEmpty()) {
             for (auto condition : rule.conditions) {
                 if (condition.key == QStringLiteral("room_id")) {
-                    return PushNotificationSection::RoomKeywords;
+                    return PushRuleSection::RoomKeywords;
                 }
             }
         }
-        return PushNotificationSection::Keywords;
+        return PushRuleSection::Keywords;
     }
 }
 
-PushNotificationAction::Action PushRuleModel::defaultState() const
+PushRuleAction::Action PushRuleModel::defaultState() const
 {
     return m_defaultKeywordAction;
 }
 
-void PushRuleModel::setDefaultState(PushNotificationAction::Action defaultState)
+void PushRuleModel::setDefaultState(PushRuleAction::Action defaultState)
 {
     if (defaultState == m_defaultKeywordAction) {
         return;
@@ -220,7 +222,7 @@ QVariant PushRuleModel::data(const QModelIndex &index, int role) const
     if (role == NameRole) {
         auto ruleId = m_rules.at(index.row()).id;
         if (defaultRuleNames.contains(ruleId)) {
-            return defaultRuleNames.value(ruleId);
+            return defaultRuleNames.value(ruleId).toString();
         } else {
             return ruleId;
         }
@@ -271,7 +273,7 @@ QHash<int, QByteArray> PushRuleModel::roleNames() const
     return roles;
 }
 
-void PushRuleModel::setPushRuleAction(const QString &id, PushNotificationAction::Action action)
+void PushRuleModel::setPushRuleAction(const QString &id, PushRuleAction::Action action)
 {
     int index = getRuleIndex(id);
     if (index == -1) {
@@ -281,22 +283,22 @@ void PushRuleModel::setPushRuleAction(const QString &id, PushNotificationAction:
     auto rule = m_rules[index];
 
     // Override rules need to be disabled when off so that other rules can match the message if they apply.
-    if (action == PushNotificationAction::Off && rule.kind == PushNotificationKind::Override) {
-        setNotificationRuleEnabled(PushNotificationKind::kindString(rule.kind), rule.id, false);
-    } else if (rule.kind == PushNotificationKind::Override) {
-        setNotificationRuleEnabled(PushNotificationKind::kindString(rule.kind), rule.id, true);
+    if (action == PushRuleAction::Off && rule.kind == PushRuleKind::Override) {
+        setNotificationRuleEnabled(PushRuleKind::kindString(rule.kind), rule.id, false);
+    } else if (rule.kind == PushRuleKind::Override) {
+        setNotificationRuleEnabled(PushRuleKind::kindString(rule.kind), rule.id, true);
     }
 
-    setNotificationRuleActions(PushNotificationKind::kindString(rule.kind), rule.id, action);
+    setNotificationRuleActions(PushRuleKind::kindString(rule.kind), rule.id, action);
 }
 
 void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
 {
-    PushNotificationKind::Kind kind = PushNotificationKind::Content;
+    PushRuleKind::Kind kind = PushRuleKind::Content;
     const QList<QVariant> actions = actionToVariant(m_defaultKeywordAction);
     QList<Quotient::PushCondition> pushConditions;
     if (!roomId.isEmpty()) {
-        kind = PushNotificationKind::Override;
+        kind = PushRuleKind::Override;
 
         Quotient::PushCondition roomCondition;
         roomCondition.kind = QStringLiteral("event_match");
@@ -312,7 +314,7 @@ void PushRuleModel::addKeyword(const QString &keyword, const QString &roomId)
     }
 
     auto job = m_connection->callApi<Quotient::SetPushRuleJob>(QLatin1String("global"),
-                                                               PushNotificationKind::kindString(kind),
+                                                               PushRuleKind::kindString(kind),
                                                                keyword,
                                                                actions,
                                                                QString(),
@@ -336,7 +338,7 @@ void PushRuleModel::removeKeyword(const QString &keyword)
         return;
     }
 
-    auto kind = PushNotificationKind::kindString(m_rules[index].kind);
+    auto kind = PushRuleKind::kindString(m_rules[index].kind);
     auto job = m_connection->callApi<Quotient::DeletePushRuleJob>(QStringLiteral("global"), kind, m_rules[index].id);
     connect(job, &Quotient::BaseJob::failure, this, [this, job, index]() {
         qWarning() << QLatin1String("Unable to remove push rule for keyword %1: ").arg(m_rules[index].id) << job->errorString();
@@ -353,7 +355,7 @@ void PushRuleModel::setNotificationRuleEnabled(const QString &kind, const QStrin
     });
 }
 
-void PushRuleModel::setNotificationRuleActions(const QString &kind, const QString &ruleId, PushNotificationAction::Action action)
+void PushRuleModel::setNotificationRuleActions(const QString &kind, const QString &ruleId, PushRuleAction::Action action)
 {
     QList<QVariant> actions;
     if (ruleId == QStringLiteral(".m.rule.call")) {
@@ -365,7 +367,7 @@ void PushRuleModel::setNotificationRuleActions(const QString &kind, const QStrin
     m_connection->callApi<Quotient::SetPushRuleActionsJob>(QStringLiteral("global"), kind, ruleId, actions);
 }
 
-PushNotificationAction::Action PushRuleModel::variantToAction(const QList<QVariant> &actions, bool enabled)
+PushRuleAction::Action PushRuleModel::variantToAction(const QList<QVariant> &actions, bool enabled)
 {
     bool notify = false;
     bool isNoisy = false;
@@ -390,47 +392,47 @@ PushNotificationAction::Action PushRuleModel::variantToAction(const QList<QVaria
     }
 
     if (!enabled) {
-        return PushNotificationAction::Off;
+        return PushRuleAction::Off;
     }
 
     if (notify) {
         if (isNoisy && highlightEnabled) {
-            return PushNotificationAction::NoisyHighlight;
+            return PushRuleAction::NoisyHighlight;
         } else if (isNoisy) {
-            return PushNotificationAction::Noisy;
+            return PushRuleAction::Noisy;
         } else if (highlightEnabled) {
-            return PushNotificationAction::Highlight;
+            return PushRuleAction::Highlight;
         } else {
-            return PushNotificationAction::On;
+            return PushRuleAction::On;
         }
     } else {
-        return PushNotificationAction::Off;
+        return PushRuleAction::Off;
     }
 }
 
-QList<QVariant> PushRuleModel::actionToVariant(PushNotificationAction::Action action, const QString &sound)
+QList<QVariant> PushRuleModel::actionToVariant(PushRuleAction::Action action, const QString &sound)
 {
     // The caller should never try to set the state to unknown.
     // It exists only as a default state to diable the settings options until the actual state is retrieved from the server.
-    if (action == PushNotificationAction::Unknown) {
+    if (action == PushRuleAction::Unknown) {
         Q_ASSERT(false);
         return QList<QVariant>();
     }
 
     QList<QVariant> actions;
 
-    if (action != PushNotificationAction::Off) {
+    if (action != PushRuleAction::Off) {
         actions.append(QStringLiteral("notify"));
     } else {
         actions.append(QStringLiteral("dont_notify"));
     }
-    if (action == PushNotificationAction::Noisy || action == PushNotificationAction::NoisyHighlight) {
+    if (action == PushRuleAction::Noisy || action == PushRuleAction::NoisyHighlight) {
         QJsonObject soundTweak;
         soundTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("sound"));
         soundTweak.insert(QStringLiteral("value"), sound);
         actions.append(soundTweak);
     }
-    if (action == PushNotificationAction::Highlight || action == PushNotificationAction::NoisyHighlight) {
+    if (action == PushRuleAction::Highlight || action == PushRuleAction::NoisyHighlight) {
         QJsonObject highlightTweak;
         highlightTweak.insert(QStringLiteral("set_tweak"), QStringLiteral("highlight"));
         actions.append(highlightTweak);

src/models/pushrulemodel.h

@@ -8,124 +8,8 @@
 
 #include <Quotient/csapi/definitions/push_rule.h>
 
-#include "notificationsmanager.h"
-
-/**
- * @class PushNotificationKind
- *
- * A class with the Kind enum for push notifications and helper functions.
- *
- * The kind relates to the kinds of push rule definied in the matrix spec, see
- * https://spec.matrix.org/v1.7/client-server-api/#push-rules for full details.
- */
-class PushNotificationKind : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Defines the different kinds of push rule.
-     */
-    enum Kind {
-        Override = 0, /**< The highest priority rules. */
-        Content, /**< These configure behaviour for messages that match certain patterns. */
-        Room, /**< These rules change the behaviour of all messages for a given room. */
-        Sender, /**< These rules configure notification behaviour for messages from a specific Matrix user ID. */
-        Underride, /**< These are identical to override rules, but have a lower priority than content, room and sender rules. */
-    };
-    Q_ENUM(Kind)
-
-    /**
-     * @brief Translate the Kind enum value to a human readable string.
-     *
-     * @sa Kind
-     */
-    static QString kindString(Kind kind)
-    {
-        switch (kind) {
-        case Kind::Override:
-            return QLatin1String("override");
-        case Kind::Content:
-            return QLatin1String("content");
-        case Kind::Room:
-            return QLatin1String("room");
-        case Kind::Sender:
-            return QLatin1String("sender");
-        case Kind::Underride:
-            return QLatin1String("underride");
-        default:
-            return {};
-        }
-    };
-};
-
-/**
- * @class PushNotificationSection
- *
- * A class with the Section enum for push notifications and helper functions.
- *
- * @note This is different from the PushNotificationKind and instead is used for sorting
- *       in the settings page which is not necessarily by Kind.
- *
- * @sa PushNotificationKind
- */
-class PushNotificationSection : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Defines the sections to sort push rules into.
-     */
-    enum Section {
-        Master = 0, /**< The master push rule */
-        Room, /**< Push rules relating to all rooms. */
-        Mentions, /**< Push rules relating to user mentions. */
-        Keywords, /**< Global Keyword push rules. */
-        RoomKeywords, /**< Keyword push rules that only apply to a specific room. */
-        Invites, /**< Push rules relating to invites. */
-        Unknown, /**< New default push rules that have not been added to the model yet. */
-        /**
-         * @brief Push rules that should never be shown.
-         *
-         * There are numerous rules that get set that shouldn't be shown in the general
-         * list e.g. The array of rules used to override global settings in individual
-         * rooms.
-         *
-         * This is specifically different to unknown which are just new default push
-         * rule that haven't been added to the model yet.
-         */
-        Undefined,
-    };
-    Q_ENUM(Section)
-
-    /**
-     * @brief Translate the Section enum value to a human readable string.
-     *
-     * @sa Section
-     */
-    static QString sectionString(Section section)
-    {
-        switch (section) {
-        case Section::Master:
-            return QLatin1String("Master");
-        case Section::Room:
-            return QLatin1String("Room Notifications");
-        case Section::Mentions:
-            return QLatin1String("@Mentions");
-        case Section::Keywords:
-            return QLatin1String("Keywords");
-        case Section::Invites:
-            return QLatin1String("Invites");
-        default:
-            return {};
-        }
-    };
-};
+#include "enums/pushrule.h"
+#include "neochatconnection.h"
 
 /**
  * @class PushRuleModel
@@ -140,7 +24,7 @@ class PushRuleModel : public QAbstractListModel
     /**
      * @brief The default state for any newly created keyword rule.
      */
-    Q_PROPERTY(PushNotificationAction::Action defaultState READ defaultState WRITE setDefaultState NOTIFY defaultStateChanged)
+    Q_PROPERTY(PushRuleAction::Action defaultState READ defaultState WRITE setDefaultState NOTIFY defaultStateChanged)
 
     /**
      * @brief The global notification state.
@@ -153,7 +37,7 @@ class PushRuleModel : public QAbstractListModel
     /**
      * @brief Whether the global notification state has been retrieved from the server.
      *
-     * @sa globalNotificationsEnabled, PushNotificationAction::Action
+     * @sa globalNotificationsEnabled, PushRuleAction::Action
      */
     Q_PROPERTY(bool globalNotificationsSet READ globalNotificationsSet NOTIFY globalNotificationsSetChanged)
 
@@ -162,9 +46,9 @@ class PushRuleModel : public QAbstractListModel
 public:
     struct Rule {
         QString id;
-        PushNotificationKind::Kind kind;
-        PushNotificationAction::Action action;
-        PushNotificationSection::Section section;
+        PushRuleKind::Kind kind;
+        PushRuleAction::Action action;
+        PushRuleSection::Section section;
         bool enabled;
         QString roomId;
     };
@@ -176,7 +60,7 @@ public:
         NameRole = Qt::DisplayRole, /**< The push rule name. */
         IdRole, /**< The push rule ID. */
         KindRole, /**< The kind of notification rule; override, content, etc. */
-        ActionRole, /**< The PushNotificationAction for the rule. */
+        ActionRole, /**< The PushRuleAction for the rule. */
         HighlightableRole, /**< Whether the rule can have a highlight action. */
         DeletableRole, /**< Whether the rule can be deleted the rule. */
         SectionRole, /**< The section to sort into in the settings page. */
@@ -186,8 +70,8 @@ public:
 
     explicit PushRuleModel(QObject *parent = nullptr);
 
-    [[nodiscard]] PushNotificationAction::Action defaultState() const;
-    void setDefaultState(PushNotificationAction::Action defaultState);
+    [[nodiscard]] PushRuleAction::Action defaultState() const;
+    void setDefaultState(PushRuleAction::Action defaultState);
 
     [[nodiscard]] bool globalNotificationsEnabled() const;
     void setGlobalNotificationsEnabled(bool enabled);
@@ -215,7 +99,7 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    Q_INVOKABLE void setPushRuleAction(const QString &id, PushNotificationAction::Action action);
+    Q_INVOKABLE void setPushRuleAction(const QString &id, PushRuleAction::Action action);
 
     /**
      * @brief Add a new keyword to the model.
@@ -240,18 +124,18 @@ private Q_SLOTS:
     void updateNotificationRules(const QString &type);
 
 private:
-    PushNotificationAction::Action m_defaultKeywordAction;
+    PushRuleAction::Action m_defaultKeywordAction;
     QList<Rule> m_rules;
     NeoChatConnection *m_connection;
 
-    void setRules(QList<Quotient::PushRule> rules, PushNotificationKind::Kind kind);
+    void setRules(QList<Quotient::PushRule> rules, PushRuleKind::Kind kind);
 
     int getRuleIndex(const QString &ruleId) const;
-    PushNotificationSection::Section getSection(Quotient::PushRule rule);
+    PushRuleSection::Section getSection(Quotient::PushRule rule);
 
     void setNotificationRuleEnabled(const QString &kind, const QString &ruleId, bool enabled);
-    void setNotificationRuleActions(const QString &kind, const QString &ruleId, PushNotificationAction::Action action);
-    PushNotificationAction::Action variantToAction(const QList<QVariant> &actions, bool enabled);
-    QList<QVariant> actionToVariant(PushNotificationAction::Action action, const QString &sound = QStringLiteral("default"));
+    void setNotificationRuleActions(const QString &kind, const QString &ruleId, PushRuleAction::Action action);
+    PushRuleAction::Action variantToAction(const QList<QVariant> &actions, bool enabled);
+    QList<QVariant> actionToVariant(PushRuleAction::Action action, const QString &sound = QStringLiteral("default"));
 };
 Q_DECLARE_METATYPE(PushRuleModel *)

src/models/reactionmodel.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 #include "reactionmodel.h"
+#include "neochatroom.h"
 
 #include <QDebug>
 #ifdef HAVE_ICU
@@ -15,11 +16,20 @@
 
 #include <Quotient/user.h>
 
-ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, Quotient::User *localUser)
-    : QAbstractListModel(parent)
-    , m_localUser(localUser)
+ReactionModel::ReactionModel(const Quotient::RoomMessageEvent *event, const NeoChatRoom *room)
+    : QAbstractListModel(nullptr)
+    , m_room(room)
+    , m_event(event)
 {
-    setReactions(reactions);
+    if (m_event != nullptr && m_room != nullptr) {
+        connect(m_room, &NeoChatRoom::updatedEvent, this, [this](const QString &eventId) {
+            if (m_event->id() == eventId) {
+                updateReactions();
+            }
+        });
+
+        updateReactions();
+    }
 }
 
 QVariant ReactionModel::data(const QModelIndex &index, int role) const
@@ -35,38 +45,11 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     const auto &reaction = m_reactions.at(index.row());
 
-    const auto isEmoji = [](const QString &text) {
-#ifdef HAVE_ICU
-        QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);
-        int from = 0;
-        while (finder.toNextBoundary() != -1) {
-            auto to = finder.position();
-            if (text[from].isSpace()) {
-                from = to;
-                continue;
-            }
-
-            auto first = text.mid(from, to - from).toUcs4()[0];
-            if (!u_hasBinaryProperty(first, UCHAR_EMOJI_PRESENTATION)) {
-                return false;
-            }
-            from = to;
-        }
-        return true;
-#else
-        return false;
-#endif
-    };
-
-    const auto reactionText = isEmoji(reaction.reaction)
-        ? QStringLiteral("<span style=\"font-family: 'emoji';\">") + reaction.reaction + QStringLiteral("</span>")
-        : reaction.reaction;
-
     if (role == TextContentRole) {
         if (reaction.authors.count() > 1) {
-            return QStringLiteral("%1  %2").arg(reactionText, QString::number(reaction.authors.count()));
+            return QStringLiteral("%1  %2").arg(reactionText(reaction.reaction), QString::number(reaction.authors.count()));
         } else {
-            return reactionText;
+            return reactionText(reaction.reaction);
         }
     }
 
@@ -97,7 +80,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
                       "%2 reacted with %3",
                       reaction.authors.count(),
                       text,
-                      reactionText);
+                      reactionText(reaction.reaction));
         return text;
     }
 
@@ -107,7 +90,7 @@ QVariant ReactionModel::data(const QModelIndex &index, int role) const
 
     if (role == HasLocalUser) {
         for (auto author : reaction.authors) {
-            if (author.toMap()[QStringLiteral("id")] == m_localUser->id()) {
+            if (author.toMap()[QStringLiteral("id")] == m_room->localUser()->id()) {
                 return true;
             }
         }
@@ -123,11 +106,44 @@ int ReactionModel::rowCount(const QModelIndex &parent) const
     return m_reactions.count();
 }
 
-void ReactionModel::setReactions(QList<Reaction> reactions)
+void ReactionModel::updateReactions()
 {
     beginResetModel();
+
     m_reactions.clear();
-    m_reactions = reactions;
+
+    const auto &annotations = m_room->relatedEvents(*m_event, Quotient::EventRelation::AnnotationType);
+    if (annotations.isEmpty()) {
+        endResetModel();
+        return;
+    };
+
+    QMap<QString, QList<Quotient::User *>> reactions = {};
+    for (const auto &a : annotations) {
+        if (a->isRedacted()) { // Just in case?
+            continue;
+        }
+        if (const auto &e = eventCast<const Quotient::ReactionEvent>(a)) {
+            reactions[e->key()].append(m_room->user(e->senderId()));
+        }
+    }
+
+    if (reactions.isEmpty()) {
+        endResetModel();
+        return;
+    }
+
+    auto i = reactions.constBegin();
+    while (i != reactions.constEnd()) {
+        QVariantList authors;
+        for (const auto &author : i.value()) {
+            authors.append(m_room->getUser(author));
+        }
+
+        m_reactions.append(ReactionModel::Reaction{i.key(), authors});
+        ++i;
+    }
+
     endResetModel();
 }
 
@@ -142,4 +158,32 @@ QHash<int, QByteArray> ReactionModel::roleNames() const
     };
 }
 
+QString ReactionModel::reactionText(const QString &text)
+{
+    const auto isEmoji = [](const QString &text) {
+#ifdef HAVE_ICU
+        QTextBoundaryFinder finder(QTextBoundaryFinder::Grapheme, text);
+        int from = 0;
+        while (finder.toNextBoundary() != -1) {
+            auto to = finder.position();
+            if (text[from].isSpace()) {
+                from = to;
+                continue;
+            }
+
+            auto first = text.mid(from, to - from).toUcs4()[0];
+            if (!u_hasBinaryProperty(first, UCHAR_EMOJI_PRESENTATION)) {
+                return false;
+            }
+            from = to;
+        }
+        return true;
+#else
+        return false;
+#endif
+    };
+
+    return isEmoji(text) ? QStringLiteral("<span style=\"font-family: 'emoji';\">") + text + QStringLiteral("</span>") : text;
+}
+
 #include "moc_reactionmodel.cpp"

src/models/reactionmodel.h

@@ -3,8 +3,10 @@
 
 #pragma once
 
+#include "neochatroom.h"
 #include <QAbstractListModel>
 #include <QQmlEngine>
+#include <Quotient/events/reactionevent.h>
 
 namespace Quotient
 {
@@ -19,7 +21,6 @@ class User;
 class ReactionModel : public QAbstractListModel
 {
     Q_OBJECT
-    QML_ELEMENT
 
 public:
     /**
@@ -41,7 +42,7 @@ public:
         HasLocalUser, /**< Whether the local user is in the list of authors. */
     };
 
-    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, Quotient::User *localUser = nullptr);
+    explicit ReactionModel(const Quotient::RoomMessageEvent *event, const NeoChatRoom *room);
 
     /**
      * @brief Get the given role value at the given index.
@@ -64,14 +65,12 @@ public:
      */
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    /**
-     * @brief Set the reactions data in the model.
-     */
-    void setReactions(QList<Reaction> reactions);
-
 private:
+    const NeoChatRoom *m_room;
+    const Quotient::RoomMessageEvent *m_event;
     QList<Reaction> m_reactions;
 
-    Quotient::User *m_localUser;
+    void updateReactions();
+    static QString reactionText(const QString &text);
 };
 Q_DECLARE_METATYPE(ReactionModel *)

src/models/roomlistmodel.cpp

@@ -4,6 +4,7 @@
 #include "roomlistmodel.h"
 
 #include "controller.h"
+#include "eventhandler.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "roommanager.h"
@@ -174,10 +175,10 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
         refresh(room);
     });
     connect(room, &Room::addedMessages, this, [this, room] {
-        refresh(room, {LastEventRole, SubtitleTextRole, LastActiveTimeRole});
+        refresh(room, {SubtitleTextRole, LastActiveTimeRole});
     });
     connect(room, &Room::pendingEventMerged, this, [this, room] {
-        refresh(room, {LastEventRole, SubtitleTextRole});
+        refresh(room, {SubtitleTextRole});
     });
     connect(room, &Room::unreadStatsChanged, this, &RoomListModel::refreshNotificationCount);
     connect(room, &Room::highlightCountChanged, this, &RoomListModel::refreshHighlightCount);
@@ -332,12 +333,6 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     if (role == HighlightCountRole) {
         return room->highlightCount();
     }
-    if (role == LastEventRole) {
-        if (room->lastEventIsSpoiler()) {
-            return QString();
-        }
-        return room->lastEventToString();
-    }
     if (role == LastActiveTimeRole) {
         return room->lastActiveTime();
     }
@@ -354,7 +349,13 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
         return m_categoryVisibility.value(data(index, CategoryRole).toInt(), true);
     }
     if (role == SubtitleTextRole) {
-        return room->lastEventToString(Qt::PlainText, true);
+        if (room->lastEventIsSpoiler()) {
+            return QString();
+        }
+        EventHandler eventHandler;
+        eventHandler.setRoom(room);
+        eventHandler.setEvent(room->lastEvent());
+        return eventHandler.subtitleText();
     }
     if (role == AvatarImageRole) {
         return room->avatar(128);
@@ -396,7 +397,6 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
     roles[CategoryRole] = "category";
     roles[NotificationCountRole] = "notificationCount";
     roles[HighlightCountRole] = "highlightCount";
-    roles[LastEventRole] = "lastEvent";
     roles[LastActiveTimeRole] = "lastActiveTime";
     roles[JoinStateRole] = "joinState";
     roles[CurrentRoomRole] = "currentRoom";

src/models/roomlistmodel.h

@@ -69,7 +69,6 @@ public:
         CategoryRole, /**< The room category, e.g favourite. */
         NotificationCountRole, /**< The number of notifications in the room. */
         HighlightCountRole, /**< The number of highlighted messages in the room. */
-        LastEventRole, /**< Text for the last event in the room. */
         LastActiveTimeRole, /**< The timestamp of the last event sent in the room. */
         JoinStateRole, /**< The local user's join state in the room. */
         CurrentRoomRole, /**< The room object for the room. */

src/neochat.notifyrc

@@ -40,6 +40,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 DesktopEntry=org.kde.neochat
 Comment=A client for matrix, the decentralized communication protocol
 Comment[ar]=عميل لماتركس، ميفاق الاتصال اللامركزي
@@ -79,6 +80,7 @@ Comment[tr]=Merkezi olmayan iletişim protokolü Matrix için bir istemci
 Comment[uk]=Клієнт matrix, децентралізованого протоколу обміну даними
 Comment[x-test]=xxA client for matrix, the decentralized communication protocolxx
 Comment[zh_CN]=分布式通讯协议 Matrix 的客户端
+Comment[zh_TW]=去中心化通訊協定 Matrix 的用戶端
 
 
 [Event/message]
@@ -117,10 +119,11 @@ Name[sk]=Nová správa
 Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[ta]=புதிய செய்தி
-Name[tr]=Yeni ileti
+Name[tr]=Yeni İleti
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
 Name[zh_CN]=新消息
+Name[zh_TW]=新訊息
 Comment=There is a new message
 Comment[ar]=توجد رسالة جديدة
 Comment[az]=Yeni ismarıc var
@@ -159,6 +162,7 @@ Comment[tr]=Yeni bir ileti var
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
 Comment[zh_CN]=有新消息
+Comment[zh_TW]=有新的訊息
 Action=Popup
 
 [Event/invite]
@@ -196,6 +200,8 @@ Name[ta]=புதிய அழைப்பிதழ்
 Name[tr]=Yeni Davet
 Name[uk]=Нове запрошення
 Name[x-test]=xxNew Invitationxx
+Name[zh_CN]=新邀请
+Name[zh_TW]=新邀請
 Comment=There is a new invitation to a room
 Comment[ar]=توجد دعوة جديدة
 Comment[az]=Otağa bir yeni dəvət var
@@ -230,4 +236,6 @@ Comment[ta]=ஓர் அரங்கிற்கான புதிய அழ
 Comment[tr]=Bir odaya yeni bir davetiye var
 Comment[uk]=У кімнаті нове запрошення
 Comment[x-test]=xxThere is a new invitation to a roomxx
+Comment[zh_CN]=有新的聊天室邀请
+Comment[zh_TW]=有新的加入聊天室邀請
 Action=Popup

src/neochatconnection.cpp

@@ -124,12 +124,11 @@ void NeoChatConnection::changePassword(const QString &currentPassword, const QSt
             QJsonObject identifier = {{"type"_ls, "m.id.user"_ls}, {"user"_ls, user()->id()}};
             authData["identifier"_ls] = identifier;
             NeochatChangePasswordJob *innerJob = callApi<NeochatChangePasswordJob>(newPassword, false, authData);
-            connect(innerJob, &BaseJob::success, this, []() {
-                Q_EMIT Controller::instance().passwordStatus(Controller::PasswordStatus::Success);
+            connect(innerJob, &BaseJob::success, this, [this]() {
+                Q_EMIT passwordStatus(PasswordStatus::Success);
             });
-            connect(innerJob, &BaseJob::failure, this, [innerJob]() {
-                Q_EMIT Controller::instance().passwordStatus(innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls ? Controller::PasswordStatus::Wrong
-                                                                                                                    : Controller::PasswordStatus::Other);
+            connect(innerJob, &BaseJob::failure, this, [innerJob, this]() {
+                Q_EMIT passwordStatus(innerJob->jsonData()["errcode"_ls] == "M_FORBIDDEN"_ls ? PasswordStatus::Wrong : PasswordStatus::Other);
             });
         }
     });
@@ -195,7 +194,7 @@ void NeoChatConnection::createRoom(const QString &name, const QString &topic, co
         });
     }
     connect(job, &CreateRoomJob::failure, this, [job] {
-        Q_EMIT Controller::instance().errorOccured(i18n("Room creation failed: %1", job->errorString()));
+        Q_EMIT Controller::instance().errorOccured(i18n("Room creation failed: %1", job->errorString()), {});
     });
     connectSingleShot(this, &Connection::newRoom, this, [](Room *room) {
         RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(room));
@@ -227,7 +226,7 @@ void NeoChatConnection::createSpace(const QString &name, const QString &topic, c
         });
     }
     connect(job, &CreateRoomJob::failure, this, [job] {
-        Q_EMIT Controller::instance().errorOccured(i18n("Space creation failed: %1", job->errorString()));
+        Q_EMIT Controller::instance().errorOccured(i18n("Space creation failed: %1", job->errorString()), {});
     });
     connectSingleShot(this, &Connection::newRoom, this, [](Room *room) {
         RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(room));

src/neochatconnection.h

@@ -33,6 +33,16 @@ class NeoChatConnection : public Quotient::Connection
     Q_PROPERTY(bool isOnline READ isOnline WRITE setIsOnline NOTIFY isOnlineChanged)
 
 public:
+    /**
+     * @brief Defines the status after an attempt to change the password on an account.
+     */
+    enum PasswordStatus {
+        Success, /**< The password was successfully changed. */
+        Wrong, /**< The current password entered was wrong. */
+        Other, /**< An unknown problem occurred. */
+    };
+    Q_ENUM(PasswordStatus)
+
     NeoChatConnection(QObject *parent = nullptr);
     NeoChatConnection(const QUrl &server, QObject *parent = nullptr);
 
@@ -88,6 +98,7 @@ public:
 Q_SIGNALS:
     void labelChanged();
     void isOnlineChanged();
+    void passwordStatus(NeoChatConnection::PasswordStatus status);
 
 private:
     bool m_isOnline = true;

src/neochatroom.cpp

@@ -57,6 +57,7 @@
 #include <KConfigGroup>
 #ifndef Q_OS_ANDROID
 #include <KIO/Job>
+#include <KIO/JobTracker>
 #endif
 #include <KJobTrackerInterface>
 #include <KLocalizedString>
@@ -108,16 +109,14 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
             return;
         }
         auto roomMemberEvent = currentState().get<RoomMemberEvent>(localUser()->id());
-        Q_ASSERT(roomMemberEvent);
-        const QString senderId = roomMemberEvent->senderId();
         QImage avatar_image;
-        if (!user(senderId)->avatarUrl(this).isEmpty()) {
-            avatar_image = user(senderId)->avatar(128, this);
+        if (roomMemberEvent && !user(roomMemberEvent->senderId())->avatarUrl(this).isEmpty()) {
+            avatar_image = user(roomMemberEvent->senderId())->avatar(128, this);
         } else {
             qWarning() << "using this room's avatar";
             avatar_image = avatar(128);
         }
-        NotificationsManager::instance().postInviteNotification(this, displayNameForHtml(), htmlSafeMemberName(senderId), avatar_image);
+        NotificationsManager::instance().postInviteNotification(this, displayName(), htmlSafeMemberName(roomMemberEvent->senderId()), avatar_image);
     });
     connect(this, &Room::changed, this, [this] {
         Q_EMIT canEncryptRoomChanged();
@@ -341,25 +340,6 @@ bool NeoChatRoom::lastEventIsSpoiler() const
     return false;
 }
 
-QString NeoChatRoom::lastEventToString(Qt::TextFormat format, bool stripNewlines) const
-{
-    if (auto event = lastEvent()) {
-        EventHandler eventHandler;
-        eventHandler.setRoom(this);
-        eventHandler.setEvent(event);
-
-        QString body;
-        if (format == Qt::TextFormat::RichText) {
-            body = eventHandler.getRichBody(stripNewlines);
-        } else {
-            body = eventHandler.getPlainBody(stripNewlines);
-        }
-
-        return eventHandler.singleLineAuthorDisplayname() + (event->isStateEvent() ? QLatin1String(" ") : QLatin1String(": ")) + body;
-    }
-    return {};
-}
-
 bool NeoChatRoom::isEventHighlighted(const RoomEvent *e) const
 {
     return highlights.contains(e);
@@ -445,6 +425,7 @@ QVariantMap NeoChatRoom::getUser(User *user) const
         {QStringLiteral("isLocalUser"), user->id() == localUser()->id()},
         {QStringLiteral("id"), user->id()},
         {QStringLiteral("displayName"), user->displayname(this)},
+        {QStringLiteral("escapedDisplayName"), htmlSafeMemberName(user->id())},
         {QStringLiteral("avatarSource"), avatarForMember(user)},
         {QStringLiteral("avatarMediaId"), user->avatarMediaId(this)},
         {QStringLiteral("color"), Utils::getUserColor(user->hueF())},
@@ -1745,15 +1726,26 @@ bool NeoChatRoom::canEncryptRoom() const
     return !usesEncryption() && canSendState("m.room.encryption"_ls);
 }
 
-PollHandler *NeoChatRoom::poll(const QString &eventId)
+static PollHandler *emptyPollHandler = new PollHandler;
+
+PollHandler *NeoChatRoom::poll(const QString &eventId) const
 {
+    if (auto pollHandler = m_polls[eventId]) {
+        return pollHandler;
+    }
+    return emptyPollHandler;
+}
+
+void NeoChatRoom::createPollHandler(const Quotient::PollStartEvent *event)
+{
+    if (event == nullptr) {
+        return;
+    }
+    auto eventId = event->id();
     if (!m_polls.contains(eventId)) {
-        auto handler = new PollHandler(this);
-        handler->setRoom(this);
-        handler->setPollStartEventId(eventId);
+        auto handler = new PollHandler(this, event);
         m_polls.insert(eventId, handler);
     }
-    return m_polls[eventId];
 }
 
 bool NeoChatRoom::downloadTempFile(const QString &eventId)

src/neochatroom.h

@@ -13,6 +13,8 @@
 #include <QCoroTask>
 #include <Quotient/user.h>
 
+#include "enums/pushrule.h"
+#include "events/pollevent.h"
 #include "pollhandler.h"
 
 namespace Quotient
@@ -22,26 +24,6 @@ class User;
 
 class ChatBarCache;
 
-class PushNotificationState : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Describes the push notification state for the room.
-     */
-    enum State {
-        Unknown, /**< The state has not yet been obtained from the server. */
-        Default, /**< The room follows the globally configured rules for the local user. */
-        Mute, /**< No notifications for messages in the room. */
-        MentionKeyword, /**< Notifications only for local user mentions and keywords. */
-        All, /**< Notifications for all messages. */
-    };
-    Q_ENUM(State)
-};
-
 /**
  * @class NeoChatRoom
  *
@@ -398,14 +380,6 @@ public:
      */
     [[nodiscard]] const Quotient::RoomEvent *lastEvent() const;
 
-    /**
-     * @brief Convenient way to call eventToString on the last event.
-     *
-     * @sa lastEvent()
-     * @sa eventToString()
-     */
-    [[nodiscard]] QString lastEventToString(Qt::TextFormat format = Qt::PlainText, bool stripNewlines = false) const;
-
     /**
      * @brief Convenient way to check if the last event looks like it has spoilers.
      *
@@ -492,15 +466,6 @@ public:
 
     [[nodiscard]] bool readMarkerLoaded() const;
 
-    /**
-     * @brief Get subtitle text for room
-     *
-     * Fetches last event and removes markdown formatting
-     *
-     * @see lastEventToString()
-     */
-    [[nodiscard]] QString subtitleText();
-
     [[nodiscard]] QString avatarMediaId() const;
 
     Quotient::User *directChatRemoteUser() const;
@@ -769,7 +734,14 @@ public:
      *
      * @sa PollHandler
      */
-    Q_INVOKABLE PollHandler *poll(const QString &eventId);
+    PollHandler *poll(const QString &eventId) const;
+
+    /**
+     * @brief Create a PollHandler object for the given event.
+     *
+     * @sa PollHandler
+     */
+    void createPollHandler(const Quotient::PollStartEvent *event);
 
     /**
      * @brief Get the full Json data for a given room account data event.

src/notificationsmanager.cpp

@@ -235,8 +235,9 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
     notification->sendEvent();
 }
 
-void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon)
+void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom, const QString &title, const QString &sender, const QImage &icon)
 {
+    QPointer room(rawRoom);
     QPixmap img;
     img.convertFromImage(icon);
     KNotification *notification = new KNotification(QStringLiteral("invite"));
@@ -246,6 +247,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
     notification->setFlags(KNotification::Persistent);
     auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
     connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
+        if (!room) {
+            return;
+        }
         WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
         notification->close();
         RoomManager::instance().enterRoom(room);

src/notificationsmanager.h

@@ -17,27 +17,6 @@ class NeoChatConnection;
 class KNotification;
 class NeoChatRoom;
 
-class PushNotificationAction : public QObject
-{
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("")
-
-public:
-    /**
-     * @brief Defines the global push notification actions.
-     */
-    enum Action {
-        Unknown = 0, /**< The action has not yet been obtained from the server. */
-        Off, /**< No push notifications are to be sent. */
-        On, /**< Push notifications are on. */
-        Noisy, /**< Push notifications are on, also trigger a notification sound. */
-        Highlight, /**< Push notifications are on, also the event should be highlighted in chat. */
-        NoisyHighlight, /**< Push notifications are on, also trigger a notification sound and highlight in chat. */
-    };
-    Q_ENUM(Action)
-};
-
 /**
  * @class NotificationsManager
  *

src/plasma-runner-neochat.desktop

@@ -41,6 +41,7 @@ Name[tr]=NeoChat
 Name[uk]=NeoChat
 Name[x-test]=xxNeoChatxx
 Name[zh_CN]=NeoChat
+Name[zh_TW]=NeoChat
 Comment=Find rooms in NeoChat
 Comment[ar]=اعثر على غرف في نيوتشات
 Comment[az]=NeoChat-da otaqları tapın
@@ -73,6 +74,8 @@ Comment[ta]=நியோச்சாட்டில் அரங்குகள
 Comment[tr]=NeoChat'te odalar bulun
 Comment[uk]=Пошук кімнат у NeoChat
 Comment[x-test]=xxFind rooms in NeoChatxx
+Comment[zh_CN]=在 NeoChat 查找聊天室
+Comment[zh_TW]=在 NeoChat 尋找聊天室
 X-KDE-ServiceTypes=Plasma/Runner
 Type=Service
 Icon=org.kde.neochat

src/pollhandler.cpp

@@ -3,90 +3,71 @@
 
 #include "pollhandler.h"
 
-#include "events/pollevent.h"
 #include "neochatroom.h"
 
 #include <Quotient/csapi/relations.h>
 #include <Quotient/events/roompowerlevelsevent.h>
-#include <Quotient/user.h>
 
 #include <algorithm>
 
 using namespace Quotient;
 
-PollHandler::PollHandler(QObject *parent)
-    : QObject(parent)
+PollHandler::PollHandler(NeoChatRoom *room, const Quotient::PollStartEvent *pollStartEvent)
+    : QObject(room)
+    , m_pollStartEvent(pollStartEvent)
 {
-    connect(this, &PollHandler::roomChanged, this, &PollHandler::checkLoadRelations);
-    connect(this, &PollHandler::pollStartEventIdChanged, this, &PollHandler::checkLoadRelations);
+    if (room != nullptr && m_pollStartEvent != nullptr) {
+        connect(room, &NeoChatRoom::aboutToAddNewMessages, this, &PollHandler::updatePoll);
+        checkLoadRelations();
+    }
 }
 
-NeoChatRoom *PollHandler::room() const
+void PollHandler::updatePoll(Quotient::RoomEventsRange events)
 {
-    return m_room;
-}
-
-void PollHandler::setRoom(NeoChatRoom *room)
-{
-    if (m_room == room) {
-        return;
-    }
-    if (m_room) {
-        disconnect(m_room, nullptr, this, nullptr);
-    }
-    connect(room, &NeoChatRoom::aboutToAddNewMessages, this, [this](Quotient::RoomEventsRange events) {
-        for (const auto &event : events) {
-            if (event->is<PollEndEvent>()) {
-                auto plEvent = m_room->currentState().get<RoomPowerLevelsEvent>();
-                if (!plEvent) {
-                    continue;
-                }
-                auto userPl = plEvent->powerLevelForUser(event->senderId());
-                if (event->senderId() == (*m_room->findInTimeline(m_pollStartEventId))->senderId() || userPl >= plEvent->redact()) {
-                    m_hasEnded = true;
-                    m_endedTimestamp = event->originTimestamp();
-                    Q_EMIT hasEndedChanged();
-                }
+    // This function will never be called if the PollHandler was not initialized with
+    // a NeoChatRoom as parent and a PollStartEvent so no need to null check.
+    auto room = dynamic_cast<NeoChatRoom *>(parent());
+    for (const auto &event : events) {
+        if (event->is<PollEndEvent>()) {
+            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            if (!plEvent) {
+                continue;
             }
-            if (event->is<PollResponseEvent>()) {
-                handleAnswer(event->contentJson(), event->senderId(), event->originTimestamp());
+            auto userPl = plEvent->powerLevelForUser(event->senderId());
+            if (event->senderId() == m_pollStartEvent->senderId() || userPl >= plEvent->redact()) {
+                m_hasEnded = true;
+                m_endedTimestamp = event->originTimestamp();
+                Q_EMIT hasEndedChanged();
             }
         }
-    });
-    m_room = room;
-    Q_EMIT roomChanged();
-}
-
-QString PollHandler::pollStartEventId() const
-{
-    return m_pollStartEventId;
-}
-
-void PollHandler::setPollStartEventId(const QString &eventId)
-{
-    if (eventId == m_pollStartEventId) {
-        return;
+        if (event->is<PollResponseEvent>()) {
+            handleAnswer(event->contentJson(), event->senderId(), event->originTimestamp());
+        }
+        if (event->contentPart<QJsonObject>("m.relates_to"_ls).contains("rel_type"_ls)
+            && event->contentPart<QJsonObject>("m.relates_to"_ls)["rel_type"_ls].toString() == "m.replace"_ls
+            && event->contentPart<QJsonObject>("m.relates_to"_ls)["event_id"_ls].toString() == m_pollStartEvent->id()) {
+            Q_EMIT questionChanged();
+            Q_EMIT optionsChanged();
+        }
     }
-    m_pollStartEventId = eventId;
-    Q_EMIT pollStartEventIdChanged();
 }
 
 void PollHandler::checkLoadRelations()
 {
-    if (!m_room || m_pollStartEventId.isEmpty()) {
-        return;
-    }
-    m_maxVotes = eventCast<const PollStartEvent>(&**m_room->findInTimeline(m_pollStartEventId))->maxSelections();
-    auto job = m_room->connection()->callApi<GetRelatingEventsJob>(m_room->id(), m_pollStartEventId);
-    connect(job, &BaseJob::success, this, [this, job]() {
+    // This function will never be called if the PollHandler was not initialized with
+    // a NeoChatRoom as parent and a PollStartEvent so no need to null check.
+    auto room = dynamic_cast<NeoChatRoom *>(parent());
+    m_maxVotes = m_pollStartEvent->maxSelections();
+    auto job = room->connection()->callApi<GetRelatingEventsJob>(room->id(), m_pollStartEvent->id());
+    connect(job, &BaseJob::success, this, [this, job, room]() {
         for (const auto &event : job->chunk()) {
             if (event->is<PollEndEvent>()) {
-                auto plEvent = m_room->currentState().get<RoomPowerLevelsEvent>();
+                auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
                 if (!plEvent) {
                     continue;
                 }
                 auto userPl = plEvent->powerLevelForUser(event->senderId());
-                if (event->senderId() == (*m_room->findInTimeline(m_pollStartEventId))->senderId() || userPl >= plEvent->redact()) {
+                if (event->senderId() == m_pollStartEvent->senderId() || userPl >= plEvent->redact()) {
                     m_hasEnded = true;
                     m_endedTimestamp = event->originTimestamp();
                     Q_EMIT hasEndedChanged();
@@ -123,6 +104,22 @@ void PollHandler::handleAnswer(const QJsonObject &content, const QString &sender
     Q_EMIT answersChanged();
 }
 
+QString PollHandler::question() const
+{
+    if (m_pollStartEvent == nullptr) {
+        return {};
+    }
+    return m_pollStartEvent->contentPart<QJsonObject>("org.matrix.msc3381.poll.start"_ls)["question"_ls].toObject()["body"_ls].toString();
+}
+
+QJsonArray PollHandler::options() const
+{
+    if (m_pollStartEvent == nullptr) {
+        return {};
+    }
+    return m_pollStartEvent->contentPart<QJsonObject>("org.matrix.msc3381.poll.start"_ls)["answers"_ls].toArray();
+}
+
 QJsonObject PollHandler::answers() const
 {
     return m_answers;
@@ -139,12 +136,25 @@ QJsonObject PollHandler::counts() const
     return counts;
 }
 
+QString PollHandler::kind() const
+{
+    if (m_pollStartEvent == nullptr) {
+        return {};
+    }
+    return m_pollStartEvent->contentPart<QJsonObject>("org.matrix.msc3381.poll.start"_ls)["kind"_ls].toString();
+}
+
 void PollHandler::sendPollAnswer(const QString &eventId, const QString &answerId)
 {
     Q_ASSERT(eventId.length() > 0);
     Q_ASSERT(answerId.length() > 0);
+    auto room = dynamic_cast<NeoChatRoom *>(parent());
+    if (room == nullptr) {
+        qWarning() << "PollHandler is empty, cannot send an answer.";
+        return;
+    }
     QStringList ownAnswers;
-    for (const auto &answer : m_answers[m_room->localUser()->id()].toArray()) {
+    for (const auto &answer : m_answers[room->localUser()->id()].toArray()) {
         ownAnswers += answer.toString();
     }
     if (ownAnswers.contains(answerId)) {
@@ -159,8 +169,8 @@ void PollHandler::sendPollAnswer(const QString &eventId, const QString &answerId
     }
 
     auto response = new PollResponseEvent(eventId, ownAnswers);
-    handleAnswer(response->contentJson(), m_room->localUser()->id(), QDateTime::currentDateTime());
-    m_room->postEvent(response);
+    handleAnswer(response->contentJson(), room->localUser()->id(), QDateTime::currentDateTime());
+    room->postEvent(response);
 }
 
 bool PollHandler::hasEnded() const

src/pollhandler.h

@@ -3,11 +3,16 @@
 
 #pragma once
 
+#include <QJsonArray>
 #include <QJsonObject>
 #include <QObject>
 #include <QPair>
 #include <QQmlEngine>
 
+#include <Quotient/events/roomevent.h>
+
+#include "events/pollevent.h"
+
 class NeoChatRoom;
 
 /**
@@ -27,17 +32,17 @@ class PollHandler : public QObject
     QML_ELEMENT
 
     /**
-     * @brief The current room for the poll.
+     * @brief The question for the poll.
      */
-    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)
+    Q_PROPERTY(QString question READ question NOTIFY questionChanged)
 
     /**
-     * @brief The Matrix event ID for the event that started the poll.
+     * @brief The list of possible answers to the poll.
      */
-    Q_PROPERTY(QString pollStartEventId READ pollStartEventId WRITE setPollStartEventId NOTIFY pollStartEventIdChanged)
+    Q_PROPERTY(QJsonArray options READ options NOTIFY optionsChanged)
 
     /**
-     * @brief The list of answers to the poll from users in the room.
+     * @brief The list of answer responses to the poll from users in the room.
      */
     Q_PROPERTY(QJsonObject answers READ answers NOTIFY answersChanged)
 
@@ -56,20 +61,23 @@ class PollHandler : public QObject
      */
     Q_PROPERTY(int answerCount READ answerCount NOTIFY answersChanged)
 
+    /**
+     * @brief The kind of the poll.
+     */
+    Q_PROPERTY(QString kind READ kind CONSTANT)
+
 public:
-    PollHandler(QObject *parent = nullptr);
-
-    NeoChatRoom *room() const;
-    void setRoom(NeoChatRoom *room);
-
-    QString pollStartEventId() const;
-    void setPollStartEventId(const QString &eventId);
+    PollHandler() = default;
+    PollHandler(NeoChatRoom *room, const Quotient::PollStartEvent *pollStartEvent);
 
     bool hasEnded() const;
     int answerCount() const;
 
+    QString question() const;
+    QJsonArray options() const;
     QJsonObject answers() const;
     QJsonObject counts() const;
+    QString kind() const;
 
     /**
      * @brief Send an answer to the poll.
@@ -77,14 +85,15 @@ public:
     Q_INVOKABLE void sendPollAnswer(const QString &eventId, const QString &answerId);
 
 Q_SIGNALS:
-    void roomChanged();
-    void pollStartEventIdChanged();
+    void questionChanged();
+    void optionsChanged();
     void answersChanged();
     void hasEndedChanged();
 
 private:
-    NeoChatRoom *m_room = nullptr;
-    QString m_pollStartEventId;
+    const Quotient::PollStartEvent *m_pollStartEvent;
+
+    void updatePoll(Quotient::RoomEventsRange events);
 
     void checkLoadRelations();
     void handleAnswer(const QJsonObject &object, const QString &sender, QDateTime timestamp);

src/qml/AccountEditorPage.qml

@@ -215,4 +215,17 @@ FormCard.FormCardPage {
             onClicked: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ConfirmDeactivateAccountDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Confirm Deactivating Account")})
         }
     }
+
+    data: Connections {
+        target: root.connection
+        function onPasswordStatus(status) {
+            if (status === NeoChatConnection.Success) {
+                showPassiveNotification(i18n("Password changed successfully"));
+            } else if (status === NeoChatConnection.Wrong) {
+                showPassiveNotification(i18n("Wrong password entered"));
+            } else {
+                showPassiveNotification(i18n("Unknown problem while trying to change password"));
+            }
+        }
+    }
 }

src/qml/AccountsPage.qml

@@ -110,14 +110,5 @@ FormCard.FormCardPage {
                 pageStack.layers.pop()
             }
         }
-        function onPasswordStatus(status) {
-            if (status === Controller.Success) {
-                showPassiveNotification(i18n("Password changed successfully"));
-            } else if (status === Controller.Wrong) {
-                showPassiveNotification(i18n("Wrong password entered"));
-            } else {
-                showPassiveNotification(i18n("Unknown problem while trying to change password"));
-            }
-        }
     }
 }

src/qml/BanSheet.qml

@@ -17,11 +17,20 @@ Kirigami.Page {
 
     title: i18n("Ban User")
 
+    leftPadding: 0
+    rightPadding: 0
+    topPadding: 0
+    bottomPadding: 0
+
     QQC2.TextArea {
         id: reason
         placeholderText: i18n("Reason for banning this user")
         anchors.fill: parent
         wrapMode: TextEdit.Wrap
+
+        background: Rectangle {
+            color: Kirigami.Theme.backgroundColor
+        }
     }
 
     footer: QQC2.ToolBar {

src/qml/CreateRoomDialog.qml

@@ -75,7 +75,7 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: newOfficialCheck
             visible: root.parentId.length > 0
-            text: i18n("Make this parent official")
+            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
             checked: true
         }
         FormCard.FormButtonDelegate {
@@ -198,7 +198,7 @@ FormCard.FormCardPage {
         FormCard.FormCheckDelegate {
             id: existingOfficialCheck
             visible: root.parentId.length > 0
-            text: i18n("Make this parent official")
+            text: i18nc("@option:check As in make the space from which this dialog was created an official parent.", "Make this parent official")
             description: enabled ? i18n("You have the required privilege level in the child to set this state") : i18n("You do not have a high enough privilege level in the child to set this state")
             checked: enabled
 
@@ -216,7 +216,7 @@ FormCard.FormCardPage {
         }
         FormCard.FormCheckDelegate {
             id: makeCanonicalCheck
-            text: i18n("Make this space the canonical parent")
+            text: i18nc("@option:check The canonical parent is the default one if a room has multiple parent spaces.", "Make this space the canonical parent")
             checked: enabled
 
             enabled: existingOfficialCheck.enabled

src/qml/EmojiDialog.qml

@@ -31,6 +31,7 @@ QQC2.Popup {
 
     onVisibleChanged: {
         if (!visible) {
+            emojiPicker.clearSearchField()
             return
         }
         emojiPicker.forceActiveFocus()

src/qml/EmojiPicker.qml

@@ -206,4 +206,8 @@ ColumnLayout {
             onClicked: stickerModel.packIndex = model.index
         }
     }
+
+    function clearSearchField() {
+        searchField.text = ""
+    }
 }

src/qml/EventDelegate.qml

@@ -50,7 +50,9 @@ DelegateChooser {
 
     DelegateChoice {
         roleValue: DelegateType.Sticker
-        delegate: ImageDelegate {}
+        delegate: ImageDelegate {
+            connection: root.connection
+        }
     }
 
     DelegateChoice {

src/qml/GlobalNotificationsPage.qml

@@ -44,7 +44,7 @@ FormCard.FormCardPage {
                 sourceModel: root.pushRuleModel
                 filterRowCallback: function(source_row, source_parent) {
                     let sectionRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), PushRuleModel.SectionRole)
-                    return sectionRole == PushNotificationSection.Room;
+                    return sectionRole == PushRuleSection.Room;
                 }
             }
 
@@ -61,7 +61,7 @@ FormCard.FormCardPage {
                 sourceModel: root.pushRuleModel
                 filterRowCallback: function(source_row, source_parent) {
                     let sectionRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), PushRuleModel.SectionRole)
-                    return sectionRole == PushNotificationSection.Mentions;
+                    return sectionRole == PushRuleSection.Mentions;
                 }
             }
 
@@ -79,7 +79,7 @@ FormCard.FormCardPage {
 
                 filterRowCallback: function(source_row, source_parent) {
                     let sectionRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), PushRuleModel.SectionRole)
-                    return sectionRole == PushNotificationSection.Keywords;
+                    return sectionRole == PushRuleSection.Keywords;
                 }
             }
 
@@ -95,7 +95,7 @@ FormCard.FormCardPage {
                     Layout.fillWidth: true
 
                     placeholderText: i18n("Keyword…")
-                    enabled: NotificationsManager.keywordNotificationAction !== PushNotificationAction.Unknown
+                    enabled: NotificationsManager.keywordNotificationAction !== PushRuleAction.Unknown
 
                     rightActions: Kirigami.Action {
                         icon.name: "edit-clear"
@@ -117,7 +117,7 @@ FormCard.FormCardPage {
                     Accessible.name: text
                     icon.name: "list-add"
                     display: QQC2.AbstractButton.IconOnly
-                    enabled: NotificationsManager.keywordNotificationAction !== PushNotificationAction.Unknown
+                    enabled: NotificationsManager.keywordNotificationAction !== PushRuleAction.Unknown
 
                     onClicked: {
                         root.pushRuleModel.addKeyword(keywordAddField.text)
@@ -142,7 +142,7 @@ FormCard.FormCardPage {
                 sourceModel: root.pushRuleModel
                 filterRowCallback: function(source_row, source_parent) {
                     let sectionRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), PushRuleModel.SectionRole)
-                    return sectionRole == PushNotificationSection.Invites;
+                    return sectionRole == PushRuleSection.Invites;
                 }
             }
 
@@ -163,7 +163,7 @@ FormCard.FormCardPage {
                 sourceModel: root.pushRuleModel
                 filterRowCallback: function(source_row, source_parent) {
                     let sectionRole = sourceModel.data(sourceModel.index(source_row, 0, source_parent), PushRuleModel.SectionRole)
-                    return sectionRole == PushNotificationSection.Unknown;
+                    return sectionRole == PushRuleSection.Unknown;
                 }
             }