From cdfd67b907a4eab7097a505e1e68a578280189c8 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 07:30:37 +0200 Subject: [PATCH 01/40] Add files via upload --- README.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 60f78f2..f1631d5 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,10 @@ -# Tooter [Fork] +# Tooter -## About Tooter is Mastodon client for Sailfish OS. It is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. -This is a fork of dysk0/harbour-tooter. The app can by downloaded here: https://openrepos.net/content/molan/tooter-fork. +## Screenshot + -## Build -Clone / download this repository and import it in your SailfishOS IDE using the harbour-tooter.pro project file. No additional configuration needed. - -## Contributions -Contributions to this project are very welcome, since I don't have the resources and time to implement and fix everything Tooter still misses or lacks. Thank you! - -## Screenshots - ## License -Licensed under GNU GPLv3 +`// TODO` From 633bccacac37f60f1daec6adeb5a1e6b5e7a159e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 08:49:31 +0200 Subject: [PATCH 02/40] Updated translations --- translations/harbour-tooter-de.ts | 104 ++++++++++--------- translations/harbour-tooter-el.ts | 68 ++++++------ translations/harbour-tooter-es.ts | 72 +++++++------ translations/harbour-tooter-fi.ts | 40 +++---- translations/harbour-tooter-fr.ts | 94 +++++++++-------- translations/harbour-tooter-nl.ts | 74 ++++++------- translations/harbour-tooter-nl_BE.ts | 74 ++++++------- translations/harbour-tooter-oc.ts | 70 +++++++------ translations/harbour-tooter-pl.ts | 122 +++++++++++----------- translations/harbour-tooter-ru.ts | 70 +++++++------ translations/harbour-tooter-sr.ts | 74 ++++++------- translations/harbour-tooter-sv.ts | 70 +++++++------ translations/harbour-tooter-zh_CN.ts | 150 ++++++++++++++------------- translations/harbour-tooter.ts | 48 +++++---- 14 files changed, 594 insertions(+), 536 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index e6f310d..4ef1a9d 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -13,7 +13,7 @@ boosted - verstärkt + geboostet said @@ -40,27 +40,27 @@ Write your warning here - - - - What's on your mind? - + Füge eine Inhaltswarnung hinzu Public - + Öffentlich Unlisted - + Nicht gelistet Followers-only - + Nur Follower Direct - + Direkt + + + What's on your mind? + Was möchtest du mitteilen? @@ -85,19 +85,19 @@ Instance - - - - Enter an Mastodon instance URL - Gib eine Mastadon Instance URL ein + Instanz 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. - Mastodon ist ein freies, auf OpenSource begründetes Soziales Netzwerk. Es bietet eine dezentralisierte Alternative zu den kommerziellen Plattformen, vermeidet aber das Risiko, dass ein einzelnes Unternehmen das Monopol auf deine gesamte Kommunikation erhält. Wähle selbst einen Server (Instanz) der du vertraust - egal welche du wählst, du kannst mit allen kommunizieren. Oder du betreibst deine eigene Mastodon Instanz und verbindest dich nahtlos mit dem Mastodon Netzwerk. + Mastodon ist ein freies, quelloffenes soziales Netzwerk. Im Gegensatz zu kommerziellen Plattformen, ist Mastodon als dezentrales Netzwerk konzipiert. Somit wird das Risiko vermieden, dass ein einziges Unternehmen die volle Kontrolle über die Kommunikation der Benutzer hat. Benutzer können einer beliebigen Instanz beitreten oder selbst eine eigene betreiben. Reload - + Neu laden + + + Enter a valid Mastodon instance URL + Eine gültige Mastodon-Instanz URL eingeben @@ -128,14 +128,14 @@ Federated - Vereinigt + Föderiert MiniStatus boosted - verstärkt + geboostet favourited @@ -217,11 +217,11 @@ Bio - + Bio Open Profile in Browser - + Profil in Browser öffnen @@ -232,74 +232,78 @@ Remove Account - Account löschen + Konto entfernen Add Account - Account hinzufügen + Konto hinzufügen Deauthorize this app and remove your account - Der App Autorisierung entziehen und Account entfernen + Konto entfernen und für diese Anwendung deaktivieren Authorize this app to use your Mastodon account in your behalf - Autorisiere diese App deinen Mastodon Account in deinem Namen zu nutzen - - - Load images in toots - Lade Bilder in den Toots + Zugriff durch diese Anwendung auf eigenes Mastodon-Konto erlauben Disable this option if you want to preserve your data connection - Deaktiviere diese Option um deinen Datenverbindung zu schonen + Diese Option deaktivieren um Datenvolumen zu sparen - Translate - Übersetzen - - - Use Transifex to help with app translation to your language - Nutze Transifex um bei der Übersetzung in deine Sprache zu helfen + About + Über Credits - Credits + Entwickler UI/UX design and development - UI/UX Design und Implementierung + UI/UX-Gestaltung und Entwicklung + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + Dies ist ein Fork und Weiterentwicklung der Mastodon-Anwendung Tooter, welche urpsrünglich von Duško Angirević entwickelt wurde. Quellcode auf <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + Load Images in Toots + Bilder in Toots laden + + + Maintainer of this release + Entwicklung dieser Version Visual identity - + Visuelle Identität Occitan & French translation - + Franzözische Übersetzung Dutch translation - + Niederländische Übersetzung Spanish translation - + Spanische Übersetzung Added README file - + README-Datei erstellt - Development and maintenence - + Chinese translation + Chinesische Übersetzung Toot boosted - verstärkt + geboostet favourited @@ -314,19 +318,19 @@ VisualContainer Unboost - Schwäche + Nicht boosten Boost - Verstärke + Boosten Unfavorite - Aus Favoriten entfernen + Favorite - Zu Favoriten + diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index c3f464a..b4edd31 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,14 +81,10 @@ LoginPage Login - Σύνδεση - - - Instance - Enter an Mastodon instance URL + Instance @@ -99,6 +95,10 @@ Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -228,47 +228,51 @@ Settings Settings - Ρυθμίσεις + Ρυθμίσεις Remove Account - Αφαίρεση λογαριασμού + Add Account - Προσθήκη λογαριασμού + Deauthorize this app and remove your account - Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας + Authorize this app to use your Mastodon account in your behalf - Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας - - - Load images in toots - Φόρτωση των εικόνων στα toot + Disable this option if you want to preserve your data connection - Απενεργοποιήστε αυτήν την επιλογή αν θέλετε να διατηρήσετε την σύνδεση των δεδομένων σας + - Translate - Μετάφραση - - - Use Transifex to help with app translation to your language - Χρησιμοποιήστε το Transifex για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας + About + Credits - Ευχαριστίες + UI/UX design and development - UI/UX σχεδιασμός και ανάπτυξη + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Αναίρεση προώθησης + Boost - Προώθηση + Unfavorite - Αφαίρεση από τους σελιδοδείκτες + Favorite - Σελιδοδείκτης + diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 7f6acfd..3d7aeae 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -40,27 +40,27 @@ Write your warning here - - - - What's on your mind? - + Escribe aquí tu aviso Public - + Público Unlisted - + Sin federar Followers-only - + Sólo seguidores Direct - + Directo + + + What's on your mind? + ¿Qué tienes en mente? @@ -87,18 +87,18 @@ Instance Instancia - - Enter an Mastodon instance URL - Introduce URL de una instancia de Mastodon - 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. - Mastodon es una red social gratuita y de código abierto. Una alternativa descentralizada a las plataformas comerciales, evita los riesgos de una única compañía que monopolice tu comunicación. Elije un servidor en el que confíes — cualquiera que elijas, puede interactuar con todos los demás. Cualquiera puede ejecutar su propia instancia de Mastodon y participar en la red social sin problemas. + Mastodon es una red social libre y de código abierto. Una alternativa descentralizada a las plataformas comerciales, evita los riesgos de una única compañía que monopolice tu comunicación. Elije un servidor en el que confíes — cualquiera que elijas, puede interactuar con todos los demás. Cualquiera puede ejecutar su propia instancia de Mastodon y participar en la red social sin problemas. Reload Volver a cargar + + Enter a valid Mastodon instance URL + Introduce una URL de instancia de Mastodon válida + MainPage @@ -217,11 +217,11 @@ Bio - + Bio Open Profile in Browser - + Abrir perfil en navegador @@ -244,23 +244,15 @@ Authorize this app to use your Mastodon account in your behalf - Autoriza a esta aplicación a usar tu cuenta de Mastodon en tu nombre - - - Load images in toots - Cargar imágenes en toots + Autoriza a esta aplicación para usar tu cuenta de Mastodon en tu nombre Disable this option if you want to preserve your data connection Deshabilita esta opción si quieres ahorrar en tu conexión de datos - Translate - Traducir - - - Use Transifex to help with app translation to your language - Usa Transifex para ayudar en la traducción a tu idioma de esta aplicación + About + Acerca de Credits @@ -270,29 +262,41 @@ UI/UX design and development Diseño UI/UX y desarrollo + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + Esta aplicación es una versión bifurcada del cliente de Mastodon Tooter, desarrollada originalmente por Duško Angirević, que corrige varios errores. Código fuente en <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + Load Images in Toots + Cargar imágenes en toots + + + Maintainer of this release + Mantenedor de esta publicación + Visual identity - + Identidad visual Occitan & French translation - + Traducción al occitano y francés Dutch translation - + Traducción al holandés Spanish translation - + Traducción al español Added README file - + Añadido archivo README - Development and maintenence - + Chinese translation + Traducción al chino diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index daf06a7..d15d70b 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -87,10 +87,6 @@ Instance - - Enter an Mastodon instance URL - - 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. @@ -99,6 +95,10 @@ Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -246,20 +246,12 @@ Authorize this app to use your Mastodon account in your behalf - - Load images in toots - - Disable this option if you want to preserve your data connection - Translate - - - - Use Transifex to help with app translation to your language + About @@ -270,6 +262,18 @@ UI/UX design and development + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index d41d682..89708bd 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -40,27 +40,27 @@ Write your warning here - - - - What's on your mind? - + Avertissement du contenu Public - + Public Unlisted - + Non coté Followers-only - + Que Followers Direct - + Direct + + + What's on your mind? + A quoi penses-tu? @@ -87,18 +87,18 @@ Instance Instance - - Enter an Mastodon instance URL - Saisissez l’URL d’une instance Mastodon - 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. - Mastodon est un réseau libre et open source. Il s’agit d'une alternative aux plateformes commerciales, pour éviter qu'une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec d’autres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste. + Mastodon est un réseau social et logiciel à source ouverte de microblog auto-hébergé, libre, distribué et acentré. Il permet de partager des messages, images et autres contenus. Mastodon peut être fédéré à un réseau d'instances capables de communiquer entre elles. Reload Recharger + + Enter a valid Mastodon instance URL + Entrer l'URL d'une instance de Mastodon + MainPage @@ -221,79 +221,83 @@ Open Profile in Browser - + Ouvrir dans le navigateur Settings Settings - Préférences + Paramètres Remove Account - Supprimer le compte + Enlever compte Add Account - Ajouter un compte + Ajouter compte Deauthorize this app and remove your account - Supprimer votre compte de l'application + Désautoriser cette application et enlever votre compte Authorize this app to use your Mastodon account in your behalf - Autoriser cette application à utiliser votre compte Mastodon en votre nom - - - Load images in toots - Charger les images des pouets + Autoriser cette application d'utiliser votre compte Disable this option if you want to preserve your data connection - Désactivez cette option si vous souhaitez économiser votre consommation de données + Désactiver cette option pour économiser des données mobiles - Translate - Traduire - - - Use Transifex to help with app translation to your language - Utilisez Transifex pour aider à la traduction de l'application dans votre langue + About + À propos Credits - Crédits + Développement UI/UX design and development - design et développement de l'interface + Design UI/UX et développement + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + Cette application est un fork de Tooter (développée par Duško Angirević). Cette version continue le développement et corrige plusieurs bugs trouvés. + + + Load Images in Toots + Charger images dans pouets + + + Maintainer of this release + Développement de cette version Visual identity - + Identité visuelle Occitan & French translation - + Traduction français Dutch translation - + Traduction néerlandaise Spanish translation - + Traduction espagnole + + + Chinese translation + Traduction chinoise Added README file - - Development and maintenence - - Toot @@ -314,19 +318,19 @@ VisualContainer Unboost - ne plus partager + Boost - partager + Unfavorite - supprimer de ses favoris + Defavoriser Favorite - ajouter aux favoris + Favoriser diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index ef0f5d3..896915a 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,23 +81,23 @@ LoginPage Login - Inloggen + Instance - Instantie - - - Enter an Mastodon instance URL - Voer de URL van een Mastodon-instantie in + 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. - Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van een enkel bedrijf dat je communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociale netwerk. + Reload - Herladen + + + + Enter a valid Mastodon instance URL + @@ -228,47 +228,51 @@ Settings Settings - Instellingen + Instellingen Remove Account - Verwijderen account + Add Account - Toevoegen account + Deauthorize this app and remove your account - Trek autorisaties van deze app in en verwijder je account + Authorize this app to use your Mastodon account in your behalf - Autoriseer deze app om je Mastodon namens jou te gebruiken - - - Load images in toots - Laden afbeeldingen in toots + Disable this option if you want to preserve your data connection - Schakel deze optie uit als je je dataverbinding wilt behouden + - Translate - Vertalen - - - Use Transifex to help with app translation to your language - Gebruik Transifex om deze app te helpen vertalen in jouw taal + About + Credits - Credits + UI/UX design and development - UI/UX ontwerp en ontwikkeling + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Unboost + Boost - Boost + Unfavorite - Demarkeren als favoriet + Favorite - Markeren als favoriet + diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 878cbfc..b246e6c 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,23 +81,23 @@ LoginPage Login - Inloggen + Instance - Instantie - - - Enter an Mastodon instance URL - Voert den URL van een Mastodon-instantie in + 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. - Mastodon is e vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van één enkel bedrijf dat uw communicatie monopoliseert. Kiest ne server die ge vertrouwt — dewelken dat ge ook kiest, ge kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociaal netwerk. + Reload - Herladen + + + + Enter a valid Mastodon instance URL + @@ -228,47 +228,51 @@ Settings Settings - Instellingen + Instellingen Remove Account - Account verwijderen + Add Account - Account toevoegen + Deauthorize this app and remove your account - Trekt autorisaties van dezen app in en verwijdert uwen account + Authorize this app to use your Mastodon account in your behalf - Autoriseert dezen app voor uwe Mastodon-account namens u te gebruiken - - - Load images in toots - Afbeeldingen in toots laden + Disable this option if you want to preserve your data connection - Schakelt dees optie uit als ge uw verbinding wilt behouden + - Translate - Vertalen - - - Use Transifex to help with app translation to your language - Gebruikt Transifex voor te helpen met dezen app in uw taal te vertalen + About + Credits - Credits + UI/UX design and development - UI/UX-ontwerp en -ontwikkeling + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Ontboosten + Boost - Boosten + Unfavorite - Duim verwijderen + Favorite - Duim toevoegen + diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 2b226a0..4969598 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,24 +81,24 @@ LoginPage Login - Connexion + Instance - - Enter an Mastodon instance URL - Picatz l’URL d’una instància Mastodon - 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. - Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu'una sola entrepresa monopolize vòstras comunicacions. Causissètz un servidor que vos fisatz - qualque siá vòstre causida poiretz interagir amb los autres. Tot lo monde pòt montar sa pròpria instància Mastodon e atal participar a construire un malhum mai solid. + Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -228,47 +228,51 @@ Settings Settings - Paramètres + Parmètres Remove Account - Levar un compte + Add Account - Ajustar un compte + Deauthorize this app and remove your account - Revocar l’aplicacion e levar vòstre compte + Authorize this app to use your Mastodon account in your behalf - Autorizar aquesta aplicacion a utilizar vòstre compte Mastodon per vos - - - Load images in toots - Cargar los imatges dels tuts + Disable this option if you want to preserve your data connection - Desactivar aquesta opcion per estalviar vòstra connexion de donadas + - Translate - Traduire - - - Use Transifex to help with app translation to your language - Utilizar Transifex per ajudar a traduire l’aplicacion dins vòstra lenga + About + Credits - Crèdits + UI/UX design and development - UI/UX design e desvlopament + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Partejar pas mai + Boost - Partejar + Unfavorite - Levar dels favorits + Favorite - Ajustar als favorits + diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 6efba16..458d9cc 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -1,51 +1,47 @@ - + API favourited - + dodał(a) do ulubionych followed you - + zaczął(-ęła) Cię śledzić boosted - + podbił(a) said - + napisał(a) Conversation Conversation - + Konwersacja Delete - + Usuń Emojis - + Emoji Tap to insert - + Dotknij aby wstawić Write your warning here - - What's on your mind? - - Public @@ -62,19 +58,23 @@ Direct + + What's on your mind? + + ImageFullScreen Error loading - + Błąd ładowania ImageUploader The file %1 does not exists - + Plik %1 nie istnieje @@ -87,10 +87,6 @@ Instance - - Enter an Mastodon instance URL - - 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. @@ -99,121 +95,125 @@ Reload + + Enter a valid Mastodon instance URL + + MainPage Home - + Strona główna Notifications - + Powiadomienia New Toot - + Nowy wpis Search - + Szukaj @user or #term - + @użytkownik lub #tag Local - + Lokalne Federated - + Globalne MiniStatus boosted - + podbił(a) favourited - + dodał(a) do ulubionych followed you - + zaczął(-ęła) Cię śledzić MyList Load more - + Załaduj więcej Settings - + Ustawienia Loading - + Ładowanie please wait... - + proszę czekać… Profile Unfollow - + Przestań śledzić Follow request sent! - + Wysłano prośbę o możliwość śledzenia! Following - + Śledzisz Mute - + Wycisz Unmute - + Unmute Unblock - + Unblock Block - + Block Statuses - + Statuses Favourites - + Favourites Follow - + Follow Summary - + Summary Followers - + Followers Bio @@ -228,7 +228,7 @@ Settings Settings - + Ustawienia Remove Account @@ -246,20 +246,12 @@ Authorize this app to use your Mastodon account in your behalf - - Load images in toots - - Disable this option if you want to preserve your data connection - Translate - - - - Use Transifex to help with app translation to your language + About @@ -270,6 +262,18 @@ UI/UX design and development + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -299,15 +303,15 @@ Toot boosted - + podbił(a) favourited - + dodał(a) do ulubionych followed you - + zaczął(-ęła Cię śledzić) diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 21152ef..eadd6e9 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,24 +81,24 @@ LoginPage Login - Авторизоваться + Instance - - Enter an Mastodon instance URL - Введите URL-адрес экземпляра Mastodon - 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. - Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети. + Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -228,47 +228,51 @@ Settings Settings - Настройки + Настройки Remove Account - Удалить учетную запись + Add Account - Добавить аккаунт + Deauthorize this app and remove your account - удалить учетную запись с устройства + Authorize this app to use your Mastodon account in your behalf - Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени - - - Load images in toots - Загружать изображения + Disable this option if you want to preserve your data connection - Отключите эту опцию, если вы хотите сохранить подключение к данным + - Translate - Переведите - - - Use Transifex to help with app translation to your language - Используйте Transifex, чтобы помочь с переводом приложения на ваш язык + About + Credits - Зачет + UI/UX design and development - Дизайн и разработка UI / UX + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Нет росту + Boost - Росту + Unfavorite - Избранные нет + Favorite - Избранные + diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index f4006bb..4d4bb43 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,23 +81,23 @@ LoginPage Login - Пријава + Instance - Инстанца - - - Enter an Mastodon instance URL - Унесите URL ваше Мастодон инстанце + 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. - Mastodon је бесплатна, open-source друштвена мрежа. Децентрализована алтернатива комерцијалним платформама која избегава ризике једне компаније која монополизује вашу комуникацију. Одаберите сервер у који имате поверења и без обзира на ваш избор - комуницирајте с осталим корисницима других мрежа. Свако може водити сопствену инстанцу Mastodon мреже и учестовати у комуникацији с другим инстанцама. + Reload - освежи + + + + Enter a valid Mastodon instance URL + @@ -228,47 +228,51 @@ Settings Settings - Подешавања + Подешавања Remove Account - Уклони налог + Add Account - Додај налог + Deauthorize this app and remove your account - Укините дозволе за кориштење и уклоните налог с телефона + Authorize this app to use your Mastodon account in your behalf - Дозволите овој апликацији да користи ваш Mastodon налог - - - Load images in toots - Прикажи слике у објавама + Disable this option if you want to preserve your data connection - Искључите ову опцију уколико желите да уштедите на преносу података + - Translate - Преведи - - - Use Transifex to help with app translation to your language - Користите Transifex и помозите у преводу апликације на други језик + About + Credits - Спомен плоча + UI/UX design and development - интерфејс дизајн и развој + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Уклони разглас + Boost - Разгласи + Unfavorite - Уклони из омиљених + Favorite - Омиљено + diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index e91a9cf..7dfde30 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -81,24 +81,24 @@ LoginPage Login - Logga in + Instance - - Enter an Mastodon instance URL - Fyll i URL till Mastodoninstans - 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. - Mastodon är ett fritt och öppet socialt nätverk byggt på öppen källkod. Ett decentraliserat alternativ till kommersiella plattformar, vilket undviker att ett ensamt företag monopoliserar din kommunikation. Välj en server du litar på --- beroende på vilken du väljer, kan du interagera med alla andra. Vem som helst kan köra deras egen Mastodoninstans och delta i nätverket. Även du! + Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -228,47 +228,51 @@ Settings Settings - Inställningar + Inställningar Remove Account - Radera konto + Add Account - Lägg till konto + Deauthorize this app and remove your account - Avauktorisera denna app och radera ditt konto + Authorize this app to use your Mastodon account in your behalf - Godkänn denna app att använda ditt Mastodon-konto på dina vägnar - - - Load images in toots - Ladda bilder i toots + Disable this option if you want to preserve your data connection - Inaktivera det här alternativet om du vill behålla din dataanslutning + - Translate - Översätt - - - Use Transifex to help with app translation to your language - Använd Transifex för att hjälpa med app-översättningar till ditt språk + About + Credits - Erkännanden + UI/UX design and development - UI/UX design och utveckling + + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Avpuffa + Boost - Puffa + Unfavorite - Avfavorisera + Favorite - Favorisera + diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 417161c..2479c2a 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -17,26 +17,7 @@ said - 说的 - - - - Browser - - Open in Browser - 在浏览器打开 - - - Web mode - 网页模式 - - - Reading mode - 阅读模式 - - - Copy URL - 复制链接 + 说过 @@ -45,26 +26,6 @@ Conversation 对话 - - Content warning! - 内容警告! - - - public - 公共区域 - - - unlisted - 未列的 - - - followers only - 仅关注者 - - - direct - 直接 - Delete 删除 @@ -75,7 +36,31 @@ Tap to insert - 点击插入 + 点击以插入 + + + Write your warning here + 在此编写你的警告信息 + + + Public + 公共区域 + + + Unlisted + 不公开 + + + Followers-only + 仅关注者 + + + Direct + 私信 + + + What's on your mind? + 有何想法? @@ -102,22 +87,17 @@ Instance 实例 - - Enter an Mastodon instance URL - 输入一个 Mastodon 实例链接 - 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. - ​Mastodon 是一个自由且开源的社交网络。一个去中心的商业平台的替代品。它能够避免某个公司垄断你的通讯方式的风险。选择一个你所信任的服务器——无论你选择什么，你都可以和其他人进行互动。任何人都能运行他们自己的 Mastodon 实例，然后无缝加入社交网站。 - + ​Mastodon 是一个自由且开源的社交网络。一个去中心化的商业平台的替代品。它能够避免某个公司垄断你的通讯方式的风险。选择一个你所信任的服务器——无论你选择什么，你都可以和其他人进行互动。任何人都能运行他们自己的 Mastodon 实例，然后无缝加入社交网站。 Reload 重新加载 - Enter an Mastodon instance URL - + Enter a valid Mastodon instance URL + 输入一个有效的 Mastodon 实例 URL @@ -182,19 +162,18 @@ please wait... - 请等候...... + 稍等片刻...... Profile Unfollow - - 未关注 + 取消关注 Follow request sent! - 关注请求已寄出！ + 已寄出关注请求！ Following @@ -253,35 +232,27 @@ Remove Account - 移除账户 + 移除账号 Add Account - 添加账户 + 添加账号 Deauthorize this app and remove your account - 取消对此软件的授权并移除你的账户 + 取消授权此软件并移除你的账号 Authorize this app to use your Mastodon account in your behalf - 授权此软件使用你的 Mastodon 账户 - - - Load images in toots - 在嘟嘟加载图片 + 授权此软件使用你的 Mastodon 账号 Disable this option if you want to preserve your data connection - 如果你想保护你的数据连接 请禁用此操作 + 如果你想保护你的数据连接，请禁用此选项 - Translate - 翻译 - - - Use Transifex to help with app translation to your language - 使用 Transifex 帮助翻译此软件到你所使用的语言。 + About + 关于 Credits @@ -289,7 +260,43 @@ UI/UX design and development - UI/UX 设计及开发 + UI/UX设计及开发 + + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + 此软件是一个 Mastodon 客户端 Tooter，原作者为 Duško Angirević。该分支修复了大量缺陷，你可以在此处找到源代码 <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a> 。 + + + Load Images in Toots + 在嘟嘟加载图片 + + + Maintainer of this release + 该发布的维护者 + + + Visual identity + 视觉识别 + + + Occitan & French translation + 奥克西坦语及法语翻译 + + + Dutch translation + 尼德兰语翻译 + + + Spanish translation + 西班牙语翻译 + + + Added README file + 添加 README 文件 + + + Chinese translation + 汉语翻译 @@ -319,12 +326,11 @@ Unfavorite - - 取消收藏 + 取消关注 Favorite - 收藏 + 关注 diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index 03bddc9..b6bec4d 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -42,10 +42,6 @@ Write your warning here - - What's on your mind? - - Public @@ -62,6 +58,10 @@ Direct + + What's on your mind? + + ImageFullScreen @@ -87,10 +87,6 @@ Instance - - Enter an Mastodon instance URL - - 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. @@ -99,6 +95,10 @@ Reload + + Enter a valid Mastodon instance URL + + MainPage @@ -246,20 +246,12 @@ Authorize this app to use your Mastodon account in your behalf - - Load images in toots - - Disable this option if you want to preserve your data connection - Translate - - - - Use Transifex to help with app translation to your language + About @@ -270,6 +262,18 @@ UI/UX design and development + + This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. + + + + Load Images in Toots + + + + Maintainer of this release + + Visual identity @@ -291,7 +295,7 @@ - Development and maintenence + Chinese translation @@ -314,19 +318,19 @@ VisualContainer Unboost - Unboost + Boost - Boost + Unfavorite - Unfavorite + Favorite - Favorite + From 017cca76a38ed9b6a845a25ce63d0327f4d8af92 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 08:53:15 +0200 Subject: [PATCH 03/40] Fix writing mistakes and add missing contributors --- qml/pages/Settings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 05c3398..8d44329 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -108,7 +108,7 @@ Page { } ListElement { name: "Molan" - desc: qsTr("Development and maintenance") + desc: qsTr("Development, maintenance and translations") mastodon: "" mail: "mol_an@sunrise.ch" } From d2c275bb938ef07cbfe2647aca9b93ef7cba7e25 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:41:30 +0200 Subject: [PATCH 04/40] Updated translations Added Italian translation file --- harbour-tooter.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 8b1cb5f..60f24c5 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -115,3 +115,4 @@ TRANSLATIONS += translations/harbour-tooter-ru.ts TRANSLATIONS += translations/harbour-tooter-sr.ts TRANSLATIONS += translations/harbour-tooter-sv.ts TRANSLATIONS += translations/harbour-tooter-zh_CN.ts +TRANSLATIONS += translations/harbour-tooter-it.ts From 0fcd83507cfbbe1fc8ea1999e9c4197a4f114627 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:43:21 +0200 Subject: [PATCH 05/40] Updated translation files - Changed translation strings in Settings page - Completed translations for German and French - Added Italian translation file --- translations/harbour-tooter-de.ts | 42 +-- translations/harbour-tooter-el.ts | 32 +-- translations/harbour-tooter-es.ts | 32 +-- translations/harbour-tooter-fi.ts | 32 +-- translations/harbour-tooter-fr.ts | 40 +-- translations/harbour-tooter-it.ts | 411 +++++++++++++++++++++++++++ translations/harbour-tooter-nl.ts | 32 +-- translations/harbour-tooter-nl_BE.ts | 32 +-- translations/harbour-tooter-oc.ts | 32 +-- translations/harbour-tooter-pl.ts | 32 +-- translations/harbour-tooter-ru.ts | 32 +-- translations/harbour-tooter-sr.ts | 32 +-- translations/harbour-tooter-sv.ts | 32 +-- translations/harbour-tooter-zh_CN.ts | 32 +-- translations/harbour-tooter.ts | 32 +-- 15 files changed, 644 insertions(+), 233 deletions(-) create mode 100644 translations/harbour-tooter-it.ts diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 4ef1a9d..5faac3b 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -158,7 +158,7 @@ Loading - Lädt... + Wird geladen please wait... @@ -250,37 +250,21 @@ Disable this option if you want to preserve your data connection Diese Option deaktivieren um Datenvolumen zu sparen - - About - Über - Credits - Entwickler + Über UI/UX design and development UI/UX-Gestaltung und Entwicklung - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - Dies ist ein Fork und Weiterentwicklung der Mastodon-Anwendung Tooter, welche urpsrünglich von Duško Angirević entwickelt wurde. Quellcode auf <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - Load Images in Toots - Bilder in Toots laden - - - Maintainer of this release - Entwicklung dieser Version - Visual identity Visuelle Identität Occitan & French translation - Franzözische Übersetzung + Französische Übersetzung Dutch translation @@ -298,6 +282,22 @@ Chinese translation Chinesische Übersetzung + + Load images in toots + Bilder in Toots laden + + + Translate + Übersetzungen + + + Use Transifex to help with app translation to your language + Transifex benutzen um bei den Übersetzungen mitzuhelfen + + + Development and translations + Entwicklung und Übersetzungen + Toot @@ -326,11 +326,11 @@ Unfavorite - + Nicht favorisieren Favorite - + Favorisieren diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index b4edd31..cdc4ec3 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 3d7aeae..1abb309 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection Deshabilita esta opción si quieres ahorrar en tu conexión de datos - - About - Acerca de - Credits Créditos @@ -262,18 +258,6 @@ UI/UX design and development Diseño UI/UX y desarrollo - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - Esta aplicación es una versión bifurcada del cliente de Mastodon Tooter, desarrollada originalmente por Duško Angirević, que corrige varios errores. Código fuente en <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - Load Images in Toots - Cargar imágenes en toots - - - Maintainer of this release - Mantenedor de esta publicación - Visual identity Identidad visual @@ -298,6 +282,22 @@ Chinese translation Traducción al chino + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index d15d70b..86879b5 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 89708bd..c802da7 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection Désactiver cette option pour économiser des données mobiles - - About - À propos - Credits Développement @@ -262,18 +258,6 @@ UI/UX design and development Design UI/UX et développement - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - Cette application est un fork de Tooter (développée par Duško Angirević). Cette version continue le développement et corrige plusieurs bugs trouvés. - - - Load Images in Toots - Charger images dans pouets - - - Maintainer of this release - Développement de cette version - Visual identity Identité visuelle @@ -296,7 +280,23 @@ Added README file - + Ajouté fichier README + + + Load images in toots + Charger images dans les pouets + + + Translate + Traduire + + + Use Transifex to help with app translation to your language + Utiliser Transifex pour aider avec les traductions de l'application + + + Development and translations + Développement et traductions @@ -318,15 +318,15 @@ VisualContainer Unboost - + Pas booster Boost - + Booster Unfavorite - Defavoriser + Défavoriser Favorite diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts new file mode 100644 index 0000000..c1cbeba --- /dev/null +++ b/translations/harbour-tooter-it.ts @@ -0,0 +1,411 @@ + + + + + API + + + favourited + + + + + followed you + + + + + boosted + + + + + + said + + + + + Conversation + + + Conversation + + + + + Write your warning here + + + + + What's on your mind? + + + + + Delete + + + + + Public + + + + + Unlisted + + + + + Followers-only + + + + + Direct + + + + + Emojis + + + + + Tap to insert + + + + + ImageFullScreen + + + Error loading + + + + + ImageUploader + + + The file %1 does not exists + + + + + LoginPage + + + Login + + + + + Instance + + + + + Enter a valid Mastodon instance URL + + + + + 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. + + + + + Reload + + + + + MainPage + + + Home + + + + + Notifications + + + + + Local + + + + + Federated + + + + + Search + + + + + @user or #term + + + + + New Toot + + + + + MiniStatus + + + boosted + + + + + favourited + + + + + followed you + + + + + MyList + + + Loading + + + + + please wait... + + + + + Settings + + + + + Load more + + + + + Profile + + + Summary + + + + + Followers + + + + + Following + + + + + Statuses + + + + + Favourites + + + + + Unfollow + + + + + Follow request sent! + + + + + Follow + + + + + Unmute + + + + + Mute + + + + + Unblock + + + + + Block + + + + + Bio + + + + + Open Profile in Browser + + + + + Settings + + + Settings + + + + + Remove Account + + + + + Add Account + + + + + Deauthorize this app and remove your account + + + + + Authorize this app to use your Mastodon account in your behalf + + + + + Load images in toots + + + + + Disable this option if you want to preserve your data connection + + + + + Translate + + + + + Use Transifex to help with app translation to your language + + + + + Credits + + + + + UI/UX design and development + + + + + Visual identity + + + + + Development and translations + + + + + Occitan & French translation + + + + + Chinese translation + + + + + Dutch translation + + + + + Spanish translation + + + + + Added README file + + + + + Toot + + + boosted + + + + + favourited + + + + + followed you + + + + + VisualContainer + + + Unboost + + + + + Boost + + + + + Unfavorite + + + + + Favorite + + + + diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 896915a..8fa6cab 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index b246e6c..44a6431 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 4969598..04416ad 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 458d9cc..baf74e3 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index eadd6e9..5f29604 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 4d4bb43..78274c1 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 7dfde30..06214ee 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 2479c2a..d21a02e 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection 如果你想保护你的数据连接，请禁用此选项 - - About - 关于 - Credits 信誉 @@ -262,18 +258,6 @@ UI/UX design and development UI/UX设计及开发 - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - 此软件是一个 Mastodon 客户端 Tooter，原作者为 Duško Angirević。该分支修复了大量缺陷，你可以在此处找到源代码 <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a> 。 - - - Load Images in Toots - 在嘟嘟加载图片 - - - Maintainer of this release - 该发布的维护者 - Visual identity 视觉识别 @@ -298,6 +282,22 @@ Chinese translation 汉语翻译 + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index b6bec4d..42090a4 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -250,10 +250,6 @@ Disable this option if you want to preserve your data connection - - About - - Credits @@ -262,18 +258,6 @@ UI/UX design and development - - This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on <a href='https://github.com/molan-git/harbour-tooter'>GitHub</a>. - - - - Load Images in Toots - - - - Maintainer of this release - - Visual identity @@ -298,6 +282,22 @@ Chinese translation + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and translations + + Toot From 7dc858d4c74f46ed2e55fb2a81e66ed076dc8805 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:43:57 +0200 Subject: [PATCH 06/40] Added information to Credits --- qml/pages/Settings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 8d44329..5a447b0 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -108,7 +108,7 @@ Page { } ListElement { name: "Molan" - desc: qsTr("Development, maintenance and translations") + desc: qsTr("Development and translations") mastodon: "" mail: "mol_an@sunrise.ch" } From 428dca31f8b2dd75c75f2844fff8b571ed143291 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 14:53:39 +0200 Subject: [PATCH 07/40] Update languages Added missing language strings --- translations/harbour-tooter-el.ts | 34 +++++++++++------------ translations/harbour-tooter-es.ts | 8 +++--- translations/harbour-tooter-nl.ts | 40 ++++++++++++++-------------- translations/harbour-tooter-nl_BE.ts | 40 ++++++++++++++-------------- translations/harbour-tooter-oc.ts | 36 ++++++++++++------------- translations/harbour-tooter-pl.ts | 2 +- translations/harbour-tooter-ru.ts | 36 ++++++++++++------------- translations/harbour-tooter-sr.ts | 38 +++++++++++++------------- translations/harbour-tooter-sv.ts | 36 ++++++++++++------------- 9 files changed, 135 insertions(+), 135 deletions(-) diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index cdc4ec3..b14cd6c 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -81,11 +81,11 @@ LoginPage Login - + Σύνδεση Instance - + Παράδειγμα 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. @@ -93,7 +93,7 @@ Reload - + Φορτώνω πάλι Enter a valid Mastodon instance URL @@ -228,35 +228,35 @@ Settings Settings - Ρυθμίσεις + Ρυθμίσεις Remove Account - + Αφαίρεση λογαριασμού Add Account - + Προσθήκη λογαριασμού Deauthorize this app and remove your account - + Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας Authorize this app to use your Mastodon account in your behalf - + Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας Disable this option if you want to preserve your data connection - + Απενεργοποιήστε αυτήν την επιλογή αν θέλετε να διατηρήσετε την σύνδεση των δεδομένων σας Credits - + Ευχαριστίες UI/UX design and development - + UI/UX σχεδιασμός και ανάπτυξη Visual identity @@ -288,11 +288,11 @@ Translate - + Μετάφραση Use Transifex to help with app translation to your language - + Χρησιμοποιήστε το Transifex για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας Development and translations @@ -318,19 +318,19 @@ VisualContainer Unboost - + Αναίρεση προώθησης Boost - + Προώθηση Unfavorite - + Αφαίρεση από τους σελιδοδείκτες Favorite - + Σελιδοδείκτης diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 1abb309..7ccdc28 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -284,19 +284,19 @@ Load images in toots - + Cargar imágenes en messages Translate - + Traducir Use Transifex to help with app translation to your language - + Usar Transifex para ayudar con traducciones Development and translations - + Desarrollo y traducciones diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 8fa6cab..5744cb4 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -81,19 +81,19 @@ LoginPage Login - + Inloggen Instance - + Instantie 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. - + Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van een enkel bedrijf dat je communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociale netwerk. Reload - + Herladen Enter a valid Mastodon instance URL @@ -228,35 +228,35 @@ Settings Settings - Instellingen + Instellingen Remove Account - + Verwijderen account Add Account - + Toevoegen account Deauthorize this app and remove your account - + Trek autorisaties van deze app in en verwijder je account Authorize this app to use your Mastodon account in your behalf - + Autoriseer deze app om je Mastodon namens jou te gebruiken Disable this option if you want to preserve your data connection - + Schakel deze optie uit als je je dataverbinding wilt behouden Credits - + Credits UI/UX design and development - + UI/UX ontwerp en ontwikkeling Visual identity @@ -284,19 +284,19 @@ Load images in toots - + Laden afbeeldingen in toots Translate - + Vertalen Use Transifex to help with app translation to your language - + Gebruik Transifex om deze app te helpen vertalen in jouw taal Development and translations - + Ontwikkeling en vertalingen @@ -318,19 +318,19 @@ VisualContainer Unboost - + Unboost Boost - + Boost Unfavorite - + Demarkeren als favoriet Favorite - + Markeren als favoriet diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 44a6431..c332f31 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -81,23 +81,23 @@ LoginPage Login - + Inloggen Instance - + Instantie 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. - + Mastodon is e vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van één enkel bedrijf dat uw communicatie monopoliseert. Kiest ne server die ge vertrouwt — dewelken dat ge ook kiest, ge kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociaal netwerk. Reload - + Herladen Enter a valid Mastodon instance URL - + Voert den URL van een Mastodon-instantie in @@ -228,35 +228,35 @@ Settings Settings - Instellingen + Instellingen Remove Account - + Account verwijderen Add Account - + Account toevoegen Deauthorize this app and remove your account - + Trekt autorisaties van dezen app in en verwijdert uwen account Authorize this app to use your Mastodon account in your behalf - + Autoriseert dezen app voor uwe Mastodon-account namens u te gebruiken Disable this option if you want to preserve your data connection - + Schakelt dees optie uit als ge uw verbinding wilt behouden Credits - + Credits UI/UX design and development - + UI/UX-ontwerp en -ontwikkeling Visual identity @@ -284,15 +284,15 @@ Load images in toots - + Afbeeldingen in toots laden Translate - + Vertalen Use Transifex to help with app translation to your language - + Gebruikt Transifex voor te helpen met dezen app in uw taal te vertalen Development and translations @@ -318,19 +318,19 @@ VisualContainer Unboost - + Ontboosten Boost - + Boosten Unfavorite - + Duim verwijderen Favorite - + Duim toevoegen diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 04416ad..ad54301 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -81,7 +81,7 @@ LoginPage Login - + Connexion Instance @@ -89,7 +89,7 @@ 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. - + Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu'una sola entrepresa monopolize vòstras comunicacions. Causissètz un servidor que vos fisatz - qualque siá vòstre causida poiretz interagir amb los autres. Tot lo monde pòt montar sa pròpria instància Mastodon e atal participar a construire un malhum mai solid. Reload @@ -97,7 +97,7 @@ Enter a valid Mastodon instance URL - + Picatz l’URL d’una instància Mastodon @@ -228,35 +228,35 @@ Settings Settings - Parmètres + Parmètres Remove Account - + Levar un compte Add Account - + Ajustar un compte Deauthorize this app and remove your account - + Revocar l’aplicacion e levar vòstre compte Authorize this app to use your Mastodon account in your behalf - + Autorizar aquesta aplicacion a utilizar vòstre compte Mastodon per vos Disable this option if you want to preserve your data connection - + Desactivar aquesta opcion per estalviar vòstra connexion de donadas Credits - + Crèdits UI/UX design and development - + UI/UX design e desvlopament Visual identity @@ -284,15 +284,15 @@ Load images in toots - + Cargar los imatges dels tuts Translate - + Traduire Use Transifex to help with app translation to your language - + Utilizar Transifex per ajudar a traduire l’aplicacion dins vòstra lenga Development and translations @@ -318,19 +318,19 @@ VisualContainer Unboost - + Partejar pas mai Boost - + Partejar Unfavorite - + Levar dels favorits Favorite - + Ajustar als favorits diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index baf74e3..b603437 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -1,6 +1,6 @@ - + API diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 5f29604..6ded1d6 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -81,7 +81,7 @@ LoginPage Login - + Авторизоваться Instance @@ -89,7 +89,7 @@ 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. - + Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети. Reload @@ -97,7 +97,7 @@ Enter a valid Mastodon instance URL - + Введите URL-адрес экземпляра Mastodon @@ -228,35 +228,35 @@ Settings Settings - Настройки + Настройки Remove Account - + Удалить учетную запись Add Account - + Добавить аккаунт Deauthorize this app and remove your account - + удалить учетную запись с устройства Authorize this app to use your Mastodon account in your behalf - + Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени Disable this option if you want to preserve your data connection - + Отключите эту опцию, если вы хотите сохранить подключение к данным Credits - + Зачет UI/UX design and development - + Дизайн и разработка UI / UX Visual identity @@ -284,15 +284,15 @@ Load images in toots - + Загружать изображения Translate - + Переведите Use Transifex to help with app translation to your language - + Используйте Transifex, чтобы помочь с переводом приложения на ваш язык Development and translations @@ -318,19 +318,19 @@ VisualContainer Unboost - + Нет росту Boost - + Росту Unfavorite - + Избранные нет Favorite - + Избранные diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 78274c1..2b12759 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -81,23 +81,23 @@ LoginPage Login - + Пријава Instance - + Инстанца 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. - + Mastodon је бесплатна, open-source друштвена мрежа. Децентрализована алтернатива комерцијалним платформама која избегава ризике једне компаније која монополизује вашу комуникацију. Одаберите сервер у који имате поверења и без обзира на ваш избор - комуницирајте с осталим корисницима других мрежа. Свако може водити сопствену инстанцу Mastodon мреже и учестовати у комуникацији с другим инстанцама. Reload - + освежи Enter a valid Mastodon instance URL - + Унесите URL ваше Мастодон инстанце @@ -228,35 +228,35 @@ Settings Settings - Подешавања + Подешавања Remove Account - + Уклони налог Add Account - + Додај налог Deauthorize this app and remove your account - + Укините дозволе за кориштење и уклоните налог с телефона Authorize this app to use your Mastodon account in your behalf - + Дозволите овој апликацији да користи ваш Mastodon налог Disable this option if you want to preserve your data connection - + Искључите ову опцију уколико желите да уштедите на преносу података Credits - + Спомен плоча UI/UX design and development - + интерфејс дизајн и развој Visual identity @@ -284,15 +284,15 @@ Load images in toots - + Прикажи слике у објавама Translate - + Преведи Use Transifex to help with app translation to your language - + Користите Transifex и помозите у преводу апликације на други језик Development and translations @@ -318,15 +318,15 @@ VisualContainer Unboost - + Уклони разглас Boost - + Разгласи Unfavorite - + Уклони из омиљених Favorite diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 06214ee..355bb33 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -81,7 +81,7 @@ LoginPage Login - + Logga in Instance @@ -89,7 +89,7 @@ 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. - + Mastodon är ett fritt och öppet socialt nätverk byggt på öppen källkod. Ett decentraliserat alternativ till kommersiella plattformar, vilket undviker att ett ensamt företag monopoliserar din kommunikation. Välj en server du litar på --- beroende på vilken du väljer, kan du interagera med alla andra. Vem som helst kan köra deras egen Mastodoninstans och delta i nätverket. Även du! Reload @@ -97,7 +97,7 @@ Enter a valid Mastodon instance URL - + Fyll i URL till Mastodoninstans @@ -228,35 +228,35 @@ Settings Settings - Inställningar + Inställningar Remove Account - + Radera konto Add Account - + Lägg till konto Deauthorize this app and remove your account - + Avauktorisera denna app och radera ditt konto Authorize this app to use your Mastodon account in your behalf - + Godkänn denna app att använda ditt Mastodon-konto på dina vägnar Disable this option if you want to preserve your data connection - + Inaktivera det här alternativet om du vill behålla din dataanslutning Credits - + Erkännanden UI/UX design and development - + UI/UX design och utveckling Visual identity @@ -284,11 +284,11 @@ Load images in toots - + Ladda bilder i toots Translate - + Översätt Use Transifex to help with app translation to your language @@ -296,7 +296,7 @@ Development and translations - + Använd Transifex för att hjälpa med app-översättningar till ditt språk @@ -318,19 +318,19 @@ VisualContainer Unboost - + Avpuffa Boost - + Puffa Unfavorite - + Avfavorisera Favorite - + Favorisera From 038f0a37fb987e9cee0678960e48224ea95d9f88 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 15:44:08 +0200 Subject: [PATCH 08/40] Added Italian translation Still misses some language strings --- translations/harbour-tooter-it.ts | 130 +++++++++++++++--------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index c1cbeba..513f55b 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -1,28 +1,28 @@ - + API favourited - + ha apprezzato il tuo post followed you - + ha iniziato a seguirti boosted - + ha condiviso il tuo post said - + ha detto @@ -30,52 +30,52 @@ Conversation - + Conversazione 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 Emojis - + Emojis Tap to insert - + Tap per inserire @@ -83,7 +83,7 @@ Error loading - + Errore caricamento @@ -91,7 +91,7 @@ The file %1 does not exists - + Il file %1 non esiste @@ -99,27 +99,27 @@ Login - + Accesso Instance - + Istanza Enter a valid Mastodon instance URL - + Inserire URL di una istanza Mastodon valida 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. - + Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'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. Reload - + Ricarica @@ -127,37 +127,37 @@ Home - + Home Notifications - + Notifiche Local - + Locale Federated - + Federazione Search - + Cerca @user or #term - + @utente o #termine New Toot - + Nuovo toot @@ -165,17 +165,17 @@ boosted - + ha condiviso il tuo post favourited - + ha apprezzato il tuo post followed you - + ha iniziato a seguirti @@ -183,22 +183,22 @@ Loading - + Caricamento please wait... - + Attendere un momento... Settings - + Impostazioni Load more - + Caricare altri @@ -206,72 +206,72 @@ Summary - + Sintesi Followers - + Seguaci Following - + Segue Statuses - + Toots Favourites - + Apprezzati Unfollow - + Smetti di seguire Follow request sent! - + Richiesta di seguito inviata Follow - + Segui Unmute - + Non silenziare Mute - + Silenzia Unblock - + Sblocca Block - + Blocca Bio - + Biografia Open Profile in Browser - + Aprire profile nel browser @@ -279,32 +279,32 @@ Settings - + Impostazione Remove Account - + Rimozione del account Add Account - + Aggiungi account Deauthorize this app and remove your account - + Annullare l'autorizzazione dell'app e rimuovere l'account Authorize this app to use your Mastodon account in your behalf - + Autorizzare l'app all'utilizzo del conto Mastodon Load images in toots - + Caricare immagini nei toots @@ -314,12 +314,12 @@ Translate - + Tradurre Use Transifex to help with app translation to your language - + Utilizzare Transifex per aiutare nella traduzione dell'app @@ -372,17 +372,17 @@ boosted - + ha condiviso il tuo post favourited - + ha apprezzato il tuo post followed you - + ha iniziato a seguirti @@ -390,22 +390,22 @@ Unboost - + Annulla condivisione Boost - + Condividi Unfavorite - + Annulla apprezzamento Favorite - + Apprezzato From 2511cd8797623d5ee5ff7f0b75a5cb749641e9b0 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 22:10:29 +0200 Subject: [PATCH 09/40] Updated translations --- translations/harbour-tooter-de.ts | 2 +- translations/harbour-tooter-el.ts | 2 +- translations/harbour-tooter-es.ts | 2 +- translations/harbour-tooter-fi.ts | 2 +- translations/harbour-tooter-fr.ts | 2 +- translations/harbour-tooter-it.ts | 38 ++++++++++++++-------------- translations/harbour-tooter-nl.ts | 2 +- translations/harbour-tooter-nl_BE.ts | 2 +- translations/harbour-tooter-oc.ts | 2 +- translations/harbour-tooter-pl.ts | 2 +- translations/harbour-tooter-ru.ts | 2 +- translations/harbour-tooter-sr.ts | 2 +- translations/harbour-tooter-sv.ts | 2 +- translations/harbour-tooter-zh_CN.ts | 2 +- translations/harbour-tooter.ts | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 5faac3b..dbb8d1e 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -243,7 +243,7 @@ Konto entfernen und für diese Anwendung deaktivieren - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Zugriff durch diese Anwendung auf eigenes Mastodon-Konto erlauben diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index b14cd6c..7485578 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -243,7 +243,7 @@ Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 7ccdc28..3f72e80 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -243,7 +243,7 @@ Retira la autorización a esta aplicación y elimina tu cuenta - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Autoriza a esta aplicación para usar tu cuenta de Mastodon en tu nombre diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index 86879b5..6fa55cb 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -243,7 +243,7 @@ - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index c802da7..4a1b391 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -243,7 +243,7 @@ Désautoriser cette application et enlever votre compte - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Autoriser cette application d'utiliser votre compte diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 513f55b..f2df398 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -114,7 +114,7 @@ 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. - Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'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. + Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'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. @@ -204,72 +204,72 @@ Profile - + Summary Sintesi - + Followers Seguaci - + Following Segue - + Statuses Toots - + Favourites Apprezzati - + Unfollow Smetti di seguire - + Follow request sent! Richiesta di seguito inviata - + Follow Segui - + Unmute Non silenziare - + Mute Silenzia - + Unblock Sblocca - + Block Blocca - + Bio Biografia - + Open Profile in Browser Aprire profile nel browser @@ -294,12 +294,12 @@ Deauthorize this app and remove your account - Annullare l'autorizzazione dell'app e rimuovere l'account + Annullare l'autorizzazione dell'app e rimuovere l'account - Authorize this app to use your Mastodon account in your behalf - Autorizzare l'app all'utilizzo del conto Mastodon + Authorize this app to access your Mastodon account + Autorizzare l'app all'utilizzo del conto Mastodon @@ -319,7 +319,7 @@ Use Transifex to help with app translation to your language - Utilizzare Transifex per aiutare nella traduzione dell'app + Utilizzare Transifex per aiutare nella traduzione dell'app diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 5744cb4..ab1c881 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -243,7 +243,7 @@ Trek autorisaties van deze app in en verwijder je account - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Autoriseer deze app om je Mastodon namens jou te gebruiken diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index c332f31..0574a30 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -243,7 +243,7 @@ Trekt autorisaties van dezen app in en verwijdert uwen account - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Autoriseert dezen app voor uwe Mastodon-account namens u te gebruiken diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index ad54301..93d6391 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -243,7 +243,7 @@ Revocar l’aplicacion e levar vòstre compte - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Autorizar aquesta aplicacion a utilizar vòstre compte Mastodon per vos diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index b603437..121352a 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -243,7 +243,7 @@ - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 6ded1d6..256b798 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -243,7 +243,7 @@ удалить учетную запись с устройства - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 2b12759..52fc514 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -243,7 +243,7 @@ Укините дозволе за кориштење и уклоните налог с телефона - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Дозволите овој апликацији да користи ваш Mastodon налог diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 355bb33..ea39d51 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -243,7 +243,7 @@ Avauktorisera denna app och radera ditt konto - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account Godkänn denna app att använda ditt Mastodon-konto på dina vägnar diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index d21a02e..98f420b 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -243,7 +243,7 @@ 取消授权此软件并移除你的账号 - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account 授权此软件使用你的 Mastodon 账号 diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index 42090a4..a199f9e 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -243,7 +243,7 @@ - Authorize this app to use your Mastodon account in your behalf + Authorize this app to access your Mastodon account From e2a52205f3e0545c9b26d9b68739cd0f13b0eb07 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 22:11:07 +0200 Subject: [PATCH 10/40] Improved label text --- qml/pages/Settings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 5a447b0..e4c68de 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -25,7 +25,7 @@ Page { IconTextSwitch { id: removeAccount text: Logic.conf['login'] ? qsTr("Remove Account") : qsTr("Add Account") - description: Logic.conf['login'] ? qsTr("Deauthorize this app and remove your account") : qsTr("Authorize this app to use your Mastodon account in your behalf") + description: Logic.conf['login'] ? qsTr("Deauthorize this app and remove your account") : qsTr("Authorize this app to access your Mastodon account") icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add" From ded87711f4da16d05eef958501499bab5b4ff034 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 22:24:35 +0200 Subject: [PATCH 11/40] Fixed ReferenceError Fixed ReferenceError: m is not defined --- qml/pages/Profile.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index c26c7ed..d7b8e42 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -72,7 +72,7 @@ Page { // line below was commented out, reason unknown // username = messageObject.data break; - case 'locked':m + case 'locked': locked = messageObject.data break; case 'created_at': From 217b44749124374d16f58c311e9cf1c41802bb9e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 14:05:36 +0200 Subject: [PATCH 12/40] Updated translations --- translations/harbour-tooter-de.ts | 72 ++++++++++++++-------------- translations/harbour-tooter-el.ts | 12 ++--- translations/harbour-tooter-es.ts | 22 ++++----- translations/harbour-tooter-fi.ts | 8 ++-- translations/harbour-tooter-fr.ts | 52 ++++++++++---------- translations/harbour-tooter-it.ts | 68 +++++++++++++------------- translations/harbour-tooter-nl.ts | 20 ++++---- translations/harbour-tooter-nl_BE.ts | 22 ++++----- translations/harbour-tooter-oc.ts | 12 ++--- translations/harbour-tooter-pl.ts | 8 ++-- translations/harbour-tooter-ru.ts | 12 ++--- translations/harbour-tooter-sr.ts | 22 ++++----- translations/harbour-tooter-sv.ts | 12 ++--- translations/harbour-tooter-zh_CN.ts | 22 ++++----- translations/harbour-tooter.ts | 8 ++-- 15 files changed, 186 insertions(+), 186 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index dbb8d1e..8f35ce9 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -5,15 +5,15 @@ API favourited - favorisiert + hat deinen Beitrag favorisiert followed you - sind dir gefolgt + folgt dir boosted - geboostet + hat deinen Beitrag geteilt said @@ -40,7 +40,7 @@ Write your warning here - Füge eine Inhaltswarnung hinzu + Inhaltswarnung Public @@ -52,15 +52,15 @@ Followers-only - Nur Follower + Nur für Folgende Direct - Direkt + Direktnachricht What's on your mind? - Was möchtest du mitteilen? + Was gibt's Neues? @@ -81,23 +81,23 @@ LoginPage Login - Login + Instance - Instanz - - - 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. - Mastodon ist ein freies, quelloffenes soziales Netzwerk. Im Gegensatz zu kommerziellen Plattformen, ist Mastodon als dezentrales Netzwerk konzipiert. Somit wird das Risiko vermieden, dass ein einziges Unternehmen die volle Kontrolle über die Kommunikation der Benutzer hat. Benutzer können einer beliebigen Instanz beitreten oder selbst eine eigene betreiben. - - - Reload - Neu laden + Enter a valid Mastodon instance URL - Eine gültige Mastodon-Instanz URL eingeben + + + + 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. + + + + Reload + @@ -120,7 +120,7 @@ @user or #term - @User oder #Ausdruck + @Benutzer oder #Ausdruck Local @@ -128,22 +128,22 @@ Federated - Föderiert + Föderation MiniStatus boosted - geboostet + hat deinen Beitrag geteilt favourited - favorisiert + hat deinen Beitrag favorisiert followed you - sind dir gefolgt + folgt dir @@ -169,7 +169,7 @@ Profile Unfollow - Nicht mehr folgen + Entfolgen Follow request sent! @@ -177,15 +177,15 @@ Following - Folgend + Folgt Mute - Stumm + Stummschalten Unmute - Nicht stumm + Nicht stummschalten Unblock @@ -197,7 +197,7 @@ Statuses - Status + Beiträge Favourites @@ -205,7 +205,7 @@ Follow - Folge + Folgen Summary @@ -213,7 +213,7 @@ Followers - Anhänger + Folgende Bio @@ -221,7 +221,7 @@ Open Profile in Browser - Profil in Browser öffnen + Profil im Browser öffnen @@ -276,7 +276,7 @@ Added README file - README-Datei erstellt + Erstellung README-Datei Chinese translation @@ -303,11 +303,11 @@ Toot boosted - geboostet + hat deinen Beitrag geteilt favourited - favorisiert + hat deinen Beitrag favorisiert followed you @@ -318,11 +318,11 @@ VisualContainer Unboost - Nicht boosten + Nicht mehr teilen Boost - Boosten + Teilen Unfavorite diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 7485578..23deefe 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -81,11 +81,15 @@ LoginPage Login - Σύνδεση + Instance - Παράδειγμα + + + + Enter a valid Mastodon instance URL + 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. @@ -93,10 +97,6 @@ Reload - Φορτώνω πάλι - - - Enter a valid Mastodon instance URL diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 3f72e80..c25cc2d 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -81,23 +81,23 @@ LoginPage Login - Acceso + Instance - Instancia - - - 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. - Mastodon es una red social libre y de código abierto. Una alternativa descentralizada a las plataformas comerciales, evita los riesgos de una única compañía que monopolice tu comunicación. Elije un servidor en el que confíes — cualquiera que elijas, puede interactuar con todos los demás. Cualquiera puede ejecutar su propia instancia de Mastodon y participar en la red social sin problemas. - - - Reload - Volver a cargar + Enter a valid Mastodon instance URL - Introduce una URL de instancia de Mastodon válida + + + + 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. + + + + Reload + diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index 6fa55cb..f1444ea 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -87,6 +87,10 @@ Instance + + Enter a valid Mastodon instance URL + + 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. @@ -95,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 4a1b391..0643fca 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -48,11 +48,11 @@ Unlisted - Non coté + Non listé Followers-only - Que Followers + Abonné(e)s uniquement Direct @@ -60,7 +60,7 @@ What's on your mind? - A quoi penses-tu? + Qu'avez-vous en tête? @@ -81,23 +81,23 @@ LoginPage Login - Login + Instance - Instance - - - 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. - Mastodon est un réseau social et logiciel à source ouverte de microblog auto-hébergé, libre, distribué et acentré. Il permet de partager des messages, images et autres contenus. Mastodon peut être fédéré à un réseau d'instances capables de communiquer entre elles. - - - Reload - Recharger + Enter a valid Mastodon instance URL - Entrer l'URL d'une instance de Mastodon + + + + 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. + + + + Reload + @@ -116,7 +116,7 @@ Search - Recherche + Chercher @user or #term @@ -124,18 +124,18 @@ Local - Local + Fil public local Federated - Fédéré + Fil public global MiniStatus boosted - a partagé + a partagé votre statut favourited @@ -143,7 +143,7 @@ followed you - vous a suivi + vous suit @@ -197,7 +197,7 @@ Statuses - Status + Pouets Favourites @@ -213,11 +213,11 @@ Followers - Abonnés + Abonné(e)s Bio - + Bio Open Profile in Browser @@ -303,7 +303,7 @@ Toot boosted - boosté + a partagé votre statut favourited @@ -318,11 +318,11 @@ VisualContainer Unboost - Pas booster + Annuler le partage Boost - Booster + Partager Unfavorite @@ -330,7 +330,7 @@ Favorite - Favoriser + Ajouter au favoris diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index f2df398..2f00c08 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -99,27 +99,27 @@ Login - Accesso + Instance - Istanza + Enter a valid Mastodon instance URL - Inserire URL di una istanza Mastodon valida + - + 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. - Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'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. + - + Reload - Ricarica + @@ -204,72 +204,72 @@ Profile - + Summary Sintesi - + Followers Seguaci - + Following Segue - + Statuses Toots - + Favourites Apprezzati - + Unfollow Smetti di seguire - + Follow request sent! - Richiesta di seguito inviata + Richiesta di seguito inviata! - + Follow Segui - + Unmute Non silenziare - + Mute Silenzia - + Unblock Sblocca - + Block Blocca - + Bio Biografia - + Open Profile in Browser Aprire profile nel browser @@ -284,7 +284,7 @@ Remove Account - Rimozione del account + Rimozione del account @@ -294,7 +294,7 @@ Deauthorize this app and remove your account - Annullare l'autorizzazione dell'app e rimuovere l'account + Annullare l'autorizzazione dell'app e rimuovere l'account @@ -309,7 +309,7 @@ Disable this option if you want to preserve your data connection - + Disabilitare questa opzione per conservare connessione dati @@ -324,47 +324,47 @@ 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 diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index ab1c881..e24d35a 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -81,24 +81,24 @@ LoginPage Login - Inloggen + Instance - Instantie - - - 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. - Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van een enkel bedrijf dat je communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociale netwerk. - - - Reload - Herladen + Enter a valid Mastodon instance URL + + 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. + + + + Reload + + MainPage diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 0574a30..ca187ab 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -81,23 +81,23 @@ LoginPage Login - Inloggen + Instance - Instantie - - - 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. - Mastodon is e vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van één enkel bedrijf dat uw communicatie monopoliseert. Kiest ne server die ge vertrouwt — dewelken dat ge ook kiest, ge kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociaal netwerk. - - - Reload - Herladen + Enter a valid Mastodon instance URL - Voert den URL van een Mastodon-instantie in + + + + 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. + + + + Reload + diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 93d6391..895e50d 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -81,24 +81,24 @@ LoginPage Login - Connexion + Instance + + Enter a valid Mastodon instance URL + + 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. - Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu'una sola entrepresa monopolize vòstras comunicacions. Causissètz un servidor que vos fisatz - qualque siá vòstre causida poiretz interagir amb los autres. Tot lo monde pòt montar sa pròpria instància Mastodon e atal participar a construire un malhum mai solid. + Reload - - Enter a valid Mastodon instance URL - Picatz l’URL d’una instància Mastodon - MainPage diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 121352a..952b1b2 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -87,6 +87,10 @@ Instance + + Enter a valid Mastodon instance URL + + 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. @@ -95,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 256b798..20d151c 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -81,24 +81,24 @@ LoginPage Login - Авторизоваться + Instance + + Enter a valid Mastodon instance URL + + 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. - Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети. + Reload - - Enter a valid Mastodon instance URL - Введите URL-адрес экземпляра Mastodon - MainPage diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 52fc514..3091e3e 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -81,23 +81,23 @@ LoginPage Login - Пријава + Instance - Инстанца - - - 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. - Mastodon је бесплатна, open-source друштвена мрежа. Децентрализована алтернатива комерцијалним платформама која избегава ризике једне компаније која монополизује вашу комуникацију. Одаберите сервер у који имате поверења и без обзира на ваш избор - комуницирајте с осталим корисницима других мрежа. Свако може водити сопствену инстанцу Mastodon мреже и учестовати у комуникацији с другим инстанцама. - - - Reload - освежи + Enter a valid Mastodon instance URL - Унесите URL ваше Мастодон инстанце + + + + 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. + + + + Reload + diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index ea39d51..02cc1cd 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -81,24 +81,24 @@ LoginPage Login - Logga in + Instance + + Enter a valid Mastodon instance URL + + 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. - Mastodon är ett fritt och öppet socialt nätverk byggt på öppen källkod. Ett decentraliserat alternativ till kommersiella plattformar, vilket undviker att ett ensamt företag monopoliserar din kommunikation. Välj en server du litar på --- beroende på vilken du väljer, kan du interagera med alla andra. Vem som helst kan köra deras egen Mastodoninstans och delta i nätverket. Även du! + Reload - - Enter a valid Mastodon instance URL - Fyll i URL till Mastodoninstans - MainPage diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 98f420b..5b4b447 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -81,23 +81,23 @@ LoginPage Login - 登录 + Instance - 实例 - - - 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. - ​Mastodon 是一个自由且开源的社交网络。一个去中心化的商业平台的替代品。它能够避免某个公司垄断你的通讯方式的风险。选择一个你所信任的服务器——无论你选择什么，你都可以和其他人进行互动。任何人都能运行他们自己的 Mastodon 实例，然后无缝加入社交网站。 - - - Reload - 重新加载 + Enter a valid Mastodon instance URL - 输入一个有效的 Mastodon 实例 URL + + + + 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. + + + + Reload + diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index a199f9e..b119e7e 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -87,6 +87,10 @@ Instance + + Enter a valid Mastodon instance URL + + 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. @@ -95,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage From c321a76f75396175ea0c2f5d7cac4b72e11032e7 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 14:08:20 +0200 Subject: [PATCH 13/40] Fixed margins and text colour - new top margin for better separation between text labels - fixed wrong label alignment with Theme.horizontalPageMargin - Changed colour of Mastodon description to Theme.highlightColor --- qml/pages/LoginPage.qml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index 235315c..c3874fb 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -68,7 +68,8 @@ Page { width: parent.width validator: RegExpValidator { regExp: /^(ftp|http|https):\/\/[^ "]+$/ } EnterKey.enabled: instance.acceptableInput; - EnterKey.iconSource: "image://theme/icon-m-enter-next" + EnterKey.highlighted: instance.acceptableInput; + EnterKey.iconSource: "image://theme/icon-m-accept" EnterKey.onClicked: { Logic.api = new Logic.MastodonAPI({ instance: instance.text, api_user_token: "" }); Logic.api.registerApplication("Tooter", @@ -110,13 +111,14 @@ Page { anchors { left: parent.left right: parent.right - leftMargin: Theme.paddingLarge - rightMargin: Theme.paddingLarge + topMargin: Theme.paddingMedium + leftMargin: Theme.horizontalPageMargin + rightMargin: Theme.horizontalPageMargin } width: parent.width wrapMode: Text.WordWrap - color: Theme.secondaryHighlightColor + 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.") } From 28cd0629b6a9e7ea436bb4a0665203e8b2c81318 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 14:27:54 +0200 Subject: [PATCH 14/40] Replaced icons Use better matching icons --- qml/pages/Settings.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index e4c68de..00d6874 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -26,7 +26,7 @@ Page { id: removeAccount text: Logic.conf['login'] ? qsTr("Remove Account") : qsTr("Add Account") description: Logic.conf['login'] ? qsTr("Deauthorize this app and remove your account") : qsTr("Authorize this app to access your Mastodon account") - icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add" + icon.source: Logic.conf['login'] ? "image://theme/icon-m-contact" : "image://theme/icon-m-add" onCheckedChanged: { @@ -59,7 +59,7 @@ Page { checked: typeof Logic.conf['loadImages'] !== "undefined" && Logic.conf['loadImages'] text: qsTr("Load images in toots") description: qsTr("Disable this option if you want to preserve your data connection") - icon.source: "image://theme/icon-m-mobile-network" + icon.source: "image://theme/icon-m-image" onClicked: { Logic.conf['loadImages'] = checked } @@ -67,7 +67,7 @@ Page { IconTextSwitch { text: qsTr("Translate") description: qsTr("Use Transifex to help with app translation to your language") - icon.source: "image://theme/icon-m-presence" + icon.source: "image://theme/icon-m-font-size" onCheckedChanged: { busy = true; checked = false; @@ -153,7 +153,7 @@ Page { verticalCenter: parent.verticalCenter right: parent.right } - icon.source: "image://theme/" + (model.mastodon !== "" ? "icon-m-person" : "icon-m-mail") + "?" + (pressed + icon.source: "image://theme/" + (model.mastodon !== "" ? "icon-m-contact" : "icon-m-mail") + "?" + (pressed ? Theme.highlightColor : Theme.primaryColor) onClicked: { From a09b00c92f338366086642cbb22720527f3d65de Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:24:16 +0200 Subject: [PATCH 15/40] Added new icons - Added new icons for empty profile avatars - Removed unused entries --- harbour-tooter.pro | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 60f24c5..6a1b13c 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -73,16 +73,14 @@ DISTFILES += qml/harbour-tooter.qml \ qml/pages/Settings.qml \ qml/lib/API.js \ qml/images/notification.svg \ - qml/images/home.svg \ - qml/images/mesagess.svg \ - qml/images/search.svg \ qml/images/verified.svg \ - qml/images/local.svg \ - qml/images/federated.svg \ + qml/images/boosted.svg \ qml/images/tooter.svg \ + qml/images/emojiselect.svg \ + qml/images/icon-m-profile.svg \ + qml/images/icon-l-profile.svg \ qml/lib/Mastodon.js \ qml/lib/Worker.js \ - qml/images/boosted.svg \ config/icon-lock-harbour-tooter.png \ config/x-harbour.tooter.activity.conf \ rpm/harbour-tooter.changes \ From e3e4a1fac01d0c9d283037845876895404bd912b Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:25:47 +0200 Subject: [PATCH 16/40] Add icon for profiles For profiles without own avatar --- qml/images/icon-l-profile.svg | 17 +++++++++++++++++ qml/images/icon-m-profile.svg | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 qml/images/icon-l-profile.svg create mode 100644 qml/images/icon-m-profile.svg diff --git a/qml/images/icon-l-profile.svg b/qml/images/icon-l-profile.svg new file mode 100644 index 0000000..f4445c4 --- /dev/null +++ b/qml/images/icon-l-profile.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/qml/images/icon-m-profile.svg b/qml/images/icon-m-profile.svg new file mode 100644 index 0000000..896129e --- /dev/null +++ b/qml/images/icon-m-profile.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + From 314b335ef0710569536297ede5a942f75392a206 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:26:51 +0200 Subject: [PATCH 17/40] Fixed reference error From 9d1846ec1965d1ee875a6119d4f8a2a1da1fb959 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:28:19 +0200 Subject: [PATCH 18/40] Added avatar placeholder icon-m-profile.svg being used if no avatar image can be loaded --- qml/pages/components/VisualContainer.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index 2d42d6c..a7bc245 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -46,7 +46,7 @@ BackgroundItem { visible: true onStatusChanged: { if (avatar.status === Image.Error) - source = "image://theme/icon-m-person?" + (pressed + source = "../../images/icon-m-profile.svg?" + (pressed ? Theme.highlightColor : Theme.primaryColor) } From c1372109a7ee2129b69196100e715a45bee80291 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:29:35 +0200 Subject: [PATCH 19/40] Placeholder for missing avatars icon-l-profile.svg being used if no avatar image can be loaded From fac72217e8e9554e26c90b63a0e1991b0951efb4 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Wed, 29 Apr 2020 15:30:47 +0200 Subject: [PATCH 20/40] Added avatar placeholder icon-l-profile.svg being used if no avatar image can be loaded --- qml/pages/components/ProfileHeader.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index 8dd369c..edba5c7 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -37,7 +37,12 @@ Item { asynchronous: true width: description === "" ? Theme.iconSizeMedium : Theme.iconSizeLarge height: width - source: image + source: + if (icon.status === Image.Error) + source = "../../images/icon-l-profile.svg?" + (pressed + ? Theme.highlightColor + : Theme.primaryColor) + else image } Column { anchors { From 5257b6e7bc511244892943699fbdf9539fb631fb Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:08:42 +0200 Subject: [PATCH 21/40] Update harbour-tooter-de.ts --- translations/harbour-tooter-de.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 8f35ce9..febcb24 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -135,11 +135,11 @@ MiniStatus boosted - hat deinen Beitrag geteilt + hat den Beitrag geteilt favourited - hat deinen Beitrag favorisiert + hat den Beitrag favorisiert followed you From df233bdf136ad26f4add9ce1b12f73841b441b9a Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:09:27 +0200 Subject: [PATCH 22/40] Update harbour-tooter-fr.ts --- translations/harbour-tooter-fr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 0643fca..3f509ea 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -135,7 +135,7 @@ MiniStatus boosted - a partagé votre statut + a partagé ce statut favourited From d0237fb037f1b98114f48ff98562ab92273ae315 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:19:45 +0200 Subject: [PATCH 23/40] Update harbour-tooter-it.ts --- translations/harbour-tooter-it.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 2f00c08..7a08ddb 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -165,12 +165,12 @@ boosted - ha condiviso il tuo post + ha condiviso il post favourited - ha apprezzato il tuo post + ha apprezzato il post From f51018a54033ba9a519a1e920566aa96ba7166dd Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:32:35 +0200 Subject: [PATCH 24/40] Update harbour-tooter-it.ts --- translations/harbour-tooter-it.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 7a08ddb..41d2a6e 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -6,7 +6,7 @@ favourited - ha apprezzato il tuo post + ha apprezzato il post @@ -16,7 +16,7 @@ boosted - ha condiviso il tuo post + ha condiviso il post From e5324d03c66c8042e47c29484837262e8b1f6030 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:36:56 +0200 Subject: [PATCH 25/40] Update harbour-tooter-fr.ts --- translations/harbour-tooter-fr.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 3f509ea..da66113 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -81,23 +81,23 @@ LoginPage Login - + Login Instance - + Instance Enter a valid Mastodon instance URL - + Saisissez l’URL d’une instance Mastodon 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. - + Mastodon est un réseau libre et open source. Il s’agit d'une alternative aux plateformes commerciales, pour éviter qu'une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec d’autres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste. Reload - + Recharger From f22463ed9d6aca4fd1ed37881e250640f3dff774 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:42:26 +0200 Subject: [PATCH 26/40] Update harbour-tooter-de.ts --- translations/harbour-tooter-de.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index febcb24..0d7c292 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -5,7 +5,7 @@ API favourited - hat deinen Beitrag favorisiert + hat den Beitrag favorisiert followed you @@ -13,7 +13,7 @@ boosted - hat deinen Beitrag geteilt + hat den Beitrag geteilt said @@ -81,23 +81,23 @@ LoginPage Login - + Login Instance - + Instanz Enter a valid Mastodon instance URL - + Eine gültige Mastodon-Instanz URL eingeben 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. - + Mastodon ist ein freies, quelloffenes soziales Netzwerk. Im Gegensatz zu kommerziellen Plattformen, ist Mastodon als dezentrales Netzwerk konzipiert. Somit wird das Risiko vermieden, dass ein einziges Unternehmen die volle Kontrolle über die Kommunikation der Benutzer hat. Benutzer können einer beliebigen Instanz beitreten oder selbst eine eigene betreiben. Reload - + Neu laden From e76758b3de7c347d738b7c3cc583bf361aca1968 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:43:27 +0200 Subject: [PATCH 27/40] Update harbour-tooter-el.ts --- translations/harbour-tooter-el.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 23deefe..6f47211 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -81,11 +81,11 @@ LoginPage Login - + Σύνδεση Instance - + Παράδειγμα Enter a valid Mastodon instance URL From 9e14ae07f48fa25f6e01615fd6b4b9ed7dee04c2 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:44:56 +0200 Subject: [PATCH 28/40] Update harbour-tooter-es.ts --- translations/harbour-tooter-es.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index c25cc2d..a226c0c 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -81,23 +81,23 @@ LoginPage Login - + Acceso Instance - + Instancia> Enter a valid Mastodon instance URL - + Introduce una URL de instancia de Mastodon válida 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. - + Mastodon es una red social libre y de código abierto. Una alternativa descentralizada a las plataformas comerciales, evita los riesgos de una única compañía que monopolice tu comunicación. Elije un servidor en el que confíes — cualquiera que elijas, puede interactuar con todos los demás. Cualquiera puede ejecutar su propia instancia de Mastodon y participar en la red social sin problemas. Reload - + Volver a cargar From 7cc486ce8bd628207935bf0fd633df48f0e20471 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:47:50 +0200 Subject: [PATCH 29/40] Update harbour-tooter-it.ts --- translations/harbour-tooter-it.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 41d2a6e..9f31bc8 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -99,27 +99,27 @@ Login - + Accesso Instance - + Istanza Enter a valid Mastodon instance URL - + Inserire URL di una istanza Mastodon valida 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. - + Mastodon è un servizio di rete sociale in software libero, costituito in una federazione d'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. Reload - + Ricarica From 45964086bb0e3491c8b2990ed9187e413509a23f Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:48:51 +0200 Subject: [PATCH 30/40] Update harbour-tooter-nl.ts --- translations/harbour-tooter-nl.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index e24d35a..6ff67ed 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -81,11 +81,11 @@ LoginPage Login - + Inloggen Instance - + Instantie Enter a valid Mastodon instance URL @@ -93,11 +93,11 @@ 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. - + Mastodon is een vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van een enkel bedrijf dat je communicatie monopoliseert. Kies een server die je vertrouwt — welke je ook kiest, je kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociale netwerk. Reload - + Herladen From ea97b3277d8f5a338c7dad5484c6c4aadb360c77 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:49:59 +0200 Subject: [PATCH 31/40] Update harbour-tooter-nl_BE.ts --- translations/harbour-tooter-nl_BE.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index ca187ab..cf8d937 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -81,23 +81,23 @@ LoginPage Login - + Inloggen Instance - + Instantie Enter a valid Mastodon instance URL - + Voert den URL van een Mastodon-instantie in 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. - + Mastodon is e vrij sociaal netwerk. Als gedecentraliseerd alternatief voor commerciële platformen, vermijdt het de risico’s van één enkel bedrijf dat uw communicatie monopoliseert. Kiest ne server die ge vertrouwt — dewelken dat ge ook kiest, ge kunt met iedereen communiceren. Iedereen kan zelf een Mastodon-instantie hebben en naadloos deelnemen aan het sociaal netwerk. Reload - + Herladen From e35f75ec4449f142c11910cbc689e88e71972fb9 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:51:11 +0200 Subject: [PATCH 32/40] Update harbour-tooter-oc.ts --- translations/harbour-tooter-oc.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 895e50d..2bb86d9 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -81,7 +81,7 @@ LoginPage Login - + Connexion Instance @@ -89,11 +89,11 @@ Enter a valid Mastodon instance URL - + Picatz l’URL d’una instància Mastodon 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. - + Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu'una sola entrepresa monopolize vòstras comunicacions. Causissètz un servidor que vos fisatz - qualque siá vòstre causida poiretz interagir amb los autres. Tot lo monde pòt montar sa pròpria instància Mastodon e atal participar a construire un malhum mai solid. Reload From c8e9049bd081afc95d5c95aaa8dfd554688d8615 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 11:53:08 +0200 Subject: [PATCH 33/40] Update harbour-tooter-ru.ts --- translations/harbour-tooter-ru.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 20d151c..277a582 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -89,11 +89,11 @@ Enter a valid Mastodon instance URL - + Введите URL-адрес экземпляра Mastodon 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. - + Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети. Reload From 9736f09820ba0038bf104bb38e60f054c085ff4e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:22:00 +0200 Subject: [PATCH 34/40] Update harbour-tooter-sv.ts --- translations/harbour-tooter-sv.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 02cc1cd..43b1866 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -81,7 +81,7 @@ LoginPage Login - + Logga in Instance @@ -89,11 +89,11 @@ Enter a valid Mastodon instance URL - + Fyll i URL till Mastodoninstans 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. - + Mastodon är ett fritt och öppet socialt nätverk byggt på öppen källkod. Ett decentraliserat alternativ till kommersiella plattformar, vilket undviker att ett ensamt företag monopoliserar din kommunikation. Välj en server du litar på --- beroende på vilken du väljer, kan du interagera med alla andra. Vem som helst kan köra deras egen Mastodoninstans och delta i nätverket. Även du! Reload From 30bedbe1d06e91213606d3b0733940c7a6b247dc Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:24:32 +0200 Subject: [PATCH 35/40] Update harbour-tooter-zh_CN.ts --- translations/harbour-tooter-zh_CN.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index 5b4b447..04ddc89 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -81,23 +81,23 @@ LoginPage Login - + 登录 Instance - + 实例 Enter a valid Mastodon instance URL - + 输入一个有效的 Mastodon 实例 URL 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. - + Mastodon 是一个自由且开源的社交网络。一个去中心化的商业平台的替代品。它能够避免某个公司垄断你的通讯方式的风险。选择一个你所信任的服务器——无论你选择什么，你都可以和其他人进行互动。任何人都能运行他们自己的 Mastodon 实例，然后无缝加入社交网站。 Reload - + 重新加载 From 17dbf74bf5c24633df4bf81e5bef57178ed3688e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:28:54 +0200 Subject: [PATCH 36/40] Text colour change --- qml/pages/ProfileHeader.qml | 78 +++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 qml/pages/ProfileHeader.qml diff --git a/qml/pages/ProfileHeader.qml b/qml/pages/ProfileHeader.qml new file mode 100644 index 0000000..54b9874 --- /dev/null +++ b/qml/pages/ProfileHeader.qml @@ -0,0 +1,78 @@ +import QtQuick 2.0 +import Sailfish.Silica 1.0 + +Item { + id: header + property int value: 0; + property string title: ""; + property string description: ""; + property string image: ""; + property string bg: ""; + width: parent.width + height: icon.height + Theme.paddingLarge*2 + /*Image { + anchors.fill: parent + asynchronous: true + fillMode: Image.PreserveAspectCrop + source: bg + opacity: 0.3 + }*/ + Rectangle { + anchors.fill: parent + opacity: 0.2 + gradient: Gradient { + GradientStop { position: 0.0; color: Theme.highlightBackgroundColor } + GradientStop { position: 1.0; color: Theme.highlightBackgroundColor } + } + + } + Image { + id: icon + anchors { + left: parent.left + leftMargin: Theme.paddingLarge + top: parent.top + topMargin: Theme.paddingLarge + } + asynchronous: true + width: description === "" ? Theme.iconSizeMedium : Theme.iconSizeLarge + height: width + source: + if (icon.status === Image.Error) + source = "../../images/icon-l-profile.svg?" + (pressed + ? Theme.highlightColor + : Theme.primaryColor) + else image + } + Column { + anchors { + left: icon.right + leftMargin: Theme.paddingLarge + right: parent.right + rightMargin: Theme.paddingLarge + verticalCenter: parent.verticalCenter + } + Label { + id: ttl + text: title + height: contentHeight + color: Theme.primaryColor + font.pixelSize: Theme.fontSizeLarge + font.family: Theme.fontFamilyHeading + horizontalAlignment: Text.AlignRight + truncationMode: TruncationMode.Fade + width: parent.width + } + Label { + height: description === "" ? 0 : contentHeight + text: description + color: Theme.secondaryColor + font.pixelSize: Theme.fontSizeSmall + font.family: Theme.fontFamilyHeading + horizontalAlignment: Text.AlignRight + truncationMode: TruncationMode.Fade + width: parent.width + } + } + +} From d6897db2d5d85313804f382d8c1d38867a60bda0 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:30:01 +0200 Subject: [PATCH 37/40] Delete ProfileHeader.qml --- qml/pages/ProfileHeader.qml | 78 ------------------------------------- 1 file changed, 78 deletions(-) delete mode 100644 qml/pages/ProfileHeader.qml diff --git a/qml/pages/ProfileHeader.qml b/qml/pages/ProfileHeader.qml deleted file mode 100644 index 54b9874..0000000 --- a/qml/pages/ProfileHeader.qml +++ /dev/null @@ -1,78 +0,0 @@ -import QtQuick 2.0 -import Sailfish.Silica 1.0 - -Item { - id: header - property int value: 0; - property string title: ""; - property string description: ""; - property string image: ""; - property string bg: ""; - width: parent.width - height: icon.height + Theme.paddingLarge*2 - /*Image { - anchors.fill: parent - asynchronous: true - fillMode: Image.PreserveAspectCrop - source: bg - opacity: 0.3 - }*/ - Rectangle { - anchors.fill: parent - opacity: 0.2 - gradient: Gradient { - GradientStop { position: 0.0; color: Theme.highlightBackgroundColor } - GradientStop { position: 1.0; color: Theme.highlightBackgroundColor } - } - - } - Image { - id: icon - anchors { - left: parent.left - leftMargin: Theme.paddingLarge - top: parent.top - topMargin: Theme.paddingLarge - } - asynchronous: true - width: description === "" ? Theme.iconSizeMedium : Theme.iconSizeLarge - height: width - source: - if (icon.status === Image.Error) - source = "../../images/icon-l-profile.svg?" + (pressed - ? Theme.highlightColor - : Theme.primaryColor) - else image - } - Column { - anchors { - left: icon.right - leftMargin: Theme.paddingLarge - right: parent.right - rightMargin: Theme.paddingLarge - verticalCenter: parent.verticalCenter - } - Label { - id: ttl - text: title - height: contentHeight - color: Theme.primaryColor - font.pixelSize: Theme.fontSizeLarge - font.family: Theme.fontFamilyHeading - horizontalAlignment: Text.AlignRight - truncationMode: TruncationMode.Fade - width: parent.width - } - Label { - height: description === "" ? 0 : contentHeight - text: description - color: Theme.secondaryColor - font.pixelSize: Theme.fontSizeSmall - font.family: Theme.fontFamilyHeading - horizontalAlignment: Text.AlignRight - truncationMode: TruncationMode.Fade - width: parent.width - } - } - -} From 8db104ae720cebbdc775351856e04c677b439dce Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 14:30:36 +0200 Subject: [PATCH 38/40] Label colour change --- qml/pages/components/ProfileHeader.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index edba5c7..54b9874 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -66,7 +66,7 @@ Item { Label { height: description === "" ? 0 : contentHeight text: description - color: Theme.primaryColor + color: Theme.secondaryColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight From 054238561d33ddd8cbdb1f964f10153f3505cb3f Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 15:18:25 +0200 Subject: [PATCH 39/40] Add files via upload --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f1631d5..60f78f2 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,18 @@ -# Tooter +# Tooter [Fork] +## About Tooter is Mastodon client for Sailfish OS. It is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. -## Screenshot - +This is a fork of dysk0/harbour-tooter. The app can by downloaded here: https://openrepos.net/content/molan/tooter-fork. +## Build +Clone / download this repository and import it in your SailfishOS IDE using the harbour-tooter.pro project file. No additional configuration needed. + +## Contributions +Contributions to this project are very welcome, since I don't have the resources and time to implement and fix everything Tooter still misses or lacks. Thank you! + +## Screenshots + ## License -`// TODO` +Licensed under GNU GPLv3 From 8f2273f514d99b840a7e2e99bbad3e9edceb5bdf Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Thu, 30 Apr 2020 15:30:39 +0200 Subject: [PATCH 40/40] Update README.md --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 60f78f2..b8d3cb3 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,18 @@ ## About Tooter is Mastodon client for Sailfish OS. It is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. -This is a fork of dysk0/harbour-tooter. The app can by downloaded here: https://openrepos.net/content/molan/tooter-fork. +This fork is being used to further develop and maintain the Tooter app by dysk0 (https://github.com/dysk0/harbour-tooter). The development branch 'upstream' is being used to create pull requests from this fork. Releases by dysk0 can be found on the Jolla store and on https://openrepos.net/content/dysko/tooter + +Releases from this forked repository can be found here: https://openrepos.net/content/molan/tooter-fork. ## Build Clone / download this repository and import it in your SailfishOS IDE using the harbour-tooter.pro project file. No additional configuration needed. +## Repository branches: +- master: default +- develop: commits WIP +- upstream: commits for Tooter release + ## Contributions Contributions to this project are very welcome, since I don't have the resources and time to implement and fix everything Tooter still misses or lacks. Thank you!