Merge branch 'master' of https://github.com/dysk0/harbour-tooter

harbour-tooter.pro

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # NOTICE:
 #
 # Application name defined in TARGET has a corresponding QML filename.
@@ -108,3 +109,122 @@ 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.
+# 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/VisualContainer.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/Browser.qml \
+    qml/pages/Profile.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/tooter.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 \
+    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
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e

qml/lib/Worker.js

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

qml/pages/Profile.qml

@@ -264,6 +264,7 @@ 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) {
@@ -284,6 +285,28 @@ 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

qml/pages/Settings.qml

@@ -131,6 +131,12 @@ Page {
                             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: qsTr("Occitan & French translation")

rpm/harbour-tooter.changes

@@ -1,3 +1,9 @@
+<<<<<<< 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

rpm/harbour-tooter.spec

@@ -13,8 +13,13 @@ 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/

rpm/harbour-tooter.yaml

@@ -1,7 +1,12 @@
 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

translations/harbour-tooter-de.ts

@@ -40,6 +40,7 @@
     </message>
     <message>
         <source>Write your warning here</source>
+<<<<<<< HEAD
         <translation>Füge eine Inhaltswarnung hinzu</translation>
     </message>
     <message>
@@ -61,6 +62,29 @@
     <message>
         <source>What&apos;s on your mind?</source>
         <translation>Was möchtest du mitteilen?</translation>
+=======
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -85,11 +109,23 @@
     </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>
+        <source>Enter an Mastodon instance URL</source>
+        <translation>Gib eine Mastadon Instance URL ein</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, 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>
@@ -217,11 +253,19 @@
     </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>
@@ -232,6 +276,7 @@
     </message>
     <message>
         <source>Remove Account</source>
+<<<<<<< HEAD
         <translation>Konto entfernen</translation>
     </message>
     <message>
@@ -297,6 +342,69 @@
     <message>
         <source>Chinese translation</source>
         <translation>Chinesische Übersetzung</translation>
+=======
+        <translation>Account löschen</translation>
+    </message>
+    <message>
+        <source>Add Account</source>
+        <translation>Account hinzufügen</translation>
+    </message>
+    <message>
+        <source>Deauthorize this app and remove your account</source>
+        <translation>Der App Autorisierung entziehen und Account entfernen</translation>
+    </message>
+    <message>
+        <source>Authorize this app to use your Mastodon account in your behalf</source>
+        <translation>Autorisiere diese App deinen Mastodon Account in deinem Namen zu nutzen</translation>
+    </message>
+    <message>
+        <source>Load images in toots</source>
+        <translation>Lade Bilder in den Toots</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Deaktiviere diese Option um deinen Datenverbindung zu schonen</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Übersetzen</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Nutze Transifex um bei der Übersetzung in deine Sprache zu helfen</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Credits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX Design und Implementierung</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>Development and maintenence</source>
+        <translation type="unfinished"></translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>

translations/harbour-tooter-el.ts

@@ -29,12 +29,21 @@
     <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>
@@ -43,6 +52,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60,6 +70,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,7 +110,7 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Σύνδεση</translation>
     </message>
     <message>
         <source>Instance</source>
@@ -228,25 +257,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Ρυθμίσεις</translation>
+        <translation>Ρυθμίσεις</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Αφαίρεση λογαριασμού</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Προσθήκη λογαριασμού</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Άρση της αδειοδότησης της εφαρμογής και αφαίρεση του λογαριασμού σας</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <translation>Να επιτρέπεται στην εφαρμογή να χρησιμοποιεί τον λογαριασμό σας στο Mastodon εκ μέρους σας</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Disable this option if you want to preserve your data connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -273,6 +303,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Φόρτωση των εικόνων στα toot</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Απενεργοποιήστε αυτήν την επιλογή αν θέλετε να διατηρήσετε την σύνδεση των δεδομένων σας</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Μετάφραση</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Χρησιμοποιήστε το Transifex για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Ευχαριστίες</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX σχεδιασμός και ανάπτυξη</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +349,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-es.ts

@@ -29,6 +29,7 @@
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Emojis</source>
@@ -61,6 +62,40 @@
     <message>
         <source>What&apos;s on your mind?</source>
         <translation>¿Qué tienes en mente?</translation>
+=======
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -86,18 +121,32 @@
     <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>
+        <translation>Introduce URL de una instancia de 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 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>
@@ -217,11 +266,19 @@
     </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>
@@ -244,6 +301,7 @@
     </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>
@@ -297,6 +355,57 @@
     <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>
+        <source>Load images in toots</source>
+        <translation>Cargar imágenes en toots</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>Translate</source>
+        <translation>Traducir</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Usa Transifex para ayudar en la traducción a tu idioma de esta aplicación</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>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>Development and maintenence</source>
+        <translation type="unfinished"></translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>

translations/harbour-tooter-fi.ts

@@ -22,11 +22,19 @@
 </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>
@@ -43,6 +51,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60,6 +69,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -298,6 +326,30 @@
         <source>Chinese translation</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>Development and maintenence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Toot</name>

translations/harbour-tooter-fr.ts

@@ -29,6 +29,7 @@
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Emojis</source>
@@ -61,6 +62,40 @@
     <message>
         <source>What&apos;s on your mind?</source>
         <translation>A quoi penses-tu?</translation>
+=======
+    </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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -86,18 +121,32 @@
     <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>
+        <translation>Saisissez l’URL d’une instance 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 est un réseau libre et open source. Il s’agit 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 d’autres 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>
@@ -221,13 +270,18 @@
     </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>
@@ -296,6 +350,72 @@
     </message>
     <message>
         <source>Added README file</source>
+=======
+        <translation>Préférences</translation>
+    </message>
+    <message>
+        <source>Remove Account</source>
+        <translation>Supprimer le compte</translation>
+    </message>
+    <message>
+        <source>Add Account</source>
+        <translation>Ajouter un compte</translation>
+    </message>
+    <message>
+        <source>Deauthorize this app and remove your account</source>
+        <translation>Supprimer votre compte de l&apos;application</translation>
+    </message>
+    <message>
+        <source>Authorize this app to use your Mastodon account in your behalf</source>
+        <translation>Autoriser cette application à utiliser votre compte Mastodon en votre nom</translation>
+    </message>
+    <message>
+        <source>Load images in toots</source>
+        <translation>Charger les images des pouets</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Désactivez cette option si vous souhaitez économiser votre consommation de données</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Traduire</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Utilisez Transifex pour aider à la traduction de l&apos;application dans votre langue</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Crédits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>design et développement de l&apos;interface</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>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-nl.ts

@@ -29,12 +29,21 @@
     <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>
@@ -43,6 +52,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60,6 +70,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,13 +110,14 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Inloggen</translation>
     </message>
     <message>
         <source>Instance</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -98,6 +128,18 @@
     <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>
+    <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 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.</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Herladen</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -228,25 +270,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Instellingen</translation>
+        <translation>Instellingen</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijderen account</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Toevoegen account</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Trek autorisaties van deze app in en verwijder je account</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -273,6 +316,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Laden afbeeldingen in toots</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Schakel deze optie uit als je je dataverbinding wilt behouden</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Vertalen</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Gebruik Transifex om deze app te helpen vertalen in jouw taal</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Credits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX ontwerp en ontwikkeling</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +362,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-nl_BE.ts

@@ -29,12 +29,21 @@
     <message>
         <source>Delete</source>
         <translation>Verwijderen</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Emojis</source>
         <translation>Emoji’s</translation>
     </message>
     <message>
+=======
+    </message>
+    <message>
+        <source>Emojis</source>
+        <translation>Emoji’s</translation>
+    </message>
+    <message>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <source>Tap to insert</source>
         <translation>Tikt voor in te voegen</translation>
     </message>
@@ -43,6 +52,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60,6 +70,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,13 +110,14 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Inloggen</translation>
     </message>
     <message>
         <source>Instance</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -98,6 +128,18 @@
     <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>
+    <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 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.</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Herladen</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -228,25 +270,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Instellingen</translation>
+        <translation>Instellingen</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Account verwijderen</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Account toevoegen</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Trekt autorisaties van dezen app in en verwijdert uwen account</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -273,6 +316,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Afbeeldingen in toots laden</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Schakelt dees optie uit als ge uw verbinding wilt behouden</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Vertalen</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Gebruikt Transifex voor te helpen met dezen app in uw taal te vertalen</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Credits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX-ontwerp en -ontwikkeling</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +362,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-oc.ts

@@ -33,6 +33,7 @@
     <message>
         <source>Emojis</source>
         <translation>Emojis</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Tap to insert</source>
@@ -60,6 +61,35 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+    </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>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,19 +111,28 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Connexion</translation>
     </message>
     <message>
         <source>Instance</source>
         <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 l’URL d’una 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>
@@ -228,25 +267,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Parmètres</translation>
+        <translation>Paramètres</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Levar un compte</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar un compte</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Revocar l’aplicacion e levar vòstre compte</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -273,6 +313,30 @@
     <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>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Desactivar aquesta opcion per estalviar vòstra connexion de donadas</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Traduire</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Utilizar Transifex per ajudar a traduire l’aplicacion dins vòstra lenga</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Crèdits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX design e desvlopament</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +359,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-pl.ts

@@ -1,33 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>API</name>
     <message>
         <source>favourited</source>
-        <translation type="unfinished">dodał(a) do ulubionych</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>followed you</source>
-        <translation>zaczął(-ęła) Cię śledzić</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>boosted</source>
-        <translation>podbił(a)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>said</source>
+<<<<<<< HEAD
         <translation>napisał(a)</translation>
+=======
+        <translation type="unfinished"></translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
     <name>Conversation</name>
     <message>
         <source>Conversation</source>
-        <translation>Konwersacja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
+<<<<<<< HEAD
         <translation>Usuń</translation>
     </message>
     <message>
@@ -37,12 +42,24 @@
     <message>
         <source>Tap to insert</source>
         <translation>Dotknij aby wstawić</translation>
+=======
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>
@@ -60,6 +77,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -67,14 +103,14 @@
     <name>ImageFullScreen</name>
     <message>
         <source>Error loading</source>
-        <translation>Błąd ładowania</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageUploader</name>
     <message>
         <source>The file %1 does not exists</source>
-        <translation>Plik %1 nie istnieje</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -104,116 +140,124 @@
     <name>MainPage</name>
     <message>
         <source>Home</source>
-        <translation>Strona główna</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications</source>
-        <translation>Powiadomienia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Toot</source>
-        <translation>Nowy wpis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Szukaj</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@user or #term</source>
-        <translation>@użytkownik lub #tag</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local</source>
-        <translation>Lokalne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Federated</source>
-        <translation>Globalne</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MiniStatus</name>
     <message>
         <source>boosted</source>
-        <translation>podbił(a)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>favourited</source>
-        <translation>dodał(a) do ulubionych</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>followed you</source>
-        <translation>zaczął(-ęła) Cię śledzić</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MyList</name>
     <message>
         <source>Load more</source>
-        <translation>Załaduj więcej</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>Ustawienia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading</source>
-        <translation>Ładowanie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait...</source>
-        <translation>proszę czekać…</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Profile</name>
     <message>
         <source>Unfollow</source>
-        <translation>Przestań śledzić</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow request sent!</source>
-        <translation>Wysłano prośbę o możliwość śledzenia!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Following</source>
-        <translation>Śledzisz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mute</source>
-        <translation>Wycisz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unmute</source>
-        <translation>Unmute</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unblock</source>
-        <translation>Unblock</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
-        <translation>Block</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statuses</source>
-        <translation>Statuses</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Favourites</source>
-        <translation>Favourites</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow</source>
-        <translation>Follow</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
-        <translation>Summary</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Followers</source>
-        <translation>Followers</translation>
+        <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>
     <message>
         <source>Bio</source>
@@ -228,7 +272,7 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Ustawienia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Account</source>
@@ -298,20 +342,44 @@
         <source>Chinese translation</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>Development and maintenence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Toot</name>
     <message>
         <source>boosted</source>
-        <translation>podbił(a)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>favourited</source>
-        <translation>dodał(a) do ulubionych</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>followed you</source>
-        <translation>zaczął(-ęła Cię śledzić)</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>

translations/harbour-tooter-ru.ts

@@ -33,6 +33,7 @@
     <message>
         <source>Emojis</source>
         <translation>Cмайликов</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Tap to insert</source>
@@ -60,6 +61,35 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+    </message>
+    <message>
+        <source>Tap to insert</source>
+        <translation>Нажмите, чтобы вставить</translation>
+    </message>
+    <message>
+        <source>Write your warning here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,19 +111,28 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Авторизоваться</translation>
     </message>
     <message>
         <source>Instance</source>
         <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>
@@ -228,25 +267,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Настройки</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить учетную запись</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить аккаунт</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>удалить учетную запись с устройства</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <translation>Уполномочить это приложение использовать свою учетную запись Mastodon от вашего имени</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Disable this option if you want to preserve your data connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -273,6 +313,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Загружать изображения</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Отключите эту опцию, если вы хотите сохранить подключение к данным</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Переведите</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Используйте Transifex, чтобы помочь с переводом приложения на ваш язык</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Зачет</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>Дизайн и разработка UI / UX</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +359,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-sr.ts

@@ -29,12 +29,21 @@
     <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>
@@ -43,6 +52,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60,6 +70,25 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+        <source>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,13 +110,14 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Пријава</translation>
     </message>
     <message>
         <source>Instance</source>
-        <translation type="unfinished"></translation>
+        <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>
@@ -98,6 +128,18 @@
     <message>
         <source>Enter a valid Mastodon instance URL</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Enter an Mastodon instance URL</source>
+        <translation>Унесите URL ваше Мастодон инстанце</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 је бесплатна, open-source друштвена мрежа. Децентрализована алтернатива комерцијалним платформама која избегава ризике једне компаније која монополизује вашу комуникацију. Одаберите сервер у који имате поверења и без обзира на ваш избор - комуницирајте с осталим корисницима других мрежа. Свако може водити сопствену инстанцу Mastodon мреже и учестовати у комуникацији с другим инстанцама.</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>освежи</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
 </context>
 <context>
@@ -228,25 +270,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Подешавања</translation>
+        <translation>Подешавања</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Уклони налог</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Додај налог</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Укините дозволе за кориштење и уклоните налог с телефона</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <translation>Дозволите овој апликацији да користи ваш Mastodon налог</translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Disable this option if you want to preserve your data connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -273,6 +316,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Прикажи слике у објавама</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Искључите ову опцију уколико желите да уштедите на преносу података</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Преведи</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Користите Transifex и помозите у преводу апликације на други језик</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Спомен плоча</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>интерфејс дизајн и развој</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +362,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-sv.ts

@@ -33,6 +33,7 @@
     <message>
         <source>Emojis</source>
         <translation>Emojis</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Tap to insert</source>
@@ -60,6 +61,35 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+    </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>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -81,19 +111,28 @@
     <name>LoginPage</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Logga in</translation>
     </message>
     <message>
         <source>Instance</source>
         <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 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!</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Enter a valid Mastodon instance URL</source>
@@ -228,25 +267,26 @@
     <name>Settings</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Inställningar</translation>
+        <translation>Inställningar</translation>
     </message>
     <message>
         <source>Remove Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Radera konto</translation>
     </message>
     <message>
         <source>Add Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till konto</translation>
     </message>
     <message>
         <source>Deauthorize this app and remove your account</source>
-        <translation type="unfinished"></translation>
+        <translation>Avauktorisera  denna app och radera ditt konto</translation>
     </message>
     <message>
         <source>Authorize this app to use your Mastodon account in your behalf</source>
-        <translation type="unfinished"></translation>
+        <translation>Godkänn denna app att använda ditt Mastodon-konto på 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>
@@ -273,6 +313,30 @@
     <message>
         <source>Maintainer of this release</source>
         <translation type="unfinished"></translation>
+=======
+        <source>Load images in toots</source>
+        <translation>Ladda bilder i toots</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Inaktivera det här alternativet om du vill behålla din dataanslutning </translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Översätt</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>Använd Transifex för att hjälpa med app-översättningar till ditt språk</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>Erkännanden</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX design och utveckling</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
     </message>
     <message>
         <source>Visual identity</source>
@@ -295,7 +359,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+<<<<<<< HEAD
         <source>Chinese translation</source>
+=======
+        <source>Development and maintenence</source>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/harbour-tooter-zh_CN.ts

@@ -39,8 +39,13 @@
         <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>
@@ -86,18 +91,35 @@
     <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>
+        <translation>输入一个 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: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>
@@ -169,11 +191,20 @@
     <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>
@@ -232,6 +263,7 @@
     </message>
     <message>
         <source>Remove Account</source>
+<<<<<<< HEAD:translations/harbour-tooter-zh_CN.ts
         <translation>移除账号</translation>
     </message>
     <message>
@@ -297,6 +329,45 @@
     <message>
         <source>Chinese translation</source>
         <translation>汉语翻译</translation>
+=======
+        <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>Load images in toots</source>
+        <translation>在嘟嘟加载图片</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>如果你想保护你的数据连接 请禁用此操作</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>翻译</translation>
+    </message>
+    <message>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation>使用 Transifex 帮助翻译此软件到你所使用的语言。</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <translation>信誉</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX 设计及开发</translation>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e:translations/harbour-tooter-zh.ts
     </message>
 </context>
 <context>
@@ -326,7 +397,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>

translations/harbour-tooter.ts

@@ -33,6 +33,7 @@
     <message>
         <source>Emojis</source>
         <translation>Emojis</translation>
+<<<<<<< HEAD
     </message>
     <message>
         <source>Tap to insert</source>
@@ -60,6 +61,35 @@
     </message>
     <message>
         <source>What&apos;s on your mind?</source>
+=======
+    </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>What&apos;s on your mind?</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>
+>>>>>>> 33d54bdda818c7a41c3a8cc8c5f09cb682584d8e
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -298,6 +328,30 @@
         <source>Chinese translation</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>Development and maintenence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Toot</name>