Merge branch 'ui-improvements'

harbour-tooterb.pro

@@ -73,7 +73,6 @@ DISTFILES += qml/harbour-tooterb.qml \
     qml/pages/LoginPage.qml \
     qml/pages/Browser.qml \
     qml/lib/API.js \
-    qml/images/icon-s-bot.svg \
     qml/images/icon-s-following \
     qml/images/icon-s-bookmark \
     qml/images/icon-m-emoji.svg \

qml/images/icon-s-bot.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <title>icon-s-bot</title>
-  <g>
-    <path d="M27.28,14.83a5,5,0,0,0-5-4.72H9.7a5,5,0,0,0-5,4.72,1.32,1.32,0,0,0,0,.28V24a1.32,1.32,0,0,0,0,.28A5,5,0,0,0,9.7,29H22.3a5,5,0,0,0,5-4.72,1.32,1.32,0,0,0,0-.28V15.11A1.32,1.32,0,0,0,27.28,14.83ZM10.85,21.32a2.81,2.81,0,1,1,2.81-2.81A2.81,2.81,0,0,1,10.85,21.32Zm10.3,0A2.81,2.81,0,1,1,24,18.51,2.81,2.81,0,0,1,21.15,21.32Z" fill="#fff"/>
-    <g opacity="0.6">
-      <path d="M17.67,5.06v5h-4v-5a2,2,0,0,1,4,0Z" fill="#fff"/>
-    </g>
-    <path d="M30.43,19.55c0,2.61-1.4,4.73-3.13,4.73h0a1.32,1.32,0,0,0,0-.28V15.11a1.32,1.32,0,0,0,0-.28h0C29,14.83,30.43,16.94,30.43,19.55Z" fill="#fff" opacity="0.6"/>
-    <path d="M4.7,24a1.32,1.32,0,0,0,0,.28h0c-1.73,0-3.13-2.12-3.13-4.73S3,14.83,4.7,14.83h0a1.32,1.32,0,0,0,0,.28Z" fill="#fff" opacity="0.6"/>
-  </g>
-</svg>

qml/pages/ConversationPage.qml

@@ -222,12 +222,6 @@ Page {
             id: warningContent
             visible: false
             height: visible ? implicitHeight : 0
-            anchors {
-                top: parent.top
-                topMargin: Theme.paddingMedium
-                left: parent.left
-                right: parent.right
-            }
             autoScrollEnabled: true
             labelVisible: false
             font.pixelSize: Theme.fontSizeSmall
@@ -235,6 +229,12 @@ Page {
             placeholderColor: palette.highlightColor
             color: palette.highlightColor
             horizontalAlignment: Text.AlignLeft
+            anchors {
+                top: parent.top
+                topMargin: Theme.paddingMedium
+                left: parent.left
+                right: parent.right
+            }
             EnterKey.onClicked: {}
         }
 
@@ -245,13 +245,6 @@ Page {
 
         TextArea {
             id: toot
-            anchors {
-                top: warningContent.bottom
-                topMargin: Theme.paddingMedium
-                left: parent.left
-                right: parent.right
-                rightMargin: Theme.paddingLarge * 2
-            }
             autoScrollEnabled: true
             labelVisible: false
             text: description !== "" && (description.charAt(0) === '@'
@@ -266,6 +259,13 @@ Page {
             horizontalAlignment: Text.AlignLeft
             placeholderText: qsTr("What's on your mind?")
             font.pixelSize: Theme.fontSizeSmall
+            anchors {
+                top: warningContent.bottom
+                topMargin: Theme.paddingMedium
+                left: parent.left
+                right: parent.right
+                rightMargin: Theme.paddingLarge * 2
+            }
             EnterKey.onClicked: {}
             onTextChanged: {
                 textOperations.text = toot.text

qml/pages/SettingsPage.qml

@@ -70,7 +70,7 @@ Page {
                     Button {
                         id: btnRemoveAccount
                         text: Logic.conf['login'] ? qsTr("Remove Account") : qsTr("Add Account")
-                        width: Theme.buttonWidthMedium
+                        preferredWidth: Theme.buttonWidthMedium
                         anchors.horizontalCenter: parent.horizontalCenter
                         onClicked: {
                             remorsePopup.execute(btnRemoveAccount.text, function() {
@@ -125,6 +125,7 @@ Page {
             }
 
             SectionHeader {
+                //: Translation alternative: "Development"
                 text:  qsTr("Credits")
             }
 
@@ -146,13 +147,6 @@ Page {
                             mail: ""
                         }
 
-                        ListElement {
-                            name: "Miodrag Nikolić"
-                            desc: qsTr("Visual identity")
-                            mastodon: ""
-                            mail: "micotakis@gmail.com"
-                        }
-
                         ListElement {
                             name: "Molan"
                             desc: qsTr("Development and translations")
@@ -160,6 +154,13 @@ Page {
                             mail: ""
                         }
 
+                        ListElement {
+                            name: "Miodrag Nikolić"
+                            desc: qsTr("Visual identity")
+                            mastodon: ""
+                            mail: "micotakis@gmail.com"
+                        }
+
                         ListElement {
                             name: "Quentin PAGÈS / Quenti ♏"
                             desc: qsTr("Occitan & French translation")
@@ -187,13 +188,6 @@ Page {
                             mastodon: ""
                             mail: ""
                         }
-
-                        ListElement {
-                            name: "Mohamed-Touhami MAHDI"
-                            desc: qsTr("Added README file")
-                            mastodon: "dragnucs@touha.me"
-                            mail: "touhami@touha.me"
-                        }
                     }
 
                     Item {

qml/pages/components/ItemUser.qml

@@ -12,12 +12,13 @@ BackgroundItem {
 
     Rectangle {
         id: avatar
+        color: "transparent"
         width: Theme.itemSizeExtraSmall
         height: width
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.leftMargin: Theme.horizontalPageMargin
-        color: Theme.highlightDimmerColor
+
 
         Image {
             id: img
@@ -55,40 +56,33 @@ BackgroundItem {
     }
 
     Item {
+        id: userdescription
+        height: account_acct.height + display_name.height
         anchors.left: avatar.right
         anchors.leftMargin: Theme.paddingLarge
+        anchors.right: parent.right
+        anchors.rightMargin: Theme.horizontalPageMargin
         anchors.verticalCenter: parent.verticalCenter
-        height: account_acct.height + display_name.height
 
         Label {
             id: display_name
             text: account_display_name ? account_display_name : account_username.split('@')[0]
             color: !pressed ? Theme.primaryColor : Theme.highlightColor
             font.pixelSize: Theme.fontSizeSmall
+            truncationMode: TruncationMode.Fade
+            width: parent.width - Theme.paddingMedium
             anchors.top: parent.top
 
         }
 
-        Image {
-            id: icnBot
-            visible: account_bot
-            source: "../../images/icon-s-bot.svg?" + ( pressed ? Theme.highlightColor : Theme.primaryColor )
-            width: account_bot ? Theme.iconSizeExtraSmall : 0
-            height: width
-            y: Theme.paddingLarge
-            anchors {
-                left: display_name.right
-                leftMargin: Theme.paddingSmall
-                verticalCenter: display_name.verticalCenter
-            }
-        }
-
         Label {
             id: account_acct
             text: "@"+model.account_acct
             color: !pressed ?  Theme.secondaryColor : Theme.secondaryHighlightColor
             anchors.leftMargin: Theme.paddingMedium
             font.pixelSize: Theme.fontSizeExtraSmall
+            truncationMode: TruncationMode.Fade
+            width: parent.width - Theme.paddingMedium
             anchors.top: display_name.bottom
         }
     }

qml/pages/components/MiniHeader.qml

@@ -16,22 +16,10 @@ Item {
                    ( pressed ? Theme.secondaryHighlightColor : (!highlight ? Theme.secondaryColor : Theme.secondaryHighlightColor ))
                } else ( pressed ? Theme.highlightColor : ( !highlight ? Theme.primaryColor : Theme.secondaryColor ))
         truncationMode: TruncationMode.Fade
-        width: contentWidth > parent.width /2 ? parent.width /2 : contentWidth
+        width: myList.type !== "follow" ? ( contentWidth > parent.width /2 ? parent.width /2 : contentWidth ) : parent.width - Theme.paddingMedium
-        anchors.left: parent.left
-    }
-
-    Icon {
-        id: icnBot
-        visible: account_bot
-        source: "../../images/icon-s-bot.svg?" + ( pressed ? Theme.highlightColor : Theme.primaryColor )
-        color: Theme.primaryColor
-        width: account_bot ? Theme.iconSizeExtraSmall * 1.3 : 0
-        height: width
-        y: Theme.paddingLarge
         anchors {
-            left: lblName.right
+            left: parent.left
-            leftMargin: Theme.paddingSmall
+            leftMargin: Theme.paddingMedium
-            verticalCenter: lblName.verticalCenter
         }
     }
 
@@ -43,8 +31,8 @@ Item {
         color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor )
         truncationMode: TruncationMode.Fade
         anchors {
-            left: icnBot ? icnBot.right : icnLocked.right
+            left: lblName.right
-            leftMargin: Theme.paddingSmall
+            leftMargin: Theme.paddingMedium
             right: lblDate.left
             rightMargin: Theme.paddingMedium
             verticalCenter: lblName.verticalCenter
@@ -53,13 +41,15 @@ Item {
 
     Label {
         id: lblScreenNameFollow
-        visible: model.type === "follow" && myList.type === "notifications"
+        visible: model.type === "follow"
         text: '@'+account_username
         font.pixelSize: Theme.fontSizeExtraSmall
         color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor )
+        width: parent.width - Theme.paddingMedium
         truncationMode: TruncationMode.Fade
         anchors {
             left: parent.left
+            leftMargin: Theme.paddingMedium
             top: lblName.bottom
         }
     }
@@ -72,6 +62,7 @@ Item {
         horizontalAlignment: Text.AlignRight
         anchors {
             right: parent.right
+            rightMargin: Theme.horizontalPageMargin
             verticalCenter: lblName.verticalCenter
         }
     }

qml/pages/components/MiniStatus.qml

@@ -7,6 +7,7 @@ Item {
     visible: true
     height: icon.height+Theme.paddingMedium
     width: parent.width
+
     Icon {
         id: icon
         visible: type.length
@@ -27,7 +28,7 @@ Item {
         id: lblRtByName
         visible: type.length
         text: {
-            var action = ""
+            var action = "";
             switch(type){
             case "reblog":
                 action =  qsTr('boosted');
@@ -42,7 +43,7 @@ Item {
                 miniStatus.visible = false
                 action = type;
             }
-            return typeof reblog_account_username !== "undefined" ? "@" + reblog_account_username + " " +  action : " "
+            return typeof reblog_account_username !== "undefined" ? '@' + reblog_account_username + " " +  action : " "
         }
         font.pixelSize: Theme.fontSizeExtraSmall
         color: Theme.highlightColor

qml/pages/components/VisualContainer.qml

@@ -29,22 +29,8 @@ BackgroundItem {
         }
     }
 
-    // Background for reblogs and favourited statuses in Notification View
+    // Element showing reblog, favourite, follow status on top of Toot
-    /* Rectangle {
+    MiniStatus {
-        id: bgNotifications
-        x: 0
-        y: 0
-        visible: myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )
-        width: parent.width
-        height: parent.height
-        opacity: 0.5
-        gradient: Gradient {
-            GradientStop { position: -0.5; color: "transparent" }
-            GradientStop { position: 0.4; color: Theme.highlightDimmerColor }
-        }
-    } */
-
-    MiniStatus { // Element showing reblog- or favourite status on top of Toot
         id: miniStatus
         anchors {
             leftMargin: Theme.horizontalPageMargin
@@ -99,6 +85,7 @@ BackgroundItem {
             }
         }
 
+        // Avatar dimmer for facourite and reblog notifications
         Rectangle {
             visible: myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )
             opacity: 0.5
@@ -106,19 +93,6 @@ BackgroundItem {
             anchors.fill: avatar
         }
 
-        Image {
-            id: iconTR
-            visible: typeof status_reblogged !== "undefined" && status_reblogged
-            width: Theme.iconSizeExtraSmall
-            height: width
-            source: "image://theme/icon-s-retweet"
-            anchors {
-                top: avatar.bottom
-                topMargin: Theme.paddingMedium
-                left: avatar.left
-            }
-        }
-
         Icon {
             id: iconDirectMsg
             visible: status_visibility === "direct"
@@ -188,16 +162,13 @@ BackgroundItem {
         anchors {
             top: avatar.top
             left: avatar.right
-            leftMargin: Theme.paddingMedium
             right: parent.right
-            rightMargin: Theme.horizontalPageMargin
         }
     }
 
     // Toot content
     Label  {
         id: lblContent
-
         visible: model.type !== "follow"
         text: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
                   content
@@ -219,7 +190,9 @@ BackgroundItem {
                 } else content.length ? ( contentWarningLabel.paintedHeight > paintedHeight ? contentWarningLabel.paintedHeight : paintedHeight ) : 0
         anchors {
             left: miniHeader.left
+            leftMargin: Theme.paddingMedium
             right: miniHeader.right
+            rightMargin: Theme.horizontalPageMargin
             top: miniHeader.bottom
             topMargin: Theme.paddingSmall
             bottomMargin: Theme.paddingLarge
@@ -295,8 +268,8 @@ BackgroundItem {
         model: typeof attachments !== "undefined" ? attachments : Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject')
         height: Theme.iconSizeExtraLarge * 2
         anchors {
-            left: miniHeader.left
+            left: lblContent.left
-            right: miniHeader.right
+            right: lblContent.right
             top: lblContent.bottom
             topMargin: Theme.paddingMedium
             bottomMargin: Theme.paddingLarge
@@ -407,6 +380,7 @@ BackgroundItem {
             }
 
             Icon {
+                id: icBM
                 source: "../../images/icon-s-bookmark.svg?"
                 color: !model.status_bookmarked ? Theme.highlightColor : Theme.primaryColor
                 width: Theme.iconSizeExtraSmall
@@ -438,8 +412,8 @@ BackgroundItem {
                 width: Theme.iconSizeExtraSmall
                 height: width
                 anchors {
-                    leftMargin: Theme.horizontalPageMargin + Theme.paddingMedium
                     left: parent.left
+                    leftMargin: Theme.horizontalPageMargin + Theme.paddingMedium
                     verticalCenter: parent.verticalCenter
                 }
             }

translations/harbour-tooterb-de.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Über</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation>Spanische Übersetzung</translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation>Erstellung README-Datei</translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-el.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Ευχαριστίες</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-es.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Créditos</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation>Traducción al español</translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation>Añadido archivo README</translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-fr.ts

@@ -66,7 +66,7 @@
     </message>
     <message>
         <source>Hide Reply</source>
-        <translation>Fermer Répondre</translation>
+        <translation>Masquer la réponse</translation>
     </message>
 </context>
 <context>
@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Développement</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation>Traduction espagnole</translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation>Fichier README ajouté</translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-it.ts

@@ -4,23 +4,18 @@
 <context>
     <name>API</name>
     <message>
-        <location filename="../qml/lib/API.js" line="158"/>
         <source>favourited</source>
         <translation>ha apprezzato</translation>
     </message>
     <message>
-        <location filename="../qml/lib/API.js" line="169"/>
         <source>followed you</source>
         <translation>ha iniziato a seguirti</translation>
     </message>
     <message>
-        <location filename="../qml/lib/API.js" line="179"/>
         <source>boosted</source>
         <translation>ha condiviso</translation>
     </message>
     <message>
-        <location filename="../qml/lib/API.js" line="189"/>
-        <location filename="../qml/lib/API.js" line="191"/>
         <source>said</source>
         <translation>ha detto</translation>
     </message>
@@ -28,80 +23,66 @@
 <context>
     <name>ConversationPage</name>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="111"/>
         <source>Copy Link to Clipboard</source>
         <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
         <translation>Copia link</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="127"/>
-        <source>Reply</source>
-        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
-        <translation>Risposta</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="127"/>
-        <source>Hide Reply</source>
-        <translation>Chiudere Risposta</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="234"/>
         <source>Write your warning here</source>
         <translation>Contenuto avviso</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="267"/>
         <source>What&apos;s on your mind?</source>
         <translation>A cosa stai pensando?</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="334"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="432"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="435"/>
         <source>Unlisted</source>
         <translation>Non elencato</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="438"/>
         <source>Followers-only</source>
         <translation>Solo ai seguaci</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="441"/>
         <source>Direct</source>
         <translation>Diretto</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="488"/>
         <source>Toot sent!</source>
         <translation>Toot è stato pubblicato!</translation>
     </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Rispondere</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Chuidere risposta</translation>
+    </message>
 </context>
 <context>
     <name>CoverPage</name>
     <message>
-        <location filename="../qml/cover/CoverPage.qml" line="118"/>
         <source>New Toot</source>
-        <translation>Nuovo toot</translation>
+        <translation>Nuovo Toot</translation>
     </message>
 </context>
 <context>
     <name>EmojiSelect</name>
     <message>
-        <location filename="../qml/pages/components/EmojiSelect.qml" line="21"/>
         <source>Emojis</source>
         <translation>Emojis</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/EmojiSelect.qml" line="22"/>
         <source>Tap to insert</source>
         <translation>Tap per inserire</translation>
     </message>
@@ -109,7 +90,6 @@
 <context>
     <name>ImageUploader</name>
     <message>
-        <location filename="../src/imageuploader.cpp" line="83"/>
         <source>The file %1 does not exists</source>
         <translation>Il file %1 non esiste</translation>
     </message>
@@ -117,27 +97,22 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../qml/pages/LoginPage.qml" line="22"/>
         <source>Login</source>
         <translation>Accesso</translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginPage.qml" line="26"/>
         <source>Instance</source>
         <translation>Istanza</translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginPage.qml" line="32"/>
         <source>Enter a valid Mastodon instance URL</source>
         <translation>Inserire URL di una istanza Mastodon valida</translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginPage.qml" line="88"/>
         <source>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.</source>
         <translation>Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d&apos;istanze. Mastodon fa parte del più ampio Fediverso, permettendo ai suoi utenti di interagire anche con utenti su diverse piattaforme aperte che supportano lo stesso protocollo.</translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginPage.qml" line="159"/>
         <source>Reload</source>
         <translation>Ricarica</translation>
     </message>
@@ -145,45 +120,37 @@
 <context>
     <name>MainPage</name>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="37"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="47"/>
         <source>Notifications</source>
         <translation>Notifiche</translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="58"/>
+        <source>New Toot</source>
-        <source>Local</source>
+        <translation>Nuovo Toot</translation>
-        <translation>Locale</translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="69"/>
-        <source>Federated</source>
-        <translation>Federazione</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/MainPage.qml" line="104"/>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="110"/>
         <source>@user or #term</source>
-        <translation>@utente o #termine</translation>
+        <translation>@utente o #terme</translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="264"/>
+        <source>Local</source>
-        <source>New Toot</source>
+        <translation>Locale</translation>
-        <translation>Nuovo toot</translation>
+    </message>
+    <message>
+        <source>Federated</source>
+        <translation>Federazione</translation>
     </message>
 </context>
 <context>
     <name>MediaFullScreen</name>
     <message>
-        <location filename="../qml/pages/components/MediaFullScreen.qml" line="289"/>
         <source>Error loading</source>
         <translation>Errore durante caricamento</translation>
     </message>
@@ -191,17 +158,14 @@
 <context>
     <name>MiniStatus</name>
     <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="33"/>
         <source>boosted</source>
         <translation>ha condiviso</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="36"/>
         <source>favourited</source>
         <translation>ha apprezzato</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="39"/>
         <source>followed you</source>
         <translation>ha iniziato a seguirti</translation>
     </message>
@@ -209,281 +173,225 @@
 <context>
     <name>MyList</name>
     <message>
-        <location filename="../qml/pages/components/MyList.qml" line="12"/>
+        <source>Load more</source>
-        <source>Loading</source>
+        <translation>Caricare altri</translation>
-        <translation>Caricamento</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/MyList.qml" line="13"/>
-        <source>please wait...</source>
-        <translation>Attendere un momento...</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/components/MyList.qml" line="63"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/MyList.qml" line="70"/>
+        <source>Loading</source>
-        <location filename="../qml/pages/components/MyList.qml" line="73"/>
+        <translation>Caricamento</translation>
-        <source>New Toot</source>
-        <translation>Nuovo toot</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/MyList.qml" line="80"/>
+        <source>please wait...</source>
-        <source>Load more</source>
+        <translation>Attendere un momento...</translation>
-        <translation>Caricare altri</translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation>Nuovo Toot</translation>
     </message>
 </context>
 <context>
     <name>ProfileHeader</name>
     <message>
-        <location filename="../qml/pages/components/ProfileHeader.qml" line="128"/>
+        <source>Bot</source>
-        <source>Group</source>
+        <translation>Bot</translation>
-        <translation>Gruppo</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/ProfileHeader.qml" line="146"/>
         <source>Follows you</source>
         <translation>Ti segue</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/ProfileHeader.qml" line="183"/>
+        <source>Group</source>
-        <source>Bot</source>
+        <translation>Gruppo</translation>
-        <translation>Bot</translation>
     </message>
 </context>
 <context>
     <name>ProfilePage</name>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="156"/>
         <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>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="235"/>
         <source>Followers</source>
         <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
         <translation>Seguaci</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="246"/>
         <source>Following</source>
         <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
         <translation>Segue</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="257"/>
         <source>Statuses</source>
         <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
         <translation>Toots</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="273"/>
-        <location filename="../qml/pages/ProfilePage.qml" line="276"/>
-        <source>Mention</source>
-        <translation>Menzionare</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="288"/>
         <source>Unfollow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Smetti di seguire</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="290"/>
         <source>Requested</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Richiesto</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="292"/>
         <source>Follow</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Segui</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="311"/>
         <source>Unmute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Non silenziare</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="313"/>
         <source>Mute</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Silenzia</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="331"/>
         <source>Unblock</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Sblocca</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="333"/>
         <source>Block</source>
         <extracomment>Is a button. Keep it as short as possible.</extracomment>
         <translation>Blocca</translation>
     </message>
     <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="349"/>
         <source>Open in Browser</source>
         <translation>Aprire nel browser</translation>
     </message>
+    <message>
+        <source>Mention</source>
+        <translation>Menzionare</translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="25"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="28"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="31"/>
         <source>Load Images in Toots</source>
-        <translation>Caricare immagini nei toots</translation>
+        <translation>Caricare immagini nei Toots</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="32"/>
         <source>Disable this option if you want to preserve your data connection</source>
         <translation>Disabilitare questa opzione per conservare connessione dati</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="40"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="72"/>
         <source>Remove Account</source>
         <translation>Rimozione del account</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="72"/>
         <source>Add Account</source>
         <translation>Aggiungi account</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="95"/>
         <source>Deauthorize this app from using your account and remove account data from phone</source>
         <translation>Annullare l&apos;autorizzazione dell&apos;app e rimuovere l&apos;account</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="95"/>
         <source>Authorize this app to access your Mastodon account</source>
         <translation>Autorizzare l&apos;app all&apos;utilizzo del conto Mastodon</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="106"/>
         <source>Translate</source>
         <translation>Tradurre</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="112"/>
+        <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
+        <translation>Sviluppo</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>Design UI/UX e sviluppo</translation>
+    </message>
+    <message>
+        <source>Visual identity</source>
+        <translation>Identità visiva</translation>
+    </message>
+    <message>
+        <source>Development and translations</source>
+        <translation>Sviluppo e traduzioni</translation>
+    </message>
+    <message>
+        <source>Occitan &amp; French translation</source>
+        <translation>Traduzione francese e occitanica</translation>
+    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation>Traduzione cinese</translation>
+    </message>
+    <message>
+        <source>Dutch translation</source>
+        <translation>Traduzione olandese</translation>
+    </message>
+    <message>
+        <source>Spanish translation</source>
+        <translation>Traduzione spagnola</translation>
+    </message>
+    <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>
         <translation>Utilizzare</translation>
     </message>
     <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="112"/>
         <source>to help with app translation to your language.</source>
         <translation>per aiutare nella traduzione dell&apos;app.</translation>
     </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="128"/>
-        <source>Credits</source>
-        <translation>Sviluppo</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="144"/>
-        <source>UI/UX design and development</source>
-        <translation>Design UI/UX e sviluppo</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="151"/>
-        <source>Visual identity</source>
-        <translation>Identità visiva</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="158"/>
-        <source>Development and translations</source>
-        <translation>Sviluppo e traduzioni</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="165"/>
-        <source>Occitan &amp; French translation</source>
-        <translation>Traduzione francese e occitanica</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="172"/>
-        <source>Chinese translation</source>
-        <translation>Traduzione cinese</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="179"/>
-        <source>Dutch translation</source>
-        <translation>Traduzione olandese</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="186"/>
-        <source>Spanish translation</source>
-        <translation>Traduzione spagnola</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="193"/>
-        <source>Added README file</source>
-        <translation>Aggiunto file README</translation>
-    </message>
 </context>
 <context>
     <name>VisualContainer</name>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="314"/>
         <source>Unboost</source>
-        <translation>Annulla condivisione</translation>
+        <translation>Annuler le partage</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="314"/>
         <source>Boost</source>
-        <translation>Condividi</translation>
+        <translation>Partager</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="355"/>
         <source>Unfavorite</source>
-        <translation>Annulla apprezzamento</translation>
+        <translation>Retirer des favoris</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="355"/>
         <source>Favorite</source>
-        <translation>Apprezzato</translation>
+        <translation>Ajouter aux favoris</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="396"/>
-        <source>Remove Bookmark</source>
-        <translation>Elimina segnalibro</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="396"/>
-        <source>Bookmark</source>
-        <translation>Aggiungi segnalibro</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="426"/>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="429"/>
         <source>Mention</source>
-        <translation>Menzionare</translation>
+        <translation>Mentionner</translation>
     </message>
     <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="455"/>
         <source>Conversation</source>
-        <translation>Conversazione</translation>
+        <translation>Conversation</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Retirer marque-page</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Ajouter aux marque-pages</translation>
     </message>
 </context>
 </TS>

translations/harbour-tooterb-nl.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Credits</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-nl_BE.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Credits</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-oc.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Crèdits</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-pl.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-ru.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Зачет</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-sr.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Спомен плоча</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-sv.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Erkännanden</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb-zh_CN.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>信誉</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation>西班牙语翻译</translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation>添加 README 文件</translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>

translations/harbour-tooterb.ts

@@ -318,6 +318,7 @@
     </message>
     <message>
         <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
         <translation>Credits</translation>
     </message>
     <message>
@@ -348,10 +349,6 @@
         <source>Spanish translation</source>
         <translation>Spanish translation</translation>
     </message>
-    <message>
-        <source>Added README file</source>
-        <translation>Added README file</translation>
-    </message>
     <message>
         <source>Use</source>
         <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>