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

qml/images/icon-m-bookmark.svg

@@ -2,10 +2,9 @@
   <title>icon-m-bookmark</title>
   <g>
     <rect width="64" height="64" fill="#fff" fill-opacity="0"/>
-    <path d="M42.75,55.81l-9.8-9.19a1.39,1.39,0,0,0-1.9,0l-9.9,9.15a4.42,4.42,0,0,1-5.21.15,5.18,5.18,0,0,1-2-4.07V12.21A5.24,5.24,0,0,1,19.21,7H44.79A5.24,5.24,0,0,1,50,12.21V51.84a5.18,5.18,0,0,1-2,4.07A4.58,4.58,0,0,1,42.75,55.81ZM19.21,9A3.18,3.18,0,0,0,16,12.21V51.84a3.15,3.15,0,0,0,0,.43,2.65,2.65,0,0,0,4.47,1.39l9-8.65a3.57,3.57,0,0,1,4.94,0l9,8.65a2.65,2.65,0,0,0,4.47-1.39,3.15,3.15,0,0,0,0-.43V12.21A3.18,3.18,0,0,0,44.79,9Z" transform="translate(0 0)" fill="#fff"/>
+    <path d="M42.75,55.81,33,46.62a1.39,1.39,0,0,0-1.9,0l-9.9,9.15a4.42,4.42,0,0,1-5.21.15,5.18,5.18,0,0,1-2-4.07V12.21A5.24,5.24,0,0,1,19.21,7H44.79A5.24,5.24,0,0,1,50,12.21V51.84a5.18,5.18,0,0,1-2,4.07A4.58,4.58,0,0,1,42.75,55.81ZM19.21,9A3.18,3.18,0,0,0,16,12.15s0,0,0,.06V51.84a3.15,3.15,0,0,0,0,.43,2.65,2.65,0,0,0,4.47,1.39l9-8.65a3.57,3.57,0,0,1,4.94,0l9,8.65a2.65,2.65,0,0,0,4.47-1.39,3.15,3.15,0,0,0,0-.43V12.21A3.18,3.18,0,0,0,44.79,9Z" transform="translate(0 0)" fill="#fff"/>
     <g opacity="0.6">
-      <path d="M31.38,16.66c.34-1,.9-1,1.24,0l1.77,5.44A2.94,2.94,0,0,0,37,24h5.72c1.1,0,1.27.53.38,1.18l-4.63,3.36a2.94,2.94,0,0,0-1,3.08l1.77,5.44c.34,1-.11,1.37-1,.73l-4.63-3.36a2.94,2.94,0,0,0-3.24,0l-4.63,3.36c-.89.65-1.34.32-1-.73l1.77-5.44a2.94,2.94,0,0,0-1-3.08L20.9,25.18c-.89-.65-.72-1.18.38-1.18H27a2.94,2.94,0,0,0,2.62-1.9Z" transform="translate(0 0)" fill="#fff"/>
+      <path d="M43.45,25.65,38.83,29A2.34,2.34,0,0,0,38,31.43l1.77,5.44a1.6,1.6,0,0,1-.06,1.46.92.92,0,0,1-.71.37,1.94,1.94,0,0,1-1.1-.44L33.27,34.9a2.46,2.46,0,0,0-2.54,0L26.1,38.26c-.8.58-1.49.57-1.85.07a1.6,1.6,0,0,1-.06-1.46L26,31.43A2.38,2.38,0,0,0,25.17,29l-4.63-3.36c-.84-.61-.88-1.15-.77-1.49s.46-.75,1.5-.75H27a2.38,2.38,0,0,0,2.06-1.49l1.77-5.44c.32-1,.82-1.19,1.18-1.19s.86.21,1.18,1.19L35,21.91a2.39,2.39,0,0,0,2,1.5h5.72c1,0,1.39.41,1.5.75S44.29,25,43.45,25.65Z" transform="translate(0 0)" fill="#fff"/>
-      <path d="M39,38.7a1.94,1.94,0,0,1-1.1-.44L33.27,34.9a2.46,2.46,0,0,0-2.54,0L26.1,38.26c-.8.58-1.49.57-1.85.07a1.6,1.6,0,0,1-.06-1.46L26,31.43A2.37,2.37,0,0,0,25.17,29l-4.63-3.36c-.84-.61-.88-1.15-.77-1.49s.46-.75,1.5-.75H27a2.37,2.37,0,0,0,2.06-1.49l1.77-5.44c.32-1,.82-1.19,1.18-1.19s.86.21,1.18,1.19l1.77,5.44A2.38,2.38,0,0,0,37,23.41h5.72c1,0,1.39.41,1.5.75s.07.88-.77,1.49L38.83,29A2.34,2.34,0,0,0,38,31.43l1.77,5.44a1.6,1.6,0,0,1-.06,1.46A.91.91,0,0,1,39,38.7Zm-7-5.36a3.35,3.35,0,0,1,2,.6l4.63,3.36.14.09,0-.16L36.92,31.8a3.52,3.52,0,0,1,1.22-3.74l4.63-3.36.13-.1H37a3.52,3.52,0,0,1-3.18-2.31l-1.77-5.44L32,16.68l-.06.16-1.77,5.44A3.52,3.52,0,0,1,27,24.59H21.11l.13.1,4.63,3.36a3.51,3.51,0,0,1,1.22,3.74l-1.77,5.44,0,.16.14-.09L30,33.94A3.36,3.36,0,0,1,32,33.35Z" transform="translate(0 0)" fill="#fff"/>
     </g>
   </g>
 </svg>

qml/pages/SettingsPage.qml

@@ -148,11 +148,12 @@ Page {
                         }
 
                         ListElement {
-                            name: "Molan"
+                            name: "molan"
                             desc: qsTr("Development and translations")
                             mastodon: "molan@fosstodon.org"
-                            mail: ""
+                            mail: "mol_an@sunrise.ch"
                         }
+
                         ListElement {
                             name: "poetaster"
                             desc: qsTr("Development")

rpm/harbour-tooterb.changes

@@ -1,3 +1,13 @@
+* Thu Jan 19 2023  Alain Molteni <mol_an@sunrise.ch> 1.1.5
+- Hotfix broken toot sending
+
+* Wed Jan 18 2023  Alain Molteni <mol_an@sunrise.ch> 1.1.4-2
+- Fixes for home not updating & search (by poetaster)
+- added page to display saved Bookmarks (by poetaster)
+- added custom Bookmarks icon
+- updated translations (de, fr, it, nl, ru)
+- added 64-bit release
+
 * Thu Jan 5 2023  Mark Washeim <blueprint@poetaster.de> 1.1.3
 - Add changes from gitlogs (++) Bump for tag release.
 - Add conditional append all for search when no knownIds

rpm/harbour-tooterb.spec

@@ -43,7 +43,7 @@ PackageName: Tooter Beta
 Type: desktop-application
 Categories:
  - Network
-PackagerName: Mark Washeim (poetaster)
+PackagerName: Alain Molteni (molan)
 Custom:
  - Repo: https://github.com/molan-git/harbour-tooter
  - PackagingRepo: https://github.com/poetaster/harbour-tooter

translations/harbour-tooterb-de.ts

@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF Dokument</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Entwicklung</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb-en.ts

@@ -0,0 +1,416 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="en">
+<context>
+    <name>API</name>
+    <message>
+        <source>favourited</source>
+        <translation>favourited</translation>
+    </message>
+    <message>
+        <source>followed you</source>
+        <translation>followed you</translation>
+    </message>
+    <message>
+        <source>boosted</source>
+        <translation>boosted</translation>
+    </message>
+    <message>
+        <source>said</source>
+        <translation>said</translation>
+    </message>
+</context>
+<context>
+    <name>ConversationPage</name>
+    <message>
+        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
+        <translation>Copy Link to Clipboard</translation>
+    </message>
+    <message>
+        <source>Write your warning here</source>
+        <extracomment>placeholderText in Toot content warning panel</extracomment>
+        <translation>Write your warning here</translation>
+    </message>
+    <message>
+        <source>What&apos;s on your mind?</source>
+        <extracomment>placeholderText in Toot text panel</extracomment>
+        <translation>What&apos;s on your mind?</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation>Public</translation>
+    </message>
+    <message>
+        <source>Unlisted</source>
+        <translation>Unlisted</translation>
+    </message>
+    <message>
+        <source>Followers-only</source>
+        <translation>Followers-only</translation>
+    </message>
+    <message>
+        <source>Direct</source>
+        <translation>Direct</translation>
+    </message>
+    <message>
+        <source>Toot sent!</source>
+        <translation>Toot sent!</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Reply</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Hide Reply</translation>
+    </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation>Open in Browser</translation>
+    </message>
+</context>
+<context>
+    <name>CoverPage</name>
+    <message>
+        <source>New Toot</source>
+        <translation>New Toot</translation>
+    </message>
+</context>
+<context>
+    <name>EmojiSelect</name>
+    <message>
+        <source>Emojis</source>
+        <translation>Emojis</translation>
+    </message>
+    <message>
+        <source>Tap to insert</source>
+        <translation>Tap to insert</translation>
+    </message>
+</context>
+<context>
+    <name>ImageUploader</name>
+    <message>
+        <source>The file %1 does not exists</source>
+        <translation>The file %1 does not exists</translation>
+    </message>
+</context>
+<context>
+    <name>LoginPage</name>
+    <message>
+        <source>Login</source>
+        <translation>Login</translation>
+    </message>
+    <message>
+        <source>Instance</source>
+        <translation>Instance</translation>
+    </message>
+    <message>
+        <source>Enter a valid Mastodon instance URL</source>
+        <translation>Enter a valid Mastodon instance 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 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.</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Reload</translation>
+    </message>
+</context>
+<context>
+    <name>MainPage</name>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Notifications</source>
+        <translation>Notifications</translation>
+    </message>
+    <message>
+        <source>Local</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <source>Federated</source>
+        <translation>Federated</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>@user or #term</source>
+        <translation>@user or #term</translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation>New Toot</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Bookmarks</translation>
+    </message>
+</context>
+<context>
+    <name>MediaFullScreen</name>
+    <message>
+        <source>Error loading</source>
+        <translation>Error loading</translation>
+    </message>
+</context>
+<context>
+    <name>MediaItem</name>
+    <message>
+        <source>Image</source>
+        <translation>Image</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <source>PDF document</source>
+        <translation>PDF document</translation>
+    </message>
+</context>
+<context>
+    <name>MiniStatus</name>
+    <message>
+        <source>boosted</source>
+        <translation>boosted</translation>
+    </message>
+    <message>
+        <source>favourited</source>
+        <translation>favourited</translation>
+    </message>
+    <message>
+        <source>followed you</source>
+        <translation>followed you</translation>
+    </message>
+</context>
+<context>
+    <name>MyList</name>
+    <message>
+        <source>Settings</source>
+        <translation>Settings</translation>
+    </message>
+    <message>
+        <source>New Toot</source>
+        <translation>New Toot</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation>Reload</translation>
+    </message>
+    <message>
+        <source>Open in Browser</source>
+        <translation>Open in Browser</translation>
+    </message>
+    <message>
+        <source>Nothing found</source>
+        <translation>Nothing found</translation>
+    </message>
+</context>
+<context>
+    <name>ProfileHeader</name>
+    <message>
+        <source>Bot</source>
+        <translation>Bot</translation>
+    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Follows you</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
+</context>
+<context>
+    <name>ProfilePage</name>
+    <message>
+        <source>About</source>
+        <extracomment>If there's no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
+        <translation>About</translation>
+    </message>
+    <message>
+        <source>Followers</source>
+        <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
+        <translation>Followers</translation>
+    </message>
+    <message>
+        <source>Following</source>
+        <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
+        <translation>Following</translation>
+    </message>
+    <message>
+        <source>Statuses</source>
+        <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
+        <translation>Statuses</translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation>Mention</translation>
+    </message>
+    <message>
+        <source>Unfollow</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Unfollow</translation>
+    </message>
+    <message>
+        <source>Requested</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Requested</translation>
+    </message>
+    <message>
+        <source>Follow</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Follow</translation>
+    </message>
+    <message>
+        <source>Unmute</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Unmute</translation>
+    </message>
+    <message>
+        <source>Mute</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Mute</translation>
+    </message>
+    <message>
+        <source>Unblock</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Unblock</translation>
+    </message>
+    <message>
+        <source>Block</source>
+        <extracomment>Is a button. Keep it as short as possible.</extracomment>
+        <translation>Block</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsPage</name>
+    <message>
+        <source>Settings</source>
+        <translation>Settings</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Load Images in Toots</source>
+        <translation>Load Images in Toots</translation>
+    </message>
+    <message>
+        <source>Disable this option if you want to preserve your data connection</source>
+        <translation>Disable this option if you want to preserve your data connection</translation>
+    </message>
+    <message>
+        <source>Account</source>
+        <translation>Account</translation>
+    </message>
+    <message>
+        <source>Remove Account</source>
+        <translation>Remove Account</translation>
+    </message>
+    <message>
+        <source>Add Account</source>
+        <translation>Add Account</translation>
+    </message>
+    <message>
+        <source>Deauthorize this app from using your account and remove account data from phone</source>
+        <translation>Deauthorize this app from using your account and remove account data from phone</translation>
+    </message>
+    <message>
+        <source>Authorize this app to access your Mastodon account</source>
+        <translation>Authorize this app to access your Mastodon account</translation>
+    </message>
+    <message>
+        <source>Translate</source>
+        <translation>Translate</translation>
+    </message>
+    <message>
+        <source>Credits</source>
+        <extracomment>Translation alternative: &quot;Development&quot;</extracomment>
+        <translation>Credits</translation>
+    </message>
+    <message>
+        <source>UI/UX design and development</source>
+        <translation>UI/UX design and development</translation>
+    </message>
+    <message>
+        <source>Visual identity</source>
+        <translation>Visual identity</translation>
+    </message>
+    <message>
+        <source>Development and translations</source>
+        <translation>Development and translations</translation>
+    </message>
+    <message>
+        <source>Occitan &amp; French translation</source>
+        <translation>Occitan &amp; French translation</translation>
+    </message>
+    <message>
+        <source>Chinese translation</source>
+        <translation>Chinese translation</translation>
+    </message>
+    <message>
+        <source>Dutch translation</source>
+        <translation>Dutch translation</translation>
+    </message>
+    <message>
+        <source>Spanish translation</source>
+        <translation>Spanish translation</translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn't need translation.</extracomment>
+        <translation>Use</translation>
+    </message>
+    <message>
+        <source>to help with app translation to your language.</source>
+        <translation>to help with app translation to your language.</translation>
+    </message>
+    <message>
+        <source>Development</source>
+        <translation>Development</translation>
+    </message>
+</context>
+<context>
+    <name>VisualContainer</name>
+    <message>
+        <source>Unboost</source>
+        <translation>Unboost</translation>
+    </message>
+    <message>
+        <source>Boost</source>
+        <translation>Boost</translation>
+    </message>
+    <message>
+        <source>Unfavorite</source>
+        <translation>Unfavourite</translation>
+    </message>
+    <message>
+        <source>Favorite</source>
+        <translation>Favourite</translation>
+    </message>
+    <message>
+        <source>Mention</source>
+        <translation>Mention</translation>
+    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Conversation</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Remove Bookmark</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bookmark</translation>
+    </message>
+</context>
+</TS>

translations/harbour-tooterb-es.ts

@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>imagen</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>video</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>documento PDF</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Desarrollo</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb-fr.ts

@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>image</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>vidéo</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>document PDF</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Développement</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb-it.ts

@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>immagine</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>video</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>documento PDF</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Sviluppo</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb-nl.ts

@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Afbeelding</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF document</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Ontwikkeling</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb-ru.ts

@@ -151,7 +151,7 @@
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Закладки</translation>
     </message>
 </context>
 <context>
@@ -165,15 +165,15 @@
     <name>MediaItem</name>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Изображение</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Видео</translation>
     </message>
     <message>
         <source>PDF document</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF Документ</translation>
     </message>
 </context>
 <context>
@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Разработка</translation>
     </message>
 </context>
 <context>

translations/harbour-tooterb.ts

@@ -377,7 +377,7 @@
     </message>
     <message>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Development</translation>
     </message>
 </context>
 <context>