Beta release version

Change file names for beta release version.

config/x-harbour.tooter.activity.conf

@@ -1,5 +1,5 @@
-appIcon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter.png
-x-nemo-icon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter.png
+appIcon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png
+x-nemo-icon=/usr/share/harbour-tooter/config/icon-lock-harbour-tooter-beta.png
 x-nemo-priority=120
 x-nemo-feedback=sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

harbour-tooter-beta.desktop

@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 X-Nemo-Application-Type=silica-qt5
-Icon=harbour-tooter
-Exec=harbour-tooter
-Name=Tooter Beta
+Icon=harbour-tooter-beta
+Exec=harbour-tooter-beta
+Name=Tooter β
 # translation example:
 # your app name in German locale (de)
 #

harbour-tooter-beta.pro

@@ -39,7 +39,8 @@ 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/harbour-tooter-beta.cpp
 SOURCES += src/imageuploader.cpp
 SOURCES += src/filedownloader.cpp
 SOURCES += src/notifications.cpp
@@ -52,7 +53,8 @@ HEADERS += src/notifications.h
 HEADERS += src/dbusAdaptor.h
 HEADERS += src/dbus.h
 
-DISTFILES += qml/harbour-tooter.qml \
+DISTFILES += qml/harbour-tooter-beta.qml \
+    config/icon-lock-harbour-tooter-beta.png \
     qml/pages/components/VisualContainer.qml \
     qml/pages/components/MiniStatus.qml \
     qml/pages/components/MiniHeader.qml \
@@ -81,7 +83,6 @@ DISTFILES += qml/harbour-tooter.qml \
     qml/images/icon-l-profile.svg \
     qml/lib/Mastodon.js \
     qml/lib/Worker.js \
-    config/icon-lock-harbour-tooter.png \
     config/x-harbour.tooter.activity.conf \
     rpm/harbour-tooter-beta.changes \
     rpm/harbour-tooter-beta.changes.run.in \
@@ -100,17 +101,17 @@ CONFIG += sailfishapp_i18n
 # 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
-TRANSLATIONS += translations/harbour-tooter-it.ts
+TRANSLATIONS += translations/harbour-tooter-beta-de.ts
+TRANSLATIONS += translations/harbour-tooter-beta-el.ts
+TRANSLATIONS += translations/harbour-tooter-beta-es.ts
+TRANSLATIONS += translations/harbour-tooter-beta-fi.ts
+TRANSLATIONS += translations/harbour-tooter-beta-fr.ts
+TRANSLATIONS += translations/harbour-tooter-beta-nl.ts
+TRANSLATIONS += translations/harbour-tooter-beta-nl_BE.ts
+TRANSLATIONS += translations/harbour-tooter-beta-oc.ts
+TRANSLATIONS += translations/harbour-tooter-beta-pl.ts
+TRANSLATIONS += translations/harbour-tooter-beta-ru.ts
+TRANSLATIONS += translations/harbour-tooter-beta-sr.ts
+TRANSLATIONS += translations/harbour-tooter-beta-sv.ts
+TRANSLATIONS += translations/harbour-tooter-beta-zh_CN.ts
+TRANSLATIONS += translations/harbour-tooter-beta-it.ts

qml/cover/CoverPage.qml

@@ -95,7 +95,7 @@ CoverBackground {
             rightMargin: Theme.paddingLarge
             verticalCenter: iconNot.verticalCenter
         }
-        text: "Tooter"
+        text: "Tooter β"
         color: Theme.primaryColor
     }
 

qml/lib/API.js

@@ -1,7 +1,7 @@
 .pragma library
 .import QtQuick.LocalStorage 2.0 as LS
 
-var db = LS.LocalStorage.openDatabaseSync("tooter", "", "harbour-tooter", 100000);
+var db = LS.LocalStorage.openDatabaseSync("tooter", "", "harbour-tooter-beta", 100000);
 var conf = {};
 var mediator = (function(){
     var subscribe = function(channel, fn){

rpm/harbour-tooter-beta.spec

@@ -3,7 +3,7 @@
 # Generated by: spectacle version 0.27
 # 
 
-Name:       harbour-tooter
+Name:       harbour-tooter-beta
 
 # >> macros
 # << macros
@@ -14,12 +14,12 @@ Name:       harbour-tooter
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Tooter
 Version:    1.0.4
-Release:    1
+Release:    2
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  harbour-tooter.yaml
+Source100:  harbour-tooter-beta.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)

rpm/harbour-tooter-beta.yaml

@@ -1,7 +1,7 @@
 Name: harbour-tooter-beta
 Summary: Tooter
 Version: 1.0.4
-Release: 1
+Release: 2
 # 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

src/harbour-tooter-beta.cpp

@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     Dbus *dbus = new Dbus();
     view->rootContext()->setContextProperty("Dbus", dbus);
 
-    view->setSource(SailfishApp::pathTo("qml/harbour-tooter.qml"));
+    view->setSource(SailfishApp::pathTo("qml/harbour-tooter-beta.qml"));
     view->show();
     return app->exec();
 }

translations/harbour-tooter-beta.ts

@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>API</name>
+    <message>
+        <location filename="../qml/lib/API.js" line="158"/>
+        <source>favourited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/lib/API.js" line="169"/>
+        <source>followed you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/lib/API.js" line="179"/>
+        <source>boosted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/lib/API.js" line="189"/>
+        <location filename="../qml/lib/API.js" line="191"/>
+        <source>said</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Conversation</name>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="65"/>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="182"/>
+        <source>Write your warning here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="213"/>
+        <source>What&apos;s on your mind?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="274"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="372"/>
+        <source>Public</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="375"/>
+        <source>Unlisted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="378"/>
+        <source>Followers-only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="381"/>
+        <source>Direct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="494"/>
+        <source>Emojis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Conversation.qml" line="495"/>
+        <source>Tap to insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFullScreen</name>
+    <message>
+        <location filename="../qml/pages/components/ImageFullScreen.qml" line="287"/>
+        <source>Error loading</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageUploader</name>
+    <message>
+        <location filename="../src/imageuploader.cpp" line="83"/>
+        <source>The file %1 does not exists</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LoginPage</name>
+    <message>
+        <location filename="../qml/pages/LoginPage.qml" line="56"/>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/LoginPage.qml" line="59"/>
+        <source>Instance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/LoginPage.qml" line="65"/>
+        <source>Enter a valid Mastodon instance URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/LoginPage.qml" line="123"/>
+        <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>
+        <location filename="../qml/pages/LoginPage.qml" line="194"/>
+        <source>Reload</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainPage</name>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="64"/>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="73"/>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="83"/>
+        <source>Local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="93"/>
+        <source>Federated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="120"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="125"/>
+        <source>@user or #term</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/MainPage.qml" line="249"/>
+        <source>New Toot</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MiniStatus</name>
+    <message>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="36"/>
+        <source>boosted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="39"/>
+        <source>favourited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="42"/>
+        <source>followed you</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MyList</name>
+    <message>
+        <location filename="../qml/pages/components/MyList.qml" line="10"/>
+        <source>Loading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/MyList.qml" line="11"/>
+        <source>please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/MyList.qml" line="63"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/MyList.qml" line="70"/>
+        <source>Load more</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Profile</name>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="172"/>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="178"/>
+        <source>Followers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="183"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="188"/>
+        <source>Statuses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="193"/>
+        <source>Favourites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="202"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="202"/>
+        <source>Follow request sent!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="202"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="215"/>
+        <source>Unmute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="215"/>
+        <source>Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="228"/>
+        <source>Unblock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="228"/>
+        <source>Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="247"/>
+        <source>Bio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Profile.qml" line="294"/>
+        <source>Open Profile in Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Settings</name>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="20"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="27"/>
+        <source>Remove Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="27"/>
+        <source>Add Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="28"/>
+        <source>Deauthorize this app and remove your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="28"/>
+        <source>Authorize this app to access your Mastodon account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="60"/>
+        <source>Load images in toots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="61"/>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="68"/>
+        <source>Translate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="69"/>
+        <source>Use Transifex to help with app translation to your language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="85"/>
+        <source>Credits</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="99"/>
+        <source>UI/UX design and development</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="105"/>
+        <source>Visual identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="111"/>
+        <source>Development and translations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="117"/>
+        <source>Occitan &amp; French translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="123"/>
+        <source>Chinese translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="129"/>
+        <source>Dutch translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="135"/>
+        <source>Spanish translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/Settings.qml" line="141"/>
+        <source>Added README file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Toot</name>
+    <message>
+        <location filename="../qml/pages/components/Toot.qml" line="35"/>
+        <source>boosted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/Toot.qml" line="38"/>
+        <source>favourited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/Toot.qml" line="41"/>
+        <source>followed you</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VisualContainer</name>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="198"/>
+        <source>Unboost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="198"/>
+        <source>Boost</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="235"/>
+        <source>Unfavorite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="235"/>
+        <source>Favorite</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>