support for landscape view

harbour-tooter.pro

@@ -14,6 +14,7 @@ TARGET = harbour-tooter
 CONFIG += sailfishapp
 
 QT += network dbus sql
+QT += multimedia
 CONFIG += link_pkgconfig
 PKGCONFIG += sailfishapp
 PKGCONFIG += \
@@ -58,16 +59,16 @@ DISTFILES += qml/harbour-tooter.qml \
     qml/pages/SettingsPage.qml \
     qml/pages/components/InfoBanner.qml \
     qml/pages/components/MediaFullScreen.qml \
+    qml/pages/components/MyMedia.qml \
+    qml/pages/components/NavigationPanel.qml \
     qml/pages/components/ProfileImage.qml \
     qml/pages/components/VisualContainer.qml \
     qml/pages/components/MiniStatus.qml \
     qml/pages/components/MiniHeader.qml \
     qml/pages/components/ItemUser.qml \
     qml/pages/components/MyList.qml \
-    qml/pages/components/Navigation.qml \
     qml/pages/components/ProfileHeader.qml \
     qml/pages/components/MediaBlock.qml \
-    qml/pages/components/MyImage.qml \
     qml/cover/CoverPage.qml \
     qml/pages/MainPage.qml \
     qml/pages/LoginPage.qml \

qml/harbour-tooter.qml

@@ -87,5 +87,4 @@ ApplicationWindow {
             activate()
         }
     }
-
 }

qml/pages/ConversationPage.qml

@@ -242,18 +242,19 @@ Page {
             id: toot
             autoScrollEnabled: true
             labelVisible: false
+            //: placeholderText in Toot text panel
+            placeholderText: qsTr("What's on your mind?")
+            font.pixelSize: Theme.fontSizeSmall
             text: username !== "" && (username.charAt(0) === '@'
                                          || username.charAt(
                                              0) === '#') ? username + ' ' : ''
             height: if (type !== "reply") {
-                        Math.max(conversationPage.height / 3, Math.min(conversationPage.height * 0.65, implicitHeight))
+                        isPortrait ? Math.max(conversationPage.height / 3, Math.min(conversationPage.height * 0.65, implicitHeight)) : Math.max(conversationPage.height / 2, Math.min(conversationPage.height * 0.65, implicitHeight))
                     }
                     else {
-                        Math.max(conversationPage.height / 4, Math.min(conversationPage.height * 0.65, implicitHeight))
+                        isPortrait ? Math.max(conversationPage.height / 4, Math.min(conversationPage.height * 0.65, implicitHeight)) : Math.max(conversationPage.height / 2.5, Math.min(conversationPage.height * 0.65, implicitHeight))
                     }
             horizontalAlignment: Text.AlignLeft
-            placeholderText: qsTr("What's on your mind?")
-            font.pixelSize: Theme.fontSizeSmall
             anchors {
                 top: warningContent.bottom
                 topMargin: Theme.paddingMedium
@@ -297,7 +298,7 @@ Page {
                 rightMargin: Theme.paddingSmall
             }
             onSelectionChanged: { console.log(selection) }
-            onClicked: pageStack.push(emojiSelect)
+            onClicked: pageStack.push(emojiDialog)
         }
 
         SilicaGridView {
@@ -583,7 +584,7 @@ Page {
     }
 
     EmojiSelect {
-        id: emojiSelect
+        id: emojiDialog
     }
 
     InfoBanner {

qml/pages/LoginPage.qml

@@ -72,7 +72,14 @@ Page {
                                                   );
                 }
             }
+
             Label {
+                id: serviceDescr
+                text: qsTr("Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.")
+                font.pixelSize: Theme.fontSizeExtraSmall
+                color: Theme.highlightColor
+                wrapMode: Text.WordWrap
+                width: parent.width
                 anchors {
                     left: parent.left
                     right: parent.right
@@ -80,30 +87,20 @@ Page {
                     leftMargin: Theme.horizontalPageMargin
                     rightMargin: Theme.horizontalPageMargin
                 }
-
-                width: parent.width
-                wrapMode: Text.WordWrap
-                color: Theme.highlightColor
-                font.pixelSize: Theme.fontSizeExtraSmall
-                text: qsTr("Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.")
             }
-
-
         }
-
     }
 
     SilicaWebView {
         id: webView
         visible: false
+        opacity: 0
         anchors {
             top: parent.top
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
-
-        opacity: 0
         onLoadingChanged: {
             console.log(url)
             if (
@@ -154,6 +151,7 @@ Page {
         }
 
         FadeAnimation on opacity {}
+
         PullDownMenu {
             MenuItem {
                 text: qsTr("Reload")

qml/pages/MainPage.qml

@@ -12,14 +12,15 @@ Page {
 
     allowedOrientations: Orientation.All
 
+    // Docked Navigation panel
     DockedPanel {
         id: infoPanel
         open: true
-        width: mainPage.isPortrait ? parent.width : Theme.itemSizeLarge
+        width: isPortrait ? parent.width : Theme.itemSizeLarge
-        height: mainPage.isPortrait ? Theme.itemSizeLarge : parent.height
+        height: isPortrait ? Theme.itemSizeLarge : parent.height
-        dock: mainPage.isPortrait ? Dock.Bottom : Dock.Right
+        dock: isPortrait ? Dock.Bottom : Dock.Right
 
-        Navigation {
+        NavigationPanel {
             id: navigation
             isPortrait: !mainPage.isPortrait
             onSlideshowShow: {
@@ -37,9 +38,9 @@ Page {
             title: qsTr("Home")
             type: "timelines/home"
             mdl: Logic.modelTLhome
-            width: parent.itemWidth
+            width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge
             height: parent.itemHeight
-            onOpenDrawer:  infoPanel.open = setDrawer
+            onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true
         }
 
         MyList {
@@ -48,9 +49,9 @@ Page {
             type: "notifications"
             notifier: true
             mdl: Logic.modelTLnotifications
-            width: parent.itemWidth
+            width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge
             height: parent.itemHeight
-            onOpenDrawer: infoPanel.open = setDrawer
+            onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true
         }
 
         MyList {
@@ -59,9 +60,9 @@ Page {
             type: "timelines/public?local=true"
             //params: ["local", true]
             mdl: Logic.modelTLlocal
-            width: parent.itemWidth
+            width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge
             height: parent.itemHeight
-            onOpenDrawer: infoPanel.open = setDrawer
+            onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true
         }
 
         MyList {
@@ -69,9 +70,9 @@ Page {
             title: qsTr("Federated")
             type: "timelines/public"
             mdl: Logic.modelTLpublic
-            width: parent.itemWidth
+            width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge
             height: parent.itemHeight
-            onOpenDrawer: infoPanel.open = setDrawer
+            onOpenDrawer: isPortrait ? infoPanel.open = setDrawer : infoPanel.open = true
         }
 
         Item {
@@ -80,7 +81,7 @@ Page {
             property ListModel mdl: ListModel {}
             property string search
 
-            width: parent.itemWidth
+            width: isPortrait ? parent.itemWidth : parent.itemWidth - Theme.itemSizeLarge
             height: parent.itemHeight
             onSearchChanged: {
                 console.log(search)
@@ -239,8 +240,8 @@ Page {
         anchors {
             fill: parent
             top: parent.top
-            rightMargin: mainPage.isPortrait ? 0 : infoPanel.visibleSize
+            rightMargin: isPortrait ? 0 : infoPanel.visibleSize
-            bottomMargin: mainPage.isPortrait ? infoPanel.visibleSize : 0
+            bottomMargin: isPortrait ? infoPanel.visibleSize : 0
         }
         model: visualModel
         Component.onCompleted: {
@@ -255,7 +256,7 @@ Page {
         icon.source: "image://theme/icon-l-add"
         anchors {
             right: (mainPage.isPortrait ? parent.right : infoPanel.left)
-            rightMargin: Theme.paddingLarge
+            rightMargin: isPortrait ? Theme.paddingLarge : Theme.paddingLarge * 0.8
             bottom: (mainPage.isPortrait ? infoPanel.top : parent.bottom)
             bottomMargin: Theme.paddingLarge
         }

qml/pages/ProfilePage.qml

@@ -182,9 +182,9 @@ Page {
                             id: txtNote
                             text: note
                             textFormat: Text.StyledText
-                            color: Theme.secondaryColor
+                            color: Theme.highlightColor
                             font.pixelSize: Theme.fontSizeExtraSmall
-                            linkColor: Theme.highlightColor
+                            linkColor: Theme.secondaryColor
                             wrapMode: Text.Wrap
                             width: parent.width - ( 2 * Theme.horizontalPageMargin )
                             anchors.horizontalCenter: parent.horizontalCenter
@@ -227,37 +227,43 @@ Page {
                     anchors.leftMargin: Theme.paddingLarge
                     anchors.rightMargin: Theme.paddingLarge
 
-                    Text {
+                    Label {
                         id: txtFollowers
                         visible: true //followers_count ? true : false
                         text: followers_count+" "+
                               //: Will show as: "35 Followers"
                               qsTr("Followers")
                         font.pixelSize: Theme.fontSizeExtraSmall
-                        color: Theme.highlightColor
+                        color: Theme.primaryColor
                         wrapMode: Text.Wrap
                     }
 
-                    Text {
+                    Label {
                         id: txtFollowing
                         visible: true //following_count ? true : false
                         text: following_count+" "+
                               //: Will show as: "23 Following"
                               qsTr("Following")
                         font.pixelSize: Theme.fontSizeExtraSmall
-                        color: Theme.highlightColor
+                        color: Theme.primaryColor
                         wrapMode: Text.Wrap
                     }
 
-                    Text {
+                   Label {
                         id: txtStatuses
                         visible: true //statuses_count ? true : false
                         text: statuses_count+" "+
                               //: Will show as: "115 Statuses"
                               qsTr("Statuses")
                         font.pixelSize: Theme.fontSizeExtraSmall
-                        color: Theme.highlightColor
+                        color: Theme.primaryColor
                         wrapMode: Text.Wrap
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: expandingSection1.expanded = false
+                        }
+
                     }
                 }
 
@@ -344,16 +350,6 @@ Page {
                     }
                 }
 
-                Button {
-                    id: btnBrowser
-                    text: qsTr("Open in Browser")
-                    preferredWidth: Theme.buttonWidthMedium
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    onClicked: {
-                        Qt.openUrlExternally(url)
-                    }
-                }
-
                 Rectangle { // dummy item for spacing
                     height: Theme.paddingSmall
                     width: parent.width

qml/pages/components/EmojiSelect.qml

@@ -2,11 +2,10 @@ import QtQuick 2.0
 import Sailfish.Silica 1.0
 
 
-Component {
-    id: emojiComponent
-
 Dialog {
-        id: emoticonsDialog
+    id: emojiDialog
+    anchors.top: parent.top
+    allowedOrientations: Orientation.All
     canAccept: false //selector.currentIndex >= 0
     onAcceptPendingChanged: {
         if (acceptPending) {
@@ -15,15 +14,22 @@ Component {
         }
     }
 
+    Column {
+        id: emojiColumn
+        spacing: Theme.paddingLarge
+        width: parent.width
+        height: parent.height
+
         SilicaGridView {
             id: gridView
             header: PageHeader {
                 title: qsTr("Emojis")
                 description: qsTr("Tap to insert")
             }
-            cellWidth: gridView.width / 6
+            cellWidth: isPortrait ? gridView.width / 6 : gridView.width / 10
             cellHeight: cellWidth
-            anchors.fill: parent
+            width: parent.width
+            height: parent.height
             model: ListModel {
                 ListElement { section: "smileys"; glyph: "😁" }
                 ListElement { section: "smileys"; glyph: "😂" }
@@ -137,6 +143,7 @@ Component {
                 ListElement { section: "Horoscope Signs"; glyph: "♒" }
                 ListElement { section: "Horoscope Signs"; glyph: "♓" }
             }
+
             delegate: BackgroundItem {
                 width: gridView.cellWidth
                 height: gridView.cellHeight
@@ -153,11 +160,10 @@ Component {
                                 0, cursorPosition) + model.glyph + toot.text.substring(
                                 cursorPosition)
                     toot.cursorPosition = cursorPosition + model.glyph.length
-                    emoticonsDialog.canAccept = true
+                    emojiDialog.canAccept = true
-                    emoticonsDialog.accept()
+                    emojiDialog.accept()
                 }
             }
-
             VerticalScrollDecorator { flickable: listEmojis }
         }
     }

qml/pages/components/MediaBlock.qml

@@ -79,7 +79,7 @@ Item {
         }
     }
 
-    MyImage {
+    MyMedia {
         id: placeholder1
         width: 2
         height: 1
@@ -98,7 +98,7 @@ Item {
         }
     }
 
-    MyImage {
+    MyMedia {
         id: placeholder2
         width: 2
         height: 1
@@ -117,7 +117,7 @@ Item {
         }
     }
 
-    MyImage {
+    MyMedia {
         id: placeholder3
         width: 2
         height: 1
@@ -136,7 +136,7 @@ Item {
         }
     }
 
-    MyImage {
+    MyMedia {
         id: placeholder4
         width: 2
         height: 1

qml/pages/components/MediaFullScreen.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-import QtMultimedia 5.0
+import QtMultimedia 5.6
 
 
 FullscreenContentPage {
@@ -21,15 +21,17 @@ FullscreenContentPage {
         } else {
             video.source = mediaURL
             video.fillMode = VideoOutput.PreserveAspectFit
-            video.play()
             videoFlickable.visible = true
+            playerIcon.visible = true
+            playerProgress.visible = true
+            video.play()
+            hideTimer.start()
         }
     }
 
-    Flickable {
+    SilicaFlickable {
         id: videoFlickable
         visible: false
-        clip: true
         contentWidth: imageContainer.width
         contentHeight: imageContainer.height
         anchors.fill: parent
@@ -84,49 +86,27 @@ FullscreenContentPage {
                 }
             }
             onStopped: function() {
-                if (type != 'video')
+                if (type == 'gifv') {
                     video.play()
-                else
+                } else {
                     video.stop()
-            }
+                    overlayIcons.active = true
-
+                    hideTimer.stop()
-            IconButton {
-                id: playerIcon
-                icon.source: "image://theme/icon-m-play"
-                anchors {
-                    left: parent.left
-                    bottom: parent.bottom
-                    leftMargin: Theme.horizontalPageMargin
-                    bottomMargin: Theme.horizontalPageMargin
-                }
-                onClicked: function() {
-                    if (video.playbackState === MediaPlayer.PlayingState)
-                        video.pause()
-                    else
-                        video.play()
                 }
             }
 
-            ProgressBar {
-                id: playerProgress
-                indeterminate: true
-                width: 400
-                anchors {
-                    verticalCenter: playerIcon.verticalCenter
-                    left: playerIcon.right
-                    right: parent.right
-                    rightMargin: Theme.horizontalPageMargin + Theme.iconSizeMedium
-                    bottomMargin: Theme.horizontalPageMargin
-                }
-            }
 
             MouseArea {
                 anchors.fill: parent
                 onClicked: function() {
-                    if (video.playbackState === MediaPlayer.PlayingState)
+                    if (video.playbackState === MediaPlayer.PlayingState) {
                         video.pause()
-                    else
+                        overlayIcons.active = true
+                        hideTimer.stop()
+                    } else {
                         video.play()
+                        hideTimer.start()
+                    }
                 }
             }
 
@@ -155,12 +135,11 @@ FullscreenContentPage {
     }
 
 
-    Flickable {
+    SilicaFlickable {
         id: imageFlickable
         visible: false
         contentWidth: imageContainer.width
         contentHeight: imageContainer.height
-        clip: true
         anchors.fill: parent
         onHeightChanged: if (imagePreview.status === Image.Ready) {
                              imagePreview.fitToScreen()
@@ -224,7 +203,6 @@ FullscreenContentPage {
             property real minScale: 1.0
             property real maxScale: 3.0
 
-            opacity: 0.3
             anchors.fill: parent
             enabled: imagePreview.status === Image.Ready
             pinch.target: imagePreview
@@ -250,6 +228,11 @@ FullscreenContentPage {
                 property: "scale"
                 from: imagePreview.scale
             }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: overlayIcons.active = !overlayIcons.active
+            }
         }
     }
 
@@ -292,15 +275,23 @@ FullscreenContentPage {
         }
     }
 
+    Item {
+        id: overlayIcons
+
+        property bool active: true
+
+        enabled: active
+        anchors.fill: parent
+        opacity: active ? 1.0 : 0.0
+        Behavior on opacity { FadeAnimator {}}
+
         IconButton {
-        id: dismissBtn
+            y: Theme.paddingLarge
-        icon.source: "image://theme/icon-m-dismiss"
             anchors {
-            top: parent.top
-            topMargin: Theme.horizontalPageMargin
                 right: parent.right
                 rightMargin: Theme.horizontalPageMargin
             }
+            icon.source: "image://theme/icon-m-dismiss"
             onClicked: pageStack.pop()
         }
 
@@ -319,5 +310,53 @@ FullscreenContentPage {
             }
         }
 
+        IconButton {
+            id: playerIcon
+            visible: false
+            icon.source: "image://theme/icon-m-play"
+            anchors {
+                left: parent.left
+                bottom: parent.bottom
+                leftMargin: Theme.horizontalPageMargin
+                bottomMargin: Theme.horizontalPageMargin
+            }
+            onClicked: function() {
+                if (video.playbackState === MediaPlayer.PlayingState) {
+                    video.pause()
+                    hideTimer.stop()
+                } else {
+                    video.play()
+                    hideTimer.start()
+
+                }
+            }
+        }
+
+        ProgressBar {
+            id: playerProgress
+            visible: false
+            indeterminate: true
+            width: 400
+            anchors {
+                verticalCenter: playerIcon.verticalCenter
+                left: playerIcon.right
+                right: parent.right
+                rightMargin: Theme.horizontalPageMargin + Theme.iconSizeMedium
+                bottomMargin: Theme.horizontalPageMargin
+            }
+        }
+
+        Timer {
+            id: hideTimer
+            running: false
+            interval: 2000
+            onTriggered: {
+                overlayIcons.active = !overlayIcons.active
+            }
+        }
+
+    }
+
     VerticalScrollDecorator { flickable: imageFlickable }
 }
+

qml/pages/components/MyList.qml

@@ -9,8 +9,6 @@ SilicaListView {
 
     property string type
     property string title
-    property string vwPlaceholderText: qsTr("Loading")
-    property string vwPlaceholderHint: qsTr("please wait...")
     property string description
     property ListModel mdl: []
     property variant params: []
@@ -52,13 +50,16 @@ SilicaListView {
     ViewPlaceholder {
         id: viewPlaceHolder
         enabled: model.count === 0
-        text: vwPlaceholderText
+        text: qsTr("Loading")
-        hintText: vwPlaceholderHint
+        hintText: qsTr("please wait...")
+        anchors.centerIn: parent
     }
 
     PullDownMenu {
+
         MenuItem {
             text: qsTr("Settings")
+            visible: !profilePage
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("../SettingsPage.qml"), {})
             }
@@ -66,6 +67,7 @@ SilicaListView {
 
         MenuItem {
             text: qsTr("New Toot")
+            visible: !profilePage
             onClicked: {
                 pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), {
                                    headerTitle: qsTr("New Toot"),
@@ -74,6 +76,14 @@ SilicaListView {
             }
         }
 
+        MenuItem {
+            text: qsTr("Open in Browser")
+            visible: !mainPage
+            onClicked: {
+                Qt.openUrlExternally(url)
+            }
+        }
+
         MenuItem {
             text: qsTr("Reload")
             onClicked: {

qml/pages/components/MyMedia.qml

@@ -4,7 +4,7 @@ import QtMultimedia 5.0
 
 
 Item {
-    id: myImage
+    id: myMedia
 
     property string type : ""
     property string previewURL: ""
@@ -17,9 +17,26 @@ Item {
     }
 
     Image {
-        opacity: status !== Image.Ready ? 1.0 : 0.0
+        visible: type == 'image'
+        opacity: img.status === Image.Ready ? 0.0 : 1.0
         Behavior on opacity { FadeAnimator {} }
-        source: "image://theme/icon-m-image"
+        source: "image://theme/icon-m-image?"
+        anchors.centerIn: parent
+    }
+
+    Image {
+        visible: type == 'video' || type == "gifv"
+        opacity: img.status === Image.Ready ? 0.0 : 1.0
+        Behavior on opacity { FadeAnimator {} }
+        source: "image://theme/icon-m-file-video?"
+        anchors.centerIn: parent
+    }
+
+    Image {
+        visible: type == 'audio'
+        opacity: img.status === Image.Ready ? 0.0 : 1.0
+        Behavior on opacity { FadeAnimator {} }
+        source: "image://theme/icon-m-file-audio?"
         anchors.centerIn: parent
     }
 
@@ -33,6 +50,7 @@ Item {
 
     Image {
         id: img
+        visible: type != 'audio'
         asynchronous: true
         opacity: status === Image.Ready ? 1.0 : 0.0
         Behavior on opacity { FadeAnimator {} }
@@ -61,7 +79,7 @@ Item {
         Image {
             id: videoIcon
             visible: type === "video" || type === "gifv"
-            source: "image://theme/icon-l-play"
+            source: "image://theme/icon-l-play?"
             anchors.centerIn: parent
         }
 

qml/pages/components/NavigationPanel.qml

@@ -17,7 +17,7 @@ SilicaGridView {
     ListModel {
         id: listModel
         ListElement {
-            icon: "image://theme/icon-m-home"
+            icon: "image://theme/icon-m-home?"
             slug: "home"
             name: "Home"
             active: true
@@ -25,14 +25,14 @@ SilicaGridView {
         }
 
         ListElement {
-            icon: "image://theme/icon-m-alarm"
+            icon: "image://theme/icon-m-alarm?"
             slug: "notifications"
             name: "Notifications"
             active: false
         }
 
         ListElement {
-            icon: "image://theme/icon-m-whereami"
+            icon: "image://theme/icon-m-whereami?"
             slug: "local"
             name: "Local"
             active: false
@@ -40,7 +40,7 @@ SilicaGridView {
         }
 
         ListElement {
-            icon: "image://theme/icon-m-website"
+            icon: "image://theme/icon-m-website?"
             slug: "federated"
             name: "Federated"
             active: false
@@ -48,7 +48,7 @@ SilicaGridView {
         }
 
         ListElement {
-            icon: "image://theme/icon-m-search"
+            icon: "image://theme/icon-m-search?"
             slug: "search"
             name: "Search"
             active: false
@@ -100,54 +100,19 @@ SilicaGridView {
             }
         }
 
-        OpacityRampEffect {
-            sourceItem: label
-            offset: 0.5
-        }
-
-        ColorOverlay {
-            source: image
-            color: (highlighted ? Theme.highlightColor : (model.active ? Theme.primaryColor : Theme.secondaryHighlightColor))
-            anchors.fill: image
-        }
-
         Image {
             id: image
             visible: false
-            source: model.icon // +'?'+ (highlighted ? Theme.highlightColor : (model.active ? Theme.primaryColor : Theme.secondaryHighlightColor))
+            source: model.icon
             sourceSize.width: Theme.iconSizeMedium
             sourceSize.height: Theme.iconSizeMedium
             anchors.centerIn: parent
         }
 
-        Text {
+        ColorOverlay {
-            visible: false
+            source: image
-            text: model.name
+            color: (highlighted ? Theme.highlightColor : (model.active ? Theme.secondaryHighlightColor : Theme.primaryColor))
-            font.pixelSize: Theme.fontSizeExtraSmall/2
+            anchors.fill: image
-            color: (highlighted
-                    ? Theme.highlightColor
-                    : (model.active ? Theme.primaryColor : Theme.secondaryHighlightColor))
-            horizontalAlignment: Text.AlignHCenter
-            anchors {
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom
-                bottomMargin: Theme.paddingSmall
-            }
-        }
-
-        Label {
-            id: label
-            visible: false
-            color: (highlighted ? Theme.highlightColor : Theme.secondaryHighlightColor)
-            text: {
-                return model.name.toUpperCase();
-            }
-            font.pixelSize: Theme.fontSizeExtraSmall
-            font.family: Theme.fontFamilyHeading
-            width: parent.width
-            horizontalAlignment : Text.AlignHCenter
-            anchors.bottom: parent.bottom
         }
 
         onClicked: {

qml/pages/components/ProfileHeader.qml

@@ -35,9 +35,7 @@ Item {
         id: avatarImage
         asynchronous: true
         source: if (avatarImage.status === Image.Error)
-                    source = "../../images/icon-l-profile.svg?" + (pressed
+                    source = "../../images/icon-l-profile.svg?" + Theme.primaryColor
-                                                                   ? Theme.highlightColor
-                                                                   : Theme.primaryColor)
                 else image
         width: Theme.iconSizeLarge
         height: width

qml/pages/components/VisualContainer.qml

@@ -9,7 +9,6 @@ BackgroundItem {
     signal send (string notice)
     signal navigateTo(string link)
 
-    width: parent.width
     height: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
                 mnu.height + miniHeader.height + Theme.paddingLarge + lblContent.height + Theme.paddingLarge + (miniStatus.visible ? miniStatus.height : 0)
             } else mnu.height + miniHeader.height + (typeof attachments !== "undefined" && attachments.count ? media.height + Theme.paddingLarge + Theme.paddingMedium: Theme.paddingLarge) + lblContent.height + Theme.paddingLarge + (miniStatus.visible ? miniStatus.height : 0) + (iconDirectMsg.visible ? iconDirectMsg.height : 0)
@@ -58,9 +57,7 @@ BackgroundItem {
         }
         onStatusChanged: {
             if (avatar.status === Image.Error)
-                source = "../../images/icon-m-profile.svg?" + (pressed
+                source = "../../images/icon-m-profile.svg?" + Theme.primaryColor
-                                                               ? Theme.highlightColor
-                                                               : Theme.primaryColor)
         }
 
         MouseArea {
@@ -97,7 +94,7 @@ BackgroundItem {
             visible: status_visibility === "direct"
             width: Theme.iconSizeMedium
             height: width
-            source: "image://theme/icon-m-mail?"
+            source: "image://theme/icon-m-mail?" + Theme.primaryColor
             color: Theme.primaryColor
             anchors {
                 horizontalCenter: avatar.horizontalCenter
@@ -266,7 +263,9 @@ BackgroundItem {
         height: Theme.iconSizeExtraLarge * 2
         anchors {
             left: lblContent.left
+            leftMargin: isPortrait ? 0 : Theme.itemSizeSmall
             right: lblContent.right
+            rightMargin: isPortrait ? 0 : Theme.itemSizeLarge
             top: lblContent.bottom
             topMargin: Theme.paddingMedium
             bottomMargin: Theme.paddingLarge

rpm/harbour-tooter.spec

@@ -25,7 +25,10 @@ BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(nemonotifications-qt5)
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  desktop-file-utils
 
 %description

rpm/harbour-tooter.yaml

@@ -25,12 +25,14 @@ PkgConfigBR:
   - Qt5Core
   - Qt5Qml
   - Qt5Quick
+  - Qt5DBus
+  - Qt5Multimedia
   - nemonotifications-qt5
-
+  - openssl
 
 # Build dependencies without a pkgconfig setup can be listed here
 #  PkgBR:
-#   - package-needed-to-build
+#    - qt5-qtmultimedia-plugin-mediaservice-gstmediaplayer
 
 # Runtime dependencies which are not automatically detected
 Requires:

src/filedownloader.h

@@ -24,7 +24,7 @@ class FileDownloader : public QObject
 {
     Q_OBJECT
 public:
-    explicit FileDownloader(QQmlEngine *engine, QObject *parent = 0);
+    explicit FileDownloader(QQmlEngine *engine, QObject *parent = nullptr);
     Q_INVOKABLE void downloadFile(QUrl url, QString filename);
     Q_INVOKABLE void open(QString filename);
 

src/imageuploader.cpp

@@ -8,7 +8,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
-//static const QUrl IMGUR_UPLOAD_URL("https://httpbin.org/post");
 //static const QUrl IMGUR_UPLOAD_URL();
 
 ImageUploader::ImageUploader(QObject *parent) : QObject(parent), m_networkAccessManager(nullptr), m_reply(nullptr) {
@@ -101,12 +100,8 @@ void ImageUploader::upload() {
 
     //imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant(fileInfo));
 
-
-
     //POST data
 
-
-
     QNetworkRequest request(m_uploadUrl);
     request.setRawHeader("Authorization", m_authorizationHeader);
     m_reply = m_networkAccessManager->post(request, multiPart);
@@ -114,8 +109,6 @@ void ImageUploader::upload() {
     connect(m_reply, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(uploadProgress(qint64,qint64)));
     connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
 
-
-
     //connect(m_reply, SIGNAL(uploadProgress(qint64,qint64)), this, SLOT(uploadProgress(qint64,qint64)));
     //connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));*/
 }

src/imageuploader.h

@@ -12,7 +12,7 @@ class ImageUploader : public QObject
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
 
 public:
-    explicit ImageUploader(QObject *parent = 0);
+    explicit ImageUploader(QObject *parent = nullptr);
     ~ImageUploader();
 
     Q_INVOKABLE void setFile(const QString &fileName);

translations/harbour-tooter-de.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>Was gibt&apos;s Neues?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tippen um einzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Home</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Benachrichtigungen</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Neuer Toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Suche</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@Benutzer oder #Ausdruck</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Föderation</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Neuer Toot</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Ladefehler</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Neu laden</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Im Browser öffnen</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>Details</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Folgende</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Folgt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Beiträge</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Erwähnen</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Entfolgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Angefragt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Nicht stumm schalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Stumm schalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Nicht blockieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blockieren</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Im Browser öffnen</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Erwähnen</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-el.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emoji</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Κτυπήστε για εισαγωγή</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,32 +118,32 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Οικοσελίδα</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Ειδοποιήσεις</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Νέος</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Αναζήτηση</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@χρήστη ή #όρος</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Τοπικός</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Νέος</translation>
+    </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation type="unfinished">Επαναφόρτωση</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -214,22 +219,26 @@
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Σας ακολουθούν</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Σε παρακολούθηση</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Κατάσταση</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Αναίρεση παρακολούθησης</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -239,34 +248,26 @@
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Παρακολούθηση</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Αναίρεση σίγασης</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Σίγαση</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Αναίρεση φραγής</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Φραγή</translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-es.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>¿En qué estás pensando?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emoticonos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Toca para insertar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Inicio</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Notificaciones</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nuevo toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Buscar</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@usuario o #término</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Local</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Federada</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nuevo toot</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Error al cargar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Volver a cargar</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Abrir en el navegador</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>Detalles</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Seguidores</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Siguiendo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Estados</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Mencionar</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Dejar de seguir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Requerido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Seguir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Dejar de silenciar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Silenciar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Desbloquear</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Bloquear</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Abrir en el navegador</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Mencionar</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-fr.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>Qu&apos;avez-vous en tête?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Appuyez pour insérer</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Accueil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Notifications</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Federated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Toot</source>
         <translation>Nouveau pouet</translation>
     </message>
-    <message>
-        <source>Search</source>
-        <translation>Rechercher</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@personne ou #terme</translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation>Fil public local</translation>
-    </message>
-    <message>
-        <source>Federated</source>
-        <translation>Fil public global</translation>
-    </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Erreur au chargement</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Recharger</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Ouvrir dans le navigateur</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>Détails</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Abonné(e)s</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Abonnements</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Pouets</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Mentionner</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Ne plus suivre</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Demandé</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Suivre</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Démasquer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Masquer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Débloquer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Bloquer</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Ouvrir dans le navigateur</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Mentionner</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-it.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>A cosa stai pensando?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tap per inserire</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Home</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Notifiche</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nuovo Toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@utente o #terme</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Locale</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Federazione</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nuovo Toot</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Errore durante caricamento</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Ricarica</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Aprire nel browser</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>Dettagli</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Seguaci</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Segue</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Toots</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Menzionare</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Smetti di seguire</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Richiesto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Segui</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Non silenziare</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Silenzia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Sblocca</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blocca</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Aprire nel browser</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Menzionare</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-nl.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>Wat wil je kwijt?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tikken om in te voegen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Thuis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Meldingen</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nieuwe Toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Zoeken</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@user of #term</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokaal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Gefedereerd</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nieuwe Toot</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Herladen</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Open een Browser</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>Gegevens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Volgers</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Volgend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Statussen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Vermelden</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Ontvolgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Gevraagd</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Volgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Ontdempen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Dempen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Deblokkeren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blokkeren</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Open een Browser</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Vermelden</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-nl_BE.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emoji’s</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tikt voor in te voegen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Thuis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Meldingen</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nieuwen toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Zoeken</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@gebruiker of #term</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokaal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Gefedereerd</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nieuwen toot</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Herladen</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -214,22 +219,26 @@
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Volgers</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Volgend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Statussen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Ontvolgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -239,34 +248,26 @@
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Volgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Ontdempen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Dempen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Deblokkeren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blokkeren</translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-oc.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tustejar per inserir</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Acuèlh</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Notificacions</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nòu Tut</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Cercar</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@utilizaire o #tèrm</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Local</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Federat</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nòu Tut</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -214,22 +219,26 @@
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Seguidors</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Abonaments</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Estatuts</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Quitar de seguir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -239,34 +248,26 @@
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Seguir</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Mostrar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Amagar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Desblocar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blocar</translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-pl.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emoji</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Dotknij aby wstawić</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Strona główna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Powiadomienia</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Nowy wpis</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Szukaj</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@użytkownik lub #tag</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokalne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Globalne</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Nowy wpis</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Załaduj ponownie</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -219,17 +224,21 @@
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Śledzisz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Przestań śledzić</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -249,7 +258,7 @@
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Wycisz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
@@ -261,14 +270,6 @@
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SettingsPage</name>

translations/harbour-tooter-ru.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>О чём думаете?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Cмайликов</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Нажмите, чтобы вставить</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Главная</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Уведомления</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Новый</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Поиск</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@пользователь или #срок</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Локальный</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Федеративные</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Новый</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Ошибка загрузки</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Перезагрузить</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Открыть в браузере</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>О профиль</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Читают</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Следующий</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Статусы</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Упоминание</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Отписаться</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Запрошенный</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Следить</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Нет безгласный</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Безгласный</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Открыть</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Блокировать</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Открыть в браузере</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Упоминание</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-sr.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Емотикони</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Тапни за убацивање</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Почетна</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Обавјештење</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Novi toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Претрага</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@korisnik ili #pojam</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Локална</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Федеративна</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Novi toot</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>учитај још</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -214,22 +219,26 @@
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Пратиоци</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Пратите</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Статуси</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Одпрати</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -239,34 +248,26 @@
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Прати</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Укини утишање</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Утишај</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Одблокирати</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Блокирати</translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-sv.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tryck för att infoga</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,31 +118,31 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Hem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Notifieringar</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>Ny toot</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Sök</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@user eller #term</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokalt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Förenade</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">Ny toot</translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>Ladda mer</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -214,22 +219,26 @@
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Följare</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Följer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Statusar</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Sluta följa</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
@@ -239,34 +248,26 @@
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Följ</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Avtysta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Tysta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Avblockera</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Blockera</translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mention</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-zh_CN.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>有何想法?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>表情</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>点击以插入</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>主页</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>通知</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation>新嘟嘟</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>搜索</translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation>@用户或#项目</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>本地</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>联合</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">新嘟嘟</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>加载错误</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation>重新加载</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">在浏览器打开个人简介</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>关于</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>关注者</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>关注中</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>状态</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">提及</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>取消关注</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>请求</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>关注</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>未静音</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>静音</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>解除封锁</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>封锁</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>在浏览器打开个人简介</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>提及</translation>
     </message>
 </context>
 <context>

translations/harbour-tooter.ts

@@ -33,6 +33,7 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
         <translation>What&apos;s on your mind?</translation>
     </message>
     <message>
@@ -76,11 +77,11 @@
     <name>EmojiSelect</name>
     <message>
         <source>Emojis</source>
-        <translation>Emojis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap to insert</source>
-        <translation>Tap to insert</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -117,38 +118,38 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Toot</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>@user or #term</source>
-        <translation></translation>
     </message>
     <message>
         <source>Local</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation type="unfinished">New Toot</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Error loading</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -188,6 +189,10 @@
         <source>Reload</source>
         <translation type="unfinished">Reload</translation>
     </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation type="unfinished">Open in Browser</translation>
+    </message>
 </context>
 <context>
     <name>ProfileHeader</name>
@@ -209,65 +214,61 @@
     <message>
         <source>About</source>
         <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
-        <translation>About</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
-        <translation>Followers</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
-        <translation>Following</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
-        <translation>Statuses</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation type="unfinished">Mention</translation>
     </message>
     <message>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Unfollow</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Requested</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Follow</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Unmute</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Mute</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Unblock</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation>Block</translation>
+        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Browser</source>
-        <translation>Open in Browser</translation>
-    </message>
-    <message>
-        <source>Mention</source>
-        <translation>Mention</translation>
     </message>
 </context>
 <context>