From 39e8a9f796d58bdf155b3ba806c5ae34da843146 Mon Sep 17 00:00:00 2001 From: Ales Katona Date: Thu, 25 Jul 2019 21:07:49 -0600 Subject: [PATCH 01/56] do not crash on status: null --- qml/lib/Worker.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index ff34e44..a5cc849 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -60,6 +60,7 @@ WorkerScript.onMessage = function(msg) { } else if(msg.action === "notifications") { // notification //console.log("Is notification... parsing...") + console.log(JSON.stringify(data[i])) item = parseNotification(data[i]); items.push(item) @@ -148,12 +149,20 @@ function parseNotification(data){ }; switch (item['type']){ case "mention": + if (!data.status) { + break; + } + item = parseToot(data.status) item['typeIcon'] = "image://theme/icon-s-retweet" item['typeIcon'] = "image://theme/icon-s-alarm" item['type'] = "mention"; break; case "reblog": + if (!data.status) { + break; + } + item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) @@ -162,6 +171,10 @@ function parseNotification(data){ item['typeIcon'] = "image://theme/icon-s-retweet" break; case "favourite": + if (!data.status) { + break; + } + item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) From da529f81d6792f33b48ccd4c94d505c6bdfec13e Mon Sep 17 00:00:00 2001 From: dashinfantry <45334556+dashinfantry@users.noreply.github.com> Date: Wed, 1 Jan 2020 16:38:45 +0800 Subject: [PATCH 02/56] Update and rename harbour-tooter-zh.ts to harbour-tooter-zh_CN.ts --- ...r-tooter-zh.ts => harbour-tooter-zh_CN.ts} | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) rename translations/{harbour-tooter-zh.ts => harbour-tooter-zh_CN.ts} (81%) diff --git a/translations/harbour-tooter-zh.ts b/translations/harbour-tooter-zh_CN.ts similarity index 81% rename from translations/harbour-tooter-zh.ts rename to translations/harbour-tooter-zh_CN.ts index f9bedda..a75407e 100644 --- a/translations/harbour-tooter-zh.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -1,6 +1,6 @@ - + API @@ -13,7 +13,7 @@ boosted - 推出的 + 推起的 said @@ -47,7 +47,7 @@ Content warning! - 内容警告 + 内容警告! public @@ -89,30 +89,30 @@ ImageUploader The file %1 does not exists - 文件%1 不存在 + 文件 %1 不存在 LoginPage Login - + 登录 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 实例，然后无缝加入社交网站。 Reload - + 重新加载 @@ -150,7 +150,7 @@ MiniStatus boosted - 推出的 + 推起的 favourited @@ -188,7 +188,7 @@ Follow request sent! - 关注请求已寄出 + 关注请求已寄出！ Following @@ -235,54 +235,54 @@ 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 帮助翻译此软件到你所使用的语言。 Credits - + 信誉 UI/UX design and development - + UI/UX 设计及开发 Toot boosted - 推出的 + 推起的 favourited @@ -297,11 +297,11 @@ VisualContainer Unboost - 取消推出 + 取消推起 Boost - 推出 + 推起 Unfavorite From 15653a90a3e8ed18b6a4c3dff00b136f0d41ffde Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Wed, 15 Apr 2020 23:58:07 +0200 Subject: [PATCH 03/56] 1.0.4 - Login bugfix merge request - Updated translations --- rpm/harbour-tooter.changes | 4 + rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- translations/harbour-tooter-de.ts | 28 +++---- translations/harbour-tooter-el.ts | 24 +++--- translations/harbour-tooter-es.ts | 32 ++++---- translations/harbour-tooter-fr.ts | 32 ++++---- translations/harbour-tooter-nl.ts | 32 ++++---- translations/harbour-tooter-nl_BE.ts | 32 ++++---- translations/harbour-tooter-oc.ts | 28 +++---- translations/harbour-tooter-pl.ts | 108 +++++++++++++-------------- translations/harbour-tooter-ru.ts | 28 +++---- translations/harbour-tooter-sr.ts | 32 ++++---- translations/harbour-tooter-sv.ts | 28 +++---- translations/harbour-tooter-zh.ts | 28 +++---- 15 files changed, 222 insertions(+), 218 deletions(-) diff --git a/rpm/harbour-tooter.changes b/rpm/harbour-tooter.changes index d7a4d66..ff8550c 100644 --- a/rpm/harbour-tooter.changes +++ b/rpm/harbour-tooter.changes @@ -1,3 +1,7 @@ +* Wed Apr 15 2020 Dusko Angirevic 1.0.4-0 +- Login bugfix merge request +- Updated translations + * Sun Jan 27 2019 Dusko Angirevic 1.0.3-0 - Remorse popup added for account removal - Updated translations diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index 520b70c..3e9ea00 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,7 +13,7 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -Version: 1.0.3 +Version: 1.0.4 Release: 0 Group: Qt/Qt License: LICENSE diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index edf95f4..e0531cf 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,6 +1,6 @@ Name: harbour-tooter Summary: Tooter -Version: 1.0.3 +Version: 1.0.4 Release: 0 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 51c1f01..ce57760 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -96,7 +96,7 @@ LoginPage Login - + Login Instance @@ -104,11 +104,11 @@ Enter an Mastodon instance URL - + Gib eine Mastadon Instance URL ein 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. Reload @@ -235,47 +235,47 @@ Settings Settings - Einstellungen + Einstellungen Remove Account - + Account löschen Add Account - + Account hinzufügen Deauthorize this app and remove your account - + Der App Autorisierung entziehen und Account entfernen 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 Disable this option if you want to preserve your data connection - + Deaktiviere diese Option um deinen Datenverbindung zu schonen Translate - + Übersetzen Use Transifex to help with app translation to your language - + Nutze Transifex um bei der Übersetzung in deine Sprache zu helfen Credits - + Credits UI/UX design and development - + UI/UX Design und Implementierung diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 9be4361..cfb00c7 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -96,7 +96,7 @@ LoginPage Login - + Σύνδεση Instance @@ -235,47 +235,47 @@ 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 για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας Credits - + Ευχαριστίες UI/UX design and development - + UI/UX σχεδιασμός και ανάπτυξη diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 8bbcec9..acbe287 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -96,23 +96,23 @@ LoginPage Login - + Acceso 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. Reload - + Volver a cargar @@ -235,47 +235,47 @@ Settings Settings - Ajustes + Ajustes Remove Account - + Eliminar cuenta Add Account - + Añadir cuenta Deauthorize this app and remove your account - + Retira la autorización a esta aplicación y elimina tu cuenta 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 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 Credits - + Créditos UI/UX design and development - + Diseño UI/UX y desarrollo diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index dc04704..3c7ddec 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -96,23 +96,23 @@ LoginPage Login - + Login 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. Reload - + Recharger @@ -235,47 +235,47 @@ Settings Settings - Paramètres + Préférences Remove Account - + Supprimer le compte Add Account - + Ajouter un compte Deauthorize this app and remove your account - + Supprimer votre compte de l'application 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 Disable this option if you want to preserve your data connection - + Désactivez cette option si vous souhaitez économiser votre consommation de données Translate - + Traduire Use Transifex to help with app translation to your language - + Utilisez Transifex pour aider à la traduction de l'application dans votre langue Credits - + Crédits UI/UX design and development - + design et développement de l'interface diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 115d648..2779c3c 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -96,23 +96,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 @@ -235,47 +235,47 @@ 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 Credits - + Credits UI/UX design and development - + UI/UX ontwerp en ontwikkeling diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 385fa6c..4772b6d 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -96,23 +96,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 @@ -235,47 +235,47 @@ 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 Credits - + Credits UI/UX design and development - + UI/UX-ontwerp en -ontwikkeling diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 0f43a2a..9e310a2 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -96,7 +96,7 @@ LoginPage Login - + Connexion Instance @@ -104,11 +104,11 @@ 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 @@ -235,47 +235,47 @@ Settings Settings - Parmètres + Paramè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 Credits - + Crèdits UI/UX design and development - + UI/UX design e desvlopament diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 60c7451..b2f84d9 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -1,95 +1,95 @@ - + API favourited - dodał(a) do ulubionych + followed you - zaczął(-ęła) Cię śledzić + boosted - podbił(a) + said - napisał(a) + Browser Open in Browser - Otwórz w przeglądarce + Web mode - Tryb sieci + Reading mode - Tryb czytania + Copy URL - Kopiuj URL + Conversation Conversation - Konwersacja + Content warning! - Ostrzeżenie o zawartości! + public - publiczny + unlisted - niewidoczny + followers only - tylko dla śledzących + direct - bezpośredni + Delete - Usuń + Emojis - Emoji + Tap to insert - Dotknij aby wstawić + ImageFullScreen Error loading - Błąd ładowania + ImageUploader The file %1 does not exists - Plik %1 nie istnieje + @@ -119,123 +119,123 @@ 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 + Settings Settings - Ustawienia + Remove Account @@ -282,34 +282,34 @@ Toot boosted - podbił(a) + favourited - dodał(a) do ulubionych + followed you - zaczął(-ęła Cię śledzić) + VisualContainer Unboost - Cofnij podbicie + Boost - Podbij + Unfavorite - Usuń z ulubionych + Favorite - Dodaj do ulubionych + diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index ee37bee..a49da69 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -96,7 +96,7 @@ LoginPage Login - + Авторизоваться Instance @@ -104,11 +104,11 @@ 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 @@ -235,47 +235,47 @@ 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, чтобы помочь с переводом приложения на ваш язык Credits - + Зачет UI/UX design and development - + Дизайн и разработка UI / UX diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 48ef2cb..694c51b 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -96,23 +96,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 - + освежи @@ -235,47 +235,47 @@ 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 и помозите у преводу апликације на други језик Credits - + Спомен плоча UI/UX design and development - + интерфејс дизајн и развој diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 16be25c..35bc745 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -96,7 +96,7 @@ LoginPage Login - + Logga in Instance @@ -104,11 +104,11 @@ 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 @@ -235,47 +235,47 @@ 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 Credits - + Erkännanden UI/UX design and development - + UI/UX design och utveckling diff --git a/translations/harbour-tooter-zh.ts b/translations/harbour-tooter-zh.ts index f9bedda..62ac87d 100644 --- a/translations/harbour-tooter-zh.ts +++ b/translations/harbour-tooter-zh.ts @@ -96,7 +96,7 @@ LoginPage Login - + 登录 Instance @@ -104,11 +104,11 @@ 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 实例并且无缝加入此社交网络。 Reload @@ -235,47 +235,47 @@ 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 以帮助翻译成你使用的语言 Credits - + 信用 UI/UX design and development - + UI/UX 设计和开发 From 45ba33825903f1e285888d2856867270ce7b9678 Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Thu, 16 Apr 2020 00:37:11 +0200 Subject: [PATCH 04/56] 1.0.4-1 Merge Co-Authored-By: molan-git --- harbour-tooter.pro | 2 +- qml/images/emojiselect.svg | 14 + qml/images/federated.svg | 19 - qml/images/home.svg | 37 - qml/images/local.svg | 39 - qml/images/public.svg | 15 - qml/images/search.svg | 39 - qml/lib/Worker.js | 15 +- qml/pages/Browser.qml | 284 ----- qml/pages/Conversation.qml | 1126 +++++++++-------- qml/pages/MainPage.qml | 27 +- qml/pages/Profile.qml | 78 +- qml/pages/Settings.qml | 20 +- qml/pages/components/ItemUser.qml | 4 +- qml/pages/components/Navigation.qml | 21 +- qml/pages/components/ProfileHeader.qml | 6 +- qml/pages/components/Toot.qml | 6 +- qml/pages/components/VisualContainer.qml | 13 +- rpm/harbour-tooter.changes | 39 +- rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- translations/harbour-tooter-de.ts | 95 +- translations/harbour-tooter-el.ts | 95 +- translations/harbour-tooter-es.ts | 95 +- translations/harbour-tooter-fi.ts | 95 +- translations/harbour-tooter-fr.ts | 95 +- translations/harbour-tooter-nl.ts | 95 +- translations/harbour-tooter-nl_BE.ts | 95 +- translations/harbour-tooter-oc.ts | 95 +- translations/harbour-tooter-pl.ts | 95 +- translations/harbour-tooter-ru.ts | 95 +- translations/harbour-tooter-sr.ts | 95 +- translations/harbour-tooter-sv.ts | 95 +- ...r-tooter-zh.ts => harbour-tooter-zh_CN.ts} | 173 +-- translations/harbour-tooter.ts | 95 +- 35 files changed, 1590 insertions(+), 1626 deletions(-) create mode 100644 qml/images/emojiselect.svg delete mode 100644 qml/images/federated.svg delete mode 100644 qml/images/home.svg delete mode 100644 qml/images/local.svg delete mode 100644 qml/images/public.svg delete mode 100644 qml/images/search.svg delete mode 100644 qml/pages/Browser.qml rename translations/{harbour-tooter-zh.ts => harbour-tooter-zh_CN.ts} (69%) diff --git a/harbour-tooter.pro b/harbour-tooter.pro index eb7ed40..8b1cb5f 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -114,4 +114,4 @@ TRANSLATIONS += translations/harbour-tooter-pl.ts TRANSLATIONS += translations/harbour-tooter-ru.ts TRANSLATIONS += translations/harbour-tooter-sr.ts TRANSLATIONS += translations/harbour-tooter-sv.ts -TRANSLATIONS += translations/harbour-tooter-zh.ts +TRANSLATIONS += translations/harbour-tooter-zh_CN.ts diff --git a/qml/images/emojiselect.svg b/qml/images/emojiselect.svg new file mode 100644 index 0000000..ffef849 --- /dev/null +++ b/qml/images/emojiselect.svg @@ -0,0 +1,14 @@ + + Artboard 1 + + + + + + + + + + + + diff --git a/qml/images/federated.svg b/qml/images/federated.svg deleted file mode 100644 index 5511f58..0000000 --- a/qml/images/federated.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/qml/images/home.svg b/qml/images/home.svg deleted file mode 100644 index be54abc..0000000 --- a/qml/images/home.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/images/local.svg b/qml/images/local.svg deleted file mode 100644 index 1ae1e7f..0000000 --- a/qml/images/local.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/images/public.svg b/qml/images/public.svg deleted file mode 100644 index bb92391..0000000 --- a/qml/images/public.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/qml/images/search.svg b/qml/images/search.svg deleted file mode 100644 index 53514ed..0000000 --- a/qml/images/search.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index ff34e44..bbd6a6b 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -60,6 +60,7 @@ WorkerScript.onMessage = function(msg) { } else if(msg.action === "notifications") { // notification //console.log("Is notification... parsing...") + console.log(JSON.stringify(data[i])) item = parseNotification(data[i]); items.push(item) @@ -81,7 +82,7 @@ WorkerScript.onMessage = function(msg) { console.log("descendants") for (var j = 0; j < data[i].length; j ++) { item = parseToot(data[i][j]); - item['id'] = item['status_id'] + item['id'] = item['status_id']; if (typeof item['attachments'] === "undefined") item['attachments'] = []; items.push(item) @@ -148,12 +149,20 @@ function parseNotification(data){ }; switch (item['type']){ case "mention": + if (!data.status) { + break; + } + item = parseToot(data.status) item['typeIcon'] = "image://theme/icon-s-retweet" item['typeIcon'] = "image://theme/icon-s-alarm" item['type'] = "mention"; break; case "reblog": + if (!data.status) { + break; + } + item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) @@ -162,6 +171,10 @@ function parseNotification(data){ item['typeIcon'] = "image://theme/icon-s-retweet" break; case "favourite": + if (!data.status) { + break; + } + item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) diff --git a/qml/pages/Browser.qml b/qml/pages/Browser.qml deleted file mode 100644 index 4143575..0000000 --- a/qml/pages/Browser.qml +++ /dev/null @@ -1,284 +0,0 @@ -/**************************************************************************************** -** -** Copyright (C) 2013 Jolla Ltd. -** Contact: Raine Makelainen -** All rights reserved. -** -** This file is part of Sailfish Silica UI component package. -** -** You may use this file under the terms of BSD license as follows: -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in the -** documentation and/or other materials provided with the distribution. -** * Neither the name of the Jolla Ltd nor the -** names of its contributors may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR -** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -** -****************************************************************************************/ - -import QtQuick 2.0 -import QtWebKit 3.0 -import Sailfish.Silica 1.0 - -Page { - id: browser - property string href; - property bool screenReaderMode: true - property bool loaded: false - property string articleContent: "" - property string articleTitle: "" - property string articleDate: "" - property string articleImage: "" - onLoadedChanged: { - pullDownMenu.busy = pullDownMenu2.busy = !loaded - } - onStatusChanged: { - if (status === PageStatus.Active) { - fetchData(); - } - - } - onScreenReaderModeChanged: { - loaded = false; - fetchData(); - } - - allowedOrientations: Orientation.All - function fetchData(){ - var xhr = new XMLHttpRequest(); - xhr.open("GET", "https://mercury.postlight.com/parser?url="+href, true); - xhr.onreadystatechange = function() { - if ( xhr.readyState === xhr.DONE ) { - if ( xhr.status === 200 ) { - console.log(xhr.responseText) - var response = JSON.parse(xhr.responseText); - //if (response.date_published) - //articleDate = new Date(response.date_published.replace(/^(\w+) (\w+) (\d+) ([\d:]+) \+0000 (\d+)$/,"$1, $2 $3 $5 $4 GMT")); - if (response.title) - articleTitle = response.title; - if (response.lead_image_url) - articleImage = response.lead_image_url - if (response.content) - articleContent = response.content; - if (response.content && response.lead_image_url) - articleContent = articleContent.replace(articleImage, "") - } else { - - } - loaded = true; - } - } - xhr.setRequestHeader("Content-Type", 'application/json'); - xhr.setRequestHeader("x-api-key", 'uakC11NlSubREs1r5NjkOCS1NJEkwti6DnDutcYC'); - - if (screenReaderMode) - xhr.send(); - else - webView.url = 'https://mercury.postlight.com/amp?url='+href - } - - - - BusyIndicator { - id: loading - size: BusyIndicatorSize.Large - anchors.centerIn: parent - running: !loaded - } - - SilicaWebView { - enabled: !screenReaderMode - visible: !screenReaderMode - id: webView - anchors { - fill: parent - } - - PullDownMenu { - id: pullDownMenu - MenuItem { - text: qsTr("Open in Browser") - onClicked: { - Qt.openUrlExternally(href); - } - } - MenuItem { - text: screenReaderMode ? qsTr("Web mode") : qsTr("Reading mode") - onClicked: { - screenReaderMode = !screenReaderMode - } - } - } - - opacity: 0 - onLoadingChanged: { - switch (loadRequest.status) - { - case WebView.LoadSucceededStatus: - opacity = 1 - loaded = true; - break - case WebView.LoadFailedStatus: - opacity = 0 - loaded = true; - viewPlaceHolder.errorString = loadRequest.errorString - break - default: - opacity = 0 - loaded = false; - break - } - } - FadeAnimation on opacity {} - } - ViewPlaceholder { - id: viewPlaceHolder - property string errorString - enabled: webView.opacity === 0 && loaded && !screenReaderMode - text: errorString - hintText: "Check network connectivity and pull down to reload" - } - - - - SilicaFlickable { - visible: screenReaderMode - enabled: screenReaderMode - anchors { - fill: parent - } - contentHeight: article.height - VerticalScrollDecorator {} - PullDownMenu { - id: pullDownMenu2 - MenuItem { - text: qsTr("Copy URL") - onClicked: Clipboard.text = href - } - MenuItem { - text: qsTr("Open in Browser") - onClicked: Qt.openUrlExternally(href); - } - MenuItem { - text: screenReaderMode ? qsTr("Web mode") : qsTr("Reading mode") - onClicked: { - screenReaderMode = !screenReaderMode - } - } - } - Column { - - id: article - width: parent.width - - Rectangle { - height: Theme.itemSizeExtraSmall/3 - width: parent.width - opacity: 0 - } - - Label { - id: title - text: articleTitle - font.pixelSize: Theme.fontSizeLarge - color: Theme.highlightColor - textFormat: Text.StyledText - wrapMode: Text.WordWrap - font.bold: true - anchors { - left: parent.left - right: parent.right - leftMargin: Theme.paddingLarge - rightMargin: Theme.paddingLarge - } - } - Label { - id: date - visible: articleDate !== "" - text: articleDate - font.pixelSize: Theme.fontSizeExtraSmall - color: Theme.secondaryColor - anchors { - left: parent.left - right: parent.right - topMargin: Theme.paddingSmall - bottomMargin: Theme.paddingSmall - leftMargin: Theme.paddingLarge - rightMargin: Theme.paddingLarge - } - } - Rectangle { - height: image.visible ? Theme.itemSizeExtraSmall/3 : 0 - width: parent.width - opacity: 0 - } - Image { - id: image - visible: articleImage !== "" ? true : false - source: articleImage - width: parent.width - height: Theme.itemSizeExtraLarge - fillMode: Image.PreserveAspectCrop - anchors { - left: parent.left - right: parent.right - } - BusyIndicator { - size: BusyIndicatorSize.Small - anchors.centerIn: parent - running: parent.status != Image.Ready - } - - onStatusChanged: if (image.status === Image.Ready) { - var ratio = image.sourceSize.width/image.sourceSize.height - height = width / ratio - } - } - Rectangle { - height: image.visible ? Theme.itemSizeExtraSmall/3 : 0 - width: parent.width - opacity: 0 - } - Label { - id: content - readonly property string _linkStyle: "" - textFormat: Text.RichText - text: _linkStyle + articleContent; - font.pixelSize: Theme.fontSizeSmall - color: Theme.secondaryColor - wrapMode: Text.WordWrap - anchors { - left: parent.left - right: parent.right - topMargin: image.visible ? Theme.paddingSmall : Theme.paddingLarge - leftMargin: Theme.paddingLarge - rightMargin: Theme.paddingLarge - bottomMargin: Theme.paddingLarge - } - - } - Rectangle { - height: Theme.itemSizeExtraSmall/3 - width: parent.width - opacity: 0 - } - - } - } -} diff --git a/qml/pages/Conversation.qml b/qml/pages/Conversation.qml index fbfc551..fce4817 100644 --- a/qml/pages/Conversation.qml +++ b/qml/pages/Conversation.qml @@ -5,587 +5,621 @@ import "../lib/API.js" as Logic import "./components/" Page { - id: conversationPage - property string type; - property alias title: header.title - property alias description: header.description - property alias avatar: header.image - property string suggestedUser: "" - property ListModel suggestedModel; - property string toot_id: "" + id: conversationPage + property string type + property alias title: header.title + property alias description: header.description + property alias avatar: header.image + property string suggestedUser: "" + property ListModel suggestedModel + property string toot_id: "" property int tootMaxChar: 500; - property ListModel mdl; - allowedOrientations: Orientation.All - onSuggestedUserChanged: { - console.log(suggestedUser) - suggestedModel = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject'); - predictionList.visible = false; - if (suggestedUser.length > 0) { - var msg = { - 'action' : 'accounts/search', - 'method' : 'GET', - 'model' : suggestedModel, - 'mode' : "append", - 'params' : [ {name: "q", data: suggestedUser} ], + property ListModel mdl + allowedOrientations: Orientation.All + onSuggestedUserChanged: { + console.log(suggestedUser) + suggestedModel = Qt.createQmlObject( + 'import QtQuick 2.0; ListModel { }', + Qt.application, 'InternalQmlObject' + ) + predictionList.visible = false + if (suggestedUser.length > 0) { + var msg = { + "action": 'accounts/search', + "method": 'GET', + "model": suggestedModel, + "mode": "append", + "params": [{ + "name": "q", + "data": suggestedUser + }], + "conf": Logic.conf + } + worker.sendMessage(msg) + predictionList.visible = true + } + } - 'conf' : Logic.conf - }; - worker.sendMessage(msg); - predictionList.visible = true; - } - } + ListModel { + id: mediaModel + onCountChanged: { + btnAddImage.enabled = mediaModel.count < 4 + } + } - ListModel { - id: mediaModel - onCountChanged: { - btnAddImage.enabled = mediaModel.count < 4 - } - } + WorkerScript { + id: worker + source: "../lib/Worker.js" + onMessage: { + console.log(JSON.stringify(messageObject)) + } + } - WorkerScript { - id: worker - source: "../lib/Worker.js" - onMessage: { - console.log(JSON.stringify(messageObject)) - } - } + ProfileHeader { + id: header + visible: false + } + SilicaListView { + id: conversationList + header: PageHeader { + title: qsTr("Conversation") + } + clip: true + anchors { + top: parent.top + bottom: panel.top + left: parent.left + right: parent.right + } + model: mdl + section { + property: 'section' + delegate: SectionHeader { + height: Theme.itemSizeExtraSmall + text: Format.formatDate(section, Formatter.DateMedium) + } + } + delegate: VisualContainer { + } + onCountChanged: { + if (mdl) + for (var i = 0; i < mdl.count; i++) { + if (mdl.get(i).status_id === toot_id) { + console.log(mdl.get(i).status_id) + positionViewAtIndex(i, ListView.Center) + } + } + } + } + Rectangle { + id: predictionList + visible: false + anchors.bottom: panel.top + anchors.left: parent.left + anchors.right: panel.right + height: suggestedModel.count > 6 ? Theme.itemSizeMedium * 6 : Theme.itemSizeMedium * suggestedModel.count + color: Theme.highlightDimmerColor - ProfileHeader { - id: header - visible: false - } - SilicaListView { - id: conversationList - header: PageHeader { - title: qsTr("Conversation") - } - clip: true; - anchors { - top: parent.top - bottom: panel.top - left: parent.left - right: parent.right - } - model: mdl - section { - property: 'section' - delegate: SectionHeader { - height: Theme.itemSizeExtraSmall - text: Format.formatDate(section, Formatter.DateMedium) - } - } - delegate: VisualContainer {} - onCountChanged: { - if (mdl) - for (var i = 0; i < mdl.count; i++){ - if (mdl.get(i).status_id === toot_id) { - console.log(mdl.get(i).status_id) - positionViewAtIndex(i, ListView.Center ) - } - } - } + SilicaListView { + anchors.fill: parent + model: suggestedModel + clip: true - } - Rectangle { - id: predictionList - visible: false; - anchors.bottom: panel.top - anchors.left: parent.left - anchors.right: panel.right - height: suggestedModel.count > 6 ? Theme.itemSizeMedium * 6 : Theme.itemSizeMedium * suggestedModel.count - color: Theme.highlightDimmerColor + delegate: ItemUser { + onClicked: { + var start = toot.cursorPosition + while (toot.text[start] !== "@" && start > 0) { + start-- + } + textOperations.text = toot.text + textOperations.cursorPosition = toot.cursorPosition + textOperations.moveCursorSelection(start - 1, TextInput.SelectWords) + toot.text = textOperations.text.substring(0, textOperations.selectionStart) + + ' @' + + model.account_acct + + ' ' + + textOperations.text.substring(textOperations.selectionEnd).trim() - SilicaListView { - anchors.fill: parent - model: suggestedModel - clip: true + toot.cursorPosition = toot.text.indexOf('@' + model.account_acct) + } + } + onCountChanged: { + positionViewAtIndex(suggestedModel.count - 1, ListView.End) + } + } + } - delegate: ItemUser { - onClicked: { - var start = toot.cursorPosition; - while(toot.text[start] !== "@" && start > 0){ - start--; - } - textOperations.text = toot.text - textOperations.cursorPosition = toot.cursorPosition - textOperations.moveCursorSelection(start-1,TextInput.SelectWords) - toot.text = textOperations.text.substring(0, textOperations.selectionStart) + ' @'+model.account_acct + ' ' + textOperations.text.substring(textOperations.selectionEnd).trim() + DockedPanel { + id: panel + open: true + onExpandedChanged: { + if (!expanded) { + show() + } + } - toot.cursorPosition = toot.text.indexOf('@'+model.account_acct) - } - } - onCountChanged: { - positionViewAtIndex(suggestedModel.count-1, ListView.End ) - } - } - } + width: parent.width + height: progressBar.height + toot.height + (mediaModel.count ? uploadedImages.height : 0) + + btnContentWarning.height + Theme.paddingMedium + + (warningContent.visible ? warningContent.height : 0) + dock: Dock.Bottom + Rectangle { + width: parent.width + height: progressBar.height + color: Theme.highlightBackgroundColor + opacity: 0.2 + anchors { + left: parent.left + right: parent.right + top: parent.top + } + } + Rectangle { + id: progressBar + width: toot.text.length ? panel.width * (toot.text.length / tootMaxChar) : 0 - DockedPanel { - id: panel - open: true - onExpandedChanged: { - if (!expanded) { - show() - } - } + height: Theme.itemSizeSmall * 0.05 + color: Theme.highlightBackgroundColor + opacity: 0.7 + anchors { + left: parent.left + top: parent.top + } + } - width: parent.width - height: progressBar.height + toot.height + (mediaModel.count ? uploadedImages.height : 0) + btnContentWarning.height + Theme.paddingMedium + (warningContent.visible ? warningContent.height : 0) - dock: Dock.Bottom - Rectangle { - width: parent.width - height: progressBar.height - color: Theme.highlightBackgroundColor - opacity: 0.2 - anchors { - left: parent.left - right: parent.right - top: parent.top - } - } - Rectangle { - id: progressBar - width: toot.text.length ? panel.width*(toot.text.length/tootMaxChar) : 0; + TextField { + id: warningContent + visible: false + height: visible ? implicitHeight : 0 + anchors { + top: parent.top + topMargin: Theme.paddingMedium + left: parent.left + right: parent.right + } + autoScrollEnabled: true + labelVisible: false + placeholderText: qsTr("Write your warning here") + placeholderColor: palette.highlightColor + color: palette.highlightColor + horizontalAlignment: Text.AlignLeft + EnterKey.onClicked: { + //tweet() + } + } + TextInput { + id: textOperations + visible: false + } - height: Theme.itemSizeSmall * 0.05 - color: Theme.highlightBackgroundColor - opacity: 0.7 - anchors { - left: parent.left - top: parent.top - } - } + TextArea { + id: toot + anchors { + top: warningContent.bottom + topMargin: Theme.paddingMedium + left: parent.left + right: parent.right + rightMargin: Theme.paddingMedium + } + autoScrollEnabled: true + labelVisible: false + //focus: true + text: description !== "" && (description.charAt(0) == '@' + || description.charAt( + 0) == '#') ? description + ' ' : '' + height: Math.max(270, Math.min(900, implicitHeight)) + //height: implicitHeight + horizontalAlignment: Text.AlignLeft + placeholderText: qsTr("What's on your mind?") + EnterKey.onClicked: { + //tweet() + } + onTextChanged: { + textOperations.text = toot.text + textOperations.cursorPosition = toot.cursorPosition + textOperations.selectWord() + textOperations.select( + textOperations.selectionStart ? textOperations.selectionStart - 1 : 0, + textOperations.selectionEnd) + //console.log(textOperations.text.substr(textOperations.selectionStart, textOperations.selectionEnd)) + console.log(toot.text.length) + suggestedUser = "" + if (textOperations.selectedText.charAt(0) === "@") { + suggestedUser = textOperations.selectedText.trim().substring(1) + } + } + } + IconButton { + id: btnSmileys + property string selection + onSelectionChanged: { + console.log(selection) + } - TextField { - id: warningContent - visible: false - height: visible ? implicitHeight : 0; - anchors { - top: parent.top - topMargin: Theme.paddingMedium - left: parent.left - right: parent.right - } - autoScrollEnabled: true - labelVisible: false - placeholderText: qsTr("Content warning!") - horizontalAlignment: Text.AlignLeft - EnterKey.onClicked: { - //tweet() - } - } - TextInput { - id: textOperations - visible: false - } - - TextArea { - id: toot - anchors { + anchors { top: warningContent.bottom - topMargin: Theme.paddingMedium - left: parent.left - right: parent.right - rightMargin: Theme.paddingMedium - } - autoScrollEnabled: true - labelVisible: false - //focus: true - text: description !== "" && (description.charAt(0) == '@' || description.charAt(0) == '#') ? description+' ' : '' - height: implicitHeight - horizontalAlignment: Text.AlignLeft - EnterKey.onClicked: { - //tweet() - } - onTextChanged: { - textOperations.text = toot.text - textOperations.cursorPosition = toot.cursorPosition - textOperations.selectWord() - textOperations.select(textOperations.selectionStart ? textOperations.selectionStart-1 : 0, textOperations.selectionEnd) - //console.log(textOperations.text.substr(textOperations.selectionStart, textOperations.selectionEnd)) - console.log(toot.text.length) - suggestedUser = "" - if (textOperations.selectedText.charAt(0) === "@") { - suggestedUser = textOperations.selectedText.trim().substring(1); - } - } - } - IconButton { - id: btnSmileys - property string selection - onSelectionChanged: { - console.log(selection) - } - - anchors { - bottom: bottom.top - right: parent.right - rightMargin: Theme.paddingSmall - } - icon.source: "image://theme/icon-s-mms?" + (pressed - ? Theme.highlightColor - : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) - onClicked: pageStack.push(firstWizardPage) - } - SilicaGridView { - id: uploadedImages - width: parent.width - anchors.bottom: parent.bottom + bottom: bottom.top + right: parent.right + rightMargin: Theme.paddingSmall + } + icon.source: "../../qml/images/emojiselect.svg" + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) + onClicked: pageStack.push(firstWizardPage) + } + SilicaGridView { + id: uploadedImages + width: parent.width + anchors.top: bottom.toot + anchors.bottom: parent.bottom height: mediaModel.count ? Theme.itemSizeSmall : 0 - model: mediaModel - cellWidth: uploadedImages.width / 4 + model: mediaModel + cellWidth: uploadedImages.width / 4 cellHeight: Theme.itemSizeSmall - delegate: BackgroundItem { - id: myDelegate - width: uploadedImages.cellWidth - height: uploadedImages.cellHeight - RemorseItem { id: remorse } - Image { - anchors.fill: parent - fillMode: Image.PreserveAspectCrop - source: model.preview_url - } + delegate: BackgroundItem { + id: myDelegate + width: uploadedImages.cellWidth + height: uploadedImages.cellHeight + RemorseItem { + id: remorse + } + Image { + anchors.fill: parent + fillMode: Image.PreserveAspectCrop + source: model.preview_url + } - onClicked: { - var idx = index - console.log(idx) - //mediaModel.remove(idx) - remorse.execute(myDelegate, qsTr("Delete"), function() { mediaModel.remove(idx) } ) - } - } - add: Transition { - NumberAnimation { property: "opacity"; from: 0; to: 1.0; duration: 800 } - } + onClicked: { + var idx = index + console.log(idx) + //mediaModel.remove(idx) + remorse.execute(myDelegate, qsTr("Delete"), function () { + mediaModel.remove(idx) + }) + } + } + add: Transition { + NumberAnimation { + property: "opacity" + from: 0 + to: 1.0 + duration: 800 + } + } - remove: Transition { - NumberAnimation { property: "opacity"; from: 1.0; to: 0; duration: 800 } - } - displaced: Transition { - NumberAnimation { properties: "x,y"; duration: 800; easing.type: Easing.InOutBack } - } - } - IconButton { + remove: Transition { + NumberAnimation { + property: "opacity" + from: 1.0 + to: 0 + duration: 800 + } + } + displaced: Transition { + NumberAnimation { + properties: "x,y" + duration: 800 + easing.type: Easing.InOutBack + } + } + } + IconButton { - id: btnContentWarning - anchors { - verticalCenter: privacy.verticalCenter - left: parent.left - leftMargin: Theme.paddingMedium - } - icon.source: "image://theme/icon-s-high-importance?" + (pressed - ? Theme.highlightColor - : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) - onClicked: warningContent.visible = !warningContent.visible - } - IconButton { - id: btnAddImage - enabled: mediaModel.count < 4 - anchors { - verticalCenter: privacy.verticalCenter - left: btnContentWarning.right - leftMargin: Theme.paddingSmall - } - icon.source: "image://theme/icon-s-attach?" + (pressed - ? Theme.highlightColor - : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) - onClicked: { - btnAddImage.enabled = false; - var once = true; - var imagePicker = pageStack.push("Sailfish.Pickers.ImagePickerPage", { "allowedOrientations" : Orientation.All }); - imagePicker.selectedContentChanged.connect(function () { - var imagePath = imagePicker.selectedContent; - console.log(imagePath) - imageUploader.setUploadUrl(Logic.conf.instance + "/api/v1/media") - imageUploader.setFile(imagePath); - imageUploader.setAuthorizationHeader(Logic.conf.api_user_token); - imageUploader.upload(); - }); - } - } - ImageUploader { - id: imageUploader + id: btnContentWarning + anchors { + verticalCenter: privacy.verticalCenter + left: parent.left + leftMargin: Theme.paddingMedium + } + icon.source: "image://theme/icon-s-warning?" + + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) + onClicked: warningContent.visible = !warningContent.visible + } + IconButton { + id: btnAddImage + enabled: mediaModel.count < 4 + anchors { + verticalCenter: privacy.verticalCenter + left: btnContentWarning.right + leftMargin: Theme.paddingSmall + } + icon.source: "image://theme/icon-s-attach?" + + (pressed ? Theme.highlightColor : (warningContent.visible ? Theme.secondaryHighlightColor : Theme.primaryColor)) + onClicked: { + btnAddImage.enabled = false + var once = true + var imagePicker = pageStack.push("Sailfish.Pickers.ImagePickerPage", {"allowedOrientations": Orientation.All}) + imagePicker.selectedContentChanged.connect(function () { + var imagePath = imagePicker.selectedContent + console.log(imagePath) + imageUploader.setUploadUrl(Logic.conf.instance + "/api/v1/media") + imageUploader.setFile(imagePath) + imageUploader.setAuthorizationHeader(Logic.conf.api_user_token) + imageUploader.upload() + }) + } + } + ImageUploader { + id: imageUploader - onProgressChanged: { - console.log("progress "+progress) - uploadProgress.width = parent.width*progress - } + onProgressChanged: { + console.log("progress " + progress) + uploadProgress.width = parent.width * progress + } - onSuccess: { - uploadProgress.width =0 - console.log(replyData); + onSuccess: { + uploadProgress.width = 0 + console.log(replyData) - mediaModel.append(JSON.parse(replyData)) + mediaModel.append(JSON.parse(replyData)) + } - - } - - onFailure: { - uploadProgress.width =0 - btnAddImage.enabled = true; - console.log(status) - console.log(statusText) - - } - - } - ComboBox { - id: privacy - anchors { + onFailure: { + uploadProgress.width = 0 + btnAddImage.enabled = true + console.log(status) + console.log(statusText) + } + } + ComboBox { + id: privacy + anchors { top: toot.bottom - topMargin: -Theme.paddingSmall*2 - left: btnAddImage.right - right: btnSend.left - } - menu: ContextMenu { - MenuItem { text: qsTr("public") } - MenuItem { text: qsTr("unlisted") } - MenuItem { text: qsTr("followers only") } - MenuItem { text: qsTr("direct") } - } - } - IconButton { - id: btnSend - icon.source: "image://theme/icon-m-enter?" + (pressed - ? Theme.highlightColor - : Theme.primaryColor) - anchors { + topMargin: -Theme.paddingSmall * 2 + left: btnAddImage.right + right: btnSend.left + } + menu: ContextMenu { + MenuItem { + text: qsTr("Public") + } + MenuItem { + text: qsTr("Unlisted") + } + MenuItem { + text: qsTr("Followers-only") + } + MenuItem { + text: qsTr("Direct") + } + } + } + + IconButton { + id: btnSend + icon.source: "image://theme/icon-m-send?" + + (pressed ? Theme.highlightColor : Theme.primaryColor) + anchors { top: toot.bottom - right: parent.right - rightMargin: Theme.paddingLarge - } - enabled: toot.text !== "" && toot.text.length < tootMaxChar - onClicked: { - var visibility = [ "public", "unlisted", "private", "direct"]; - var media_ids = []; - for(var k = 0; k < mediaModel.count; k++){ - console.log(mediaModel.get(k).id) - media_ids.push(mediaModel.get(k).id) - } + right: parent.right + rightMargin: Theme.paddingSmall + } + enabled: toot.text !== "" && toot.text.length < tootMaxChar && uploadProgress.width == 0 + onClicked: { + var visibility = ["public", "unlisted", "private", "direct"] + var media_ids = [] + for (var k = 0; k < mediaModel.count; k++) { + console.log(mediaModel.get(k).id) + media_ids.push(mediaModel.get(k).id) + } - var msg = { - 'action' : 'statuses', - 'method' : 'POST', - 'model' : mdl, - 'mode' : "append", - 'params' : { - "status": toot.text, - "visibility": visibility[privacy.currentIndex], - "media_ids": media_ids - }, - 'conf' : Logic.conf - }; - if (toot_id) - msg.params['in_reply_to_id'] = (toot_id)+"" + var msg = { + "action": 'statuses', + "method": 'POST', + "model": mdl, + "mode": "append", + "params": { + "status": toot.text, + "visibility": visibility[privacy.currentIndex], + "media_ids": media_ids + }, + "conf": Logic.conf + } + if (toot_id) + msg.params['in_reply_to_id'] = (toot_id) + "" - if (warningContent.visible && warningContent.text.length > 0){ - msg.params['sensitive'] = 1 - msg.params['spoiler_text'] = warningContent.text - } + if (warningContent.visible && warningContent.text.length > 0) { + msg.params['sensitive'] = 1 + msg.params['spoiler_text'] = warningContent.text + } - worker.sendMessage(msg); - warningContent.text = "" - toot.text = "" - mediaModel.clear() - } - } + worker.sendMessage(msg) + warningContent.text = "" + toot.text = "" + mediaModel.clear() + pageStack.pop() + } + } + Rectangle { + id: uploadProgress + color: Theme.highlightBackgroundColor + anchors.bottom: parent.bottom + anchors.left: parent.left + height: 3 + } + } + Component.onCompleted: { + toot.cursorPosition = toot.text.length + if (mdl.count > 0) { + var setIndex = 0 + switch (mdl.get(0).status_visibility) { + case "unlisted": + setIndex = 1 + break + case "private": + setIndex = 2 + break + case "direct": + privacy.enabled = false + setIndex = 3 + break + default: + privacy.enabled = true + setIndex = 0 + } + privacy.currentIndex = setIndex + } + console.log(JSON.stringify()) - Rectangle { - id: uploadProgress - color: Theme.highlightBackgroundColor - anchors.bottom: parent.bottom - anchors.left: parent.left - height: 3 - } - } - Component.onCompleted: { - toot.cursorPosition = toot.text.length - if (mdl.count > 0) { - var setIndex = 0; - switch (mdl.get(0).status_visibility){ - case "unlisted": - setIndex = 1; - break; - case "private": - setIndex = 2; - break; - case "direct": - privacy.enabled = false; - setIndex = 3; - break; - default: - privacy.enabled = true; - setIndex = 0; - } - privacy.currentIndex = setIndex; - } + worker.sendMessage({ + "action": 'statuses/' + mdl.get(0).status_id + '/context', + "method": 'GET', + "model": mdl, + "params": { }, + "conf": Logic.conf + }) + } + Component { + id: firstWizardPage - console.log(JSON.stringify()) + Dialog { + id: emoticonsDialog + canAccept: false //selector.currentIndex >= 0 - worker.sendMessage({ - 'action' : 'statuses/'+mdl.get(0).status_id+'/context', - 'method' : 'GET', - 'model' : mdl, - 'params' : { }, - 'conf' : Logic.conf - }); - } - Component { - id: firstWizardPage + //acceptDestination: conversationPage + onAcceptPendingChanged: { + if (acceptPending) { - Dialog { - id: emoticonsDialog - canAccept: false; //selector.currentIndex >= 0 - //acceptDestination: conversationPage + // Tell the destination page what the selected category is + // acceptDestinationInstance.category = selector.value + } + } - onAcceptPendingChanged: { - if (acceptPending) { - // Tell the destination page what the selected category is - // acceptDestinationInstance.category = selector.value - } - } + SilicaGridView { + id: gridView + anchors.fill: parent + cellWidth: gridView.width / 6 + cellHeight: cellWidth + header: PageHeader { + title: qsTr("Emojis") + description: qsTr("Tap to insert") + } + model: ListModel { + ListElement { section: "smileys"; glyph: "😁" } + ListElement { section: "smileys"; glyph: "😂" } + ListElement { section: "smileys"; glyph: "😃" } + ListElement { section: "smileys"; glyph: "😄" } + ListElement { section: "smileys"; glyph: "😅" } + ListElement { section: "smileys"; glyph: "😆" } + ListElement { section: "smileys"; glyph: "😉" } + ListElement { section: "smileys"; glyph: "😊" } + ListElement { section: "smileys"; glyph: "😋" } + ListElement { section: "smileys"; glyph: "😌" } + ListElement { section: "smileys"; glyph: "😍" } + ListElement { section: "smileys"; glyph: "😏" } + ListElement { section: "smileys"; glyph: "😒" } + ListElement { section: "smileys"; glyph: "😓" } + ListElement { section: "smileys"; glyph: "😔" } + ListElement { section: "smileys"; glyph: "😖" } + ListElement { section: "smileys"; glyph: "😘" } + ListElement { section: "smileys"; glyph: "😚" } + ListElement { section: "smileys"; glyph: "😜" } + ListElement { section: "smileys"; glyph: "😝" } + ListElement { section: "smileys"; glyph: "😞" } + ListElement { section: "smileys"; glyph: "😠" } + ListElement { section: "smileys"; glyph: "😡" } + ListElement { section: "smileys"; glyph: "😢" } + ListElement { section: "smileys"; glyph: "😣" } + ListElement { section: "smileys"; glyph: "😤" } + ListElement { section: "smileys"; glyph: "😥" } + ListElement { section: "smileys"; glyph: "😨" } + ListElement { section: "smileys"; glyph: "😩" } + ListElement { section: "smileys"; glyph: "😪" } + ListElement { section: "smileys"; glyph: "😫" } + ListElement { section: "smileys"; glyph: "😭" } + ListElement { section: "smileys"; glyph: "😰" } + ListElement { section: "smileys"; glyph: "😱" } + ListElement { section: "smileys"; glyph: "😲" } + ListElement { section: "smileys"; glyph: "😳" } + ListElement { section: "smileys"; glyph: "😵" } + ListElement { section: "smileys"; glyph: "😷" } + ListElement { section: "smileys"; glyph: "😸" } + ListElement { section: "smileys"; glyph: "😹" } + ListElement { section: "smileys"; glyph: "😺" } + ListElement { section: "smileys"; glyph: "😻" } + ListElement { section: "smileys"; glyph: "😼" } + ListElement { section: "smileys"; glyph: "😽" } + ListElement { section: "smileys"; glyph: "😾" } + ListElement { section: "smileys"; glyph: "😿" } + ListElement { section: "smileys"; glyph: "🙀" } + ListElement { section: "smileys"; glyph: "🙅" } + ListElement { section: "smileys"; glyph: "🙆" } + ListElement { section: "smileys"; glyph: "🙇" } + ListElement { section: "smileys"; glyph: "🙈" } + ListElement { section: "smileys"; glyph: "🙉" } + ListElement { section: "smileys"; glyph: "🙊" } + ListElement { section: "smileys"; glyph: "🙋" } + ListElement { section: "smileys"; glyph: "🙌" } + ListElement { section: "smileys"; glyph: "🙍" } + ListElement { section: "smileys"; glyph: "🙎" } + ListElement { section: "smileys"; glyph: "🙏" } - SilicaGridView { - id: gridView - anchors.fill: parent - cellWidth: gridView.width / 6 - cellHeight: cellWidth - header: PageHeader { - title: qsTr("Emojis") - description: qsTr("Tap to insert") - } - model: ListModel { - ListElement { section: "smileys"; glyph: "😁" } - ListElement { section: "smileys"; glyph: "😂" } - ListElement { section: "smileys"; glyph: "😃" } - ListElement { section: "smileys"; glyph: "😄" } - ListElement { section: "smileys"; glyph: "😅" } - ListElement { section: "smileys"; glyph: "😆" } - ListElement { section: "smileys"; glyph: "😉" } - ListElement { section: "smileys"; glyph: "😊" } - ListElement { section: "smileys"; glyph: "😋" } - ListElement { section: "smileys"; glyph: "😌" } - ListElement { section: "smileys"; glyph: "😍" } - ListElement { section: "smileys"; glyph: "😏" } - ListElement { section: "smileys"; glyph: "😒" } - ListElement { section: "smileys"; glyph: "😓" } - ListElement { section: "smileys"; glyph: "😔" } - ListElement { section: "smileys"; glyph: "😖" } - ListElement { section: "smileys"; glyph: "😘" } - ListElement { section: "smileys"; glyph: "😚" } - ListElement { section: "smileys"; glyph: "😜" } - ListElement { section: "smileys"; glyph: "😝" } - ListElement { section: "smileys"; glyph: "😞" } - ListElement { section: "smileys"; glyph: "😠" } - ListElement { section: "smileys"; glyph: "😡" } - ListElement { section: "smileys"; glyph: "😢" } - ListElement { section: "smileys"; glyph: "😣" } - ListElement { section: "smileys"; glyph: "😤" } - ListElement { section: "smileys"; glyph: "😥" } - ListElement { section: "smileys"; glyph: "😨" } - ListElement { section: "smileys"; glyph: "😩" } - ListElement { section: "smileys"; glyph: "😪" } - ListElement { section: "smileys"; glyph: "😫" } - ListElement { section: "smileys"; glyph: "😭" } - ListElement { section: "smileys"; glyph: "😰" } - ListElement { section: "smileys"; glyph: "😱" } - ListElement { section: "smileys"; glyph: "😲" } - ListElement { section: "smileys"; glyph: "😳" } - ListElement { section: "smileys"; glyph: "😵" } - ListElement { section: "smileys"; glyph: "😷" } - ListElement { section: "smileys"; glyph: "😸" } - ListElement { section: "smileys"; glyph: "😹" } - ListElement { section: "smileys"; glyph: "😺" } - ListElement { section: "smileys"; glyph: "😻" } - ListElement { section: "smileys"; glyph: "😼" } - ListElement { section: "smileys"; glyph: "😽" } - ListElement { section: "smileys"; glyph: "😾" } - ListElement { section: "smileys"; glyph: "😿" } - ListElement { section: "smileys"; glyph: "🙀" } - ListElement { section: "smileys"; glyph: "🙅" } - ListElement { section: "smileys"; glyph: "🙆" } - ListElement { section: "smileys"; glyph: "🙇" } - ListElement { section: "smileys"; glyph: "🙈" } - ListElement { section: "smileys"; glyph: "🙉" } - ListElement { section: "smileys"; glyph: "🙊" } - ListElement { section: "smileys"; glyph: "🙋" } - ListElement { section: "smileys"; glyph: "🙌" } - ListElement { section: "smileys"; glyph: "🙍" } - ListElement { section: "smileys"; glyph: "🙎" } - ListElement { section: "smileys"; glyph: "🙏" } + ListElement { section: "Transport and map"; glyph: "🚀" } + ListElement { section: "Transport and map"; glyph: "🚃" } + ListElement { section: "Transport and map"; glyph: "🚀" } + ListElement { section: "Transport and map"; glyph: "🚄" } + ListElement { section: "Transport and map"; glyph: "🚅" } + ListElement { section: "Transport and map"; glyph: "🚇" } + ListElement { section: "Transport and map"; glyph: "🚉" } + ListElement { section: "Transport and map"; glyph: "🚌" } + ListElement { section: "Transport and map"; glyph: "🚏" } + ListElement { section: "Transport and map"; glyph: "🚑" } + ListElement { section: "Transport and map"; glyph: "🚒" } + ListElement { section: "Transport and map"; glyph: "🚓" } + ListElement { section: "Transport and map"; glyph: "🚕" } + ListElement { section: "Transport and map"; glyph: "🚗" } + ListElement { section: "Transport and map"; glyph: "🚙" } + ListElement { section: "Transport and map"; glyph: "🚚" } + ListElement { section: "Transport and map"; glyph: "🚢" } + ListElement { section: "Transport and map"; glyph: "🚨" } + ListElement { section: "Transport and map"; glyph: "🚩" } + ListElement { section: "Transport and map"; glyph: "🚪" } + ListElement { section: "Transport and map"; glyph: "🚫" } + ListElement { section: "Transport and map"; glyph: "🚬" } + ListElement { section: "Transport and map"; glyph: "🚭" } + ListElement { section: "Transport and map"; glyph: "🚲" } + ListElement { section: "Transport and map"; glyph: "🚶" } + ListElement { section: "Transport and map"; glyph: "🚹" } + ListElement { section: "Transport and map"; glyph: "🚺" } + ListElement { section: "Transport and map"; glyph: "🚻" } + ListElement { section: "Transport and map"; glyph: "🚼" } + ListElement { section: "Transport and map"; glyph: "🚽" } + ListElement { section: "Transport and map"; glyph: "🚾" } + ListElement { section: "Transport and map"; glyph: "🛀" } - - ListElement { section: "Transport and map"; glyph: "🚀" } - ListElement { section: "Transport and map"; glyph: "🚃" } - ListElement { section: "Transport and map"; glyph: "🚀" } - ListElement { section: "Transport and map"; glyph: "🚄" } - ListElement { section: "Transport and map"; glyph: "🚅" } - ListElement { section: "Transport and map"; glyph: "🚇" } - ListElement { section: "Transport and map"; glyph: "🚉" } - ListElement { section: "Transport and map"; glyph: "🚌" } - ListElement { section: "Transport and map"; glyph: "🚏" } - ListElement { section: "Transport and map"; glyph: "🚑" } - ListElement { section: "Transport and map"; glyph: "🚒" } - ListElement { section: "Transport and map"; glyph: "🚓" } - ListElement { section: "Transport and map"; glyph: "🚕" } - ListElement { section: "Transport and map"; glyph: "🚗" } - ListElement { section: "Transport and map"; glyph: "🚙" } - ListElement { section: "Transport and map"; glyph: "🚚" } - ListElement { section: "Transport and map"; glyph: "🚢" } - ListElement { section: "Transport and map"; glyph: "🚨" } - ListElement { section: "Transport and map"; glyph: "🚩" } - ListElement { section: "Transport and map"; glyph: "🚪" } - ListElement { section: "Transport and map"; glyph: "🚫" } - ListElement { section: "Transport and map"; glyph: "🚬" } - ListElement { section: "Transport and map"; glyph: "🚭" } - ListElement { section: "Transport and map"; glyph: "🚲" } - ListElement { section: "Transport and map"; glyph: "🚶" } - ListElement { section: "Transport and map"; glyph: "🚹" } - ListElement { section: "Transport and map"; glyph: "🚺" } - ListElement { section: "Transport and map"; glyph: "🚻" } - ListElement { section: "Transport and map"; glyph: "🚼" } - ListElement { section: "Transport and map"; glyph: "🚽" } - ListElement { section: "Transport and map"; glyph: "🚾" } - ListElement { section: "Transport and map"; glyph: "🛀" } - - ListElement { section: "Horoscope Signs"; glyph: "♈" } - ListElement { section: "Horoscope Signs"; glyph: "♉" } - ListElement { section: "Horoscope Signs"; glyph: "♊" } - ListElement { section: "Horoscope Signs"; glyph: "♋" } - ListElement { section: "Horoscope Signs"; glyph: "♌" } - ListElement { section: "Horoscope Signs"; glyph: "♍" } - ListElement { section: "Horoscope Signs"; glyph: "♎" } - ListElement { section: "Horoscope Signs"; glyph: "♏" } - ListElement { section: "Horoscope Signs"; glyph: "♐" } - ListElement { section: "Horoscope Signs"; glyph: "♑" } - ListElement { section: "Horoscope Signs"; glyph: "♒" } - ListElement { section: "Horoscope Signs"; glyph: "♓" } - - - - - - } - delegate: BackgroundItem { - width: gridView.cellWidth - height: gridView.cellHeight - Label { - anchors.centerIn: parent - color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) - font.pixelSize: Theme.fontSizeLarge - text: glyph - } - onClicked: { - var cursorPosition = toot.cursorPosition - toot.text = toot.text.substring(0, cursorPosition) + model.glyph + toot.text.substring(cursorPosition) - toot.cursorPosition = cursorPosition+model.glyph.length - emoticonsDialog.canAccept = true; - emoticonsDialog.accept() - - } - } - } - } - } + ListElement { section: "Horoscope Signs"; glyph: "♈" } + ListElement { section: "Horoscope Signs"; glyph: "♉" } + ListElement { section: "Horoscope Signs"; glyph: "♊" } + ListElement { section: "Horoscope Signs"; glyph: "♋" } + ListElement { section: "Horoscope Signs"; glyph: "♌" } + ListElement { section: "Horoscope Signs"; glyph: "♍" } + ListElement { section: "Horoscope Signs"; glyph: "♎" } + ListElement { section: "Horoscope Signs"; glyph: "♏" } + ListElement { section: "Horoscope Signs"; glyph: "♐" } + ListElement { section: "Horoscope Signs"; glyph: "♑" } + ListElement { section: "Horoscope Signs"; glyph: "♒" } + ListElement { section: "Horoscope Signs"; glyph: "♓" } + } + delegate: BackgroundItem { + width: gridView.cellWidth + height: gridView.cellHeight + Label { + anchors.centerIn: parent + color: (highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor) + font.pixelSize: Theme.fontSizeLarge + text: glyph + } + onClicked: { + var cursorPosition = toot.cursorPosition + toot.text = toot.text.substring( + 0, cursorPosition) + model.glyph + toot.text.substring( + cursorPosition) + toot.cursorPosition = cursorPosition + model.glyph.length + emoticonsDialog.canAccept = true + emoticonsDialog.accept() + } + } + } + } + } } diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 3745cc7..e676870 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -69,10 +69,11 @@ Page { onOpenDrawer: infoPanel.open = setDrawer } MyList{ - id: tlPublic; - title: qsTr("Federated") - type: "timelines/public" - mdl: Logic.modelTLpublic + id: tlNotifications; + title: qsTr("Notifications") + type: "notifications" + notifier: true + mdl: Logic.modelTLnotifications width: parent.itemWidth height: parent.itemHeight onOpenDrawer: infoPanel.open = setDrawer @@ -88,11 +89,10 @@ Page { onOpenDrawer: infoPanel.open = setDrawer } MyList{ - id: tlNotifications; - title: qsTr("Notifications") - type: "notifications" - notifier: true - mdl: Logic.modelTLnotifications + id: tlPublic; + title: qsTr("Federated") + type: "timelines/public" + mdl: Logic.modelTLpublic width: parent.itemWidth height: parent.itemHeight onOpenDrawer: infoPanel.open = setDrawer @@ -185,7 +185,7 @@ Page { delegate: ItemUser { onClicked: { pageStack.push(Qt.resolvedUrl("Profile.qml"), { - "displayname": model.account_username, + "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, "profileImage": model.account_avatar @@ -260,8 +260,13 @@ Page { slideshow.positionViewAtIndex(4, ListView.SnapToItem) navigation.navigateTo('search') + } else if (test.length === 4 && test[3][0] === "@" ) { + tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) + slideshow.positionViewAtIndex(4, ListView.SnapToItem) + navigation.navigateTo('search') + } else { - pageStack.push(Qt.resolvedUrl("Browser.qml"), {"href" : href}) + Qt.openUrlExternally(href); } } Component.onCompleted: { diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index c432b04..c26c7ed 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -6,7 +6,7 @@ import QtGraphicalEffects 1.0 Page { property ListModel tweets; - property string displayname : ""; + property string display_name : ""; property string username : ""; property string profileImage : ""; property int user_id; @@ -16,8 +16,9 @@ Page { property int favourites_count; property int reblogs_count; property int count_moments; - property string profile_background : ""; + property string profile_background: ""; property string note: ""; + property string url: ""; property bool locked : false; property date created_at; @@ -39,7 +40,7 @@ Page { followers_count = messageObject.data.followers_count following_count = messageObject.data.following_count username = messageObject.data.acct - displayname = messageObject.data.display_name + display_name = messageObject.data.display_name profileImage = messageObject.data.avatar_static var msg = { @@ -68,9 +69,10 @@ Page { following_count = messageObject.data break; case 'acct': - //username = messageObject.data + // line below was commented out, reason unknown + // username = messageObject.data break; - case 'locked': + case 'locked':m locked = messageObject.data break; case 'created_at': @@ -82,6 +84,9 @@ Page { case 'note': note = messageObject.data break; + case 'url': + url = messageObject.data + break; case 'following': following = messageObject.data followers_count = followers_count + (following ? 1 : - 1) @@ -135,7 +140,7 @@ Page { id: list header: ProfileHeader { id: header - title: displayname + title: display_name description: '@'+username image: profileImage } @@ -238,10 +243,65 @@ Page { } } - /*ExpandingSection { - title: "Tweets" + ExpandingSection { + title: qsTr("Bio") + content.sourceComponent: Column { + spacing: Theme.paddingMedium + anchors.bottomMargin: Theme.paddingLarge + Text { + x: Theme.horizontalPageMargin + width: parent.width - ( 2 * Theme.horizontalPageMargin ) + id: txtnote + text: note + font.pixelSize: Theme.fontSizeExtraSmall + color: Theme.secondaryColor + linkColor: Theme.secondaryHighlightColor + wrapMode: Text.Wrap + anchors { + horizontalCenter: parent.horizontalCenter + } + onLinkActivated: { + var test = link.split("/") + console.log(link) + console.log(JSON.stringify(test)) + console.log(JSON.stringify(test.length)) - }*/ + if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { + pageStack.pop(pageStack.find(function(page) { + var check = page.isFirstPage === true; + if (check) + page.onLinkActivated(link) + return check; + })); + send(link) + + } else if (test.length === 4 && test[3][0] === "@" ) { + tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) + slideshow.positionViewAtIndex(4, ListView.SnapToItem) + navigation.navigateTo('search') + + } else { + Qt.openUrlExternally(link); + } + } + + } + Column { + spacing: Theme.paddingMedium + anchors.horizontalCenter: parent.horizontalCenter + Button { + id: btnUrl + text: qsTr("Open Profile in Browser") + onClicked: { + Qt.openUrlExternally(url); + } + } + } + Label { + text: " " + } + } + } } diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index 0dbc847..637cf94 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -102,32 +102,38 @@ Page { } ListElement { name: "Miodrag Nikolić" - desc: "visual identity" + desc: qsTr("Visual identity") mastodon: "" mail: "micotakis@gmail.com" } + ListElement { + name: "molan" + desc: qsTr("Development and maintenence") + mastodon: "" + mail: "mol_an@sunrise.ch" + } ListElement { name: "Quentin PAGÈS / Quenti ♏" - desc: "Occitan & French translation" + desc: qsTr("Occitan & French translation") mastodon: "Quenti@framapiaf.org" mail: "" } ListElement { name: "André Koot" - desc: "Dutch translation" + desc: qsTr("Dutch translation") mastodon: "meneer@mastodon.social" mail: "https://twitter.com/meneer" } ListElement { - name: "Carlos Gonzalez / Caballlero" - desc: "Español translation" + name: "CarmenFdez" + desc: qsTr("Spanish translation") mastodon: "" - mail: "carlosgonz@protonmail.com" + mail: "" } ListElement { name: "Mohamed-Touhami MAHDI" - desc: "Added README file" + desc: qsTr("Added README file") mastodon: "dragnucs@touha.me" mail: "touhami@touha.me" } diff --git a/qml/pages/components/ItemUser.qml b/qml/pages/components/ItemUser.qml index ffebb63..809c97e 100644 --- a/qml/pages/components/ItemUser.qml +++ b/qml/pages/components/ItemUser.qml @@ -33,7 +33,7 @@ BackgroundItem { MouseArea { anchors.fill: parent onClicked: pageStack.push(Qt.resolvedUrl("./../Profile.qml"), { - "displayname": model.account_username, + "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, "profileImage": model.account_avatar @@ -60,7 +60,7 @@ BackgroundItem { } } onClicked: openUser({ - "displayname": model.account_username, + "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, "profileImage": model.account_avatar diff --git a/qml/pages/components/Navigation.qml b/qml/pages/components/Navigation.qml index d2e3c35..30e5e81 100644 --- a/qml/pages/components/Navigation.qml +++ b/qml/pages/components/Navigation.qml @@ -15,38 +15,33 @@ SilicaGridView { id: listModel ListElement { icon: "image://theme/icon-m-home" - //icon: "../../images/home.svg" slug: "home" name: "Home" active: true unread: false } ListElement { - //icon: "image://theme/icon-m-region" - icon: "../../images/federated.svg" - slug: "federated" - name: "Federated" + icon: "image://theme/icon-m-alarm" + slug: "notifications" + name: "Notifications" active: false - unread: false } ListElement { - //icon: "image://theme/icon-m-sailfish" - icon: "../../images/local.svg" + icon: "image://theme/icon-m-whereami" slug: "local" name: "Local" active: false unread: false } ListElement { - icon: "image://theme/icon-m-alarm" - //icon: "../../images/notification.svg" - slug: "notifications" - name: "Notifications" + icon: "image://theme/icon-m-website" + slug: "federated" + name: "Federated" active: false + unread: false } ListElement { icon: "image://theme/icon-m-search" - //icon: "../../images/search.svg" slug: "search" name: "Search" active: false diff --git a/qml/pages/components/ProfileHeader.qml b/qml/pages/components/ProfileHeader.qml index e557bcb..8dd369c 100644 --- a/qml/pages/components/ProfileHeader.qml +++ b/qml/pages/components/ProfileHeader.qml @@ -19,7 +19,7 @@ Item { }*/ Rectangle { anchors.fill: parent - opacity: 0.1 + opacity: 0.2 gradient: Gradient { GradientStop { position: 0.0; color: Theme.highlightBackgroundColor } GradientStop { position: 1.0; color: Theme.highlightBackgroundColor } @@ -51,7 +51,7 @@ Item { id: ttl text: title height: contentHeight - color: Theme.highlightColor + color: Theme.primaryColor font.pixelSize: Theme.fontSizeLarge font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight @@ -61,7 +61,7 @@ Item { Label { height: description === "" ? 0 : contentHeight text: description - color: Theme.secondaryHighlightColor + color: Theme.primaryColor font.pixelSize: Theme.fontSizeSmall font.family: Theme.fontFamilyHeading horizontalAlignment: Text.AlignRight diff --git a/qml/pages/components/Toot.qml b/qml/pages/components/Toot.qml index fb9b9ab..7809e7a 100644 --- a/qml/pages/components/Toot.qml +++ b/qml/pages/components/Toot.qml @@ -63,7 +63,7 @@ BackgroundItem { anchors.fill: parent onClicked: { pageStack.push(Qt.resolvedUrl("../Profile.qml"), { - "displayname": account_display_name, + "display_name": account_display_name, "username": account_username, "profileImage": account_avatar }) @@ -142,7 +142,7 @@ BackgroundItem { right: parent.right top: lblScreenName.bottom topMargin: Theme.paddingSmall - rightMargin: Theme.paddingLarge + rightMargin: Theme.paddingLarge } height: content.length ? paintedHeight : 0 onLinkActivated: { @@ -164,7 +164,7 @@ BackgroundItem { send(link) } else { - pageStack.push(Qt.resolvedUrl("../Browser.qml"), {"href" : link}) + Qt.openUrlExternally(link); } diff --git a/qml/pages/components/VisualContainer.qml b/qml/pages/components/VisualContainer.qml index 9f649d9..2d42d6c 100644 --- a/qml/pages/components/VisualContainer.qml +++ b/qml/pages/components/VisualContainer.qml @@ -55,7 +55,7 @@ BackgroundItem { anchors.fill: parent onClicked: { pageStack.push(Qt.resolvedUrl("../Profile.qml"), { - "displayname": model.account_username, + "display_name": model.account_display_name, "username": model.account_acct, "user_id": model.account_id, "profileImage": model.account_avatar @@ -134,13 +134,12 @@ BackgroundItem { })); send(link) } else if (test.length === 4 && test[3][0] === "@" ) { - pageStack.push(Qt.resolvedUrl("../Profile.qml"), { - "name": "", - "username": test[3].substring(1)+"@"+test[2], - "profileImage": "" - }) + tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) + slideshow.positionViewAtIndex(4, ListView.SnapToItem) + navigation.navigateTo('search') + } else { - pageStack.push(Qt.resolvedUrl("../Browser.qml"), {"href" : link}) + Qt.openUrlExternally(link); } } text: content.replace(new RegExp(" 1.0.4-0 -- Login bugfix merge request -- Updated translations +* Thu Apr 16 2020 Dusko Angirevic 1.0.4-1 +- Merge with molan code + +* Tue Feb 04 2020 molan 1.0.3-8 +- Fix for broken translations +- Updated Spanish translation + +* Mon Feb 03 2020 molan 1.0.3-7 +- Updated translations for new language strings + +* Thu Jan 30 2020 molan 1.0.3-6 +- Workaround for opening user profiles in toots +- Show profile descriptions (Bio) with option to open them in Browser +- Updated and improved UI for Conversation page +- Indication for sending toot (move back to previous page) +- New arrangement of main pages (like used in Mastodon websites and other apps) +- Small UI and text/label changes + +* Thu Jan 16 2020 molan 1.0.3-5 [fork of Tooter 1.0.3] +- Fix for broken profile pages when clicking on usernames in toots +- Fixed navigation icons for inverted ambiences +- Updated Chinese translation (thanks to dashinfantry) + +* Wed Jan 15 2020 molan 1.0.3-4 [fork of Tooter 1.0.3] +- Website links in toots now open directly in browser since the web scraper service which was used before is discontinued +- Profile page now shows full display name in title instead of user name +- Changed send, content warning and add emoji icon in Conversation page for clarification +- Small update to Chinese translation (thanks to dashinfantry) +- Completed German and French translations + +* Mon Jan 06 2020 molan 1.0.3-3 [fork of Tooter 1.0.3] +- Update and rename harbour-tooter-zh.ts to harbour-tooter-zh_CN.ts (thanks to dashinfantry) + +* Sat Dec 28 2019 molan 1.0.3-1 [fork of Tooter 1.0.3] +- Fixed broken Mastodon login (app built with Sailfish SDK 2.4) +- Fixed crash on certain notifications * Sun Jan 27 2019 Dusko Angirevic 1.0.3-0 - Remorse popup added for account removal diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index 3e9ea00..4c576ba 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -14,7 +14,7 @@ Name: harbour-tooter %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter Version: 1.0.4 -Release: 0 +Release: 1 Group: Qt/Qt License: LICENSE URL: http://example.org/ diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index e0531cf..093166c 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,7 +1,7 @@ Name: harbour-tooter Summary: Tooter Version: 1.0.4 -Release: 0 +Release: 1 # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Qt/Qt diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index ce57760..e6f310d 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -20,51 +20,12 @@ hat gesagt - - Browser - - Open in Browser - Öffne in Browser - - - Web mode - Web-Modus - - - Reading mode - Lese-Modus - - - Copy URL - Kopiere URL - - Conversation Conversation Konversation - - Content warning! - Inhaltswarnung! - - - public - öffentlich - - - unlisted - nicht aufgeführt - - - followers only - nur Follower - - - direct - direkt - Delete Löschen @@ -77,6 +38,30 @@ Tap to insert Tippen um einzufügen + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Anhänger + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX Design und Implementierung + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index cfb00c7..c3f464a 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -20,51 +20,12 @@ είπε - - Browser - - Open in Browser - Άνοιγμα στον φυλλομετρητή - - - Web mode - Λειτουργία ιστού - - - Reading mode - Λειτουργία ανάγνωσης - - - Copy URL - Αντιγραφή διεύθυνσης URL - - Conversation Conversation Συνομιλία - - Content warning! - Προειδοποίηση περιεχομένου! - - - public - δημόσιο - - - unlisted - μη καταχωρημένο - - - followers only - μόνο αυτοί που σας ακολουθούν - - - direct - απευθείας - Delete Διαγραφή @@ -77,6 +38,30 @@ Tap to insert Κτυπήστε για εισαγωγή + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Σας ακολουθούν + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX σχεδιασμός και ανάπτυξη + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index acbe287..7f6acfd 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -20,51 +20,12 @@ dijo - - Browser - - Open in Browser - Abrir en navegador - - - Web mode - Modo Web - - - Reading mode - Modo lectura - - - Copy URL - Copiar URL - - Conversation Conversation Conversación - - Content warning! - Advertencia de contenido - - - public - público - - - unlisted - sin federar - - - followers only - sólo seguidores - - - direct - directo - Delete Borrar @@ -77,6 +38,30 @@ Tap to insert Toca para insertar + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Seguidores + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development Diseño UI/UX y desarrollo + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index 8a9fe60..daf06a7 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -20,51 +20,12 @@ - - Browser - - Open in Browser - - - - Web mode - - - - Reading mode - - - - Copy URL - - - Conversation Conversation - - Content warning! - - - - public - - - - unlisted - - - - followers only - - - - direct - - Delete @@ -77,6 +38,30 @@ Tap to insert + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 3c7ddec..d41d682 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -20,51 +20,12 @@ a dit - - Browser - - Open in Browser - Ouvrir dans le navigateur - - - Web mode - Vue internet - - - Reading mode - Mode lecture - - - Copy URL - Copier l'URL - - Conversation Conversation Conversation - - Content warning! - Contenu sensible ! - - - public - public - - - unlisted - non listé - - - followers only - abonnés seulement - - - direct - direct - Delete Supprimer @@ -77,6 +38,30 @@ Tap to insert Appuyez pour insérer + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Abonnés + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development design et développement de l'interface + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 2779c3c..ef0f5d3 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -20,51 +20,12 @@ zei - - Browser - - Open in Browser - Openen in browser - - - Web mode - Webmodus - - - Reading mode - Leesmodus - - - Copy URL - Kopieer URL - - Conversation Conversation Gesprek - - Content warning! - Gevoelige inhoud! - - - public - openbaar - - - unlisted - niet op lijst - - - followers only - alleen volgers - - - direct - direct - Delete Verwijderen @@ -77,6 +38,30 @@ Tap to insert Tikken om in te voegen + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Volgers + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX ontwerp en ontwikkeling + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 4772b6d..878cbfc 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -20,51 +20,12 @@ zei - - Browser - - Open in Browser - Openen in browser - - - Web mode - Webmodus - - - Reading mode - Leesmodus - - - Copy URL - URL kopiëren - - Conversation Conversation Gesprek - - Content warning! - Gevoeligen inhoud! - - - public - openbaar - - - unlisted - niet op lijst - - - followers only - alleen volgers - - - direct - direct - Delete Verwijderen @@ -77,6 +38,30 @@ Tap to insert Tikt voor in te voegen + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Volgers + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX-ontwerp en -ontwikkeling + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 9e310a2..2b226a0 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -20,51 +20,12 @@ a dich - - Browser - - Open in Browser - Dobrir dins lo navigator - - - Web mode - Mòde Web - - - Reading mode - Mòde lectura - - - Copy URL - Copiar l'URL - - Conversation Conversation Discutida - - Content warning! - Contengut sensible ! - - - public - public - - - unlisted - pas listat - - - followers only - seguidors solament - - - direct - dirècte - Delete Escafar @@ -77,6 +38,30 @@ Tap to insert Tustejar per inserir + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Seguidors + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX design e desvlopament + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index b2f84d9..6efba16 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -20,51 +20,12 @@ - - Browser - - Open in Browser - - - - Web mode - - - - Reading mode - - - - Copy URL - - - Conversation Conversation - - Content warning! - - - - public - - - - unlisted - - - - followers only - - - - direct - - Delete @@ -77,6 +38,30 @@ Tap to insert + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index a49da69..21152ef 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -20,51 +20,12 @@ сказал - - Browser - - Open in Browser - Открыть в браузере - - - Web mode - Веб-режим - - - Reading mode - Режим чтения - - - Copy URL - Копировать URL - - Conversation Conversation Беседа - - Content warning! - Предупреждение о содержании! - - - public - публика - - - unlisted - не указан - - - followers only - только последователи - - - direct - непосредственный - Delete Удалить @@ -77,6 +38,30 @@ Tap to insert Нажмите, чтобы вставить + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Читают + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development Дизайн и разработка UI / UX + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 694c51b..f4006bb 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -20,51 +20,12 @@ каже - - Browser - - Open in Browser - Отвори у прегледнику веба - - - Web mode - Прегледник веба - - - Reading mode - Мод за читање - - - Copy URL - Kopiraj link - - Conversation Conversation Разговор - - Content warning! - Упозорење на садржај - - - public - јавно - - - unlisted - не приказано - - - followers only - само за пратиоце - - - direct - директна порука - Delete Обриши @@ -77,6 +38,30 @@ Tap to insert Тапни за убацивање + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Пратиоци + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development интерфејс дизајн и развој + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index 35bc745..e91a9cf 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -20,51 +20,12 @@ sade - - Browser - - Open in Browser - Öppna i webbläsare - - - Web mode - Webbläge - - - Reading mode - Läsläge - - - Copy URL - Kopiera URL - - Conversation Conversation Konversation - - Content warning! - Innehållsvarning! - - - public - publik - - - unlisted - olistad - - - followers only - endast följare - - - direct - direkt - Delete Radera @@ -77,6 +38,30 @@ Tap to insert Tryck för att infoga + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Följare + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development UI/UX design och utveckling + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot diff --git a/translations/harbour-tooter-zh.ts b/translations/harbour-tooter-zh_CN.ts similarity index 69% rename from translations/harbour-tooter-zh.ts rename to translations/harbour-tooter-zh_CN.ts index 62ac87d..8e8d00f 100644 --- a/translations/harbour-tooter-zh.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -1,6 +1,6 @@ - + API @@ -13,30 +13,11 @@ boosted - 推出的 + 推起的 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? + 有何想法? @@ -89,7 +74,7 @@ ImageUploader The file %1 does not exists - 文件%1 不存在 + 文件 %1 不存在 @@ -100,18 +85,18 @@ 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 @@ -150,7 +135,7 @@ MiniStatus boosted - 推出的 + 推起的 favourited @@ -177,18 +162,18 @@ please wait... - 请等候...... + 稍等片刻...... Profile Unfollow - 未关注 + 取消关注 Follow request sent! - 关注请求已寄出 + 已寄出关注请求！ Following @@ -230,6 +215,14 @@ Followers 关注者 + + Bio + 简介 + + + Open Profile in Browser + 在浏览器打开个人简介 + Settings @@ -239,50 +232,74 @@ 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 以帮助翻译成你使用的语言 + 如果你想保护你的数据连接，请禁用此选项 Credits - 信用 + 信誉 UI/UX design and development - UI/UX 设计和开发 + UI/UX设计及开发 + + + Visual identity + 视觉识别 + + + Occitan & French translation + 奥克西坦语及法语翻译 + + + Dutch translation + 尼德兰语翻译 + + + Spanish translation + 西班牙语翻译 + + + Added README file + 添加 README 文件 + + + Load images in toots + + + + Translate + + + + Use Transifex to help with app translation to your language + + + + Development and maintenence + Toot boosted - 推出的 + 推起的 favourited @@ -297,19 +314,19 @@ VisualContainer Unboost - 取消推出 + 取消推起 Boost - 推出 + 推起 Unfavorite - 取消收藏 + 取消关注 Favorite - 收藏 + 关注 diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index c580d4b..03bddc9 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -20,51 +20,12 @@ said - - Browser - - Open in Browser - Open in Browser - - - Web mode - Web mode - - - Reading mode - Reading mode - - - Copy URL - Copy URL - - Conversation Conversation Conversation - - Content warning! - Content warning! - - - public - public - - - unlisted - unlisted - - - followers only - followers only - - - direct - direct - Delete Delete @@ -77,6 +38,30 @@ Tap to insert Tap to insert + + Write your warning here + + + + What's on your mind? + + + + Public + + + + Unlisted + + + + Followers-only + + + + Direct + + ImageFullScreen @@ -230,6 +215,14 @@ Followers Followers + + Bio + + + + Open Profile in Browser + + Settings @@ -277,6 +270,30 @@ UI/UX design and development + + Visual identity + + + + Occitan & French translation + + + + Dutch translation + + + + Spanish translation + + + + Added README file + + + + Development and maintenence + + Toot From 220deae6d5360e75ff8d5f72ee382f55b0978245 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:53:48 +0200 Subject: [PATCH 05/56] Merge branch 'master' into crash-fix --- qml/lib/Worker.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index bbd6a6b..15c13fd 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -150,8 +150,8 @@ function parseNotification(data){ switch (item['type']){ case "mention": if (!data.status) { - break; - } + break; + } item = parseToot(data.status) item['typeIcon'] = "image://theme/icon-s-retweet" @@ -160,8 +160,8 @@ function parseNotification(data){ break; case "reblog": if (!data.status) { - break; - } + break; + } item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) From 3078cef1a2be8df2e6575888ecdd894fa61f7623 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:11:34 +0200 Subject: [PATCH 06/56] Writing mistake fix Fixed 'Development and maintenance' --- qml/pages/Settings.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index e254de5..aafccae 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -113,12 +113,6 @@ Page { } Repeater { model: ListModel { - ListElement { - name: "molan" - desc: qsTr("Maintainer of this release") - mastodon: "" - mail: "mol_an@sunrise.ch" - } ListElement { name: "Duško Angirević" desc: qsTr("UI/UX design and development") @@ -132,8 +126,8 @@ Page { mail: "micotakis@gmail.com" } ListElement { - name: "molan" - desc: qsTr("Development and maintenence") + name: "Molan" + desc: qsTr("Development and maintenance") mastodon: "" mail: "mol_an@sunrise.ch" } From 25ef712cba05f777a1bf2086826fd0716249893a Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:14:03 +0200 Subject: [PATCH 07/56] Added contributor and fixes Writing fix in "Development and maintenance" and added translation contributors for Chinese and Spanish. --- 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 aafccae..0123e0d 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -29,7 +29,7 @@ Page { icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add" - onCheckedChanged: { + onCheckedChanged: { remorsePopup.execute(removeAccount.text, function() { busy = true; checked = false; From 91b63bfef5601fa63ed00574651fbc47cb017734 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:24:01 +0200 Subject: [PATCH 08/56] Sync to upstream --- qml/harbour-tooter.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qml/harbour-tooter.qml b/qml/harbour-tooter.qml index 60fe3f6..7b23d5e 100644 --- a/qml/harbour-tooter.qml +++ b/qml/harbour-tooter.qml @@ -36,6 +36,7 @@ import "./lib/API.js" as Logic ApplicationWindow { id: appWindow + //initialPage: Component { FirstPage { } } cover: Qt.resolvedUrl("cover/CoverPage.qml") allowedOrientations: defaultAllowedOrientations Component.onCompleted: { @@ -58,6 +59,9 @@ ApplicationWindow pageStack.push(Qt.resolvedUrl("./pages/MainPage.qml"), {}) }); + // + // + //pageStack.push(Qt.resolvedUrl("./pages/Conversation.qml"), {}) } else { pageStack.push(Qt.resolvedUrl("./pages/LoginPage.qml"), {}) } From a87c27e58edbb112c01dd609174ded2bb4491c23 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:25:01 +0200 Subject: [PATCH 09/56] Sync to upstream --- qml/lib/Worker.js | 1 - 1 file changed, 1 deletion(-) diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index cd42e1d..15c13fd 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -163,7 +163,6 @@ function parseNotification(data){ break; } - item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) From 977f8b2fc072e75e6daaf9941a77b7794ad48d7e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:26:05 +0200 Subject: [PATCH 10/56] Sync to upstream --- qml/pages/Profile.qml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index aaca520..c26c7ed 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -29,6 +29,7 @@ Page { property bool muting : false; property bool domain_blocking : false; + WorkerScript { id: worker source: "../lib/Worker.js" @@ -264,7 +265,6 @@ Page { console.log(link) console.log(JSON.stringify(test)) console.log(JSON.stringify(test.length)) -<<<<<<< HEAD if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { pageStack.pop(pageStack.find(function(page) { @@ -285,28 +285,6 @@ Page { } } -======= - - if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { - pageStack.pop(pageStack.find(function(page) { - var check = page.isFirstPage === true; - if (check) - page.onLinkActivated(link) - return check; - })); - send(link) - - } else if (test.length === 4 && test[3][0] === "@" ) { - tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) - slideshow.positionViewAtIndex(4, ListView.SnapToItem) - navigation.navigateTo('search') - - } else { - Qt.openUrlExternally(link); - } - } - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e } Column { spacing: Theme.paddingMedium From 8c31138a50c4ae7e63bc4179227bc5a5459c0359 Mon Sep 17 00:00:00 2001 From: molan-git Date: Mon, 27 Apr 2020 17:28:59 +0200 Subject: [PATCH 11/56] Sync to upstream Merge with upstream release 1.0.4-1 --- harbour-tooter.pro | 113 ------------------ qml/harbour-tooter.qml | 4 + qml/images/boosted.svg | 16 +++ qml/lib/Worker.js | 1 - qml/pages/LoginPage.qml | 3 +- qml/pages/Profile.qml | 24 +--- qml/pages/Settings.qml | 66 +++-------- qml/pages/components/Toot.qml | 1 + rpm/harbour-tooter.changes | 3 - rpm/harbour-tooter.spec | 5 - rpm/harbour-tooter.yaml | 5 - translations/harbour-tooter-de.ts | 130 ++------------------- translations/harbour-tooter-el.ts | 78 ++----------- translations/harbour-tooter-es.ts | 113 ------------------ translations/harbour-tooter-fi.ts | 82 +++---------- translations/harbour-tooter-fr.ts | 132 +-------------------- translations/harbour-tooter-nl.ts | 83 +------------ translations/harbour-tooter-nl_BE.ts | 83 +------------ translations/harbour-tooter-oc.ts | 82 +------------ translations/harbour-tooter-pl.ts | 98 +++------------- translations/harbour-tooter-ru.ts | 82 +------------ translations/harbour-tooter-sr.ts | 83 +------------ translations/harbour-tooter-sv.ts | 82 +------------ translations/harbour-tooter-zh_CN.ts | 168 +++++++-------------------- translations/harbour-tooter.ts | 92 +++------------ 25 files changed, 176 insertions(+), 1453 deletions(-) create mode 100644 qml/images/boosted.svg diff --git a/harbour-tooter.pro b/harbour-tooter.pro index 9fed95f..8b1cb5f 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -1,115 +1,3 @@ -<<<<<<< HEAD -# NOTICE: -# -# Application name defined in TARGET has a corresponding QML filename. -# If name defined in TARGET is changed, the following needs to be done -# to match new name: -# - corresponding QML filename must be changed -# - desktop icon filename must be changed -# - desktop filename must be changed -# - icon definition filename in desktop file must be changed -# - translation filenames have to be changed - -# The name of your application -TARGET = harbour-tooter - -CONFIG += sailfishapp - -QT += network dbus sql -CONFIG += link_pkgconfig -PKGCONFIG += sailfishapp -PKGCONFIG += \ - nemonotifications-qt5 - -DEFINES += "APPVERSION=\\\"$${SPECVERSION}\\\"" -DEFINES += "APPNAME=\\\"$${TARGET}\\\"" - -!exists( src/dbusAdaptor.h ) { - system(qdbusxml2cpp config/ba.dysko.harbour.tooter.xml -i dbus.h -a src/dbusAdaptor) -} - -config.path = /usr/share/$${TARGET}/config/ -config.files = config/icon-lock-harbour-tooter.png - -notification_categories.path = /usr/share/lipstick/notificationcategories -notification_categories.files = config/x-harbour.tooter.activity.* - -dbus_services.path = /usr/share/dbus-1/services/ -dbus_services.files = config/ba.dysko.harbour.tooter.service - -interfaces.path = /usr/share/dbus-1/interfaces/ -interfaces.files = config/ba.dysko.harbour.tooter.xml - -SOURCES += src/harbour-tooter.cpp -SOURCES += src/imageuploader.cpp -SOURCES += src/filedownloader.cpp -SOURCES += src/notifications.cpp -SOURCES += src/dbusAdaptor.cpp -SOURCES += src/dbus.cpp - -HEADERS += src/imageuploader.h -HEADERS += src/filedownloader.h -HEADERS += src/notifications.h -HEADERS += src/dbusAdaptor.h -HEADERS += src/dbus.h - -DISTFILES += qml/harbour-tooter.qml \ - qml/pages/components/MiniStatus.qml \ - qml/pages/components/MiniHeader.qml \ - qml/pages/components/ItemUser.qml \ - qml/pages/components/MyList.qml \ - qml/pages/components/Navigation.qml \ - qml/pages/components/ProfileHeader.qml \ - qml/pages/components/MediaBlock.qml \ - qml/pages/components/MyImage.qml \ - qml/pages/components/ImageFullScreen.qml \ - qml/cover/CoverPage.qml \ - qml/pages/MainPage.qml \ - qml/pages/LoginPage.qml \ - qml/pages/Conversation.qml \ - qml/pages/components/Toot.qml \ - qml/pages/Profile.qml \ - qml/pages/Settings.qml \ - qml/lib/API.js \ - qml/images/notification.svg \ - qml/images/verified.svg \ - qml/images/tooter.svg \ - qml/lib/Mastodon.js \ - qml/lib/Worker.js \ - config/icon-lock-harbour-tooter.png \ - config/x-harbour.tooter.activity.conf \ - qml/pages/components/VisualContainer.qml \ - rpm/harbour-tooter.changes \ - rpm/harbour-tooter.changes.run.in \ - rpm/harbour-tooter.spec \ - rpm/harbour-tooter.yaml \ - translations/*.ts \ - harbour-tooter.desktop - -SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172 - -# to disable building translations every time, comment out the -# following CONFIG line -CONFIG += sailfishapp_i18n - -# German translation is enabled as an example. If you aren't -# planning to localize your app, remember to comment out the -# following TRANSLATIONS line. And also do not forget to -# modify the localized app name in the the .desktop file. -TRANSLATIONS += translations/harbour-tooter-de.ts -TRANSLATIONS += translations/harbour-tooter-el.ts -TRANSLATIONS += translations/harbour-tooter-es.ts -TRANSLATIONS += translations/harbour-tooter-fi.ts -TRANSLATIONS += translations/harbour-tooter-fr.ts -TRANSLATIONS += translations/harbour-tooter-nl.ts -TRANSLATIONS += translations/harbour-tooter-nl_BE.ts -TRANSLATIONS += translations/harbour-tooter-oc.ts -TRANSLATIONS += translations/harbour-tooter-pl.ts -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 -======= # NOTICE: # # Application name defined in TARGET has a corresponding QML filename. @@ -227,4 +115,3 @@ 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 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e diff --git a/qml/harbour-tooter.qml b/qml/harbour-tooter.qml index 60fe3f6..7b23d5e 100644 --- a/qml/harbour-tooter.qml +++ b/qml/harbour-tooter.qml @@ -36,6 +36,7 @@ import "./lib/API.js" as Logic ApplicationWindow { id: appWindow + //initialPage: Component { FirstPage { } } cover: Qt.resolvedUrl("cover/CoverPage.qml") allowedOrientations: defaultAllowedOrientations Component.onCompleted: { @@ -58,6 +59,9 @@ ApplicationWindow pageStack.push(Qt.resolvedUrl("./pages/MainPage.qml"), {}) }); + // + // + //pageStack.push(Qt.resolvedUrl("./pages/Conversation.qml"), {}) } else { pageStack.push(Qt.resolvedUrl("./pages/LoginPage.qml"), {}) } diff --git a/qml/images/boosted.svg b/qml/images/boosted.svg new file mode 100644 index 0000000..468e2da --- /dev/null +++ b/qml/images/boosted.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/qml/lib/Worker.js b/qml/lib/Worker.js index cd42e1d..15c13fd 100644 --- a/qml/lib/Worker.js +++ b/qml/lib/Worker.js @@ -163,7 +163,6 @@ function parseNotification(data){ break; } - item = parseToot(data.status) item = parseAccounts(item, "reblog_", data["account"]) item = parseAccounts(item, "", data["status"]["account"]) diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index 8549e62..19f0948 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -37,6 +37,7 @@ import "../lib/API.js" as Logic Page { id: loginPage + // The effective value will be restricted by ApplicationWindow.allowedOrientations allowedOrientations: Orientation.All @@ -61,7 +62,7 @@ Page { TextField { id: instance focus: true - label: qsTr("Enter a valid Mastodon instance URL") + label: qsTr("Enter an Mastodon instance URL") text: "https://" placeholderText: "https://mastodon.social" width: parent.width diff --git a/qml/pages/Profile.qml b/qml/pages/Profile.qml index aaca520..c26c7ed 100644 --- a/qml/pages/Profile.qml +++ b/qml/pages/Profile.qml @@ -29,6 +29,7 @@ Page { property bool muting : false; property bool domain_blocking : false; + WorkerScript { id: worker source: "../lib/Worker.js" @@ -264,7 +265,6 @@ Page { console.log(link) console.log(JSON.stringify(test)) console.log(JSON.stringify(test.length)) -<<<<<<< HEAD if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { pageStack.pop(pageStack.find(function(page) { @@ -285,28 +285,6 @@ Page { } } -======= - - if (test.length === 5 && (test[3] === "tags" || test[3] === "tag") ) { - pageStack.pop(pageStack.find(function(page) { - var check = page.isFirstPage === true; - if (check) - page.onLinkActivated(link) - return check; - })); - send(link) - - } else if (test.length === 4 && test[3][0] === "@" ) { - tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2]) - slideshow.positionViewAtIndex(4, ListView.SnapToItem) - navigation.navigateTo('search') - - } else { - Qt.openUrlExternally(link); - } - } - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e } Column { spacing: Theme.paddingMedium diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index e254de5..637cf94 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -57,49 +57,30 @@ Page { IconTextSwitch { //enabled: false checked: typeof Logic.conf['loadImages'] !== "undefined" && Logic.conf['loadImages'] - text: qsTr("Load Images in Toots") + 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" onClicked: { Logic.conf['loadImages'] = checked } } -// IconTextSwitch { -// text: qsTr("Translate") -// description: qsTr("Use Transifex to help with app translation to your language") -// icon.source: "image://theme/icon-m-presence" -// onCheckedChanged: { -// busy = true; -// checked = false; -// Qt.openUrlExternally("https://www.transifex.com/dysko/tooter/"); -// timer2.start() -// } -// Timer { -// id: timer2 -// interval: 4700 -// onTriggered: parent.busy = false -// } -// } + IconTextSwitch { + text: qsTr("Translate") + description: qsTr("Use Transifex to help with app translation to your language") + icon.source: "image://theme/icon-m-presence" + onCheckedChanged: { + busy = true; + checked = false; + Qt.openUrlExternally("https://www.transifex.com/dysko/tooter/"); + timer2.start() + } + Timer { + id: timer2 + interval: 4700 + onTriggered: parent.busy = false + } + } } - - SectionHeader { - text: qsTr("About") - } - - Text { - x: Theme.horizontalPageMargin - width: parent.width - ( 2 * Theme.horizontalPageMargin ) - text: qsTr("This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on GitHub.") - font.pixelSize: Theme.fontSizeExtraSmall - color: Theme.secondaryColor - linkColor: Theme.secondaryHighlightColor - wrapMode: Text.Wrap - anchors { - horizontalCenter: parent.horizontalCenter - } - onLinkActivated: Qt.openUrlExternally(link) - } - SectionHeader { text: qsTr("Credits") } @@ -113,12 +94,6 @@ Page { } Repeater { model: ListModel { - ListElement { - name: "molan" - desc: qsTr("Maintainer of this release") - mastodon: "" - mail: "mol_an@sunrise.ch" - } ListElement { name: "Duško Angirević" desc: qsTr("UI/UX design and development") @@ -143,12 +118,6 @@ Page { mastodon: "Quenti@framapiaf.org" mail: "" } - ListElement { - name: "Luchy Kon / dashinfantry" - desc: qsTr("Chinese translation") - mastodon: "" - mail: "dashinfantry@gmail.com" - } ListElement { name: "André Koot" desc: qsTr("Dutch translation") @@ -161,6 +130,7 @@ Page { mastodon: "" mail: "" } + ListElement { name: "Mohamed-Touhami MAHDI" desc: qsTr("Added README file") diff --git a/qml/pages/components/Toot.qml b/qml/pages/components/Toot.qml index 05d235c..7809e7a 100644 --- a/qml/pages/components/Toot.qml +++ b/qml/pages/components/Toot.qml @@ -4,6 +4,7 @@ import QtGraphicalEffects 1.0 BackgroundItem { signal send (string notice) + id: delegate //property string text: "0" width: parent.width diff --git a/rpm/harbour-tooter.changes b/rpm/harbour-tooter.changes index 3643173..c708a4b 100644 --- a/rpm/harbour-tooter.changes +++ b/rpm/harbour-tooter.changes @@ -1,9 +1,6 @@ -<<<<<<< HEAD -======= * Thu Apr 16 2020 Dusko Angirevic 1.0.4-1 - Merge with molan code ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e * Tue Feb 04 2020 molan 1.0.3-8 - Fix for broken translations - Updated Spanish translation diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index f6d6428..4c576ba 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,13 +13,8 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -<<<<<<< HEAD -Version: 1.0.3 -Release: 8 -======= Version: 1.0.4 Release: 1 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Group: Qt/Qt License: LICENSE URL: http://example.org/ diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 790f1fe..093166c 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,12 +1,7 @@ Name: harbour-tooter Summary: Tooter -<<<<<<< HEAD -Version: 1.0.3 -Release: 8 -======= Version: 1.0.4 Release: 1 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e # The contents of the Group field should be one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Qt/Qt diff --git a/translations/harbour-tooter-de.ts b/translations/harbour-tooter-de.ts index 6b9304b..e6f310d 100644 --- a/translations/harbour-tooter-de.ts +++ b/translations/harbour-tooter-de.ts @@ -13,7 +13,7 @@ boosted - geboostet + verstärkt said @@ -40,29 +40,6 @@ Write your warning here -<<<<<<< HEAD - 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? -======= @@ -84,7 +61,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -109,13 +85,6 @@ Instance -<<<<<<< HEAD - 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. -======= @@ -125,15 +94,10 @@ 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. ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Reload - Neu laden - - - Enter a valid Mastodon instance URL - Eine gültige Mastodon-Instanz URL eingeben + @@ -164,14 +128,14 @@ Federated - Föderiert + Vereinigt MiniStatus boosted - geboostet + verstärkt favourited @@ -253,19 +217,11 @@ Bio -<<<<<<< HEAD - Bio - - - Open Profile in Browser - Profil in Browser öffnen -======= Open Profile in Browser ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -276,73 +232,6 @@ Remove Account -<<<<<<< HEAD - Konto entfernen - - - Add Account - Konto hinzufügen - - - Deauthorize this app and remove your account - Konto entfernen und für diese Anwendung deaktivieren - - - Authorize this app to use your Mastodon account in your behalf - Zugriff durch diese Anwendung auf eigenes Mastodon-Konto erlauben - - - Disable this option if you want to preserve your data connection - Diese Option deaktivieren um Datenvolumen zu sparen - - - About - Über - - - Credits - Entwickler - - - 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 - - - Dutch translation - Niederländische Übersetzung - - - Spanish translation - Spanische Übersetzung - - - Added README file - README-Datei erstellt - - - Chinese translation - Chinesische Übersetzung -======= Account löschen @@ -404,14 +293,13 @@ Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Toot boosted - geboostet + verstärkt favourited @@ -426,19 +314,19 @@ VisualContainer Unboost - Nicht boosten + Schwäche Boost - Boosten + Verstärke Unfavorite - + Aus Favoriten entfernen Favorite - + Zu Favoriten diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 2b73dd5..c3f464a 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -29,21 +29,12 @@ Delete Διαγραφή -<<<<<<< HEAD Emojis Emoji -======= - - - Emojis - Emoji - - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Tap to insert Κτυπήστε για εισαγωγή @@ -52,25 +43,6 @@ -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -88,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -116,6 +87,10 @@ 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. @@ -124,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage @@ -276,34 +247,6 @@ Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Φόρτωση των εικόνων στα toot @@ -326,7 +269,6 @@ UI/UX design and development UI/UX σχεδιασμός και ανάπτυξη ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -349,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -376,19 +314,19 @@ VisualContainer Unboost - + Αναίρεση προώθησης Boost - + Προώθηση Unfavorite - + Αφαίρεση από τους σελιδοδείκτες Favorite - + Σελιδοδείκτης diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 22b42dd..7f6acfd 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -29,40 +29,6 @@ Delete Borrar -<<<<<<< HEAD - - - Emojis - Emoticonos - - - Tap to insert - Toca para insertar - - - Write your warning here - 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? -======= Emojis @@ -95,7 +61,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -121,12 +86,6 @@ Instance Instancia -<<<<<<< HEAD - - - 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. -======= Enter an Mastodon instance URL @@ -135,18 +94,10 @@ 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. ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Reload Volver a cargar -<<<<<<< HEAD - - - Enter a valid Mastodon instance URL - Introduce una URL de instancia de Mastodon válida -======= ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -266,19 +217,11 @@ Bio -<<<<<<< HEAD - Bio - - - Open Profile in Browser - Abrir perfil en navegador -======= Open Profile in Browser ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -301,61 +244,6 @@ Authorize this app to use your Mastodon account in your behalf -<<<<<<< HEAD - 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 - - - About - Acerca de - - - Credits - Créditos - - - 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 - - - Chinese translation - Traducción al chino -======= Autoriza a esta aplicación a usar tu cuenta de Mastodon en tu nombre @@ -405,7 +293,6 @@ Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e diff --git a/translations/harbour-tooter-fi.ts b/translations/harbour-tooter-fi.ts index 7fdeb5d..daf06a7 100644 --- a/translations/harbour-tooter-fi.ts +++ b/translations/harbour-tooter-fi.ts @@ -22,19 +22,11 @@ Conversation -<<<<<<< HEAD Conversation -======= - - Conversation - - - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Delete @@ -51,25 +43,6 @@ -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -87,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -115,6 +87,10 @@ 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. @@ -123,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage @@ -274,12 +246,20 @@ 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 - About + Translate + + + + Use Transifex to help with app translation to your language @@ -290,42 +270,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 - - - - Occitan & French translation - - - - Dutch translation - - - - Spanish translation - - - - Added README file - - - - Chinese translation - - Visual identity diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index 1d49720..d41d682 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -29,40 +29,6 @@ Delete Supprimer -<<<<<<< HEAD - - - Emojis - Emojis - - - Tap to insert - Appuyez pour insérer - - - Write your warning here - Avertissement du contenu - - - Public - Public - - - Unlisted - Non coté - - - Followers-only - Que Followers - - - Direct - Direct - - - What's on your mind? - A quoi penses-tu? -======= Emojis @@ -95,7 +61,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -121,12 +86,6 @@ Instance Instance -<<<<<<< HEAD - - - 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. -======= Enter an Mastodon instance URL @@ -135,18 +94,10 @@ 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. ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Reload Recharger -<<<<<<< HEAD - - - Enter a valid Mastodon instance URL - Entrer l'URL d'une instance de Mastodon -======= ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -270,87 +221,13 @@ Open Profile in Browser -<<<<<<< HEAD - Ouvrir dans le navigateur -======= ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Settings Settings -<<<<<<< HEAD - Paramètres - - - Remove Account - Enlever compte - - - Add Account - Ajouter compte - - - Deauthorize this app and remove your account - Désautoriser cette application et enlever votre compte - - - Authorize this app to use your Mastodon account in your behalf - Autoriser cette application d'utiliser votre compte - - - 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 - - - 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 - - - Occitan & French translation - Traduction français - - - Dutch translation - Traduction néerlandaise - - - Spanish translation - Traduction espagnole - - - Chinese translation - Traduction chinoise - - - Added README file -======= Préférences @@ -415,7 +292,6 @@ Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -438,19 +314,19 @@ VisualContainer Unboost - + ne plus partager Boost - + partager Unfavorite - Defavoriser + supprimer de ses favoris Favorite - Favoriser + ajouter aux favoris diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index ba5d6a3..ef0f5d3 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -29,21 +29,12 @@ Delete Verwijderen -<<<<<<< HEAD Emojis Emojis -======= - - - Emojis - Emojis - - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Tap to insert Tikken om in te voegen @@ -52,25 +43,6 @@ -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -88,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -117,18 +88,6 @@ Instantie -<<<<<<< HEAD - 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 - - - - Enter a valid Mastodon instance URL - -======= Enter an Mastodon instance URL Voer de URL van een Mastodon-instantie in @@ -139,7 +98,6 @@ Reload Herladen ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -289,34 +247,6 @@ Autoriseer deze app om je Mastodon namens jou te gebruiken -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Laden afbeeldingen in toots @@ -339,7 +269,6 @@ UI/UX design and development UI/UX ontwerp en ontwikkeling ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -362,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -389,19 +314,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 271b33f..878cbfc 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -29,21 +29,12 @@ Delete Verwijderen -<<<<<<< HEAD Emojis Emoji’s -======= - - - Emojis - Emoji’s - - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Tap to insert Tikt voor in te voegen @@ -52,25 +43,6 @@ -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -88,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -117,18 +88,6 @@ Instantie -<<<<<<< HEAD - 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 - - - - Enter a valid Mastodon instance URL - -======= Enter an Mastodon instance URL Voert den URL van een Mastodon-instantie in @@ -139,7 +98,6 @@ Reload Herladen ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -289,34 +247,6 @@ Autoriseert dezen app voor uwe Mastodon-account namens u te gebruiken -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Afbeeldingen in toots laden @@ -339,7 +269,6 @@ UI/UX design and development UI/UX-ontwerp en -ontwikkeling ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -362,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -389,19 +314,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 a071ef1..2b226a0 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -33,35 +33,6 @@ Emojis Emojis -<<<<<<< HEAD - - - Tap to insert - Tustejar per inserir - - - Write your warning here - - - - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= Tap to insert @@ -89,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -118,24 +88,15 @@ -<<<<<<< HEAD - 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 - -======= 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. ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e - Enter a valid Mastodon instance URL + Reload @@ -286,34 +247,6 @@ Autorizar aquesta aplicacion a utilizar vòstre compte Mastodon per vos -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Cargar los imatges dels tuts @@ -336,7 +269,6 @@ UI/UX design and development UI/UX design e desvlopament ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -359,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -386,19 +314,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 7069f91..6efba16 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -17,11 +17,7 @@ said -<<<<<<< HEAD - napisał(a) -======= ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -32,17 +28,6 @@ Delete -<<<<<<< HEAD - Usuń - - - Emojis - Emoji - - - Tap to insert - Dotknij aby wstawić -======= @@ -52,32 +37,12 @@ Tap to insert ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Write your warning here -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -95,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -123,6 +87,10 @@ 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. @@ -131,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage @@ -259,14 +223,6 @@ Open Profile in Browser - - Bio - - - - Open Profile in Browser - - Settings @@ -290,12 +246,20 @@ 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 - About + Translate + + + + Use Transifex to help with app translation to your language @@ -306,42 +270,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 - - - - Occitan & French translation - - - - Dutch translation - - - - Spanish translation - - - - Added README file - - - - Chinese translation - - Visual identity diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index e3e2bb6..21152ef 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -33,35 +33,6 @@ Emojis Cмайликов -<<<<<<< HEAD - - - Tap to insert - Нажмите, чтобы вставить - - - Write your warning here - - - - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= Tap to insert @@ -89,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -118,24 +88,15 @@ -<<<<<<< HEAD - 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 - -======= 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 и беспрепятственно участвовать в социальной сети. ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e - Enter a valid Mastodon instance URL + Reload @@ -286,34 +247,6 @@ Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Загружать изображения @@ -336,7 +269,6 @@ UI/UX design and development Дизайн и разработка UI / UX ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -359,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -386,19 +314,19 @@ VisualContainer Unboost - + Нет росту Boost - + Росту Unfavorite - + Избранные нет Favorite - + Избранные diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index f567f12..f4006bb 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -29,21 +29,12 @@ Delete Обриши -<<<<<<< HEAD Emojis Емотикони -======= - - - Emojis - Емотикони - - ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Tap to insert Тапни за убацивање @@ -52,25 +43,6 @@ -<<<<<<< HEAD - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= What's on your mind? @@ -88,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -117,18 +88,6 @@ Инстанца -<<<<<<< HEAD - 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 - - - - Enter a valid Mastodon instance URL - -======= Enter an Mastodon instance URL Унесите URL ваше Мастодон инстанце @@ -139,7 +98,6 @@ Reload освежи ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -289,34 +247,6 @@ Дозволите овој апликацији да користи ваш Mastodon налог -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Прикажи слике у објавама @@ -339,7 +269,6 @@ UI/UX design and development интерфејс дизајн и развој ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -362,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -389,19 +314,19 @@ VisualContainer Unboost - + Уклони разглас Boost - + Разгласи Unfavorite - + Уклони из омиљених Favorite - + Омиљено diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index ba0e6ad..e91a9cf 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -33,35 +33,6 @@ Emojis Emojis -<<<<<<< HEAD - - - Tap to insert - Tryck för att infoga - - - Write your warning here - - - - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= Tap to insert @@ -89,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -118,24 +88,15 @@ -<<<<<<< HEAD - 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 - -======= 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! ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e - Enter a valid Mastodon instance URL + Reload @@ -286,34 +247,6 @@ Godkänn denna app att använda ditt Mastodon-konto på dina vägnar -<<<<<<< HEAD - Disable this option if you want to preserve your data connection - - - - 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 - -======= Load images in toots Ladda bilder i toots @@ -336,7 +269,6 @@ UI/UX design and development UI/UX design och utveckling ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e Visual identity @@ -359,11 +291,7 @@ -<<<<<<< HEAD - Chinese translation -======= Development and maintenence ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -386,19 +314,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 70ac5a9..417161c 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -17,7 +17,26 @@ said - 说过 + 说的 + + + + Browser + + Open in Browser + 在浏览器打开 + + + Web mode + 网页模式 + + + Reading mode + 阅读模式 + + + Copy URL + 复制链接 @@ -26,6 +45,26 @@ Conversation 对话 + + Content warning! + 内容警告! + + + public + 公共区域 + + + unlisted + 未列的 + + + followers only + 仅关注者 + + + direct + 直接 + Delete 删除 @@ -36,36 +75,7 @@ Tap to insert - 点击以插入 - - -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - Write your warning here - 在此编写你的警告信息 -======= - Content warning! - 内容警告! ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts - - - Public - 公共区域 - - - Unlisted - 不公开 - - - Followers-only - 仅关注者 - - - Direct - 私信 - - - What's on your mind? - 有何想法? + 点击插入 @@ -91,12 +101,6 @@ Instance 实例 -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - - - 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 实例，然后无缝加入社交网站。 -======= Enter an Mastodon instance URL @@ -106,20 +110,14 @@ 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 实例，然后无缝加入社交网站。 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts Reload 重新加载 -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - Enter a valid Mastodon instance URL - 输入一个有效的 Mastodon 实例 URL -======= Enter an Mastodon instance URL ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts @@ -184,27 +182,19 @@ please wait... - 稍等片刻...... + 请等候...... Profile Unfollow -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - 取消关注 - - - Follow request sent! - 已寄出关注请求！ -======= 未关注 Follow request sent! 关注请求已寄出！ ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts Following @@ -263,73 +253,6 @@ Remove Account -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - 移除账号 - - - 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 - 如果你想保护你的数据连接，请禁用此选项 - - - 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>. - 此软件是一个 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 - 汉语翻译 -======= 移除账户 @@ -367,7 +290,6 @@ UI/UX design and development UI/UX 设计及开发 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts @@ -397,16 +319,12 @@ Unfavorite -<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts - 取消关注 -======= 取消收藏 ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts Favorite - 关注 + 收藏 diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index b2825fa..03bddc9 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -33,35 +33,6 @@ Emojis Emojis -<<<<<<< HEAD - - - Tap to insert - Tap to insert - - - Write your warning here - - - - Public - - - - Unlisted - - - - Followers-only - - - - Direct - - - - What's on your mind? -======= Tap to insert @@ -89,7 +60,6 @@ Direct ->>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e @@ -117,6 +87,10 @@ 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. @@ -125,10 +99,6 @@ Reload - - Enter a valid Mastodon instance URL - - MainPage @@ -276,12 +246,20 @@ 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 - About + Translate + + + + Use Transifex to help with app translation to your language @@ -292,42 +270,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 - - - - Occitan & French translation - - - - Dutch translation - - - - Spanish translation - - - - Added README file - - - - Chinese translation - - Visual identity @@ -372,19 +314,19 @@ VisualContainer Unboost - + Unboost Boost - + Boost Unfavorite - + Unfavorite Favorite - + Favorite From b392d5b12c467d951fe4b0e5a629b245185ca26e Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:31:25 +0200 Subject: [PATCH 12/56] Update Settings.qml --- 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 e61e9c5..cc06281 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -29,7 +29,7 @@ Page { icon.source: Logic.conf['login'] ? "image://theme/icon-m-people" : "image://theme/icon-m-add" - onCheckedChanged: { + onCheckedChanged: { remorsePopup.execute(removeAccount.text, function() { busy = true; checked = false; From d196727d23fd57a351d35cfe97bfb8900c92a1e1 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:40:16 +0200 Subject: [PATCH 13/56] Added Chinsese contributor --- qml/pages/Settings.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qml/pages/Settings.qml b/qml/pages/Settings.qml index cc06281..05c3398 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -118,6 +118,12 @@ Page { mastodon: "Quenti@framapiaf.org" mail: "" } + ListElement { + name: "Luchy Kon / dashinfantry" + desc: qsTr("Chinese translation") + mastodon: "" + mail: "dashinfantry@gmail.com" + } ListElement { name: "André Koot" desc: qsTr("Dutch translation") @@ -130,7 +136,6 @@ Page { mastodon: "" mail: "" } - ListElement { name: "Mohamed-Touhami MAHDI" desc: qsTr("Added README file") From 2ff6742d7f4dd8fff204cf5c33cf8ecfc355c6b8 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:41:09 +0200 Subject: [PATCH 14/56] Added Chinese contributor From 64af509c2f9e4899188cad8df95c7bfffde70392 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:42:04 +0200 Subject: [PATCH 15/56] Added Chinese contributor From bef74d3857268f448c2aa77e4b7e4a22627d5bb0 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:42:59 +0200 Subject: [PATCH 16/56] Added Chinese contributor --- 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..19786f5 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -12,7 +12,7 @@ Page { VerticalScrollDecorator {} - Column { + Column {a id: column spacing: Theme.paddingSmall width: parent.width From 222c112f6f5aa5db0c91c35f7a14b753753f1d20 Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:43:10 +0200 Subject: [PATCH 17/56] Added Chinese contributor --- 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 19786f5..05c3398 100644 --- a/qml/pages/Settings.qml +++ b/qml/pages/Settings.qml @@ -12,7 +12,7 @@ Page { VerticalScrollDecorator {} - Column {a + Column { id: column spacing: Theme.paddingSmall width: parent.width From d067dd0807be7c623d5ecc63d73d749fc78d409d Mon Sep 17 00:00:00 2001 From: molan-git <59296158+molan-git@users.noreply.github.com> Date: Tue, 28 Apr 2020 07:24:51 +0200 Subject: [PATCH 18/56] Fix writing mistake --- qml/pages/LoginPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml index 19f0948..235315c 100644 --- a/qml/pages/LoginPage.qml +++ b/qml/pages/LoginPage.qml @@ -62,7 +62,7 @@ Page { TextField { id: instance focus: true - label: qsTr("Enter an Mastodon instance URL") + label: qsTr("Enter a valid Mastodon instance URL") text: "https://" placeholderText: "https://mastodon.social" width: parent.width 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 19/56] 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 20/56] 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 21/56] 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 22/56] 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 23/56] 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 24/56] 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 25/56] 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 26/56] 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 27/56] 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 28/56] 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 29/56] 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 30/56] 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 31/56] 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 32/56] 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 33/56] 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 34/56] 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 35/56] 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 36/56] 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 37/56] 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 38/56] 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 39/56] 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 40/56] 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 41/56] 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 42/56] 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 43/56] 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 44/56] 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 45/56] 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 46/56] 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 47/56] 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 48/56] 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 49/56] 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 50/56] 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 51/56] 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 52/56] 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 53/56] 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 54/56] 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 55/56] 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 56/56] 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