From f77d539f5aa578c74fa139b7a6cf31467a5bd53f Mon Sep 17 00:00:00 2001 From: molan-git Date: Thu, 18 Jun 2020 08:32:52 +0200 Subject: [PATCH] Bot icn / better element anchoring --- harbour-tooter.pro | 1 + qml/images/icon-s-bot.svg | 11 ++ qml/pages/ConversationPage.qml | 3 +- qml/pages/LoginPage.qml | 1 - qml/pages/MainPage.qml | 7 +- qml/pages/ProfilePage.qml | 1 - qml/pages/SettingsPage.qml | 3 +- qml/pages/components/EmojiSelect.qml | 2 - qml/pages/components/InfoBanner.qml | 1 - qml/pages/components/ItemUser.qml | 24 +++- qml/pages/components/MediaBlock.qml | 1 - qml/pages/components/MiniHeader.qml | 55 +++++---- qml/pages/components/MyImage.qml | 1 - qml/pages/components/MyList.qml | 9 +- qml/pages/components/Navigation.qml | 2 - qml/pages/components/ProfileHeader.qml | 26 ++-- qml/pages/components/ProfileImage.qml | 1 - qml/pages/components/VisualContainer.qml | 46 ++++--- src/imageuploader.cpp | 12 +- translations/harbour-tooter-de.ts | 33 ++--- translations/harbour-tooter-el.ts | 33 ++--- translations/harbour-tooter-es.ts | 33 ++--- translations/harbour-tooter-fr.ts | 33 ++--- translations/harbour-tooter-it.ts | 147 ++++++++++++----------- translations/harbour-tooter-nl.ts | 33 ++--- translations/harbour-tooter-nl_BE.ts | 33 ++--- translations/harbour-tooter-oc.ts | 33 ++--- translations/harbour-tooter-pl.ts | 33 ++--- translations/harbour-tooter-ru.ts | 33 ++--- translations/harbour-tooter-sr.ts | 33 ++--- translations/harbour-tooter-sv.ts | 33 ++--- translations/harbour-tooter-zh_CN.ts | 33 ++--- translations/harbour-tooter.ts | 33 ++--- 33 files changed, 429 insertions(+), 354 deletions(-) create mode 100644 qml/images/icon-s-bot.svg diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 577a632..7ec9265 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -73,6 +73,7 @@ DISTFILES += qml/harbour-tooter.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-m-emoji.svg \ qml/images/icon-m-profile.svg \ diff --git a/qml/images/icon-s-bot.svg b/qml/images/icon-s-bot.svg new file mode 100644 index 0000000..d4c484c --- /dev/null +++ b/qml/images/icon-s-bot.svg @@ -0,0 +1,11 @@ + + icon-s-bot + + + + + + + + + diff --git a/qml/pages/ConversationPage.qml b/qml/pages/ConversationPage.qml index a1137cf..f54a0a6 100644 --- a/qml/pages/ConversationPage.qml +++ b/qml/pages/ConversationPage.qml @@ -106,6 +106,7 @@ Page { visible: type === "reply" MenuItem { + //: Use the translation of "Copy Link" for a shorter PullDownMenu label text: qsTr("Copy Link to Clipboard") onClicked: if (toot_url === "") { var test = toot_uri.split("/") @@ -121,6 +122,7 @@ Page { } MenuItem { + //: "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" text: !panel.open ? qsTr("Reply") : qsTr("Hide Reply") visible: type == "reply" onClicked: if (!panel.open) { @@ -590,5 +592,4 @@ Page { InfoBanner { id: sentBanner } - } diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index 3a2cb10..10f469e 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -161,5 +161,4 @@ Page { } } } - } diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index eae284c..6ccd4f0 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -10,7 +10,6 @@ Page { property bool isFirstPage: true property bool isTablet: true //Screen.sizeCategory >= Screen.Large - // The effective value will be restricted by ApplicationWindow.allowedOrientations allowedOrientations: Orientation.All DockedPanel { @@ -19,6 +18,7 @@ Page { width: mainPage.isPortrait ? parent.width : Theme.itemSizeLarge height: mainPage.isPortrait ? Theme.itemSizeLarge : parent.height dock: mainPage.isPortrait ? Dock.Bottom : Dock.Right + Navigation { id: navigation isPortrait: !mainPage.isPortrait @@ -31,6 +31,7 @@ Page { VisualItemModel { id: visualModel + MyList{ id: tlHome title: qsTr("Home") @@ -88,7 +89,7 @@ Page { loader.sourceComponent = userListComponent } else if (search.charAt(0) === "#") { loader.sourceComponent = tagListComponent - } else { loader.sourceComponent = wordListComponent} + } else loader.sourceComponent = wordListComponent } Loader { @@ -102,6 +103,7 @@ Page { PageHeader { title: qsTr("Search") } + SearchField { id: searchField width: parent.width @@ -287,5 +289,4 @@ Page { Component.onCompleted: { console.log("aaa") } - } diff --git a/qml/pages/ProfilePage.qml b/qml/pages/ProfilePage.qml index efdf0c3..f0c0206 100644 --- a/qml/pages/ProfilePage.qml +++ b/qml/pages/ProfilePage.qml @@ -382,5 +382,4 @@ Page { } } } - } diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index c2caa47..19b2dd4 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -37,7 +37,7 @@ Page { } } - SectionHeader { text: qsTr("Account")} + SectionHeader { text: qsTr("Account") } Item { id: removeAccount @@ -249,5 +249,4 @@ Page { } } } - } diff --git a/qml/pages/components/EmojiSelect.qml b/qml/pages/components/EmojiSelect.qml index 45a6f10..67c067a 100644 --- a/qml/pages/components/EmojiSelect.qml +++ b/qml/pages/components/EmojiSelect.qml @@ -161,6 +161,4 @@ Component { VerticalScrollDecorator {flickable: listEmojis } } } - - } diff --git a/qml/pages/components/InfoBanner.qml b/qml/pages/components/InfoBanner.qml index 06601aa..048a43f 100644 --- a/qml/pages/components/InfoBanner.qml +++ b/qml/pages/components/InfoBanner.qml @@ -55,5 +55,4 @@ DockedPanel { stop() } } - } diff --git a/qml/pages/components/ItemUser.qml b/qml/pages/components/ItemUser.qml index 1f4ce55..29a3cca 100644 --- a/qml/pages/components/ItemUser.qml +++ b/qml/pages/components/ItemUser.qml @@ -54,7 +54,7 @@ BackgroundItem { } } - Column { + Item { anchors.left: avatar.right anchors.leftMargin: Theme.paddingLarge anchors.verticalCenter: parent.verticalCenter @@ -62,11 +62,25 @@ BackgroundItem { Label { id: display_name - text: if (model.account_display_name === "") { - model.account_username.split("@")[0] + " " - } else model.account_display_name + text: account_display_name ? account_display_name : account_username.split('@')[0] color: !pressed ? Theme.primaryColor : Theme.highlightColor font.pixelSize: Theme.fontSizeSmall + 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 { @@ -75,6 +89,7 @@ BackgroundItem { color: !pressed ? Theme.secondaryColor : Theme.secondaryHighlightColor anchors.leftMargin: Theme.paddingMedium font.pixelSize: Theme.fontSizeExtraSmall + anchors.top: display_name.bottom } } @@ -92,5 +107,4 @@ BackgroundItem { "locked": model.account_locked, "bot": model.account_bot } ) - } diff --git a/qml/pages/components/MediaBlock.qml b/qml/pages/components/MediaBlock.qml index 10cd985..650bfdb 100644 --- a/qml/pages/components/MediaBlock.qml +++ b/qml/pages/components/MediaBlock.qml @@ -154,5 +154,4 @@ Item { } } } - } diff --git a/qml/pages/components/MiniHeader.qml b/qml/pages/components/MiniHeader.qml index e227fd0..6347664 100644 --- a/qml/pages/components/MiniHeader.qml +++ b/qml/pages/components/MiniHeader.qml @@ -9,30 +9,22 @@ Item { Label { id: lblName - text: - if (account_display_name === "") { - account_username.split('@')[0] - } - else account_display_name + text: account_display_name ? account_display_name : account_username.split('@')[0] font.weight: Font.Bold font.pixelSize: Theme.fontSizeSmall - color: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) { - (pressed ? Theme.secondaryHighlightColor : (!highlight ? Theme.secondaryColor : Theme.secondaryHighlightColor)) - } else (pressed ? Theme.highlightColor : (!highlight ? Theme.primaryColor : Theme.secondaryColor)) + color: if ( myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) { + ( 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 - anchors { - left: parent.left - leftMargin: Theme.paddingMedium - } + anchors.left: parent.left } Image { - id: icnLocked - visible: account_locked - opacity: 0.8 - source: "image://theme/icon-s-secure?" + (pressed ? Theme.highlightColor : Theme.primaryColor) - width: account_locked ? Theme.iconSizeExtraSmall*0.8 : 0 + id: icnBot + visible: account_bot + source: "../../images/icon-s-bot.svg?" + ( pressed ? Theme.highlightColor : Theme.primaryColor ) + width: account_bot ? Theme.iconSizeExtraSmall * 1.3 : 0 height: width y: Theme.paddingLarge anchors { @@ -44,15 +36,30 @@ Item { Label { id: lblScreenName + visible: model.type !== "follow" text: '@'+account_username font.pixelSize: Theme.fontSizeExtraSmall - color: (pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor) + color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor ) truncationMode: TruncationMode.Fade anchors { - left: icnLocked.right + left: icnBot ? icnBot.right : icnLocked.right + leftMargin: Theme.paddingSmall right: lblDate.left - leftMargin: Theme.paddingMedium - baseline: lblName.baseline + rightMargin: Theme.paddingMedium + verticalCenter: lblName.verticalCenter + } + } + + Label { + id: lblScreenNameFollow + visible: model.type === "follow" && myList.type === "notifications" + text: '@'+account_username + font.pixelSize: Theme.fontSizeExtraSmall + color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor ) + truncationMode: TruncationMode.Fade + anchors { + left: parent.left + top: lblName.bottom } } @@ -60,13 +67,11 @@ Item { id: lblDate text: Format.formatDate(created_at, new Date() - created_at < 60*60*1000 ? Formatter.DurationElapsedShort : Formatter.TimeValueTwentyFourHours) font.pixelSize: Theme.fontSizeExtraSmall - color: (pressed ? Theme.highlightColor : Theme.primaryColor) + color: ( pressed ? Theme.highlightColor : Theme.secondaryColor ) horizontalAlignment: Text.AlignRight anchors { right: parent.right - rightMargin: Theme.horizontalPageMargin - baseline: lblName.baseline + verticalCenter: lblName.verticalCenter } } - } diff --git a/qml/pages/components/MyImage.qml b/qml/pages/components/MyImage.qml index 8e0be74..9b60c4d 100644 --- a/qml/pages/components/MyImage.qml +++ b/qml/pages/components/MyImage.qml @@ -89,5 +89,4 @@ Item { } } } - } diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index c654fa6..14f90ea 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -128,7 +128,7 @@ SilicaListView { openDrawer(contentY - scrollOffset > 0 ? false : true ) scrollOffset = contentY } - if(contentY+height > footerItem.y && !loadStarted && autoLoadMore){ + if(contentY+height > footerItem.y && !loadStarted && autoLoadMore) { loadData("append") loadStarted = true } @@ -161,16 +161,16 @@ SilicaListView { } } - function loadData(mode){ + function loadData(mode) { var p = [] if (params.length) for(var i = 0; i 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 @@ -236,6 +247,7 @@ BackgroundItem { } } + // Content warning cover for Toots Rectangle { color: Theme.highlightDimmerColor visible: status_spoiler_text.length > 0 @@ -269,22 +281,24 @@ BackgroundItem { } } + // Displays media in Toots MediaBlock { id: media visible: if (myList.type === "notifications" && ( type === "favourite" || type === "reblog" )) { false } else true - model: typeof attachments !== "undefined" ? attachments : Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); + model: typeof attachments !== "undefined" ? attachments : Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject') height: Theme.iconSizeExtraLarge * 2 anchors { - left: lblContent.left - right: lblContent.right + left: miniHeader.left + right: miniHeader.right top: lblContent.bottom topMargin: Theme.paddingMedium bottomMargin: Theme.paddingLarge } } + // Context menu for Toots ContextMenu { id: mnu @@ -377,7 +391,7 @@ BackgroundItem { text: qsTr("Mention") onClicked: { pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), { - headerTitle: "Mention", + headerTitle: qsTr("Mention"), description: "@"+reblog_account_acct, type: "new" }) @@ -397,6 +411,7 @@ BackgroundItem { } } + // Open ConversationPage and show other Toots in thread (if available) onClicked: { var m = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); if (typeof mdl !== "undefined") @@ -419,5 +434,4 @@ BackgroundItem { onDoubleClicked: { console.log("double click") } - } diff --git a/src/imageuploader.cpp b/src/imageuploader.cpp index 3153372..40ddb2a 100644 --- a/src/imageuploader.cpp +++ b/src/imageuploader.cpp @@ -11,15 +11,15 @@ //static const QUrl IMGUR_UPLOAD_URL("https://httpbin.org/post"); //static const QUrl IMGUR_UPLOAD_URL(); -ImageUploader::ImageUploader(QObject *parent) : QObject(parent), m_networkAccessManager(0), m_reply(0) { +ImageUploader::ImageUploader(QObject *parent) : QObject(parent), m_networkAccessManager(nullptr), m_reply(nullptr) { m_networkAccessManager = new QNetworkAccessManager(this); } ImageUploader::~ImageUploader() { - if (m_reply != 0) { + if (m_reply != nullptr) { m_reply->disconnect(); m_reply->deleteLater(); - m_reply = 0; + m_reply = nullptr; } } @@ -58,10 +58,10 @@ void ImageUploader::upload() { return; } - if (m_reply != 0) { + if (m_reply != nullptr) { m_reply->disconnect(); m_reply->deleteLater(); - m_reply = 0; + m_reply = nullptr; } /*QFileInfo fileInfo(QUrl(m_fileName).toLocalFile()); @@ -146,6 +146,6 @@ void ImageUploader::replyFinished() { } m_reply->deleteLater(); - m_reply = 0; + m_reply = nullptr; postdata.clear(); } diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 63930d6..c593d66 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Link kopieren @@ -58,6 +59,15 @@ Toot sent! Toot gesendet! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + Antworten + + + Hide Reply + Antwort verbergen + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + Folgt dir + ProfilePage @@ -344,21 +358,6 @@ um bei den Übersetzungen mitzuhelfen. - - Toot - - boosted - hat geteilt - - - favourited - hat favorisiert - - - followed you - folgt dir - - VisualContainer @@ -381,5 +380,9 @@ Mention Erwähnen + + Conversation + Konversation + diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index ea65a83..ed641fd 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας. - - Toot - - boosted - προωθημένο - - - favourited - στους σελιδοδείκτες - - - followed you - σας ακολουθούν - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 75ca954..27c26c2 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Copiar enlace al portapapeles @@ -58,6 +59,15 @@ Toot sent! ¡Toot enviado! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ para ayudar con traducciones. - - Toot - - boosted - retooteó - - - favourited - marcó como favorito - - - followed you - te empezó a seguir - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 10f6ce9..500e6e0 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Copier le lien @@ -58,6 +59,15 @@ Toot sent! Pouet envoyé ! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + Répondre + + + Hide Reply + Fermer Répondre + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + Vous suit + ProfilePage @@ -344,21 +358,6 @@ pour aider à traduire cette application. - - Toot - - boosted - a partagé - - - favourited - a ajouté à ses favoris - - - followed you - vous suit - - VisualContainer @@ -381,5 +380,9 @@ Mention Mentionner + + Conversation + Conversation + diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 6089ce2..bcd2957 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -28,47 +28,59 @@ ConversationPage - + Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Copia link - + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + Risposta + + + + Hide Reply + Chiudere Risposta + + + Write your warning here Contenuto avviso - + What's on your mind? A cosa stai pensando? - + Delete Elimina - + Public Pubblico - + Unlisted Non elencato - + Followers-only Solo ai seguaci - + Direct Diretto - + Toot sent! Toot è stato pubblicato! @@ -133,37 +145,37 @@ MainPage - + Home Home - + Notifications Notifiche - + Local Locale - + Federated Federazione - + Search Cerca - + @user or #term @utente o #termine - + New Toot Nuovo toot @@ -171,7 +183,7 @@ MediaFullScreen - + Error loading Errore durante caricamento @@ -179,17 +191,17 @@ MiniStatus - + boosted ha condiviso - + favourited ha apprezzato - + followed you ha iniziato a seguirti @@ -213,6 +225,7 @@ + New Toot Nuovo toot @@ -225,7 +238,12 @@ ProfileHeader - + + Follows you + Ti segue + + + Bot Bot @@ -257,54 +275,55 @@ Toots - + + Mention Menzionare - + Unfollow Is a button. Keep it as short as possible. Smetti di seguire - + Requested Is a button. Keep it as short as possible. Richiesto - + Follow Is a button. Keep it as short as possible. Segui - + Unmute Is a button. Keep it as short as possible. Non silenziare - + Mute Is a button. Keep it as short as possible. Silenzia - + Unblock Is a button. Keep it as short as possible. Sblocca - + Block Is a button. Keep it as short as possible. Blocca - + Open in Browser Aprire nel browser @@ -332,136 +351,124 @@ Disabilitare questa opzione per conservare connessione dati - + Account Account - + Remove Account Rimozione del account - + Add Account Aggiungi account - + Deauthorize this app from using your account and remove account data from phone Annullare l'autorizzazione dell'app e rimuovere l'account - + Authorize this app to access your Mastodon account Autorizzare l'app all'utilizzo del conto Mastodon - + Translate Tradurre - + Use Full sentence for translation: "Use Transifex to help with app translation to your language." - The word Transifex is a link and doesn't need translation. Utilizzare - + to help with app translation to your language. per aiutare nella traduzione dell'app. - + Credits Sviluppo - + UI/UX design and development Design UI/UX e sviluppo - + Visual identity Identità visiva - + Development and translations Sviluppo e traduzioni - + Occitan & French translation Traduzione francese e occitanica - + Chinese translation Traduzione cinese - + Dutch translation Traduzione olandese - + Spanish translation Traduzione spagnola - + Added README file Aggiunto file README - - Toot - - - boosted - ha condiviso - - - - favourited - ha apprezzato - - - - followed you - ha iniziato a seguirti - - VisualContainer - + Unboost Annulla condivisione - + Boost Condividi - + Unfavorite Annulla apprezzamento - + Favorite Apprezzato - + + Mention Menzionare + + + Conversation + Conversazione + diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 6879a00..a3259b1 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Linkadres kopiëren @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ om deze app te helpen vertalen in jouw taal. - - Toot - - boosted - boostte - - - favourited - maakte favoriet - - - followed you - volgde jou - - VisualContainer @@ -381,5 +380,9 @@ Mention Vermelden + + Conversation + + diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 712bc42..52517c9 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ voor te helpen met dezen app in uw taal te vertalen. - - Toot - - boosted - heeft geboost - - - favourited - heeft geduimd voor - - - followed you - volgt u nu - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 4912f6c..69ca0d0 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ per ajudar a traduire l’aplicacion dins vòstra lenga. - - Toot - - boosted - a tornat partejar - - - favourited - a mes en favorit - - - followed you - vos sèc - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index b2fbbb9..fedaf9c 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ - - Toot - - boosted - podbił(a) - - - favourited - dodał(a) do ulubionych - - - followed you - zaczął(-ęła Cię śledzić) - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 50a075a..9171ede 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ чтобы помочь с переводом приложения на ваш язык. - - Toot - - boosted - росту - - - favourited - имеет любимый - - - followed you - следую за тобой - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 471c224..d80e7d8 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ и помозите у преводу апликације на други језик. - - Toot - - boosted - разглашено - - - favourited - омиљено - - - followed you - вас прати - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 394ddbf..d99d520 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label @@ -58,6 +59,15 @@ Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ för att hjälpa med app-översättningar till ditt språk. - - Toot - - boosted - puffade - - - favourited - favoriserad - - - followed you - följer dig - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index fb93b97..5d18598 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label 复制链接到剪切板 @@ -58,6 +59,15 @@ Toot sent! 已发送嘟嘟！ + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ - - Toot - - boosted - 推起 - - - favourited - 收藏 - - - followed you - 关注你 - - VisualContainer @@ -381,5 +380,9 @@ Mention + + Conversation + + diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index 2a521e4..8005ce9 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -24,6 +24,7 @@ ConversationPage Copy Link to Clipboard + Use the translation of "Copy Link" for a shorter PullDownMenu label Copy Link to Clipboard @@ -58,6 +59,15 @@ Toot sent! Toot sent! + + Reply + "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply" + + + + Hide Reply + + CoverPage @@ -189,6 +199,10 @@ Bot Bot + + Follows you + + ProfilePage @@ -344,21 +358,6 @@ to help with app translation to your language. - - Toot - - boosted - boosted - - - favourited - favourited - - - followed you - followed you - - VisualContainer @@ -381,5 +380,9 @@ Mention Mention + + Conversation + +