diff --git a/src/app/qml/GlobalMenu.qml b/src/app/qml/GlobalMenu.qml index 8c3d29627..6c5eb91c2 100644 --- a/src/app/qml/GlobalMenu.qml +++ b/src/app/qml/GlobalMenu.qml @@ -45,14 +45,12 @@ Labs.MenuBar { } Labs.MenuItem { icon.name: "compass-symbolic" - text: i18nc("@action:inmenu", "Explore Rooms") + text: i18nc("@action:inmenu Explore public rooms and spaces", "Explore") enabled: root.connection onTriggered: { let dialog = root.appWindow.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join"); }); diff --git a/src/app/qml/QuickSwitcher.qml b/src/app/qml/QuickSwitcher.qml index c1bdf1e23..8e40dc4a9 100644 --- a/src/app/qml/QuickSwitcher.qml +++ b/src/app/qml/QuickSwitcher.qml @@ -30,15 +30,13 @@ Kirigami.SearchDialog { emptyText: i18nc("Placeholder message", "No room found") Kirigami.Action { id: exploreRoomAction - text: i18nc("@action:button", "Explore rooms") + text: i18nc("@action:button Explore public rooms and spaces", "Explore") icon.name: "compass" onTriggered: { root.close() let dialog = root.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join"); }); diff --git a/src/libneochat/qml/ExploreRoomsPage.qml b/src/libneochat/qml/ExploreRoomsPage.qml index 0c71a6b8c..cca7fa2df 100644 --- a/src/libneochat/qml/ExploreRoomsPage.qml +++ b/src/libneochat/qml/ExploreRoomsPage.qml @@ -50,7 +50,7 @@ SearchPage { */ signal roomSelected(string roomId, string displayName, url avatarUrl, string alias, string topic, int memberCount, bool isJoined) - title: i18nc("@action:title", "Explore Rooms") + title: i18nc("@action:title Explore public rooms and spaces", "Explore") customPlaceholderText: publicRoomListModel.redirectedText customPlaceholderIcon: "data-warning" diff --git a/src/rooms/ExploreComponentMobile.qml b/src/rooms/ExploreComponentMobile.qml index 9113bf846..1174771a7 100644 --- a/src/rooms/ExploreComponentMobile.qml +++ b/src/rooms/ExploreComponentMobile.qml @@ -46,15 +46,13 @@ Kirigami.NavigationTabBar { } }, Kirigami.Action { - text: i18n("Explore rooms") + text: i18nc("@action:inmenu Explore public rooms and spaces", "Explore") icon.name: "compass" onTriggered: { explorePopup.close(); let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join"); }); diff --git a/src/rooms/RoomListPage.qml b/src/rooms/RoomListPage.qml index bb4cccc18..b33807c7b 100644 --- a/src/rooms/RoomListPage.qml +++ b/src/rooms/RoomListPage.qml @@ -222,14 +222,12 @@ Kirigami.Page { Kirigami.Action { id: exploreRoomAction icon.name: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? "search" : "compass" - text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18nc("@action", "Search in room directory") : i18nc("@action", "Explore rooms") + text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18nc("@action:button Search public directory for this room", "Search for Room") : i18nc("@action:button Explore public rooms and spaces", "Explore") onTriggered: { let dialog = (root.Kirigami.PageStack.pageStack as Kirigami.PageRow).layers.push(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection, keyword: RoomManager.sortFilterRoomTreeModel.filterText - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join"); }); diff --git a/src/rooms/SpaceDrawer.qml b/src/rooms/SpaceDrawer.qml index 128e08d86..b16df0630 100644 --- a/src/rooms/SpaceDrawer.qml +++ b/src/rooms/SpaceDrawer.qml @@ -286,7 +286,7 @@ QQC2.Control { Layout.preferredHeight: width - Kirigami.Units.smallSpacing Layout.maximumHeight: width - Kirigami.Units.smallSpacing - text: i18nc("@action:button", "Explore rooms") + text: i18nc("@action:button Explore public rooms and spaces", "Explore") contentItem: Kirigami.Icon { source: "compass" } @@ -297,9 +297,7 @@ QQC2.Control { let dialog = (Kirigami.PageStack.pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection, keyword: RoomManager.sortFilterRoomTreeModel.filterText - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { RoomManager.resolveResource(roomId.length > 0 ? roomId : alias, isJoined ? "" : "join"); }); diff --git a/src/settings/SelectParentDialog.qml b/src/settings/SelectParentDialog.qml index f5d9336ab..a2918a3cb 100644 --- a/src/settings/SelectParentDialog.qml +++ b/src/settings/SelectParentDialog.qml @@ -138,9 +138,7 @@ Kirigami.Dialog { connection: root.room.connection, showOnlySpaces: true, showOnlySpacesButton: false - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { chosenRoomDelegate.roomId = roomId; chosenRoomDelegate.displayName = displayName; diff --git a/src/spaces/SelectExistingRoomDialog.qml b/src/spaces/SelectExistingRoomDialog.qml index 99a3d06b0..b15efc26b 100644 --- a/src/spaces/SelectExistingRoomDialog.qml +++ b/src/spaces/SelectExistingRoomDialog.qml @@ -41,7 +41,7 @@ Kirigami.Dialog { let dialog = ((root.QQC2.ApplicationWindow.window as Kirigami.ApplicationWindow).pageStack as Kirigami.PageRow).pushDialogLayer(Qt.createComponent('org.kde.neochat.libneochat', 'ExploreRoomsPage'), { connection: root.connection }, { - title: i18nc("@title", "Explore Rooms") + title: i18nc("@title Explore public rooms and spaces", "Explore") }); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { chosenRoomDelegate.roomId = roomId; @@ -123,9 +123,7 @@ Kirigami.Dialog { onClicked: { let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection - }, { - title: i18nc("@title", "Explore Rooms") - }); + }, {}); dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => { chosenRoomDelegate.roomId = roomId; chosenRoomDelegate.displayName = displayName;