Sync to upstream

Merge with upstream release 1.0.4-1
This commit is contained in:
molan-git 2020-04-27 17:28:59 +02:00
parent 873d9b7231
commit 8c31138a50
25 changed files with 176 additions and 1453 deletions

View file

@ -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

View file

@ -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"), {})
}

16
qml/images/boosted.svg Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 36 36" enable-background="new 0 0 36 36" xml:space="preserve">
<g>
<g>
<path fill="#FFFFFF" d="M28.8,12.5c-1.8,0-4.6,0-6.3,0c-0.5,0-1.5,0-0.8-1.1c1-1.9,3-5.9,4.3-8.1c0.7-1.1,0.8-1.8-0.4-1.8
c-2.7,0-9.1,0-12,0c-1.1,0-1.6,0.5-2.1,1.6c-1.4,3.5-4.7,12.1-5.9,15.7c-0.4,1.2,0.3,1.7,1.2,1.7c1.8,0,5,0,6.7,0
c0.6,0,1.2,0.1,0.8,1.4c-0.8,2.3-2,7-2.8,9.7c0,0-0.8,3.7,2.4,0.8C18.1,28.2,25.4,17.7,29,14C29.7,13.4,29.7,12.5,28.8,12.5z
M20.7,21.1c-2.2,2.8-4.4,5.7-6.3,7.8c0.1-0.2,0.1-0.5,0.2-0.7c0.6-2.1,1.2-4.3,1.7-5.7l0,0l0,0c0.3-1.2,0.2-2.1-0.3-2.9
c-0.5-0.7-1.4-1.1-2.4-1.1H7.9c1.3-3.7,3.9-10.4,5.2-13.8l0.3-0.8c0.1-0.2,0.2-0.3,0.2-0.4c0,0,0,0,0,0h10
c-1.2,2.2-2.7,5.2-3.6,6.9c-0.7,1.3-0.5,2.2-0.2,2.8c0.7,1.3,2.2,1.3,2.7,1.3h3.4C24.4,16.3,22.6,18.6,20.7,21.1z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -163,7 +163,6 @@ function parseNotification(data){
break;
}
item = parseToot(data.status)
item = parseAccounts(item, "reblog_", data["account"])
item = parseAccounts(item, "", data["status"]["account"])

View file

@ -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

View file

@ -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

View file

@ -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 <a href=\'https://github.com/molan-git/harbour-tooter'>GitHub</a>.")
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")

View file

@ -4,6 +4,7 @@ import QtGraphicalEffects 1.0
BackgroundItem {
signal send (string notice)
id: delegate
//property string text: "0"
width: parent.width

View file

@ -1,9 +1,6 @@
<<<<<<< HEAD
=======
* Thu Apr 16 2020 Dusko Angirevic <dysko@me.com> 1.0.4-1
- Merge with molan code
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
* Tue Feb 04 2020 molan <mol_an@sunrise.ch> 1.0.3-8
- Fix for broken translations
- Updated Spanish translation

View file

@ -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/

View file

@ -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

View file

@ -13,7 +13,7 @@
</message>
<message>
<source>boosted</source>
<translation>geboostet</translation>
<translation>verstärkt</translation>
</message>
<message>
<source>said</source>
@ -40,29 +40,6 @@
</message>
<message>
<source>Write your warning here</source>
<<<<<<< HEAD
<translation>Füge eine Inhaltswarnung hinzu</translation>
</message>
<message>
<source>Public</source>
<translation>Öffentlich</translation>
</message>
<message>
<source>Unlisted</source>
<translation>Nicht gelistet</translation>
</message>
<message>
<source>Followers-only</source>
<translation>Nur Follower</translation>
</message>
<message>
<source>Direct</source>
<translation>Direkt</translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
<translation>Was möchtest du mitteilen?</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -84,7 +61,6 @@
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -109,13 +85,6 @@
</message>
<message>
<source>Instance</source>
<<<<<<< HEAD
<translation>Instanz</translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon 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.</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -125,15 +94,10 @@
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon 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.</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Reload</source>
<translation>Neu laden</translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation>Eine gültige Mastodon-Instanz URL eingeben</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -164,14 +128,14 @@
</message>
<message>
<source>Federated</source>
<translation>Föderiert</translation>
<translation>Vereinigt</translation>
</message>
</context>
<context>
<name>MiniStatus</name>
<message>
<source>boosted</source>
<translation>geboostet</translation>
<translation>verstärkt</translation>
</message>
<message>
<source>favourited</source>
@ -253,19 +217,11 @@
</message>
<message>
<source>Bio</source>
<<<<<<< HEAD
<translation>Bio</translation>
</message>
<message>
<source>Open Profile in Browser</source>
<translation>Profil in Browser öffnen</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Open Profile in Browser</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -276,73 +232,6 @@
</message>
<message>
<source>Remove Account</source>
<<<<<<< HEAD
<translation>Konto entfernen</translation>
</message>
<message>
<source>Add Account</source>
<translation>Konto hinzufügen</translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Konto entfernen und für diese Anwendung deaktivieren</translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Zugriff durch diese Anwendung auf eigenes Mastodon-Konto erlauben</translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Diese Option deaktivieren um Datenvolumen zu sparen</translation>
</message>
<message>
<source>About</source>
<translation>Über</translation>
</message>
<message>
<source>Credits</source>
<translation>Entwickler</translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>UI/UX-Gestaltung und Entwicklung</translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation>Dies ist ein Fork und Weiterentwicklung der Mastodon-Anwendung Tooter, welche urpsrünglich von Duško Angirević entwickelt wurde. Quellcode auf &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation>Bilder in Toots laden</translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation>Entwicklung dieser Version</translation>
</message>
<message>
<source>Visual identity</source>
<translation>Visuelle Identität</translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation>Franzözische Übersetzung</translation>
</message>
<message>
<source>Dutch translation</source>
<translation>Niederländische Übersetzung</translation>
</message>
<message>
<source>Spanish translation</source>
<translation>Spanische Übersetzung</translation>
</message>
<message>
<source>Added README file</source>
<translation>README-Datei erstellt</translation>
</message>
<message>
<source>Chinese translation</source>
<translation>Chinesische Übersetzung</translation>
=======
<translation>Account löschen</translation>
</message>
<message>
@ -404,14 +293,13 @@
<message>
<source>Development and maintenence</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
<name>Toot</name>
<message>
<source>boosted</source>
<translation>geboostet</translation>
<translation>verstärkt</translation>
</message>
<message>
<source>favourited</source>
@ -426,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation>Nicht boosten</translation>
<translation>Schwäche</translation>
</message>
<message>
<source>Boost</source>
<translation>Boosten</translation>
<translation>Verstärke</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Aus Favoriten entfernen</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Zu Favoriten</translation>
</message>
</context>
</TS>

View file

@ -29,21 +29,12 @@
<message>
<source>Delete</source>
<translation>Διαγραφή</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Emoji</translation>
</message>
<message>
=======
</message>
<message>
<source>Emojis</source>
<translation>Emoji</translation>
</message>
<message>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<source>Tap to insert</source>
<translation>Κτυπήστε για εισαγωγή</translation>
</message>
@ -52,25 +43,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -88,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -116,6 +87,10 @@
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
@ -124,10 +99,6 @@
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
@ -276,34 +247,6 @@
<translation>Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Φόρτωση των εικόνων στα toot</translation>
</message>
@ -326,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX σχεδιασμός και ανάπτυξη</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -349,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -376,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Αναίρεση προώθησης</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Προώθηση</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Αφαίρεση από τους σελιδοδείκτες</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Σελιδοδείκτης</translation>
</message>
</context>
</TS>

View file

@ -29,40 +29,6 @@
<message>
<source>Delete</source>
<translation>Borrar</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Emoticonos</translation>
</message>
<message>
<source>Tap to insert</source>
<translation>Toca para insertar</translation>
</message>
<message>
<source>Write your warning here</source>
<translation>Escribe aquí tu aviso</translation>
</message>
<message>
<source>Public</source>
<translation>Público</translation>
</message>
<message>
<source>Unlisted</source>
<translation>Sin federar</translation>
</message>
<message>
<source>Followers-only</source>
<translation>Sólo seguidores</translation>
</message>
<message>
<source>Direct</source>
<translation>Directo</translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
<translation>¿Qué tienes en mente?</translation>
=======
</message>
<message>
<source>Emojis</source>
@ -95,7 +61,6 @@
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -121,12 +86,6 @@
<message>
<source>Instance</source>
<translation>Instancia</translation>
<<<<<<< HEAD
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon 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.</translation>
=======
</message>
<message>
<source>Enter an Mastodon instance URL</source>
@ -135,18 +94,10 @@
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon 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.</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Reload</source>
<translation>Volver a cargar</translation>
<<<<<<< HEAD
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation>Introduce una URL de instancia de Mastodon válida</translation>
=======
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -266,19 +217,11 @@
</message>
<message>
<source>Bio</source>
<<<<<<< HEAD
<translation>Bio</translation>
</message>
<message>
<source>Open Profile in Browser</source>
<translation>Abrir perfil en navegador</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
<source>Open Profile in Browser</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -301,61 +244,6 @@
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<<<<<<< HEAD
<translation>Autoriza a esta aplicación para usar tu cuenta de Mastodon en tu nombre</translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Deshabilita esta opción si quieres ahorrar en tu conexión de datos</translation>
</message>
<message>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
<source>Credits</source>
<translation>Créditos</translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>Diseño UI/UX y desarrollo</translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation>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 &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation>Cargar imágenes en toots</translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation>Mantenedor de esta publicación</translation>
</message>
<message>
<source>Visual identity</source>
<translation>Identidad visual</translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation>Traducción al occitano y francés</translation>
</message>
<message>
<source>Dutch translation</source>
<translation>Traducción al holandés</translation>
</message>
<message>
<source>Spanish translation</source>
<translation>Traducción al español</translation>
</message>
<message>
<source>Added README file</source>
<translation>Añadido archivo README</translation>
</message>
<message>
<source>Chinese translation</source>
<translation>Traducción al chino</translation>
=======
<translation>Autoriza a esta aplicación a usar tu cuenta de Mastodon en tu nombre</translation>
</message>
<message>
@ -405,7 +293,6 @@
<message>
<source>Development and maintenence</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>

View file

@ -22,19 +22,11 @@
</context>
<context>
<name>Conversation</name>
<<<<<<< HEAD
<message>
<source>Conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
=======
<message>
<source>Conversation</source>
<translation type="unfinished"></translation>
</message>
<message>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
@ -51,25 +43,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -87,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -115,6 +87,10 @@
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
@ -123,10 +99,6 @@
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
@ -274,12 +246,20 @@
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<source>Translate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -290,42 +270,6 @@
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dutch translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Spanish translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Added README file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Chinese translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>

View file

@ -29,40 +29,6 @@
<message>
<source>Delete</source>
<translation>Supprimer</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
<source>Tap to insert</source>
<translation>Appuyez pour insérer</translation>
</message>
<message>
<source>Write your warning here</source>
<translation>Avertissement du contenu</translation>
</message>
<message>
<source>Public</source>
<translation>Public</translation>
</message>
<message>
<source>Unlisted</source>
<translation>Non coté</translation>
</message>
<message>
<source>Followers-only</source>
<translation>Que Followers</translation>
</message>
<message>
<source>Direct</source>
<translation>Direct</translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
<translation>A quoi penses-tu?</translation>
=======
</message>
<message>
<source>Emojis</source>
@ -95,7 +61,6 @@
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -121,12 +86,6 @@
<message>
<source>Instance</source>
<translation>Instance</translation>
<<<<<<< HEAD
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon 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&apos;instances capables de communiquer entre elles.</translation>
=======
</message>
<message>
<source>Enter an Mastodon instance URL</source>
@ -135,18 +94,10 @@
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon est un réseau libre et open source. Il sagit d&apos;une alternative aux plateformes commerciales, pour éviter qu&apos;une seule entreprise monopolise vos communications. Choisissez un serveur dans lequel vous avez confiance - quelque que soit votre choix vous pourrez interagir avec dautres personnes. Tout le monde peut monter sa propre instance Mastodon et participer rendre le réseau plus robuste.</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Reload</source>
<translation>Recharger</translation>
<<<<<<< HEAD
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished">Entrer l&apos;URL d&apos;une instance de Mastodon</translation>
=======
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -270,87 +221,13 @@
</message>
<message>
<source>Open Profile in Browser</source>
<<<<<<< HEAD
<translation>Ouvrir dans le navigateur</translation>
=======
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
<name>Settings</name>
<message>
<source>Settings</source>
<<<<<<< HEAD
<translation>Paramètres</translation>
</message>
<message>
<source>Remove Account</source>
<translation>Enlever compte</translation>
</message>
<message>
<source>Add Account</source>
<translation>Ajouter compte</translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation>Désautoriser cette application et enlever votre compte</translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>Autoriser cette application d&apos;utiliser votre compte</translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation>Désactiver cette option pour économiser des données mobiles</translation>
</message>
<message>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
<source>Credits</source>
<translation>Développement</translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>Design UI/UX et développement</translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation>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.</translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation>Charger images dans pouets</translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation>Développement de cette version</translation>
</message>
<message>
<source>Visual identity</source>
<translation>Identité visuelle</translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation>Traduction français</translation>
</message>
<message>
<source>Dutch translation</source>
<translation>Traduction néerlandaise</translation>
</message>
<message>
<source>Spanish translation</source>
<translation>Traduction espagnole</translation>
</message>
<message>
<source>Chinese translation</source>
<translation>Traduction chinoise</translation>
</message>
<message>
<source>Added README file</source>
=======
<translation>Préférences</translation>
</message>
<message>
@ -415,7 +292,6 @@
</message>
<message>
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -438,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>ne plus partager</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>partager</translation>
</message>
<message>
<source>Unfavorite</source>
<translation>Defavoriser</translation>
<translation>supprimer de ses favoris </translation>
</message>
<message>
<source>Favorite</source>
<translation>Favoriser</translation>
<translation>ajouter aux favoris</translation>
</message>
</context>
</TS>

View file

@ -29,21 +29,12 @@
<message>
<source>Delete</source>
<translation>Verwijderen</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
=======
</message>
<message>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<source>Tap to insert</source>
<translation>Tikken om in te voegen</translation>
</message>
@ -52,25 +43,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -88,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -117,18 +88,6 @@
<translation>Instantie</translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Voer de URL van een Mastodon-instantie in</translation>
</message>
@ -139,7 +98,6 @@
<message>
<source>Reload</source>
<translation>Herladen</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -289,34 +247,6 @@
<translation>Autoriseer deze app om je Mastodon namens jou te gebruiken</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Laden afbeeldingen in toots</translation>
</message>
@ -339,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX ontwerp en ontwikkeling</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -362,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -389,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Unboost</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Boost</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Demarkeren als favoriet</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Markeren als favoriet</translation>
</message>
</context>
</TS>

View file

@ -29,21 +29,12 @@
<message>
<source>Delete</source>
<translation>Verwijderen</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
=======
</message>
<message>
<source>Emojis</source>
<translation>Emojis</translation>
</message>
<message>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<source>Tap to insert</source>
<translation>Tikt voor in te voegen</translation>
</message>
@ -52,25 +43,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -88,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -117,18 +88,6 @@
<translation>Instantie</translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Voert den URL van een Mastodon-instantie in</translation>
</message>
@ -139,7 +98,6 @@
<message>
<source>Reload</source>
<translation>Herladen</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -289,34 +247,6 @@
<translation>Autoriseert dezen app voor uwe Mastodon-account namens u te gebruiken</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Afbeeldingen in toots laden</translation>
</message>
@ -339,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX-ontwerp en -ontwikkeling</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -362,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -389,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Ontboosten</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Boosten</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Duim verwijderen</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Duim toevoegen</translation>
</message>
</context>
</TS>

View file

@ -33,35 +33,6 @@
<message>
<source>Emojis</source>
<translation>Emojis</translation>
<<<<<<< HEAD
</message>
<message>
<source>Tap to insert</source>
<translation>Tustejar per inserir</translation>
</message>
<message>
<source>Write your warning here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
</message>
<message>
<source>Tap to insert</source>
@ -89,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -118,24 +88,15 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Picatz lURL duna instància Mastodon</translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon es un malhum liure e open source. Es una alternativa descentralizada a las plataformas comercialas, per empachar qu&apos;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.</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -286,34 +247,6 @@
<translation>Autorizar aquesta aplicacion a utilizar vòstre compte Mastodon per vos</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Cargar los imatges dels tuts</translation>
</message>
@ -336,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX design e desvlopament</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -359,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -386,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Partejar pas mai</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Partejar</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Levar dels favorits</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Ajustar als favorits</translation>
</message>
</context>
</TS>

View file

@ -17,11 +17,7 @@
</message>
<message>
<source>said</source>
<<<<<<< HEAD
<translation>napisał(a)</translation>
=======
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -32,17 +28,6 @@
</message>
<message>
<source>Delete</source>
<<<<<<< HEAD
<translation>Usuń</translation>
</message>
<message>
<source>Emojis</source>
<translation>Emoji</translation>
</message>
<message>
<source>Tap to insert</source>
<translation>Dotknij aby wstawić</translation>
=======
<translation type="unfinished"></translation>
</message>
<message>
@ -52,32 +37,12 @@
<message>
<source>Tap to insert</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Write your warning here</source>
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -95,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -123,6 +87,10 @@
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
@ -131,10 +99,6 @@
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
@ -259,14 +223,6 @@
<source>Open Profile in Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bio</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open Profile in Browser</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Settings</name>
@ -290,12 +246,20 @@
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<source>Translate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -306,42 +270,6 @@
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dutch translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Spanish translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Added README file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Chinese translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>

View file

@ -33,35 +33,6 @@
<message>
<source>Emojis</source>
<translation>айликов</translation>
<<<<<<< HEAD
</message>
<message>
<source>Tap to insert</source>
<translation>Нажмите, чтобы вставить</translation>
</message>
<message>
<source>Write your warning here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
</message>
<message>
<source>Tap to insert</source>
@ -89,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -118,24 +88,15 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Введите URL-адрес экземпляра Mastodon</translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon - бесплатная социальная сеть с открытым исходным кодом. Децентрализованная альтернатива коммерческим платформам позволяет избежать рисков, связанных с тем, что одна компания монополизирует ваше общение. Выберите сервер, которому вы доверяете - в зависимости от того, что вы выберете, вы можете взаимодействовать со всеми остальными. Любой может запустить свой собственный экземпляр Mastodon и беспрепятственно участвовать в социальной сети.</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -286,34 +247,6 @@
<translation>Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Загружать изображения</translation>
</message>
@ -336,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>Дизайн и разработка UI / UX</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -359,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -386,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Нет росту</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Росту</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Избранные нет</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Избранные</translation>
</message>
</context>
</TS>

View file

@ -29,21 +29,12 @@
<message>
<source>Delete</source>
<translation>Обриши</translation>
<<<<<<< HEAD
</message>
<message>
<source>Emojis</source>
<translation>Емотикони</translation>
</message>
<message>
=======
</message>
<message>
<source>Emojis</source>
<translation>Емотикони</translation>
</message>
<message>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<source>Tap to insert</source>
<translation>Тапни за убацивање</translation>
</message>
@ -52,25 +43,6 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
<source>What&apos;s on your mind?</source>
<translation type="unfinished"></translation>
</message>
@ -88,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -117,18 +88,6 @@
<translation>Инстанца</translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Унесите URL ваше Мастодон инстанце</translation>
</message>
@ -139,7 +98,6 @@
<message>
<source>Reload</source>
<translation>освежи</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
</context>
<context>
@ -289,34 +247,6 @@
<translation>Дозволите овој апликацији да користи ваш Mastodon налог</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Прикажи слике у објавама</translation>
</message>
@ -339,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>интерфејс дизајн и развој</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -362,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -389,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Уклони разглас</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Разгласи</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Уклони из омиљених</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Омиљено</translation>
</message>
</context>
</TS>

View file

@ -33,35 +33,6 @@
<message>
<source>Emojis</source>
<translation>Emojis</translation>
<<<<<<< HEAD
</message>
<message>
<source>Tap to insert</source>
<translation>Tryck för att infoga</translation>
</message>
<message>
<source>Write your warning here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
</message>
<message>
<source>Tap to insert</source>
@ -89,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -118,24 +88,15 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reload</source>
<translation type="unfinished"></translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation>Fyll i URL till Mastodoninstans</translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon är ett fritt och öppet socialt nätverk byggt ö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 --- beroende 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!</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -286,34 +247,6 @@
<translation>Godkänn denna app att använda ditt Mastodon-konto dina vägnar</translation>
</message>
<message>
<<<<<<< HEAD
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Credits</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
=======
<source>Load images in toots</source>
<translation>Ladda bilder i toots</translation>
</message>
@ -336,7 +269,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX design och utveckling</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
</message>
<message>
<source>Visual identity</source>
@ -359,11 +291,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<<<<<<< HEAD
<source>Chinese translation</source>
=======
<source>Development and maintenence</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -386,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Avpuffa</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Puffa</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Avfavorisera</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Favorisera</translation>
</message>
</context>
</TS>

View file

@ -17,7 +17,26 @@
</message>
<message>
<source>said</source>
<translation></translation>
<translation></translation>
</message>
</context>
<context>
<name>Browser</name>
<message>
<source>Open in Browser</source>
<translation></translation>
</message>
<message>
<source>Web mode</source>
<translation></translation>
</message>
<message>
<source>Reading mode</source>
<translation></translation>
</message>
<message>
<source>Copy URL</source>
<translation></translation>
</message>
</context>
<context>
@ -26,6 +45,26 @@
<source>Conversation</source>
<translation></translation>
</message>
<message>
<source>Content warning!</source>
<translation>!</translation>
</message>
<message>
<source>public</source>
<translation></translation>
</message>
<message>
<source>unlisted</source>
<translation></translation>
</message>
<message>
<source>followers only</source>
<translation></translation>
</message>
<message>
<source>direct</source>
<translation></translation>
</message>
<message>
<source>Delete</source>
<translation></translation>
@ -36,36 +75,7 @@
</message>
<message>
<source>Tap to insert</source>
<translation></translation>
</message>
<message>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
<source>Write your warning here</source>
<translation></translation>
=======
<source>Content warning!</source>
<translation>!</translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
<message>
<source>Public</source>
<translation></translation>
</message>
<message>
<source>Unlisted</source>
<translation></translation>
</message>
<message>
<source>Followers-only</source>
<translation></translation>
</message>
<message>
<source>Direct</source>
<translation></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
<translation>?</translation>
<translation></translation>
</message>
</context>
<context>
@ -91,12 +101,6 @@
<message>
<source>Instance</source>
<translation></translation>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon Mastodon </translation>
=======
</message>
<message>
<source>Enter an Mastodon instance URL</source>
@ -106,20 +110,14 @@
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation>Mastodon Mastodon </translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
<message>
<source>Reload</source>
<translation></translation>
</message>
<message>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
<source>Enter a valid Mastodon instance URL</source>
<translation> Mastodon URL</translation>
=======
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
</context>
<context>
@ -184,27 +182,19 @@
</message>
<message>
<source>please wait...</source>
<translation>......</translation>
<translation>......</translation>
</message>
</context>
<context>
<name>Profile</name>
<message>
<source>Unfollow</source>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
<translation></translation>
</message>
<message>
<source>Follow request sent!</source>
<translation></translation>
=======
<translation></translation>
</message>
<message>
<source>Follow request sent!</source>
<translation></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
<message>
<source>Following</source>
@ -263,73 +253,6 @@
</message>
<message>
<source>Remove Account</source>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
<translation></translation>
</message>
<message>
<source>Add Account</source>
<translation></translation>
</message>
<message>
<source>Deauthorize this app and remove your account</source>
<translation></translation>
</message>
<message>
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation>使 Mastodon </translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation></translation>
</message>
<message>
<source>About</source>
<translation></translation>
</message>
<message>
<source>Credits</source>
<translation></translation>
</message>
<message>
<source>UI/UX design and development</source>
<translation>UI/UX设计及开发</translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation> Mastodon Tooter Duško Angirević &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt; 。</translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation></translation>
</message>
<message>
<source>Visual identity</source>
<translation></translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation>西</translation>
</message>
<message>
<source>Dutch translation</source>
<translation></translation>
</message>
<message>
<source>Spanish translation</source>
<translation>西</translation>
</message>
<message>
<source>Added README file</source>
<translation> README </translation>
</message>
<message>
<source>Chinese translation</source>
<translation></translation>
=======
<translation></translation>
</message>
<message>
@ -367,7 +290,6 @@
<message>
<source>UI/UX design and development</source>
<translation>UI/UX </translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
</context>
<context>
@ -397,16 +319,12 @@
</message>
<message>
<source>Unfavorite</source>
<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
<translation></translation>
=======
<translation></translation>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
</message>
<message>
<source>Favorite</source>
<translation></translation>
<translation></translation>
</message>
</context>
</TS>

View file

@ -33,35 +33,6 @@
<message>
<source>Emojis</source>
<translation>Emojis</translation>
<<<<<<< HEAD
</message>
<message>
<source>Tap to insert</source>
<translation>Tap to insert</translation>
</message>
<message>
<source>Write your warning here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Public</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unlisted</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Followers-only</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Direct</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>What&apos;s on your mind?</source>
=======
</message>
<message>
<source>Tap to insert</source>
@ -89,7 +60,6 @@
</message>
<message>
<source>Direct</source>
>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
<translation type="unfinished"></translation>
</message>
</context>
@ -117,6 +87,10 @@
<source>Instance</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter an Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
<translation type="unfinished"></translation>
@ -125,10 +99,6 @@
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter a valid Mastodon instance URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainPage</name>
@ -276,12 +246,20 @@
<source>Authorize this app to use your Mastodon account in your behalf</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load images in toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable this option if you want to preserve your data connection</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>About</source>
<source>Translate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use Transifex to help with app translation to your language</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -292,42 +270,6 @@
<source>UI/UX design and development</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>This application is a forked version of the Mastodon client Tooter, originally developed by Duško Angirević, which fixes various bugs. Source code on &lt;a href=&apos;https://github.com/molan-git/harbour-tooter&apos;&gt;GitHub&lt;/a&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Load Images in Toots</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Maintainer of this release</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Occitan &amp; French translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dutch translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Spanish translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Added README file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Chinese translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Visual identity</source>
<translation type="unfinished"></translation>
@ -372,19 +314,19 @@
<name>VisualContainer</name>
<message>
<source>Unboost</source>
<translation type="unfinished"></translation>
<translation>Unboost</translation>
</message>
<message>
<source>Boost</source>
<translation type="unfinished"></translation>
<translation>Boost</translation>
</message>
<message>
<source>Unfavorite</source>
<translation type="unfinished"></translation>
<translation>Unfavorite</translation>
</message>
<message>
<source>Favorite</source>
<translation type="unfinished"></translation>
<translation>Favorite</translation>
</message>
</context>
</TS>