diff --git a/README.md b/README.md index 75d6626..f403de4 100644 --- a/README.md +++ b/README.md @@ -1,55 +1,25 @@ # Kaktus -Multi services mobile feed reader, specially designed to work offline. Supports [Netvibes](http://www.netvibes.com/), [The Old Reader](https://theoldreader.com/) and [Tiny Tiny Rss](https://tt-rss.org) as a feed aggregators. Works on Sailfish OS & BlackBerry 10 devices. +Multi aggregators mobile feed reader for Sailfish OS -Kaktus is working in sync mode, so network connectivity is not -required all the time. The significant feature is possibility -to read articles in offline mode, so without a network usage. -In such mode, previously downloaded content of web pages are -displayed from local cache. +## Supported aggregators -Kaktus is an *unofficial* application. It means that it was not developed by Netvibes nor Old Reader team. - -![Screenshots: Sailfish OS, BlackBerry 10, Meego](https://raw.githubusercontent.com/mkiol/kaktus/master/screenshots/00.png) +Kaktus supports follwing RSS feed aggregation services: +- [Netvibes](http://www.netvibes.com/) +- [The Old Reader](https://theoldreader.com/) +- [Tiny Tiny Rss](https://tt-rss.org) ## Downloads -The binary packages can be downloaded from: -- Sailfish (Jolla phone): Jolla Store or [OpenRepos](https://openrepos.net/content/mkiol/kaktus) -- BlackBerry 10: [BlackBerry World](https://appworld.blackberry.com/webstore/content/59951312) or [BAR file directly from GitHub](https://github.com/mkiol/kaktus/raw/master/bb10/bar/kaktus-2_5_0_1.bar) +Binary packages for Sailfish OS can be downloaded +from [OpenRepos](https://openrepos.net/content/mkiol/kaktus) and Jolla Store -Symbian and Meego versions were discontinued. +## Translations +If you would like to contribute to the project by doing translation, feel free to: +* make pull request with new [translation file](https://github.com/mkiol/kaktus/tree/master/translations), or +* add translation using [Transifex](https://www.transifex.com/mkiol/kaktus/) service, or +* just send finished translation file to Kaktus's support email. -## Copyrights - -Copyright © 2014-2016 Michal Kosciesza - -Kaktus is free software: you can redistribute it and/or modify it under the -terms of the GNU General Public License as published by the Free Software -Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -## Third-party components - -Kaktus utilizes third party software. Such third party software -is copyrighted by their owners as indicated below. - -##### AbstractItemModel -Copyright © 2013, Kläralvdalens Datakonsult AB, a KDAB -Group company, - -##### SimpleCrypt -Copyright © 2011, Andre Somers - -##### QHttpServer -Copyright © 2011-2013 Nikhil Marathe - -##### QJson -Copyright © 2008 Flavio Castelli - -##### Readability.js -Copyright © 2010 Arc90 Inc +## License +Kaktus is developed as an open source project under +[GNU General Public License version 3](https://www.gnu.org/licenses/gpl-3.0.en.html). diff --git a/bb10/bar/kaktus-2_5_0_1.bar b/bb10/bar/kaktus-2_5_0_1.bar deleted file mode 100644 index 2c04ff5..0000000 Binary files a/bb10/bar/kaktus-2_5_0_1.bar and /dev/null differ diff --git a/sailfish/harbour-kaktus.desktop b/harbour-kaktus.desktop similarity index 100% rename from sailfish/harbour-kaktus.desktop rename to harbour-kaktus.desktop diff --git a/sailfish/icons/108x108/harbour-kaktus.png b/icons/108x108/harbour-kaktus.png similarity index 100% rename from sailfish/icons/108x108/harbour-kaktus.png rename to icons/108x108/harbour-kaktus.png diff --git a/sailfish/icons/128x128/harbour-kaktus.png b/icons/128x128/harbour-kaktus.png similarity index 100% rename from sailfish/icons/128x128/harbour-kaktus.png rename to icons/128x128/harbour-kaktus.png diff --git a/sailfish/icons/150x150/harbour-kaktus.png b/icons/150x150/harbour-kaktus.png similarity index 100% rename from sailfish/icons/150x150/harbour-kaktus.png rename to icons/150x150/harbour-kaktus.png diff --git a/sailfish/images/z1.75/icon-i-kaktus.png b/icons/172x172/harbour-kaktus.png similarity index 100% rename from sailfish/images/z1.75/icon-i-kaktus.png rename to icons/172x172/harbour-kaktus.png diff --git a/sailfish/icons/256x256/harbour-kaktus.png b/icons/256x256/harbour-kaktus.png similarity index 100% rename from sailfish/icons/256x256/harbour-kaktus.png rename to icons/256x256/harbour-kaktus.png diff --git a/sailfish/icons/86x86/harbour-kaktus.png b/icons/86x86/harbour-kaktus.png similarity index 100% rename from sailfish/icons/86x86/harbour-kaktus.png rename to icons/86x86/harbour-kaktus.png diff --git a/sailfish/images/z1.0/icon-a-kaktus.png b/images/z1.0/icon-a-kaktus.png similarity index 100% rename from sailfish/images/z1.0/icon-a-kaktus.png rename to images/z1.0/icon-a-kaktus.png diff --git a/sailfish/images/z1.0/icon-i-kaktus.png b/images/z1.0/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z1.0/icon-i-kaktus.png rename to images/z1.0/icon-i-kaktus.png diff --git a/sailfish/images/z1.0/icon-m-bad-selected.png b/images/z1.0/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-bad-selected.png rename to images/z1.0/icon-m-bad-selected.png diff --git a/sailfish/images/z1.0/icon-m-bad.png b/images/z1.0/icon-m-bad.png similarity index 100% rename from sailfish/images/z1.0/icon-m-bad.png rename to images/z1.0/icon-m-bad.png diff --git a/sailfish/images/z1.0/icon-m-browser.png b/images/z1.0/icon-m-browser.png similarity index 100% rename from sailfish/images/z1.0/icon-m-browser.png rename to images/z1.0/icon-m-browser.png diff --git a/sailfish/images/z1.0/icon-m-filter-0.png b/images/z1.0/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z1.0/icon-m-filter-0.png rename to images/z1.0/icon-m-filter-0.png diff --git a/sailfish/images/z1.0/icon-m-filter-1.png b/images/z1.0/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z1.0/icon-m-filter-1.png rename to images/z1.0/icon-m-filter-1.png diff --git a/sailfish/images/z1.0/icon-m-filter-2.png b/images/z1.0/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z1.0/icon-m-filter-2.png rename to images/z1.0/icon-m-filter-2.png diff --git a/sailfish/images/z1.0/icon-m-fontdown.png b/images/z1.0/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z1.0/icon-m-fontdown.png rename to images/z1.0/icon-m-fontdown.png diff --git a/sailfish/images/z1.0/icon-m-fontup.png b/images/z1.0/icon-m-fontup.png similarity index 100% rename from sailfish/images/z1.0/icon-m-fontup.png rename to images/z1.0/icon-m-fontup.png diff --git a/sailfish/images/z1.0/icon-m-friend.png b/images/z1.0/icon-m-friend.png similarity index 100% rename from sailfish/images/z1.0/icon-m-friend.png rename to images/z1.0/icon-m-friend.png diff --git a/sailfish/images/z1.0/icon-m-good-selected.png b/images/z1.0/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-good-selected.png rename to images/z1.0/icon-m-good-selected.png diff --git a/sailfish/images/z1.0/icon-m-good.png b/images/z1.0/icon-m-good.png similarity index 100% rename from sailfish/images/z1.0/icon-m-good.png rename to images/z1.0/icon-m-good.png diff --git a/sailfish/images/z1.0/icon-m-item.png b/images/z1.0/icon-m-item.png similarity index 100% rename from sailfish/images/z1.0/icon-m-item.png rename to images/z1.0/icon-m-item.png diff --git a/sailfish/images/z1.0/icon-m-like-selected.png b/images/z1.0/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-like-selected.png rename to images/z1.0/icon-m-like-selected.png diff --git a/sailfish/images/z1.0/icon-m-like.png b/images/z1.0/icon-m-like.png similarity index 100% rename from sailfish/images/z1.0/icon-m-like.png rename to images/z1.0/icon-m-like.png diff --git a/sailfish/images/z1.0/icon-m-netvibes.png b/images/z1.0/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z1.0/icon-m-netvibes.png rename to images/z1.0/icon-m-netvibes.png diff --git a/sailfish/images/z1.0/icon-m-night-selected.png b/images/z1.0/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-night-selected.png rename to images/z1.0/icon-m-night-selected.png diff --git a/sailfish/images/z1.0/icon-m-night.png b/images/z1.0/icon-m-night.png similarity index 100% rename from sailfish/images/z1.0/icon-m-night.png rename to images/z1.0/icon-m-night.png diff --git a/sailfish/images/z1.0/icon-m-oldreader.png b/images/z1.0/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z1.0/icon-m-oldreader.png rename to images/z1.0/icon-m-oldreader.png diff --git a/sailfish/images/z1.0/icon-m-pocket.png b/images/z1.0/icon-m-pocket.png similarity index 100% rename from sailfish/images/z1.0/icon-m-pocket.png rename to images/z1.0/icon-m-pocket.png diff --git a/sailfish/images/z1.0/icon-m-read-selected.png b/images/z1.0/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-read-selected.png rename to images/z1.0/icon-m-read-selected.png diff --git a/sailfish/images/z1.0/icon-m-read.png b/images/z1.0/icon-m-read.png similarity index 100% rename from sailfish/images/z1.0/icon-m-read.png rename to images/z1.0/icon-m-read.png diff --git a/sailfish/images/z1.0/icon-m-readabove.png b/images/z1.0/icon-m-readabove.png similarity index 100% rename from sailfish/images/z1.0/icon-m-readabove.png rename to images/z1.0/icon-m-readabove.png diff --git a/sailfish/images/z1.0/icon-m-reader-selected.png b/images/z1.0/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-reader-selected.png rename to images/z1.0/icon-m-reader-selected.png diff --git a/sailfish/images/z1.0/icon-m-reader.png b/images/z1.0/icon-m-reader.png similarity index 100% rename from sailfish/images/z1.0/icon-m-reader.png rename to images/z1.0/icon-m-reader.png diff --git a/sailfish/images/z1.0/icon-m-rss.png b/images/z1.0/icon-m-rss.png similarity index 100% rename from sailfish/images/z1.0/icon-m-rss.png rename to images/z1.0/icon-m-rss.png diff --git a/sailfish/images/z1.0/icon-m-selector.png b/images/z1.0/icon-m-selector.png similarity index 100% rename from sailfish/images/z1.0/icon-m-selector.png rename to images/z1.0/icon-m-selector.png diff --git a/sailfish/images/z1.0/icon-m-share-selected.png b/images/z1.0/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z1.0/icon-m-share-selected.png rename to images/z1.0/icon-m-share-selected.png diff --git a/sailfish/images/z1.0/icon-m-share.png b/images/z1.0/icon-m-share.png similarity index 100% rename from sailfish/images/z1.0/icon-m-share.png rename to images/z1.0/icon-m-share.png diff --git a/sailfish/images/z1.0/icon-m-ttrss.png b/images/z1.0/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z1.0/icon-m-ttrss.png rename to images/z1.0/icon-m-ttrss.png diff --git a/sailfish/images/z1.0/icon-m-vm0.png b/images/z1.0/icon-m-vm0.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm0.png rename to images/z1.0/icon-m-vm0.png diff --git a/sailfish/images/z1.0/icon-m-vm1.png b/images/z1.0/icon-m-vm1.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm1.png rename to images/z1.0/icon-m-vm1.png diff --git a/sailfish/images/z1.0/icon-m-vm2.png b/images/z1.0/icon-m-vm2.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm2.png rename to images/z1.0/icon-m-vm2.png diff --git a/sailfish/images/z1.0/icon-m-vm3.png b/images/z1.0/icon-m-vm3.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm3.png rename to images/z1.0/icon-m-vm3.png diff --git a/sailfish/images/z1.0/icon-m-vm4.png b/images/z1.0/icon-m-vm4.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm4.png rename to images/z1.0/icon-m-vm4.png diff --git a/sailfish/images/z1.0/icon-m-vm5.png b/images/z1.0/icon-m-vm5.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm5.png rename to images/z1.0/icon-m-vm5.png diff --git a/sailfish/images/z1.0/icon-m-vm6.png b/images/z1.0/icon-m-vm6.png similarity index 100% rename from sailfish/images/z1.0/icon-m-vm6.png rename to images/z1.0/icon-m-vm6.png diff --git a/sailfish/images/z1.0/icon-m-webview.png b/images/z1.0/icon-m-webview.png similarity index 100% rename from sailfish/images/z1.0/icon-m-webview.png rename to images/z1.0/icon-m-webview.png diff --git a/sailfish/images/z1.25/icon-a-kaktus.png b/images/z1.25/icon-a-kaktus.png similarity index 100% rename from sailfish/images/z1.25/icon-a-kaktus.png rename to images/z1.25/icon-a-kaktus.png diff --git a/sailfish/images/z1.25/icon-i-kaktus.png b/images/z1.25/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z1.25/icon-i-kaktus.png rename to images/z1.25/icon-i-kaktus.png diff --git a/sailfish/images/z1.25/icon-m-bad-selected.png b/images/z1.25/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-bad-selected.png rename to images/z1.25/icon-m-bad-selected.png diff --git a/sailfish/images/z1.25/icon-m-bad.png b/images/z1.25/icon-m-bad.png similarity index 100% rename from sailfish/images/z1.25/icon-m-bad.png rename to images/z1.25/icon-m-bad.png diff --git a/sailfish/images/z1.25/icon-m-browser.png b/images/z1.25/icon-m-browser.png similarity index 100% rename from sailfish/images/z1.25/icon-m-browser.png rename to images/z1.25/icon-m-browser.png diff --git a/sailfish/images/z1.25/icon-m-filter-0.png b/images/z1.25/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z1.25/icon-m-filter-0.png rename to images/z1.25/icon-m-filter-0.png diff --git a/sailfish/images/z1.25/icon-m-filter-1.png b/images/z1.25/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z1.25/icon-m-filter-1.png rename to images/z1.25/icon-m-filter-1.png diff --git a/sailfish/images/z1.25/icon-m-filter-2.png b/images/z1.25/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z1.25/icon-m-filter-2.png rename to images/z1.25/icon-m-filter-2.png diff --git a/sailfish/images/z1.25/icon-m-fontdown.png b/images/z1.25/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z1.25/icon-m-fontdown.png rename to images/z1.25/icon-m-fontdown.png diff --git a/sailfish/images/z1.25/icon-m-fontup.png b/images/z1.25/icon-m-fontup.png similarity index 100% rename from sailfish/images/z1.25/icon-m-fontup.png rename to images/z1.25/icon-m-fontup.png diff --git a/sailfish/images/z1.25/icon-m-friend.png b/images/z1.25/icon-m-friend.png similarity index 100% rename from sailfish/images/z1.25/icon-m-friend.png rename to images/z1.25/icon-m-friend.png diff --git a/sailfish/images/z1.25/icon-m-good-selected.png b/images/z1.25/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-good-selected.png rename to images/z1.25/icon-m-good-selected.png diff --git a/sailfish/images/z1.25/icon-m-good.png b/images/z1.25/icon-m-good.png similarity index 100% rename from sailfish/images/z1.25/icon-m-good.png rename to images/z1.25/icon-m-good.png diff --git a/sailfish/images/z1.25/icon-m-item.png b/images/z1.25/icon-m-item.png similarity index 100% rename from sailfish/images/z1.25/icon-m-item.png rename to images/z1.25/icon-m-item.png diff --git a/sailfish/images/z1.25/icon-m-like-selected.png b/images/z1.25/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-like-selected.png rename to images/z1.25/icon-m-like-selected.png diff --git a/sailfish/images/z1.25/icon-m-like.png b/images/z1.25/icon-m-like.png similarity index 100% rename from sailfish/images/z1.25/icon-m-like.png rename to images/z1.25/icon-m-like.png diff --git a/sailfish/images/z1.25/icon-m-netvibes.png b/images/z1.25/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z1.25/icon-m-netvibes.png rename to images/z1.25/icon-m-netvibes.png diff --git a/sailfish/images/z1.25/icon-m-night-selected.png b/images/z1.25/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-night-selected.png rename to images/z1.25/icon-m-night-selected.png diff --git a/sailfish/images/z1.25/icon-m-night.png b/images/z1.25/icon-m-night.png similarity index 100% rename from sailfish/images/z1.25/icon-m-night.png rename to images/z1.25/icon-m-night.png diff --git a/sailfish/images/z1.25/icon-m-oldreader.png b/images/z1.25/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z1.25/icon-m-oldreader.png rename to images/z1.25/icon-m-oldreader.png diff --git a/sailfish/images/z1.25/icon-m-pocket.png b/images/z1.25/icon-m-pocket.png similarity index 100% rename from sailfish/images/z1.25/icon-m-pocket.png rename to images/z1.25/icon-m-pocket.png diff --git a/sailfish/images/z1.25/icon-m-read-selected.png b/images/z1.25/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-read-selected.png rename to images/z1.25/icon-m-read-selected.png diff --git a/sailfish/images/z1.25/icon-m-read.png b/images/z1.25/icon-m-read.png similarity index 100% rename from sailfish/images/z1.25/icon-m-read.png rename to images/z1.25/icon-m-read.png diff --git a/sailfish/images/z1.25/icon-m-readabove.png b/images/z1.25/icon-m-readabove.png similarity index 100% rename from sailfish/images/z1.25/icon-m-readabove.png rename to images/z1.25/icon-m-readabove.png diff --git a/sailfish/images/z1.25/icon-m-reader-selected.png b/images/z1.25/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-reader-selected.png rename to images/z1.25/icon-m-reader-selected.png diff --git a/sailfish/images/z1.25/icon-m-reader.png b/images/z1.25/icon-m-reader.png similarity index 100% rename from sailfish/images/z1.25/icon-m-reader.png rename to images/z1.25/icon-m-reader.png diff --git a/sailfish/images/z1.25/icon-m-rss.png b/images/z1.25/icon-m-rss.png similarity index 100% rename from sailfish/images/z1.25/icon-m-rss.png rename to images/z1.25/icon-m-rss.png diff --git a/sailfish/images/z1.25/icon-m-selector.png b/images/z1.25/icon-m-selector.png similarity index 100% rename from sailfish/images/z1.25/icon-m-selector.png rename to images/z1.25/icon-m-selector.png diff --git a/sailfish/images/z1.25/icon-m-share-selected.png b/images/z1.25/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z1.25/icon-m-share-selected.png rename to images/z1.25/icon-m-share-selected.png diff --git a/sailfish/images/z1.25/icon-m-share.png b/images/z1.25/icon-m-share.png similarity index 100% rename from sailfish/images/z1.25/icon-m-share.png rename to images/z1.25/icon-m-share.png diff --git a/sailfish/images/z1.25/icon-m-ttrss.png b/images/z1.25/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z1.25/icon-m-ttrss.png rename to images/z1.25/icon-m-ttrss.png diff --git a/sailfish/images/z1.25/icon-m-vm0.png b/images/z1.25/icon-m-vm0.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm0.png rename to images/z1.25/icon-m-vm0.png diff --git a/sailfish/images/z1.25/icon-m-vm1.png b/images/z1.25/icon-m-vm1.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm1.png rename to images/z1.25/icon-m-vm1.png diff --git a/sailfish/images/z1.25/icon-m-vm2.png b/images/z1.25/icon-m-vm2.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm2.png rename to images/z1.25/icon-m-vm2.png diff --git a/sailfish/images/z1.25/icon-m-vm3.png b/images/z1.25/icon-m-vm3.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm3.png rename to images/z1.25/icon-m-vm3.png diff --git a/sailfish/images/z1.25/icon-m-vm4.png b/images/z1.25/icon-m-vm4.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm4.png rename to images/z1.25/icon-m-vm4.png diff --git a/sailfish/images/z1.25/icon-m-vm5.png b/images/z1.25/icon-m-vm5.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm5.png rename to images/z1.25/icon-m-vm5.png diff --git a/sailfish/images/z1.25/icon-m-vm6.png b/images/z1.25/icon-m-vm6.png similarity index 100% rename from sailfish/images/z1.25/icon-m-vm6.png rename to images/z1.25/icon-m-vm6.png diff --git a/sailfish/images/z1.25/icon-m-webview.png b/images/z1.25/icon-m-webview.png similarity index 100% rename from sailfish/images/z1.25/icon-m-webview.png rename to images/z1.25/icon-m-webview.png diff --git a/sailfish/images/z1.5-large/icon-a-kaktus.png b/images/z1.5-large/icon-a-kaktus.png similarity index 100% rename from sailfish/images/z1.5-large/icon-a-kaktus.png rename to images/z1.5-large/icon-a-kaktus.png diff --git a/sailfish/images/z1.5-large/icon-i-kaktus.png b/images/z1.5-large/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z1.5-large/icon-i-kaktus.png rename to images/z1.5-large/icon-i-kaktus.png diff --git a/sailfish/images/z1.5-large/icon-m-bad-selected.png b/images/z1.5-large/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-bad-selected.png rename to images/z1.5-large/icon-m-bad-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-bad.png b/images/z1.5-large/icon-m-bad.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-bad.png rename to images/z1.5-large/icon-m-bad.png diff --git a/sailfish/images/z1.5-large/icon-m-browser.png b/images/z1.5-large/icon-m-browser.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-browser.png rename to images/z1.5-large/icon-m-browser.png diff --git a/sailfish/images/z1.5-large/icon-m-filter-0.png b/images/z1.5-large/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-filter-0.png rename to images/z1.5-large/icon-m-filter-0.png diff --git a/sailfish/images/z1.5-large/icon-m-filter-1.png b/images/z1.5-large/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-filter-1.png rename to images/z1.5-large/icon-m-filter-1.png diff --git a/sailfish/images/z1.5-large/icon-m-filter-2.png b/images/z1.5-large/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-filter-2.png rename to images/z1.5-large/icon-m-filter-2.png diff --git a/sailfish/images/z1.5-large/icon-m-fontdown.png b/images/z1.5-large/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-fontdown.png rename to images/z1.5-large/icon-m-fontdown.png diff --git a/sailfish/images/z1.5-large/icon-m-fontup.png b/images/z1.5-large/icon-m-fontup.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-fontup.png rename to images/z1.5-large/icon-m-fontup.png diff --git a/sailfish/images/z1.5-large/icon-m-friend.png b/images/z1.5-large/icon-m-friend.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-friend.png rename to images/z1.5-large/icon-m-friend.png diff --git a/sailfish/images/z1.5-large/icon-m-good-selected.png b/images/z1.5-large/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-good-selected.png rename to images/z1.5-large/icon-m-good-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-good.png b/images/z1.5-large/icon-m-good.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-good.png rename to images/z1.5-large/icon-m-good.png diff --git a/sailfish/images/z1.5-large/icon-m-item.png b/images/z1.5-large/icon-m-item.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-item.png rename to images/z1.5-large/icon-m-item.png diff --git a/sailfish/images/z1.5-large/icon-m-like-selected.png b/images/z1.5-large/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-like-selected.png rename to images/z1.5-large/icon-m-like-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-like.png b/images/z1.5-large/icon-m-like.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-like.png rename to images/z1.5-large/icon-m-like.png diff --git a/sailfish/images/z1.5-large/icon-m-netvibes.png b/images/z1.5-large/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-netvibes.png rename to images/z1.5-large/icon-m-netvibes.png diff --git a/sailfish/images/z1.5-large/icon-m-night-selected.png b/images/z1.5-large/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-night-selected.png rename to images/z1.5-large/icon-m-night-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-night.png b/images/z1.5-large/icon-m-night.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-night.png rename to images/z1.5-large/icon-m-night.png diff --git a/sailfish/images/z1.5-large/icon-m-oldreader.png b/images/z1.5-large/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-oldreader.png rename to images/z1.5-large/icon-m-oldreader.png diff --git a/sailfish/images/z1.5-large/icon-m-pocket.png b/images/z1.5-large/icon-m-pocket.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-pocket.png rename to images/z1.5-large/icon-m-pocket.png diff --git a/sailfish/images/z1.5-large/icon-m-read-selected.png b/images/z1.5-large/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-read-selected.png rename to images/z1.5-large/icon-m-read-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-read.png b/images/z1.5-large/icon-m-read.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-read.png rename to images/z1.5-large/icon-m-read.png diff --git a/sailfish/images/z1.5-large/icon-m-readabove.png b/images/z1.5-large/icon-m-readabove.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-readabove.png rename to images/z1.5-large/icon-m-readabove.png diff --git a/sailfish/images/z1.5-large/icon-m-reader-selected.png b/images/z1.5-large/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-reader-selected.png rename to images/z1.5-large/icon-m-reader-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-reader.png b/images/z1.5-large/icon-m-reader.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-reader.png rename to images/z1.5-large/icon-m-reader.png diff --git a/sailfish/images/z1.5-large/icon-m-rss.png b/images/z1.5-large/icon-m-rss.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-rss.png rename to images/z1.5-large/icon-m-rss.png diff --git a/sailfish/images/z1.5-large/icon-m-selector.png b/images/z1.5-large/icon-m-selector.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-selector.png rename to images/z1.5-large/icon-m-selector.png diff --git a/sailfish/images/z1.5-large/icon-m-share-selected.png b/images/z1.5-large/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-share-selected.png rename to images/z1.5-large/icon-m-share-selected.png diff --git a/sailfish/images/z1.5-large/icon-m-share.png b/images/z1.5-large/icon-m-share.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-share.png rename to images/z1.5-large/icon-m-share.png diff --git a/sailfish/images/z1.5-large/icon-m-ttrss.png b/images/z1.5-large/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-ttrss.png rename to images/z1.5-large/icon-m-ttrss.png diff --git a/sailfish/images/z1.5-large/icon-m-vm0.png b/images/z1.5-large/icon-m-vm0.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm0.png rename to images/z1.5-large/icon-m-vm0.png diff --git a/sailfish/images/z1.5-large/icon-m-vm1.png b/images/z1.5-large/icon-m-vm1.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm1.png rename to images/z1.5-large/icon-m-vm1.png diff --git a/sailfish/images/z1.5-large/icon-m-vm2.png b/images/z1.5-large/icon-m-vm2.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm2.png rename to images/z1.5-large/icon-m-vm2.png diff --git a/sailfish/images/z1.5-large/icon-m-vm3.png b/images/z1.5-large/icon-m-vm3.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm3.png rename to images/z1.5-large/icon-m-vm3.png diff --git a/sailfish/images/z1.5-large/icon-m-vm4.png b/images/z1.5-large/icon-m-vm4.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm4.png rename to images/z1.5-large/icon-m-vm4.png diff --git a/sailfish/images/z1.5-large/icon-m-vm5.png b/images/z1.5-large/icon-m-vm5.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm5.png rename to images/z1.5-large/icon-m-vm5.png diff --git a/sailfish/images/z1.5-large/icon-m-vm6.png b/images/z1.5-large/icon-m-vm6.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-vm6.png rename to images/z1.5-large/icon-m-vm6.png diff --git a/sailfish/images/z1.5-large/icon-m-webview.png b/images/z1.5-large/icon-m-webview.png similarity index 100% rename from sailfish/images/z1.5-large/icon-m-webview.png rename to images/z1.5-large/icon-m-webview.png diff --git a/sailfish/images/z1.5/icon-a-kaktus.png b/images/z1.5/icon-a-kaktus.png similarity index 100% rename from sailfish/images/z1.5/icon-a-kaktus.png rename to images/z1.5/icon-a-kaktus.png diff --git a/sailfish/images/z1.5/icon-i-kaktus.png b/images/z1.5/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z1.5/icon-i-kaktus.png rename to images/z1.5/icon-i-kaktus.png diff --git a/sailfish/images/z1.5/icon-m-bad-selected.png b/images/z1.5/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-bad-selected.png rename to images/z1.5/icon-m-bad-selected.png diff --git a/sailfish/images/z1.5/icon-m-bad.png b/images/z1.5/icon-m-bad.png similarity index 100% rename from sailfish/images/z1.5/icon-m-bad.png rename to images/z1.5/icon-m-bad.png diff --git a/sailfish/images/z1.5/icon-m-browser.png b/images/z1.5/icon-m-browser.png similarity index 100% rename from sailfish/images/z1.5/icon-m-browser.png rename to images/z1.5/icon-m-browser.png diff --git a/sailfish/images/z1.5/icon-m-filter-0.png b/images/z1.5/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z1.5/icon-m-filter-0.png rename to images/z1.5/icon-m-filter-0.png diff --git a/sailfish/images/z1.5/icon-m-filter-1.png b/images/z1.5/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z1.5/icon-m-filter-1.png rename to images/z1.5/icon-m-filter-1.png diff --git a/sailfish/images/z1.5/icon-m-filter-2.png b/images/z1.5/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z1.5/icon-m-filter-2.png rename to images/z1.5/icon-m-filter-2.png diff --git a/sailfish/images/z1.5/icon-m-fontdown.png b/images/z1.5/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z1.5/icon-m-fontdown.png rename to images/z1.5/icon-m-fontdown.png diff --git a/sailfish/images/z1.5/icon-m-fontup.png b/images/z1.5/icon-m-fontup.png similarity index 100% rename from sailfish/images/z1.5/icon-m-fontup.png rename to images/z1.5/icon-m-fontup.png diff --git a/sailfish/images/z1.5/icon-m-friend.png b/images/z1.5/icon-m-friend.png similarity index 100% rename from sailfish/images/z1.5/icon-m-friend.png rename to images/z1.5/icon-m-friend.png diff --git a/sailfish/images/z1.5/icon-m-good-selected.png b/images/z1.5/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-good-selected.png rename to images/z1.5/icon-m-good-selected.png diff --git a/sailfish/images/z1.5/icon-m-good.png b/images/z1.5/icon-m-good.png similarity index 100% rename from sailfish/images/z1.5/icon-m-good.png rename to images/z1.5/icon-m-good.png diff --git a/sailfish/images/z1.5/icon-m-item.png b/images/z1.5/icon-m-item.png similarity index 100% rename from sailfish/images/z1.5/icon-m-item.png rename to images/z1.5/icon-m-item.png diff --git a/sailfish/images/z1.5/icon-m-like-selected.png b/images/z1.5/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-like-selected.png rename to images/z1.5/icon-m-like-selected.png diff --git a/sailfish/images/z1.5/icon-m-like.png b/images/z1.5/icon-m-like.png similarity index 100% rename from sailfish/images/z1.5/icon-m-like.png rename to images/z1.5/icon-m-like.png diff --git a/sailfish/images/z1.5/icon-m-netvibes.png b/images/z1.5/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z1.5/icon-m-netvibes.png rename to images/z1.5/icon-m-netvibes.png diff --git a/sailfish/images/z1.5/icon-m-night-selected.png b/images/z1.5/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-night-selected.png rename to images/z1.5/icon-m-night-selected.png diff --git a/sailfish/images/z1.5/icon-m-night.png b/images/z1.5/icon-m-night.png similarity index 100% rename from sailfish/images/z1.5/icon-m-night.png rename to images/z1.5/icon-m-night.png diff --git a/sailfish/images/z1.5/icon-m-oldreader.png b/images/z1.5/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z1.5/icon-m-oldreader.png rename to images/z1.5/icon-m-oldreader.png diff --git a/sailfish/images/z1.5/icon-m-pocket.png b/images/z1.5/icon-m-pocket.png similarity index 100% rename from sailfish/images/z1.5/icon-m-pocket.png rename to images/z1.5/icon-m-pocket.png diff --git a/sailfish/images/z1.5/icon-m-read-selected.png b/images/z1.5/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-read-selected.png rename to images/z1.5/icon-m-read-selected.png diff --git a/sailfish/images/z1.5/icon-m-read.png b/images/z1.5/icon-m-read.png similarity index 100% rename from sailfish/images/z1.5/icon-m-read.png rename to images/z1.5/icon-m-read.png diff --git a/sailfish/images/z1.5/icon-m-readabove.png b/images/z1.5/icon-m-readabove.png similarity index 100% rename from sailfish/images/z1.5/icon-m-readabove.png rename to images/z1.5/icon-m-readabove.png diff --git a/sailfish/images/z1.5/icon-m-reader-selected.png b/images/z1.5/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-reader-selected.png rename to images/z1.5/icon-m-reader-selected.png diff --git a/sailfish/images/z1.5/icon-m-reader.png b/images/z1.5/icon-m-reader.png similarity index 100% rename from sailfish/images/z1.5/icon-m-reader.png rename to images/z1.5/icon-m-reader.png diff --git a/sailfish/images/z1.5/icon-m-rss.png b/images/z1.5/icon-m-rss.png similarity index 100% rename from sailfish/images/z1.5/icon-m-rss.png rename to images/z1.5/icon-m-rss.png diff --git a/sailfish/images/z1.5/icon-m-selector.png b/images/z1.5/icon-m-selector.png similarity index 100% rename from sailfish/images/z1.5/icon-m-selector.png rename to images/z1.5/icon-m-selector.png diff --git a/sailfish/images/z1.5/icon-m-share-selected.png b/images/z1.5/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z1.5/icon-m-share-selected.png rename to images/z1.5/icon-m-share-selected.png diff --git a/sailfish/images/z1.5/icon-m-share.png b/images/z1.5/icon-m-share.png similarity index 100% rename from sailfish/images/z1.5/icon-m-share.png rename to images/z1.5/icon-m-share.png diff --git a/sailfish/images/z1.5/icon-m-ttrss.png b/images/z1.5/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z1.5/icon-m-ttrss.png rename to images/z1.5/icon-m-ttrss.png diff --git a/sailfish/images/z1.5/icon-m-vm0.png b/images/z1.5/icon-m-vm0.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm0.png rename to images/z1.5/icon-m-vm0.png diff --git a/sailfish/images/z1.5/icon-m-vm1.png b/images/z1.5/icon-m-vm1.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm1.png rename to images/z1.5/icon-m-vm1.png diff --git a/sailfish/images/z1.5/icon-m-vm2.png b/images/z1.5/icon-m-vm2.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm2.png rename to images/z1.5/icon-m-vm2.png diff --git a/sailfish/images/z1.5/icon-m-vm3.png b/images/z1.5/icon-m-vm3.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm3.png rename to images/z1.5/icon-m-vm3.png diff --git a/sailfish/images/z1.5/icon-m-vm4.png b/images/z1.5/icon-m-vm4.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm4.png rename to images/z1.5/icon-m-vm4.png diff --git a/sailfish/images/z1.5/icon-m-vm5.png b/images/z1.5/icon-m-vm5.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm5.png rename to images/z1.5/icon-m-vm5.png diff --git a/sailfish/images/z1.5/icon-m-vm6.png b/images/z1.5/icon-m-vm6.png similarity index 100% rename from sailfish/images/z1.5/icon-m-vm6.png rename to images/z1.5/icon-m-vm6.png diff --git a/sailfish/images/z1.5/icon-m-webview.png b/images/z1.5/icon-m-webview.png similarity index 100% rename from sailfish/images/z1.5/icon-m-webview.png rename to images/z1.5/icon-m-webview.png diff --git a/sailfish/images/z1.75/icon-a-kaktus.png b/images/z1.75/icon-a-kaktus.png similarity index 100% rename from sailfish/images/z1.75/icon-a-kaktus.png rename to images/z1.75/icon-a-kaktus.png diff --git a/sailfish/images/z2.0/icon-a-kaktus.png b/images/z1.75/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z2.0/icon-a-kaktus.png rename to images/z1.75/icon-i-kaktus.png diff --git a/sailfish/images/z1.75/icon-m-bad-selected.png b/images/z1.75/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-bad-selected.png rename to images/z1.75/icon-m-bad-selected.png diff --git a/sailfish/images/z1.75/icon-m-bad.png b/images/z1.75/icon-m-bad.png similarity index 100% rename from sailfish/images/z1.75/icon-m-bad.png rename to images/z1.75/icon-m-bad.png diff --git a/sailfish/images/z1.75/icon-m-browser.png b/images/z1.75/icon-m-browser.png similarity index 100% rename from sailfish/images/z1.75/icon-m-browser.png rename to images/z1.75/icon-m-browser.png diff --git a/sailfish/images/z1.75/icon-m-filter-0.png b/images/z1.75/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z1.75/icon-m-filter-0.png rename to images/z1.75/icon-m-filter-0.png diff --git a/sailfish/images/z1.75/icon-m-filter-1.png b/images/z1.75/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z1.75/icon-m-filter-1.png rename to images/z1.75/icon-m-filter-1.png diff --git a/sailfish/images/z1.75/icon-m-filter-2.png b/images/z1.75/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z1.75/icon-m-filter-2.png rename to images/z1.75/icon-m-filter-2.png diff --git a/sailfish/images/z1.75/icon-m-fontdown.png b/images/z1.75/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z1.75/icon-m-fontdown.png rename to images/z1.75/icon-m-fontdown.png diff --git a/sailfish/images/z1.75/icon-m-fontup.png b/images/z1.75/icon-m-fontup.png similarity index 100% rename from sailfish/images/z1.75/icon-m-fontup.png rename to images/z1.75/icon-m-fontup.png diff --git a/sailfish/images/z1.75/icon-m-friend.png b/images/z1.75/icon-m-friend.png similarity index 100% rename from sailfish/images/z1.75/icon-m-friend.png rename to images/z1.75/icon-m-friend.png diff --git a/sailfish/images/z1.75/icon-m-good-selected.png b/images/z1.75/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-good-selected.png rename to images/z1.75/icon-m-good-selected.png diff --git a/sailfish/images/z1.75/icon-m-good.png b/images/z1.75/icon-m-good.png similarity index 100% rename from sailfish/images/z1.75/icon-m-good.png rename to images/z1.75/icon-m-good.png diff --git a/sailfish/images/z1.75/icon-m-item.png b/images/z1.75/icon-m-item.png similarity index 100% rename from sailfish/images/z1.75/icon-m-item.png rename to images/z1.75/icon-m-item.png diff --git a/sailfish/images/z1.75/icon-m-like-selected.png b/images/z1.75/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-like-selected.png rename to images/z1.75/icon-m-like-selected.png diff --git a/sailfish/images/z1.75/icon-m-like.png b/images/z1.75/icon-m-like.png similarity index 100% rename from sailfish/images/z1.75/icon-m-like.png rename to images/z1.75/icon-m-like.png diff --git a/sailfish/images/z1.75/icon-m-netvibes.png b/images/z1.75/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z1.75/icon-m-netvibes.png rename to images/z1.75/icon-m-netvibes.png diff --git a/sailfish/images/z1.75/icon-m-night-selected.png b/images/z1.75/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-night-selected.png rename to images/z1.75/icon-m-night-selected.png diff --git a/sailfish/images/z1.75/icon-m-night.png b/images/z1.75/icon-m-night.png similarity index 100% rename from sailfish/images/z1.75/icon-m-night.png rename to images/z1.75/icon-m-night.png diff --git a/sailfish/images/z1.75/icon-m-oldreader.png b/images/z1.75/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z1.75/icon-m-oldreader.png rename to images/z1.75/icon-m-oldreader.png diff --git a/sailfish/images/z1.75/icon-m-pocket.png b/images/z1.75/icon-m-pocket.png similarity index 100% rename from sailfish/images/z1.75/icon-m-pocket.png rename to images/z1.75/icon-m-pocket.png diff --git a/sailfish/images/z1.75/icon-m-read-selected.png b/images/z1.75/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-read-selected.png rename to images/z1.75/icon-m-read-selected.png diff --git a/sailfish/images/z1.75/icon-m-read.png b/images/z1.75/icon-m-read.png similarity index 100% rename from sailfish/images/z1.75/icon-m-read.png rename to images/z1.75/icon-m-read.png diff --git a/sailfish/images/z1.75/icon-m-readabove.png b/images/z1.75/icon-m-readabove.png similarity index 100% rename from sailfish/images/z1.75/icon-m-readabove.png rename to images/z1.75/icon-m-readabove.png diff --git a/sailfish/images/z1.75/icon-m-reader-selected.png b/images/z1.75/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-reader-selected.png rename to images/z1.75/icon-m-reader-selected.png diff --git a/sailfish/images/z1.75/icon-m-reader.png b/images/z1.75/icon-m-reader.png similarity index 100% rename from sailfish/images/z1.75/icon-m-reader.png rename to images/z1.75/icon-m-reader.png diff --git a/sailfish/images/z1.75/icon-m-rss.png b/images/z1.75/icon-m-rss.png similarity index 100% rename from sailfish/images/z1.75/icon-m-rss.png rename to images/z1.75/icon-m-rss.png diff --git a/sailfish/images/z1.75/icon-m-selector.png b/images/z1.75/icon-m-selector.png similarity index 100% rename from sailfish/images/z1.75/icon-m-selector.png rename to images/z1.75/icon-m-selector.png diff --git a/sailfish/images/z1.75/icon-m-share-selected.png b/images/z1.75/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z1.75/icon-m-share-selected.png rename to images/z1.75/icon-m-share-selected.png diff --git a/sailfish/images/z1.75/icon-m-share.png b/images/z1.75/icon-m-share.png similarity index 100% rename from sailfish/images/z1.75/icon-m-share.png rename to images/z1.75/icon-m-share.png diff --git a/sailfish/images/z1.75/icon-m-ttrss.png b/images/z1.75/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z1.75/icon-m-ttrss.png rename to images/z1.75/icon-m-ttrss.png diff --git a/sailfish/images/z1.75/icon-m-vm0.png b/images/z1.75/icon-m-vm0.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm0.png rename to images/z1.75/icon-m-vm0.png diff --git a/sailfish/images/z1.75/icon-m-vm1.png b/images/z1.75/icon-m-vm1.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm1.png rename to images/z1.75/icon-m-vm1.png diff --git a/sailfish/images/z1.75/icon-m-vm2.png b/images/z1.75/icon-m-vm2.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm2.png rename to images/z1.75/icon-m-vm2.png diff --git a/sailfish/images/z1.75/icon-m-vm3.png b/images/z1.75/icon-m-vm3.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm3.png rename to images/z1.75/icon-m-vm3.png diff --git a/sailfish/images/z1.75/icon-m-vm4.png b/images/z1.75/icon-m-vm4.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm4.png rename to images/z1.75/icon-m-vm4.png diff --git a/sailfish/images/z1.75/icon-m-vm5.png b/images/z1.75/icon-m-vm5.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm5.png rename to images/z1.75/icon-m-vm5.png diff --git a/sailfish/images/z1.75/icon-m-vm6.png b/images/z1.75/icon-m-vm6.png similarity index 100% rename from sailfish/images/z1.75/icon-m-vm6.png rename to images/z1.75/icon-m-vm6.png diff --git a/sailfish/images/z1.75/icon-m-webview.png b/images/z1.75/icon-m-webview.png similarity index 100% rename from sailfish/images/z1.75/icon-m-webview.png rename to images/z1.75/icon-m-webview.png diff --git a/images/z2.0/icon-a-kaktus.png b/images/z2.0/icon-a-kaktus.png new file mode 100644 index 0000000..b9824e0 Binary files /dev/null and b/images/z2.0/icon-a-kaktus.png differ diff --git a/sailfish/images/z2.0/icon-i-kaktus.png b/images/z2.0/icon-i-kaktus.png similarity index 100% rename from sailfish/images/z2.0/icon-i-kaktus.png rename to images/z2.0/icon-i-kaktus.png diff --git a/sailfish/images/z2.0/icon-m-bad-selected.png b/images/z2.0/icon-m-bad-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-bad-selected.png rename to images/z2.0/icon-m-bad-selected.png diff --git a/sailfish/images/z2.0/icon-m-bad.png b/images/z2.0/icon-m-bad.png similarity index 100% rename from sailfish/images/z2.0/icon-m-bad.png rename to images/z2.0/icon-m-bad.png diff --git a/sailfish/images/z2.0/icon-m-browser.png b/images/z2.0/icon-m-browser.png similarity index 100% rename from sailfish/images/z2.0/icon-m-browser.png rename to images/z2.0/icon-m-browser.png diff --git a/sailfish/images/z2.0/icon-m-filter-0.png b/images/z2.0/icon-m-filter-0.png similarity index 100% rename from sailfish/images/z2.0/icon-m-filter-0.png rename to images/z2.0/icon-m-filter-0.png diff --git a/sailfish/images/z2.0/icon-m-filter-1.png b/images/z2.0/icon-m-filter-1.png similarity index 100% rename from sailfish/images/z2.0/icon-m-filter-1.png rename to images/z2.0/icon-m-filter-1.png diff --git a/sailfish/images/z2.0/icon-m-filter-2.png b/images/z2.0/icon-m-filter-2.png similarity index 100% rename from sailfish/images/z2.0/icon-m-filter-2.png rename to images/z2.0/icon-m-filter-2.png diff --git a/sailfish/images/z2.0/icon-m-fontdown.png b/images/z2.0/icon-m-fontdown.png similarity index 100% rename from sailfish/images/z2.0/icon-m-fontdown.png rename to images/z2.0/icon-m-fontdown.png diff --git a/sailfish/images/z2.0/icon-m-fontup.png b/images/z2.0/icon-m-fontup.png similarity index 100% rename from sailfish/images/z2.0/icon-m-fontup.png rename to images/z2.0/icon-m-fontup.png diff --git a/sailfish/images/z2.0/icon-m-friend.png b/images/z2.0/icon-m-friend.png similarity index 100% rename from sailfish/images/z2.0/icon-m-friend.png rename to images/z2.0/icon-m-friend.png diff --git a/sailfish/images/z2.0/icon-m-good-selected.png b/images/z2.0/icon-m-good-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-good-selected.png rename to images/z2.0/icon-m-good-selected.png diff --git a/sailfish/images/z2.0/icon-m-good.png b/images/z2.0/icon-m-good.png similarity index 100% rename from sailfish/images/z2.0/icon-m-good.png rename to images/z2.0/icon-m-good.png diff --git a/sailfish/images/z2.0/icon-m-item.png b/images/z2.0/icon-m-item.png similarity index 100% rename from sailfish/images/z2.0/icon-m-item.png rename to images/z2.0/icon-m-item.png diff --git a/sailfish/images/z2.0/icon-m-like-selected.png b/images/z2.0/icon-m-like-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-like-selected.png rename to images/z2.0/icon-m-like-selected.png diff --git a/sailfish/images/z2.0/icon-m-like.png b/images/z2.0/icon-m-like.png similarity index 100% rename from sailfish/images/z2.0/icon-m-like.png rename to images/z2.0/icon-m-like.png diff --git a/sailfish/images/z2.0/icon-m-netvibes.png b/images/z2.0/icon-m-netvibes.png similarity index 100% rename from sailfish/images/z2.0/icon-m-netvibes.png rename to images/z2.0/icon-m-netvibes.png diff --git a/sailfish/images/z2.0/icon-m-night-selected.png b/images/z2.0/icon-m-night-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-night-selected.png rename to images/z2.0/icon-m-night-selected.png diff --git a/sailfish/images/z2.0/icon-m-night.png b/images/z2.0/icon-m-night.png similarity index 100% rename from sailfish/images/z2.0/icon-m-night.png rename to images/z2.0/icon-m-night.png diff --git a/sailfish/images/z2.0/icon-m-oldreader.png b/images/z2.0/icon-m-oldreader.png similarity index 100% rename from sailfish/images/z2.0/icon-m-oldreader.png rename to images/z2.0/icon-m-oldreader.png diff --git a/sailfish/images/z2.0/icon-m-pocket.png b/images/z2.0/icon-m-pocket.png similarity index 100% rename from sailfish/images/z2.0/icon-m-pocket.png rename to images/z2.0/icon-m-pocket.png diff --git a/sailfish/images/z2.0/icon-m-read-selected.png b/images/z2.0/icon-m-read-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-read-selected.png rename to images/z2.0/icon-m-read-selected.png diff --git a/sailfish/images/z2.0/icon-m-read.png b/images/z2.0/icon-m-read.png similarity index 100% rename from sailfish/images/z2.0/icon-m-read.png rename to images/z2.0/icon-m-read.png diff --git a/sailfish/images/z2.0/icon-m-readabove.png b/images/z2.0/icon-m-readabove.png similarity index 100% rename from sailfish/images/z2.0/icon-m-readabove.png rename to images/z2.0/icon-m-readabove.png diff --git a/sailfish/images/z2.0/icon-m-reader-selected.png b/images/z2.0/icon-m-reader-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-reader-selected.png rename to images/z2.0/icon-m-reader-selected.png diff --git a/sailfish/images/z2.0/icon-m-reader.png b/images/z2.0/icon-m-reader.png similarity index 100% rename from sailfish/images/z2.0/icon-m-reader.png rename to images/z2.0/icon-m-reader.png diff --git a/sailfish/images/z2.0/icon-m-rss.png b/images/z2.0/icon-m-rss.png similarity index 100% rename from sailfish/images/z2.0/icon-m-rss.png rename to images/z2.0/icon-m-rss.png diff --git a/sailfish/images/z2.0/icon-m-selector.png b/images/z2.0/icon-m-selector.png similarity index 100% rename from sailfish/images/z2.0/icon-m-selector.png rename to images/z2.0/icon-m-selector.png diff --git a/sailfish/images/z2.0/icon-m-share-selected.png b/images/z2.0/icon-m-share-selected.png similarity index 100% rename from sailfish/images/z2.0/icon-m-share-selected.png rename to images/z2.0/icon-m-share-selected.png diff --git a/sailfish/images/z2.0/icon-m-share.png b/images/z2.0/icon-m-share.png similarity index 100% rename from sailfish/images/z2.0/icon-m-share.png rename to images/z2.0/icon-m-share.png diff --git a/sailfish/images/z2.0/icon-m-ttrss.png b/images/z2.0/icon-m-ttrss.png similarity index 100% rename from sailfish/images/z2.0/icon-m-ttrss.png rename to images/z2.0/icon-m-ttrss.png diff --git a/sailfish/images/z2.0/icon-m-vm0.png b/images/z2.0/icon-m-vm0.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm0.png rename to images/z2.0/icon-m-vm0.png diff --git a/sailfish/images/z2.0/icon-m-vm1.png b/images/z2.0/icon-m-vm1.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm1.png rename to images/z2.0/icon-m-vm1.png diff --git a/sailfish/images/z2.0/icon-m-vm2.png b/images/z2.0/icon-m-vm2.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm2.png rename to images/z2.0/icon-m-vm2.png diff --git a/sailfish/images/z2.0/icon-m-vm3.png b/images/z2.0/icon-m-vm3.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm3.png rename to images/z2.0/icon-m-vm3.png diff --git a/sailfish/images/z2.0/icon-m-vm4.png b/images/z2.0/icon-m-vm4.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm4.png rename to images/z2.0/icon-m-vm4.png diff --git a/sailfish/images/z2.0/icon-m-vm5.png b/images/z2.0/icon-m-vm5.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm5.png rename to images/z2.0/icon-m-vm5.png diff --git a/sailfish/images/z2.0/icon-m-vm6.png b/images/z2.0/icon-m-vm6.png similarity index 100% rename from sailfish/images/z2.0/icon-m-vm6.png rename to images/z2.0/icon-m-vm6.png diff --git a/sailfish/images/z2.0/icon-m-webview.png b/images/z2.0/icon-m-webview.png similarity index 100% rename from sailfish/images/z2.0/icon-m-webview.png rename to images/z2.0/icon-m-webview.png diff --git a/kaktus.pro b/kaktus.pro new file mode 100644 index 0000000..d920d69 --- /dev/null +++ b/kaktus.pro @@ -0,0 +1,90 @@ +TARGET = harbour-kaktus + +CONFIG += c++1z sailfishapp json +PKGCONFIG += mlite5 +QT += sql network dbus +DEFINES += QT_NO_URL_CAST_FROM_STRING + +QMAKE_CXXFLAGS_RELEASE -= -O2 +QMAKE_CXXFLAGS_RELEASE += -O3 + +CONFIG(debug, debug|release) { + CONFIG += sanitizer sanitize_address +} + +INCLUDEPATH += src + +include(qhttpserver/qhttpserver.pri) + +OTHER_FILES += \ + $$files(qml/*.qml) \ + $$files(rpm/*) + +SOURCES += \ + src/main.cpp \ + src/utils.cpp \ + src/tabmodel.cpp \ + src/listmodel.cpp \ + src/feedmodel.cpp \ + src/entrymodel.cpp \ + src/downloadmanager.cpp \ + src/databasemanager.cpp \ + src/dashboardmodel.cpp \ + src/cacheserver.cpp \ + src/settings.cpp \ + src/simplecrypt.cpp \ + src/nviconprovider.cpp \ + src/fetcher.cpp \ + src/oldreaderfetcher.cpp \ + src/nvfetcher.cpp \ + src/ttrssfetcher.cpp \ + src/networkaccessmanagerfactory.cpp \ + src/customnetworkaccessmanager.cpp \ + src/iconprovider.cpp + +HEADERS += \ + src/info.h \ + src/utils.h \ + src/tabmodel.h \ + src/listmodel.h \ + src/feedmodel.h \ + src/entrymodel.h \ + src/downloadmanager.h \ + src/databasemanager.h \ + src/dashboardmodel.h \ + src/cacheserver.h \ + src/settings.h \ + src/simplecrypt.h \ + src/iconprovider.h \ + src/nviconprovider.h \ + src/fetcher.h \ + src/oldreaderfetcher.h \ + src/nvfetcher.h \ + src/ttrssfetcher.h \ + src/networkaccessmanagerfactory.h \ + src/customnetworkaccessmanager.h \ + src/key.h + +SAILFISHAPP_ICONS = 86x86 108x108 128x128 150x150 172x172 256x256 +CONFIG += sailfishapp_i18n_include_obsolete +TRANSLATIONS += \ + translations/kaktus_en.ts \ + translations/kaktus_pl.ts \ + translations/kaktus_ru.ts \ + translations/kaktus_cs.ts \ + translations/kaktus_nl_NL.ts \ + translations/kaktus_nl_BE.ts \ + translations/kaktus_tr.ts \ + translations/kaktus_es.ts \ + translations/kaktus_it.ts \ + translations/kaktus_de.ts \ + translations/kaktus_zh_CN.ts +include(sailfishapp_i18n.pri) + +# install + +install_images.files = images/* +install_images.path = /usr/share/$${TARGET}/images +INSTALLS += install_images + +DEPENDPATH += $${INCLUDEPATH} diff --git a/sailfish/qhttpserver/LICENSE b/qhttpserver/LICENSE similarity index 100% rename from sailfish/qhttpserver/LICENSE rename to qhttpserver/LICENSE diff --git a/sailfish/qhttpserver/README.md b/qhttpserver/README.md similarity index 100% rename from sailfish/qhttpserver/README.md rename to qhttpserver/README.md diff --git a/sailfish/qhttpserver/http_parser.c b/qhttpserver/http_parser.c similarity index 100% rename from sailfish/qhttpserver/http_parser.c rename to qhttpserver/http_parser.c diff --git a/sailfish/qhttpserver/http_parser.gyp b/qhttpserver/http_parser.gyp similarity index 100% rename from sailfish/qhttpserver/http_parser.gyp rename to qhttpserver/http_parser.gyp diff --git a/sailfish/qhttpserver/http_parser.h b/qhttpserver/http_parser.h similarity index 100% rename from sailfish/qhttpserver/http_parser.h rename to qhttpserver/http_parser.h diff --git a/sailfish/qhttpserver/qhttpconnection.cpp b/qhttpserver/qhttpconnection.cpp similarity index 100% rename from sailfish/qhttpserver/qhttpconnection.cpp rename to qhttpserver/qhttpconnection.cpp diff --git a/sailfish/qhttpserver/qhttpconnection.h b/qhttpserver/qhttpconnection.h similarity index 100% rename from sailfish/qhttpserver/qhttpconnection.h rename to qhttpserver/qhttpconnection.h diff --git a/sailfish/qhttpserver/qhttprequest.cpp b/qhttpserver/qhttprequest.cpp similarity index 100% rename from sailfish/qhttpserver/qhttprequest.cpp rename to qhttpserver/qhttprequest.cpp diff --git a/sailfish/qhttpserver/qhttprequest.h b/qhttpserver/qhttprequest.h similarity index 100% rename from sailfish/qhttpserver/qhttprequest.h rename to qhttpserver/qhttprequest.h diff --git a/sailfish/qhttpserver/qhttpresponse.cpp b/qhttpserver/qhttpresponse.cpp similarity index 100% rename from sailfish/qhttpserver/qhttpresponse.cpp rename to qhttpserver/qhttpresponse.cpp diff --git a/sailfish/qhttpserver/qhttpresponse.h b/qhttpserver/qhttpresponse.h similarity index 100% rename from sailfish/qhttpserver/qhttpresponse.h rename to qhttpserver/qhttpresponse.h diff --git a/sailfish/qhttpserver/qhttpserver.cpp b/qhttpserver/qhttpserver.cpp similarity index 100% rename from sailfish/qhttpserver/qhttpserver.cpp rename to qhttpserver/qhttpserver.cpp diff --git a/sailfish/qhttpserver/qhttpserver.h b/qhttpserver/qhttpserver.h similarity index 100% rename from sailfish/qhttpserver/qhttpserver.h rename to qhttpserver/qhttpserver.h diff --git a/qhttpserver/qhttpserver.pri b/qhttpserver/qhttpserver.pri new file mode 100644 index 0000000..ab5289d --- /dev/null +++ b/qhttpserver/qhttpserver.pri @@ -0,0 +1,18 @@ +INCLUDEPATH += qhttpserver +DEPENDPATH += qhttpserver + +HEADERS += \ + qhttpserver/http_parser.h \ + qhttpserver/qhttpconnection.h \ + qhttpserver/qhttprequest.h \ + qhttpserver/qhttpresponse.h \ + qhttpserver/qhttpserver.h \ + qhttpserver/qhttpserverapi.h \ + qhttpserver/qhttpserverfwd.h + +SOURCES += \ + qhttpserver/http_parser.c \ + qhttpserver/qhttpconnection.cpp \ + qhttpserver/qhttprequest.cpp \ + qhttpserver/qhttpresponse.cpp \ + qhttpserver/qhttpserver.cpp diff --git a/sailfish/qhttpserver/qhttpserverapi.h b/qhttpserver/qhttpserverapi.h similarity index 100% rename from sailfish/qhttpserver/qhttpserverapi.h rename to qhttpserver/qhttpserverapi.h diff --git a/sailfish/qhttpserver/qhttpserverfwd.h b/qhttpserver/qhttpserverfwd.h similarity index 100% rename from sailfish/qhttpserver/qhttpserverfwd.h rename to qhttpserver/qhttpserverfwd.h diff --git a/sailfish/qml/AboutPage.qml b/qml/AboutPage.qml similarity index 100% rename from sailfish/qml/AboutPage.qml rename to qml/AboutPage.qml diff --git a/sailfish/qml/AccountsDialog.qml b/qml/AccountsDialog.qml similarity index 100% rename from sailfish/qml/AccountsDialog.qml rename to qml/AccountsDialog.qml diff --git a/sailfish/qml/ActiveDetector.qml b/qml/ActiveDetector.qml similarity index 100% rename from sailfish/qml/ActiveDetector.qml rename to qml/ActiveDetector.qml diff --git a/sailfish/qml/AuthWebViewPage.qml b/qml/AuthWebViewPage.qml similarity index 100% rename from sailfish/qml/AuthWebViewPage.qml rename to qml/AuthWebViewPage.qml diff --git a/sailfish/qml/ButtonItem.qml b/qml/ButtonItem.qml similarity index 100% rename from sailfish/qml/ButtonItem.qml rename to qml/ButtonItem.qml diff --git a/sailfish/qml/CachedImage.qml b/qml/CachedImage.qml similarity index 100% rename from sailfish/qml/CachedImage.qml rename to qml/CachedImage.qml diff --git a/sailfish/qml/ChangelogPage.qml b/qml/ChangelogPage.qml similarity index 99% rename from sailfish/qml/ChangelogPage.qml rename to qml/ChangelogPage.qml index 7631197..c0d02f3 100644 --- a/sailfish/qml/ChangelogPage.qml +++ b/qml/ChangelogPage.qml @@ -66,7 +66,7 @@ Page { LogItem { title: "Netvibes fixes" - description: "Syncing from Netvibies was broked due to API change." + description: "Syncing from Netvibies was broken due to API change." } LogItem { diff --git a/sailfish/qml/ClickableLabel.qml b/qml/ClickableLabel.qml similarity index 100% rename from sailfish/qml/ClickableLabel.qml rename to qml/ClickableLabel.qml diff --git a/sailfish/qml/ControlBar.qml b/qml/ControlBar.qml similarity index 100% rename from sailfish/qml/ControlBar.qml rename to qml/ControlBar.qml diff --git a/sailfish/qml/CoverPage.qml b/qml/CoverPage.qml similarity index 100% rename from sailfish/qml/CoverPage.qml rename to qml/CoverPage.qml diff --git a/sailfish/qml/DashboardDialog.qml b/qml/DashboardDialog.qml similarity index 100% rename from sailfish/qml/DashboardDialog.qml rename to qml/DashboardDialog.qml diff --git a/sailfish/qml/DashboardPage.qml b/qml/DashboardPage.qml similarity index 100% rename from sailfish/qml/DashboardPage.qml rename to qml/DashboardPage.qml diff --git a/sailfish/qml/DebugPage.qml b/qml/DebugPage.qml similarity index 100% rename from sailfish/qml/DebugPage.qml rename to qml/DebugPage.qml diff --git a/sailfish/qml/Dot.qml b/qml/Dot.qml similarity index 100% rename from sailfish/qml/Dot.qml rename to qml/Dot.qml diff --git a/sailfish/qml/EntryDelegate.qml b/qml/EntryDelegate.qml similarity index 100% rename from sailfish/qml/EntryDelegate.qml rename to qml/EntryDelegate.qml diff --git a/sailfish/qml/EntryPage.qml b/qml/EntryPage.qml similarity index 100% rename from sailfish/qml/EntryPage.qml rename to qml/EntryPage.qml diff --git a/sailfish/qml/EntryPageContent.qml b/qml/EntryPageContent.qml similarity index 100% rename from sailfish/qml/EntryPageContent.qml rename to qml/EntryPageContent.qml diff --git a/sailfish/qml/ErrorPage.qml b/qml/ErrorPage.qml similarity index 100% rename from sailfish/qml/ErrorPage.qml rename to qml/ErrorPage.qml diff --git a/sailfish/qml/FeedIcon.qml b/qml/FeedIcon.qml similarity index 100% rename from sailfish/qml/FeedIcon.qml rename to qml/FeedIcon.qml diff --git a/sailfish/qml/FeedPage.qml b/qml/FeedPage.qml similarity index 100% rename from sailfish/qml/FeedPage.qml rename to qml/FeedPage.qml diff --git a/sailfish/qml/FeedWebContentPage.qml b/qml/FeedWebContentPage.qml similarity index 100% rename from sailfish/qml/FeedWebContentPage.qml rename to qml/FeedWebContentPage.qml diff --git a/sailfish/qml/FirstPage.qml b/qml/FirstPage.qml similarity index 100% rename from sailfish/qml/FirstPage.qml rename to qml/FirstPage.qml diff --git a/sailfish/qml/HintLabel.qml b/qml/HintLabel.qml similarity index 100% rename from sailfish/qml/HintLabel.qml rename to qml/HintLabel.qml diff --git a/sailfish/qml/IconBar.qml b/qml/IconBar.qml similarity index 100% rename from sailfish/qml/IconBar.qml rename to qml/IconBar.qml diff --git a/sailfish/qml/IconBarItem.qml b/qml/IconBarItem.qml similarity index 100% rename from sailfish/qml/IconBarItem.qml rename to qml/IconBarItem.qml diff --git a/sailfish/qml/IconContextMenu.qml b/qml/IconContextMenu.qml similarity index 100% rename from sailfish/qml/IconContextMenu.qml rename to qml/IconContextMenu.qml diff --git a/sailfish/qml/IconMenuItem_.qml b/qml/IconMenuItem_.qml similarity index 100% rename from sailfish/qml/IconMenuItem_.qml rename to qml/IconMenuItem_.qml diff --git a/sailfish/qml/IconPlaceholder.qml b/qml/IconPlaceholder.qml similarity index 100% rename from sailfish/qml/IconPlaceholder.qml rename to qml/IconPlaceholder.qml diff --git a/sailfish/qml/IconSlider.qml b/qml/IconSlider.qml similarity index 100% rename from sailfish/qml/IconSlider.qml rename to qml/IconSlider.qml diff --git a/sailfish/qml/LogItem.qml b/qml/LogItem.qml similarity index 100% rename from sailfish/qml/LogItem.qml rename to qml/LogItem.qml diff --git a/sailfish/qml/MenuIconItem.qml b/qml/MenuIconItem.qml similarity index 100% rename from sailfish/qml/MenuIconItem.qml rename to qml/MenuIconItem.qml diff --git a/sailfish/qml/Notification.qml b/qml/Notification.qml similarity index 100% rename from sailfish/qml/Notification.qml rename to qml/Notification.qml diff --git a/sailfish/qml/NvSignInDialog.qml b/qml/NvSignInDialog.qml similarity index 100% rename from sailfish/qml/NvSignInDialog.qml rename to qml/NvSignInDialog.qml diff --git a/sailfish/qml/OldReaderSignInDialog.qml b/qml/OldReaderSignInDialog.qml similarity index 100% rename from sailfish/qml/OldReaderSignInDialog.qml rename to qml/OldReaderSignInDialog.qml diff --git a/sailfish/qml/PaddedLabel.qml b/qml/PaddedLabel.qml similarity index 100% rename from sailfish/qml/PaddedLabel.qml rename to qml/PaddedLabel.qml diff --git a/sailfish/qml/PageMenu.qml b/qml/PageMenu.qml similarity index 100% rename from sailfish/qml/PageMenu.qml rename to qml/PageMenu.qml diff --git a/sailfish/qml/Pocket.qml b/qml/Pocket.qml similarity index 100% rename from sailfish/qml/Pocket.qml rename to qml/Pocket.qml diff --git a/sailfish/qml/PocketAuthWebViewPage.qml b/qml/PocketAuthWebViewPage.qml similarity index 100% rename from sailfish/qml/PocketAuthWebViewPage.qml rename to qml/PocketAuthWebViewPage.qml diff --git a/sailfish/qml/PocketDialog.qml b/qml/PocketDialog.qml similarity index 100% rename from sailfish/qml/PocketDialog.qml rename to qml/PocketDialog.qml diff --git a/sailfish/qml/ProgressPanel.qml b/qml/ProgressPanel.qml similarity index 100% rename from sailfish/qml/ProgressPanel.qml rename to qml/ProgressPanel.qml diff --git a/sailfish/qml/ReadAllDialog.qml b/qml/ReadAllDialog.qml similarity index 100% rename from sailfish/qml/ReadAllDialog.qml rename to qml/ReadAllDialog.qml diff --git a/sailfish/qml/SettingsPage.qml b/qml/SettingsPage.qml similarity index 100% rename from sailfish/qml/SettingsPage.qml rename to qml/SettingsPage.qml diff --git a/sailfish/qml/ShareDialog.qml b/qml/ShareDialog.qml similarity index 100% rename from sailfish/qml/ShareDialog.qml rename to qml/ShareDialog.qml diff --git a/sailfish/qml/ShareLinkPage.qml b/qml/ShareLinkPage.qml similarity index 95% rename from sailfish/qml/ShareLinkPage.qml rename to qml/ShareLinkPage.qml index 881eb41..bc024e1 100644 --- a/sailfish/qml/ShareLinkPage.qml +++ b/qml/ShareLinkPage.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import Sailfish.TransferEngine 1.0 // not available in harbour package +//import Sailfish.TransferEngine 1.0 // not available in harbour package Page { id: root diff --git a/sailfish/qml/SignOutDialog.qml b/qml/SignOutDialog.qml similarity index 100% rename from sailfish/qml/SignOutDialog.qml rename to qml/SignOutDialog.qml diff --git a/sailfish/qml/SimpleListItem.qml b/qml/SimpleListItem.qml similarity index 100% rename from sailfish/qml/SimpleListItem.qml rename to qml/SimpleListItem.qml diff --git a/sailfish/qml/SmallIconButton.qml b/qml/SmallIconButton.qml similarity index 100% rename from sailfish/qml/SmallIconButton.qml rename to qml/SmallIconButton.qml diff --git a/sailfish/qml/Spacer.qml b/qml/Spacer.qml similarity index 100% rename from sailfish/qml/Spacer.qml rename to qml/Spacer.qml diff --git a/sailfish/qml/TTRssSignInDialog.qml b/qml/TTRssSignInDialog.qml similarity index 100% rename from sailfish/qml/TTRssSignInDialog.qml rename to qml/TTRssSignInDialog.qml diff --git a/sailfish/qml/TabPage.qml b/qml/TabPage.qml similarity index 100% rename from sailfish/qml/TabPage.qml rename to qml/TabPage.qml diff --git a/sailfish/qml/TempBaner.qml b/qml/TempBaner.qml similarity index 100% rename from sailfish/qml/TempBaner.qml rename to qml/TempBaner.qml diff --git a/sailfish/qml/TextAreaItem.qml b/qml/TextAreaItem.qml similarity index 100% rename from sailfish/qml/TextAreaItem.qml rename to qml/TextAreaItem.qml diff --git a/sailfish/qml/TextFieldItem.qml b/qml/TextFieldItem.qml similarity index 100% rename from sailfish/qml/TextFieldItem.qml rename to qml/TextFieldItem.qml diff --git a/sailfish/qml/TextSwitchWithIcon.qml b/qml/TextSwitchWithIcon.qml similarity index 100% rename from sailfish/qml/TextSwitchWithIcon.qml rename to qml/TextSwitchWithIcon.qml diff --git a/sailfish/qml/UnreadAllDialog.qml b/qml/UnreadAllDialog.qml similarity index 100% rename from sailfish/qml/UnreadAllDialog.qml rename to qml/UnreadAllDialog.qml diff --git a/sailfish/qml/UnreadBox.qml b/qml/UnreadBox.qml similarity index 100% rename from sailfish/qml/UnreadBox.qml rename to qml/UnreadBox.qml diff --git a/sailfish/qml/WebPreviewPage.qml b/qml/WebPreviewPage.qml similarity index 100% rename from sailfish/qml/WebPreviewPage.qml rename to qml/WebPreviewPage.qml diff --git a/sailfish/qml/js/Console.js b/qml/js/Console.js similarity index 100% rename from sailfish/qml/js/Console.js rename to qml/js/Console.js diff --git a/sailfish/qml/js/Kaktus.js b/qml/js/Kaktus.js similarity index 100% rename from sailfish/qml/js/Kaktus.js rename to qml/js/Kaktus.js diff --git a/sailfish/qml/js/MessageListener.js b/qml/js/MessageListener.js similarity index 100% rename from sailfish/qml/js/MessageListener.js rename to qml/js/MessageListener.js diff --git a/sailfish/qml/js/NightMode.js b/qml/js/NightMode.js similarity index 100% rename from sailfish/qml/js/NightMode.js rename to qml/js/NightMode.js diff --git a/sailfish/qml/js/Readability.js b/qml/js/Readability.js similarity index 100% rename from sailfish/qml/js/Readability.js rename to qml/js/Readability.js diff --git a/sailfish/qml/js/ReaderMode.js b/qml/js/ReaderMode.js similarity index 100% rename from sailfish/qml/js/ReaderMode.js rename to qml/js/ReaderMode.js diff --git a/sailfish/qml/js/Theme.js b/qml/js/Theme.js similarity index 100% rename from sailfish/qml/js/Theme.js rename to qml/js/Theme.js diff --git a/sailfish/qml/js/init.js b/qml/js/init.js similarity index 100% rename from sailfish/qml/js/init.js rename to qml/js/init.js diff --git a/sailfish/qml/main.qml b/qml/main.qml similarity index 100% rename from sailfish/qml/main.qml rename to qml/main.qml diff --git a/sailfish/qml/sprite-icons.png b/qml/sprite-icons.png similarity index 100% rename from sailfish/qml/sprite-icons.png rename to qml/sprite-icons.png diff --git a/sailfish/harbour-kaktus.pro b/sailfish/harbour-kaktus.pro deleted file mode 100644 index 5ba4ba8..0000000 --- a/sailfish/harbour-kaktus.pro +++ /dev/null @@ -1,147 +0,0 @@ -TARGET = harbour-kaktus - -CONFIG += c++1z sailfishapp json - -QT += sql network dbus - -PKGCONFIG += mlite5 - -DEFINES += SAILFISH -DEFINES += ONLINE_CHECK -#DEFINES += HARBOUR - -INCLUDEPATH += src - -SOURCES += \ - src/main.cpp \ - src/utils.cpp \ - src/tabmodel.cpp \ - src/listmodel.cpp \ - src/feedmodel.cpp \ - src/entrymodel.cpp \ - src/downloadmanager.cpp \ - src/databasemanager.cpp \ - src/dashboardmodel.cpp \ - src/cacheserver.cpp \ - src/settings.cpp \ - src/simplecrypt.cpp \ - src/nviconprovider.cpp \ - src/fetcher.cpp \ - src/oldreaderfetcher.cpp \ - src/nvfetcher.cpp \ - src/ttrssfetcher.cpp \ - src/networkaccessmanagerfactory.cpp \ - src/customnetworkaccessmanager.cpp \ - src/iconprovider.cpp - -HEADERS += \ - src/info.h \ - src/utils.h \ - src/tabmodel.h \ - src/listmodel.h \ - src/feedmodel.h \ - src/entrymodel.h \ - src/downloadmanager.h \ - src/databasemanager.h \ - src/dashboardmodel.h \ - src/cacheserver.h \ - src/settings.h \ - src/simplecrypt.h \ - src/iconprovider.h \ - src/nviconprovider.h \ - src/fetcher.h \ - src/oldreaderfetcher.h \ - src/nvfetcher.h \ - src/ttrssfetcher.h \ - src/networkaccessmanagerfactory.h \ - src/customnetworkaccessmanager.h \ - key.h - -# libs -include(qhttpserver/qhttpserver.pri) - -SAILFISHAPP_ICONS = 86x86 108x108 128x128 150x150 172x172 256x256 - -CONFIG += sailfishapp_i18n_include_obsolete -TRANSLATIONS += \ - translations/kaktus_en.ts \ - translations/kaktus_pl.ts \ - translations/kaktus_ru.ts \ - translations/kaktus_cs.ts \ - translations/kaktus_nl_NL.ts \ - translations/kaktus_nl_BE.ts \ - translations/kaktus_tr.ts \ - translations/kaktus_es.ts \ - translations/kaktus_it.ts \ - translations/kaktus_de.ts \ - translations/kaktus_zh_CN.ts -include(sailfishapp_i18n.pri) - -images.files = images/* -images.path = /usr/share/$${TARGET}/images -INSTALLS += images - -OTHER_FILES += \ - qml/AboutPage.qml \ - qml/AccountsDialog.qml \ - qml/ActiveDetector.qml \ - qml/AuthWebViewPage.qml \ - qml/ButtonItem.qml \ - qml/CachedImage.qml \ - qml/ChangelogPage.qml \ - qml/ControlBar.qml \ - qml/CoverPage.qml \ - qml/DashboardDialog.qml \ - qml/DashboardPage.qml \ - qml/DebugPage.qml \ - qml/Dot.qml \ - qml/EntryDelegate.qml \ - qml/EntryPageContent.qml \ - qml/EntryPage.qml \ - qml/ErrorPage.qml \ - qml/FeedIcon.qml \ - qml/FeedPage.qml \ - qml/FeedWebContentPage.qml \ - qml/FirstPage.qml \ - qml/HintLabel.qml \ - qml/IconBarItem.qml \ - qml/IconBar.qml \ - qml/IconContextMenu.qml \ - qml/IconMenuItem_.qml \ - qml/IconPlaceholder.qml \ - qml/IconSlider.qml \ - qml/LogItem.qml \ - qml/main.qml \ - qml/MenuIconItem.qml \ - qml/Notification.qml \ - qml/NvSignInDialog.qml \ - qml/OldReaderSignInDialog.qml \ - qml/PaddedLabel.qml \ - qml/PageMenu.qml \ - qml/PocketAuthWebViewPage.qml \ - qml/PocketDialog.qml \ - qml/Pocket.qml \ - qml/ProgressPanel.qml \ - qml/ReadAllDialog.qml \ - qml/SettingsPage.qml \ - qml/ShareDialog.qml \ - qml/ShareLinkPage.qml \ - qml/SignOutDialog.qml \ - qml/SmallIconButton.qml \ - qml/Spacer.qml \ - qml/TabPage.qml \ - qml/TempBaner.qml \ - qml/TextAreaItem.qml \ - qml/TextFieldItem.qml \ - qml/TextSwitchWithIcon.qml \ - qml/TTRssSignInDialog.qml \ - qml/UnreadAllDialog.qml \ - qml/WebPreviewPage.qml \ - qml/ClickableLabel.qml \ - qml/SimpleListItem.qml \ - qml/UnreadBox.qml - -OTHER_FILES += \ - rpm/$${TARGET}.yaml \ - rpm/$${TARGET}.changes.in \ - rpm/$${TARGET}.spec diff --git a/sailfish/key.h b/sailfish/key.h deleted file mode 100644 index e27e3a2..0000000 --- a/sailfish/key.h +++ /dev/null @@ -1,4 +0,0 @@ -#include - -static const quint64 KEY = Q_UINT64_C(0x00000000000000000); -static const QString pocket_consumer_key = ""; diff --git a/sailfish/qhttpserver/qhttpserver.pri b/sailfish/qhttpserver/qhttpserver.pri deleted file mode 100644 index 70ba554..0000000 --- a/sailfish/qhttpserver/qhttpserver.pri +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDEPATH += ./qhttpserver -DEPENDPATH += ./qhttpserver - -HEADERS += \ - ./qhttpserver/http_parser.h \ - ./qhttpserver/qhttpconnection.h \ - ./qhttpserver/qhttprequest.h \ - ./qhttpserver/qhttpresponse.h \ - ./qhttpserver/qhttpserver.h \ - ./qhttpserver/qhttpserverapi.h \ - ./qhttpserver/qhttpserverfwd.h - -SOURCES += \ - ./qhttpserver/http_parser.c \ - ./qhttpserver/qhttpconnection.cpp \ - ./qhttpserver/qhttprequest.cpp \ - ./qhttpserver/qhttpresponse.cpp \ - ./qhttpserver/qhttpserver.cpp - -#SOURCES += $$PWD/*.cpp $$PWD/*.c -#HEADERS += $$PWD/*.h -#INCLUDEPATH += $$PWD diff --git a/sailfish/res/bad-selected.svg b/sailfish/res/bad-selected.svg deleted file mode 100644 index 635a6df..0000000 --- a/sailfish/res/bad-selected.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/bad.svg b/sailfish/res/bad.svg deleted file mode 100644 index 93b973f..0000000 --- a/sailfish/res/bad.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/sailfish/res/browser.svg b/sailfish/res/browser.svg deleted file mode 100644 index 73028ec..0000000 --- a/sailfish/res/browser.svg +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/sailfish/res/filter-0.svg b/sailfish/res/filter-0.svg deleted file mode 100644 index 10e3af3..0000000 --- a/sailfish/res/filter-0.svg +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/filter-1.svg b/sailfish/res/filter-1.svg deleted file mode 100644 index cff183c..0000000 --- a/sailfish/res/filter-1.svg +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/filter-2.svg b/sailfish/res/filter-2.svg deleted file mode 100644 index 4f77d0b..0000000 --- a/sailfish/res/filter-2.svg +++ /dev/null @@ -1,278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/fontdown.svg b/sailfish/res/fontdown.svg deleted file mode 100644 index e6d139a..0000000 --- a/sailfish/res/fontdown.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - a - - diff --git a/sailfish/res/fontup.svg b/sailfish/res/fontup.svg deleted file mode 100644 index 2925ad7..0000000 --- a/sailfish/res/fontup.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - a - - - diff --git a/sailfish/res/friend.svg b/sailfish/res/friend.svg deleted file mode 100644 index 0d37b85..0000000 --- a/sailfish/res/friend.svg +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sailfish/res/gen.sh b/sailfish/res/gen.sh deleted file mode 100755 index fc0a307..0000000 --- a/sailfish/res/gen.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -DEST_DIR=.. - -if ! [ -x "$(command -v python)" ]; then - echo 'Error: python is not installed.' >&2 - exit 1 -fi - -if ! [ -x "$(command -v inkscape)" ]; then - echo 'Error: inkscape is not installed.' >&2 - exit 1 -fi - -echo "Generating images..." -python gen_png.py - -echo "Generating icons..." -python gen_png_app.py - -echo "Deleting old images..." -rm -R $DEST_DIR/images - -echo "Coping images to dest dir..." -cp -R images $DEST_DIR - -echo "Deleting old icons..." -rm -R $DEST_DIR/icons - -echo "Coping icons to dest dir..." -cp -R icons $DEST_DIR diff --git a/sailfish/res/gen_png.py b/sailfish/res/gen_png.py deleted file mode 100644 index abb1c65..0000000 --- a/sailfish/res/gen_png.py +++ /dev/null @@ -1,105 +0,0 @@ -import glob, os - -dir_name = "images" - -# "dir_name": [small, medium, large, app_icon, app_icon_large] -sizes = { - "z1.0": [32, 64, 96, 86, 108, 540], - "z1.25": [40, 80, 120, 108, 128, 540], - "z1.5": [48, 96, 144, 128, 150, 720], - "z1.5-large": [48, 72, 108, 128, 150, 720], - "z1.75": [56, 112, 168, 150, 172, 1080], - "z2.0": [64, 128, 192, 172, 256, 1080], -} - -sizes_cover = { - "z1.0": [234, 374], - "z1.25": [234, 374], - "z1.5": [292, 468], - "z1.5-large": [292, 468], - "z1.75": [410, 654], - "z2.0": [410, 654], -} - -icons = { - "vm0": [1], - "vm1": [1], - "vm2": [1], - "vm3": [1], - "vm4": [1], - "vm5": [1], - "vm6": [1], - "kaktus": [3,4], - "read" : [1], - "read-selected" : [1], - "browser" : [1], - "webview" : [1], - "item" : [1], - "like" : [1], - "like-selected" : [1], - "reader" : [1], - "reader-selected" : [1], - "night" : [1], - "night-selected" : [1], - "rss" : [1], - "selector" : [1], - "share" : [1], - "share-selected" : [1], - "fontup" : [1], - "fontdown" : [1], - "readabove" : [1], - "friend" : [1], - "good" : [1], - "good-selected" : [1], - "bad" : [1], - "bad-selected" : [1], - "filter-0" : [1], - "filter-2" : [1], - "filter-1" : [1], - "pocket" : [1], - "netvibes" : [1], - "oldreader" : [1], - "ttrss" : [1] -} - -size_names = { - 0: "s", - 1: "m", - 2: "l", - 3: "a", - 4: "i", - 5: "x", - 6: "c" -} - -if not os.path.exists(dir_name): - os.makedirs(dir_name) - -for svg in glob.glob("*.svg"): - icon_id = svg[:-4] - - if icon_id in icons.keys(): - for d in sizes.keys(): - _dir = "%s/%s" % (dir_name, d) - - if not os.path.exists(_dir): - os.makedirs(_dir) - - for size_id in icons[icon_id]: - png = "{}/icon-{}-{}.png".format(_dir, size_names[size_id], icon_id) - - if not os.path.isfile(png): - size1 = 0 - size2 = 0 - if size_id == 6: - size1 = sizes_cover[d][0] - size2 = sizes_cover[d][1] - else: - size1 = sizes[d][size_id] - size2 = size1 - - print "File name: %s, size: %dx%d" % (png, size1, size2) - print ("inkscape -f {} -e {} -C -w {:.0f} -h {:.0f}" - .format(svg, png, size1, size2)) - os.system("inkscape -f {} -e {} -C -w {:.0f} -h {:.0f}" - .format(svg, png, size1, size2)) diff --git a/sailfish/res/gen_png_app.py b/sailfish/res/gen_png_app.py deleted file mode 100644 index fb3bbb4..0000000 --- a/sailfish/res/gen_png_app.py +++ /dev/null @@ -1,36 +0,0 @@ -import glob, os - -dir_name = "icons" - -app_name = "kaktus" - -# "dir_name": size -sizes = { - "86x86": 86, - "108x108": 108, - "128x128": 128, - "150x150": 150, - "172x172": 172, - "256x256": 256 -} - -svg = app_name + ".svg" - -if not os.path.exists(dir_name): - os.makedirs(dir_name) - -for name in sizes.keys(): - d = dir_name + "/" + name - - if not os.path.exists(d): - os.makedirs(d) - - png = d + "/harbour-" + app_name + ".png" - - if not os.path.isfile(png): - size = sizes[name] - print "File name: %s, size: %d" % (png, size) - print ("inkscape -f {} -e {} -C -w {:.0f} -h {:.0f}" - .format(svg, png, size, size)) - os.system("inkscape -f {} -e {} -C -w {:.0f} -h {:.0f}" - .format(svg, png, size, size)) diff --git a/sailfish/res/good-selected.svg b/sailfish/res/good-selected.svg deleted file mode 100644 index 9d26523..0000000 --- a/sailfish/res/good-selected.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/good.svg b/sailfish/res/good.svg deleted file mode 100644 index ea25c3c..0000000 --- a/sailfish/res/good.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/sailfish/res/item.svg b/sailfish/res/item.svg deleted file mode 100644 index 2255ae3..0000000 --- a/sailfish/res/item.svg +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/sailfish/res/kaktus-android.svg b/sailfish/res/kaktus-android.svg deleted file mode 100644 index 6119ed0..0000000 --- a/sailfish/res/kaktus-android.svg +++ /dev/null @@ -1,3525 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/sailfish/res/kaktus.svg b/sailfish/res/kaktus.svg deleted file mode 100644 index 9d71b01..0000000 --- a/sailfish/res/kaktus.svg +++ /dev/null @@ -1,3496 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/sailfish/res/kaktus_old.svg b/sailfish/res/kaktus_old.svg deleted file mode 100644 index 9e1e146..0000000 --- a/sailfish/res/kaktus_old.svg +++ /dev/null @@ -1,3310 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/sailfish/res/like-selected.svg b/sailfish/res/like-selected.svg deleted file mode 100644 index 7bcb372..0000000 --- a/sailfish/res/like-selected.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - Layer 1 - - - - - - - diff --git a/sailfish/res/like.svg b/sailfish/res/like.svg deleted file mode 100644 index 3c7227f..0000000 --- a/sailfish/res/like.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - Layer 1 - - - - - - - diff --git a/sailfish/res/netvibes.svg b/sailfish/res/netvibes.svg deleted file mode 100644 index 917d0c2..0000000 --- a/sailfish/res/netvibes.svg +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sailfish/res/night-selected.svg b/sailfish/res/night-selected.svg deleted file mode 100644 index 5866e3d..0000000 --- a/sailfish/res/night-selected.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/sailfish/res/night.svg b/sailfish/res/night.svg deleted file mode 100644 index 2b6e191..0000000 --- a/sailfish/res/night.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/sailfish/res/oldreader.svg b/sailfish/res/oldreader.svg deleted file mode 100644 index a9efef1..0000000 --- a/sailfish/res/oldreader.svg +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/pocket.svg b/sailfish/res/pocket.svg deleted file mode 100644 index cc846ba..0000000 --- a/sailfish/res/pocket.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/sailfish/res/read-selected.svg b/sailfish/res/read-selected.svg deleted file mode 100644 index 446428f..0000000 --- a/sailfish/res/read-selected.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/read.svg b/sailfish/res/read.svg deleted file mode 100644 index e8b66d6..0000000 --- a/sailfish/res/read.svg +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/sailfish/res/readabove.svg b/sailfish/res/readabove.svg deleted file mode 100644 index b399f54..0000000 --- a/sailfish/res/readabove.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/sailfish/res/reader-selected.svg b/sailfish/res/reader-selected.svg deleted file mode 100644 index fd9d508..0000000 --- a/sailfish/res/reader-selected.svg +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/sailfish/res/reader.svg b/sailfish/res/reader.svg deleted file mode 100644 index 6f2dc5b..0000000 --- a/sailfish/res/reader.svg +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/rss.svg b/sailfish/res/rss.svg deleted file mode 100644 index 90f3005..0000000 --- a/sailfish/res/rss.svg +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/sailfish/res/selector.svg b/sailfish/res/selector.svg deleted file mode 100644 index 55dce58..0000000 --- a/sailfish/res/selector.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/sailfish/res/share-selected.svg b/sailfish/res/share-selected.svg deleted file mode 100644 index 774f2c0..0000000 --- a/sailfish/res/share-selected.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/sailfish/res/share.svg b/sailfish/res/share.svg deleted file mode 100644 index e7051bf..0000000 --- a/sailfish/res/share.svg +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/sailfish/res/ttrss.svg b/sailfish/res/ttrss.svg deleted file mode 100644 index 1c30854..0000000 --- a/sailfish/res/ttrss.svg +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sailfish/res/vm0.svg b/sailfish/res/vm0.svg deleted file mode 100755 index 3121647..0000000 --- a/sailfish/res/vm0.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/sailfish/res/vm1.svg b/sailfish/res/vm1.svg deleted file mode 100644 index 525d9d6..0000000 --- a/sailfish/res/vm1.svg +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sailfish/res/vm2.svg b/sailfish/res/vm2.svg deleted file mode 100644 index 1afe9de..0000000 --- a/sailfish/res/vm2.svg +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sailfish/res/vm3.svg b/sailfish/res/vm3.svg deleted file mode 100755 index 0d12c6a..0000000 --- a/sailfish/res/vm3.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/vm4.svg b/sailfish/res/vm4.svg deleted file mode 100755 index 124e07a..0000000 --- a/sailfish/res/vm4.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/vm5.svg b/sailfish/res/vm5.svg deleted file mode 100755 index e580afd..0000000 --- a/sailfish/res/vm5.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Layer 1 - - - diff --git a/sailfish/res/vm6.svg b/sailfish/res/vm6.svg deleted file mode 100644 index b20c0b8..0000000 --- a/sailfish/res/vm6.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/sailfish/res/webview.svg b/sailfish/res/webview.svg deleted file mode 100644 index 12393d2..0000000 --- a/sailfish/res/webview.svg +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/sailfish/rpm/harbour-kaktus.changes.in b/sailfish/rpm/harbour-kaktus.changes.in deleted file mode 100644 index ac866c6..0000000 --- a/sailfish/rpm/harbour-kaktus.changes.in +++ /dev/null @@ -1,346 +0,0 @@ -# Rename this file as zimpedia.changes to include changelog -# entries in your RPM file. -# -# Add new changelog entries following the format below. -# Add newest entries to the top of the list. -# Separate entries from eachother with a blank line. - -# * date Author's Name version-release -# - Summary of changes - -* Sun Feb 13 2022 Michal Kosciesza 3.0.4-1 -- Fix: Netvibes API requires 'consent' cookie - -* Sat Jun 26 2021 Michal Kosciesza 3.0.3-1 -- High res Netvibes icons - -* Mon Mar 15 2021 Michal Kosciesza 3.0.2-1 -- Bug fixes discovered on SFOS 4.0 - -* Tue Feb 09 2021 Michal Kosciesza 3.0.1-1 -- Bug fixes discovered on SFOS 4.0 - -* Mon Apr 22 2019 Michal Kosciesza 3.0.0-1 -- Translation files update for: de, zh_CN - -* Sat Mar 23 2019 Michal Kosciesza 2.9.1-1 -- Translation files update for: es, nl_BE, nl_NL - -* Sat Mar 23 2019 Michal Kosciesza 2.9.0-1 -- Tiny Tiny RSS -- Readability.js updated to latest git version -- UI refresh -- Support for Light themes -- Save Image to gallery option - -* Sun Aug 27 2017 Michal Kosciesza 2.6.1-2 -- UI minor fixes -- Readability.js updated to latest git version - -* Sun Apr 30 2017 Michal Kosciesza 2.6.1-1 -- 1.8 pixel ratio support (for OnePlus X) - -* Tue Apr 18 2017 Michal Kosciesza 2.6.0-6 -- RU translations update - -* Fri Apr 14 2017 Michal Kosciesza 2.6.0-4 -- RU and CS translations update - -* Mon Apr 03 2017 Michal Kosciesza 2.6.0-3 -- IT, NL, PL and RU translations update - -* Wed Mar 15 2017 Michal Kosciesza 2.6.0-2 -- Pocket integration -- New app icon - -* Sun Feb 19 2017 Michal Kosciesza 2.6.0-1 -- Share link option (only in openrepos package) -- ES translation update - -* Tue Feb 09 2017 Michal Kosciesza 2.5.3-1 -- FIX: Sync process did not download all saved articles in Netvibes - -* Tue Jan 24 2017 Michal Kosciesza 2.5.2-2 -- Critical bug fix - -* Sat Jan 22 2017 Michal Kosciesza 2.5.2-1 -- Caching improvements -- Minor UI improvements - -* Sat Dec 23 2016 Michal Kosciesza 2.5.1-3 -- RU translations update - -* Thu Dec 22 2016 Michal Kosciesza 2.5.1-2 -- DE & RU translations update - -* Mon Dec 19 2016 Michal Kosciesza 2.5.1-1 -- FIX: New netvibes API - -* Sat Dec 03 2016 Michal Kosciesza 2.5.0-4 -- Bug fixes - -* Mon Nov 28 2016 Michal Kosciesza 2.5.0-3 -- Translations update - -* Sat Nov 19 2016 Michal Kosciesza 2.5.0-2 -- Night View -- Translations update - -* Sun Nov 13 2016 Michal Kosciesza 2.5.0-1 -- List filtering -- Auto network mode -- Bug fixes - -* Tue Nov 08 2016 Michal Kosciesza 2.5.0-0 -- Reader View with Readablility.js -- Bottom bar improvements -- Smoother offline mode -- Unsynced data indicator - -* Tue Jul 12 2016 Michal Kosciesza 2.4.0-0 -- UI improvements for Jolla C - -* Tue Jul 12 2016 Michal Kosciesza 2.3.1-1 -- FIX: New netvibes API support -- Translations update - -* Tue Apr 05 2016 Michal Kosciesza 2.3-6 -- Translations update: IT, PL - -* Sat Apr 02 2016 Michal Kosciesza 2.3-5 -- Translations update: IT, NL, RU, PL -- Updated cover page - -* Fri Mar 11 2016 Michal Kosciesza 2.3-4 -- New option: Open link behaviour - -* Thu Mar 10 2016 Michal Kosciesza 2.3-3 -- New option: Expanded items -- UI improvements - -* Sun Jan 31 2016 Michal Kosciesza 2.3-2 -- Small UI improvements - -* Sat Jan 23 2016 Michal Kosciesza 2.3-1 -- Option to display full content from the RSS feed - -* Mon Jan 11 2016 Michal Kosciesza 2.2-7 -- Translations update - -* Fri Jan 08 2016 Michal Kosciesza 2.2-6 -- FIX: New netvibes API support - -* Sun Dec 13 2015 Michal Kosciesza 2.2-3 -- Double-pane view in landscape mode - -* Tue Dec 10 2015 Michal Kosciesza 2.2-2 -- New bottom bar design -- Improvements in proggress indicator -- BUG FIX: [Sailish 2.0] Icons are not displayed in offline mode - -* Fri Nov 27 2015 Michal Kosciesza 2.2-1 -- Open articles in web browser option -- BUG FIX: Workaround for https://github.com/mkiol/kaktus/issues/14 - -* Sat Oct 10 2015 Michal Kosciesza 2.1.1-6 -- BUG FIX: "Unknown error" while syncing Netvibes account - -* Wed Sep 30 2015 Michal Kosciesza 2.1-5 -- Polishing for Sailfish 2.0 - -* Sat Sep 12 2015 Michal Kosciesza 2.1-4 -- Translations update: RU, IT - -* Thu Aug 27 2015 Michal Kosciesza 2.1-3 -- BUG FIX: Mark above as read fix - -* Sat Aug 22 2015 Michal Kosciesza 2.1-2 -- Old Reader: Enable social features -- Old Reader: Like & Liked articles view mode -- Sync read articles option -- BUG FIX: Handling HTTP redirection loop in cache downloading - -* Sun Aug 09 2015 Michal Kosciesza 2.1-1 -- Sort order for list of articles -- Mark above as read option -- Translations update -- BUG FIX: Uploading indicator wasn't shown for Old Reader - -* Tue Jun 23 2015 Michal Kosciesza 2.0-9 -- Lanscape mode bug fixes -- Removed unfinished translations - -* Tue Jun 23 2015 Michal Kosciesza 2.0-8 -- DB bug fix - -* Tue Jun 23 2015 Michal Kosciesza 2.0-7 -- Bug fixes - -* Sun Jun 21 2015 Michal Kosciesza 2.0-6 -- Bug fixes -- NL translation update - -* Sat Jun 20 2015 Michal Kosciesza 2.0-5 -- Performance optimization - -* Sat Jun 06 2015 Michal Kosciesza 2.0-4 -- Following folder & share action for Oldreader -- Hint panel -- BUG FIX: Some Netvibes tab icons are not displayed - -* Sun May 31 2015 Michal Kosciesza 2.0-3 -- Many small bug fixes - -* Sat May 23 2015 Michal Kosciesza 2.0-2 -- Old Reader support as feed aggregator service - -* Wed Apr 22 2015 Michal Kosciesza 1.4-2 -- Ru and Nl translations update - -* Tue Apr 21 2015 Michal Kosciesza 1.4-1 -- UI polishing -- Remorse popups instead Dialog prompts - -* Wed Apr 08 2015 Michal Kosciesza 1.3-4 -- BUG FIX: Segfault when view mode changing -- UI enhancements: UI is more inline with Sailfish design style - -* Wed Apr 08 2015 Michal Kosciesza 1.3-3 -- BUG FIX: Wrong padding on entry list, if image size is very tiny - -* Tue Apr 07 2015 Michal Kosciesza 1.3-2 -- pl_PL translation update -- Minor UI enhancements - -* Sun Mar 15 2015 Michal Kosciesza 1.3-1 -- Sign in with Twitter and Facebook -- New caching option: WiFi only -- Reader view mode - -* Sat Jan 17 2015 Michal Kosciesza 1.2.3-1 -- Turkish translation (thanks to Mesut Aktaş) - -* Sat Dec 27 2014 Michal Kosciesza 1.2.3-0 -- Caching improvements -- Support for new Netvibes tabs icons -- Detecting and not displaying tiny images in offline mode -- Show only unread option in Pull-down menu -- BUG FIX: Handling Netvibes errors: 700 & 702 - -* Wed Nov 12 2014 Michal Kosciesza 1.2.2-3 -- Small UI improvements for 1.1.0.38 -- Czech and Dutch translation - -* Tue Oct 21 2014 Michal Kosciesza 1.2.2-2 -- Small UI improvements -- BUG FIX: Huge cache size take too long to calculate -- QtWebKit cache file removal on 'Delete cache' action -- Persian and Russian translation update - -* Tue Oct 21 2014 Michal Kosciesza 1.2.2-1 -- Russian language -- Updated Persian translation -- Better increase viewport implementation - -* Tue Oct 21 2014 Michal Kosciesza 1.2.2-0 -- Option to increase viewport in web viewer - -* Sun Oct 12 2014 Michal Kosciesza 1.2.1-2 -- BUG FIX: Auto mark as read does not work - -* Fri Oct 10 2014 Michal Kosciesza 1.2.1-1 -- UI improvements -- Language settings -- Farsi language (thanks to Ali Adineh) - -* Sat Oct 03 2014 Michal Kosciesza 1.2.1-0 -- UI improvements -- Handling for 'malformed database file' error - -* Mon Sep 29 2014 Michal Kosciesza 1.2.0-5 -- BUG FIX: Very old saved items not syncec correctly -- Image in offline web view - -* Sat Sep 27 2014 Michal Kosciesza 1.2.0-5 -- BUG FIX: Read all on Tabs does not work as should -- Image download improvement - -* Fri Sep 26 2014 Michal Kosciesza 1.2.0-4 -- New Netvibes APi support -- Bottom Bar -- Slow feeds view mode -- User Guide - -* Sat Sep 06 2014 Michal Kosciesza 1.2.0-3 -- Caching and downloading improvements - -* Tue Sep 02 2014 Michal Kosciesza 1.2.0-2 -- Netvibes Multi-Feed widget (initial) support -- Improved display of images - -* Mon Sep 01 2014 Michal Kosciesza 1.2.0-1 -- New "View Mode" options e.g. Option to show all feeds in one list -- Double-click marks article as read/unread -- Changelog page - -* Wed Aug 27 2014 Michal Kosciesza 1.2.0-0 -- Posibility to browse articles by Tabs (see "View Mode" option) -- Indicator for articles that have been added since last sync -- Possibility to delete cache data (see "Cache size" option) -- Many UI improvements - -* Tue Aug 12 2014 Michal Kosciesza 1.1.0-5 -- New Offline mode indicator -- Posibility to set Offline/Online mode in Pull-down menu - -* Tue Jul 15 2014 Michal Kosciesza 1.1.0-4 -- Polkit update - -* Fri Jul 11 2014 Michal Kosciesza 1.1.0-3 -- Thumbnails in articles list -- 'Mark as read' in Pull-down menu -- Offline mode indicator in Pull-down menu -- BUG FIX: Sync Failed on every first sync attempt - -* Sat May 03 2014 Michal Kosciesza 1.0.5-0 -- Sigin fix due to change in Netvibes API -- Qt4 support and initial Meego Harmattan support - -* Sat May 03 2014 Michal Kosciesza 1.0.4-3 -- Workaround for 'High Power Consumption' webkit bug - -* Wed Apr 23 2014 Michal Kosciesza 1.0.4-2 -- Cover improvements - -* Sat Apr 19 2014 Michal Kosciesza 1.0.4-1 -- Landscape mode -- 'Last sync' info on Cover -- Possibility to mark all articles in Tab as read/unread - -* Mon Apr 14 2014 Michal Kosciesza 1.0.3-4 -- Version for Openrepos.org - -* Mon Apr 14 2014 Michal Kosciesza 1.0.3-3 -- Showing number of unread articles on Cover -- Icon update - -* Sun Apr 13 2014 Michal Kosciesza 1.0.3-2 -- Showing number of unread articles on Tabs - -* Sat Apr 12 2014 Michal Kosciesza 1.0.3-1 -- 'Show only unread' option -- Possibility to mark all articles in Feed as read/unread -- Auto cache cleaning algorithm -- Cache size view in Settings -- UI improvements - -* Thu Apr 03 2014 Michal Kosciesza 1.0.2-1 -- Increased performance -- Better error handling when ne twork connection fails - -* Sun Mar 30 2014 Michal Kosciesza 1.0.1-1 -- UI improvements -- Extra Tab with Saved articles - -* Mon Mar 25 2014 Michal Kosciesza 1.0.0-1 -- First release diff --git a/sailfish/rpm/harbour-kaktus.spec b/sailfish/rpm/harbour-kaktus.spec deleted file mode 100644 index d59eada..0000000 --- a/sailfish/rpm/harbour-kaktus.spec +++ /dev/null @@ -1,73 +0,0 @@ -# -# Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.32 -# - -Name: harbour-kaktus - -# >> macros -# << macros - -%{!?qtc_qmake:%define qtc_qmake %qmake} -%{!?qtc_qmake5:%define qtc_qmake5 %qmake5} -%{!?qtc_make:%define qtc_make make} -%{?qtc_builddir:%define _builddir %qtc_builddir} -Summary: Kaktus -Version: 3.0.4 -Release: 1 -Group: Qt/Qt -License: LICENSE -URL: https://github.com/mkiol/kaktus -Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-kaktus.yaml -Requires: sailfishsilica-qt5 >= 0.10.9 -Requires: mlite-qt5 -BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(mlite5) -BuildRequires: desktop-file-utils - -%description -Multi services feed reader, specially designed to work offline. - - -%prep -%setup -q -n %{name}-%{version} - -# >> setup -# << setup - -%build -# >> build pre -# << build pre - -%qtc_qmake5 - -%qtc_make %{?_smp_mflags} - -# >> build post -# << build post - -%install -rm -rf %{buildroot} -# >> install pre -# << install pre -%qmake5_install - -# >> install post -# << install post - -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/*.desktop - -%files -%defattr(-,root,root,-) -%{_bindir} -%{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -# >> files -# << files diff --git a/sailfish/rpm/harbour-kaktus.yaml b/sailfish/rpm/harbour-kaktus.yaml deleted file mode 100644 index d7a8ccb..0000000 --- a/sailfish/rpm/harbour-kaktus.yaml +++ /dev/null @@ -1,48 +0,0 @@ -Name: harbour-kaktus -Summary: Kaktus -Version: 3.0.4 -Release: 1 -# The contents of the Group field should be one of the groups listed here: -# http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS -Group: Qt/Qt -URL: https://github.com/mkiol/kaktus -License: LICENSE -# This must be generated before uploading a package to a remote build service. -# Usually this line does not need to be modified. -Sources: -- '%{name}-%{version}.tar.bz2' -Description: | - Multi services feed reader, specially designed to work offline. -Configure: none -# The qtc5 builder inserts macros to allow QtCreator to have fine -# control over qmake/make execution -Builder: qtc5 - -# This section specifies build dependencies that are resolved using pkgconfig. -# This is the preferred way of specifying build dependencies for your package. -PkgConfigBR: - - sailfishapp >= 1.0.2 - - Qt5Core - - Qt5Qml - - Qt5Quick - - mlite5 - -# Build dependencies without a pkgconfig setup can be listed here -# PkgBR: -# - package-needed-to-build - -# Runtime dependencies which are not automatically detected -Requires: - - sailfishsilica-qt5 >= 0.10.9 - - mlite-qt5 - -# All installed files -Files: - - '%{_bindir}' - - '%{_datadir}/%{name}' - - '%{_datadir}/applications/%{name}.desktop' - - '%{_datadir}/icons/hicolor/*/apps/%{name}.png' - -# For more information about yaml and what's supported in Sailfish OS -# build system, please see https://wiki.merproject.org/wiki/Spectacle - diff --git a/sailfish/src/info.h b/sailfish/src/info.h deleted file mode 100644 index befdad7..0000000 --- a/sailfish/src/info.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (C) 2014-2021 Michal Kosciesza - - This file is part of Kaktus. - - Kaktus is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Kaktus is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Kaktus. If not, see . -*/ - -#ifndef INFO_H -#define INFO_H - -namespace Kaktus { -constexpr const char* APP_NAME = "Kaktus"; -#ifdef QT_DEBUG -constexpr const char* APP_VERSION = "3.0.4 (debug)"; -#else -constexpr const char* APP_VERSION = "3.0.4"; -#endif // QT_DEBUG -constexpr const char* AUTHOR = "Michal Kosciesza"; -constexpr const char* COPYRIGHT_YEAR = "2014-2022"; -constexpr const char* AUTHOR1 = "Renaud Casenave-Péré"; -constexpr const char* COPYRIGHT_YEAR1 = "2019-2022"; -constexpr const char* SUPPORT_EMAIL = "kaktus@mkiol.net"; -constexpr const char* PAGE = "https://github.com/mkiol/kaktus"; -constexpr const char* LICENSE = "GNU General Public Licence version 3"; -constexpr const char* LICENSE_URL = "https://www.gnu.org/licenses/gpl-3.0.html"; -} - -#endif // INFO_H diff --git a/sailfish/src/main.cpp b/sailfish/src/main.cpp deleted file mode 100644 index 168121f..0000000 --- a/sailfish/src/main.cpp +++ /dev/null @@ -1,155 +0,0 @@ -/* - Copyright (C) 2014-2019 Michal Kosciesza - - This file is part of Kaktus. - - Kaktus is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Kaktus is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Kaktus. If not, see . -*/ - -#include -#include -#include -#include -#include -#include -#include -#ifdef SAILFISH -#include -#include -#include -#include -#endif -#ifdef ANDROID -#include -#include -#include -#endif - -#include "info.h" -#include "iconprovider.h" -#include "nviconprovider.h" -#include "databasemanager.h" -#include "downloadmanager.h" -#include "cacheserver.h" -#include "utils.h" -#include "settings.h" -#include "networkaccessmanagerfactory.h" - -int main(int argc, char *argv[]) -{ -#ifdef SAILFISH - QScopedPointer app(SailfishApp::application(argc, argv)); - QScopedPointer view(SailfishApp::createView()); - QScopedPointer engine(view->engine()); - QQmlContext *context = view->rootContext(); - QString translationsDirPath = SailfishApp::pathTo("translations").toLocalFile(); -#endif -#ifdef ANDROID - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QScopedPointer app(new QGuiApplication(argc, argv)); - QtWebView::initialize(); - QScopedPointer engine(new QQmlApplicationEngine()); - QQmlContext *context = engine->rootContext(); - QString translationsDirPath = ""; //TODO -#endif - - Utils utils; -#ifdef ANDROID - utils.setStatusBarColor(QColor("#00796b")); - app->setApplicationName(APP_NAME); -#endif - - app->setApplicationDisplayName(Kaktus::APP_NAME); - app->setApplicationVersion(Kaktus::APP_VERSION); - - context->setContextProperty("APP_NAME", Kaktus::APP_NAME); - context->setContextProperty("APP_VERSION", Kaktus::APP_VERSION); - context->setContextProperty("AUTHOR", Kaktus::AUTHOR); - context->setContextProperty("COPYRIGHT_YEAR", Kaktus::COPYRIGHT_YEAR); - context->setContextProperty("AUTHOR1", Kaktus::AUTHOR1); - context->setContextProperty("COPYRIGHT_YEAR1", Kaktus::COPYRIGHT_YEAR1); - context->setContextProperty("SUPPORT_EMAIL", Kaktus::SUPPORT_EMAIL); - context->setContextProperty("PAGE", Kaktus::PAGE); - context->setContextProperty("LICENSE", Kaktus::LICENSE); - context->setContextProperty("LICENSE_URL", Kaktus::LICENSE_URL); - - engine->addImageProvider(QLatin1String("icons"), new IconProvider); - engine->addImageProvider(QLatin1String("nvicons"), new NvIconProvider); - - qRegisterMetaType("CacheItem"); -/* -#ifdef SAILFISH - //-- temp fix -- - // config file - QString path = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)).path(); - if (QFile::exists(path + "/harbour-kaktus/Kaktus.conf")) { - qWarning() << "Old config file exists -> doing migration"; - QFile::remove(path + "/harbour-kaktus/harbour-kaktus.conf"); - if (QFile::copy(path + "/harbour-kaktus/Kaktus.conf", - path + "/harbour-kaktus/harbour-kaktus.conf")) { - QFile::remove(path + "/harbour-kaktus/Kaktus.conf"); - } - } - // cache file - path = QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)).path(); - QDir newDir(path + "/harbour-kaktus/Kaktus/"); - if (newDir.exists()) { - qWarning() << "Old cache dir exists -> doing migration"; - QDir oldDir(path + "/harbour-kaktus/harbour-kaktus/"); - if (oldDir.exists()) { - oldDir.removeRecursively(); - } - qDebug() << newDir.rename(path + "/harbour-kaktus/Kaktus/", - path + "/harbour-kaktus/harbour-kaktus/"); - } - //-- -#endif -*/ - - Settings *settings = Settings::instance(); - - QTranslator translator; - QString locale = settings->getLocale() == "" ? QLocale::system().name() : settings->getLocale(); - if(!translator.load(locale, "kaktus", "_", translationsDirPath, ".qm")) { - qDebug() << "Cannot load translation:" << locale << translationsDirPath; - if (!translator.load("kaktus_en", translationsDirPath)) { - qDebug() << "Cannot load default translation"; - } - } - app->installTranslator(&translator); - - settings->context = context; - - QObject::connect(engine.data(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); - - NetworkAccessManagerFactory NAMfactory(settings->getDmUserAgent()); - engine->setNetworkAccessManagerFactory(&NAMfactory); - - context->setContextProperty("db", DatabaseManager::instance()); - context->setContextProperty("utils", &utils); - context->setContextProperty("dm", DownloadManager::instance()); - context->setContextProperty("cache", CacheServer::instance()); - context->setContextProperty("cserver", CacheServer::instance()); - context->setContextProperty("settings", settings); - -#ifdef SAILFISH - view->setSource(SailfishApp::pathTo("qml/main.qml")); - view->show(); -#endif -#ifdef ANDROID - engine->load(QUrl(QLatin1String("qrc:/qml/main.qml"))); -#endif - - return app->exec(); -} diff --git a/sailfish/src/utils.cpp b/sailfish/src/utils.cpp deleted file mode 100644 index 37bbfed..0000000 --- a/sailfish/src/utils.cpp +++ /dev/null @@ -1,815 +0,0 @@ -/* - Copyright (C) 2014 Michal Kosciesza - - This file is part of Kaktus. - - Kaktus is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Kaktus is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Kaktus. If not, see . -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef SAILFISH -#include -#endif -#ifdef ANDROID -#include -#include -#endif -#ifdef BB10 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#else -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) -#include -#include -#include -#else -#include -#include -#include -#endif -#include -#endif - -#include "utils.h" -#include "fetcher.h" -#include "oldreaderfetcher.h" -#include "nvfetcher.h" -#include "ttrssfetcher.h" -#include "databasemanager.h" - -Utils::Utils(QObject *parent) : - QObject(parent)//, ncm(new QNetworkConfigurationManager(parent)) -{ - dashboardModel = nullptr; - entryModel = nullptr; - tabModel = nullptr; - feedModel = nullptr; -#ifdef ANDROID - screen = QGuiApplication::screens().at(0); -#endif -} - -bool Utils::isLight() -{ -#ifdef KAKTUS_LIGHT - return true; -#else - return false; -#endif -} - -#ifdef ANDROID -int Utils::dp(float value) -{ - //float dp = value * (screen->physicalDotsPerInch() / 160) + 0.5; - //dp = (10 * dp + 5) / 10; - //qDebug() << "value=" << value << "dp=" << value * (screen->physicalDotsPerInch() / 160) << "dpp=" << dp; - return value * (screen->physicalDotsPerInch() / 160) + 0.5; -} - -int Utils::mm(float value) -{ - return value * (screen->physicalDotsPerInch() / 25.4); -} - -int Utils::in(float value) -{ - return value * screen->physicalDotsPerInch(); -} - -int Utils::pt(float value) -{ - return value * (screen->physicalDotsPerInch() / 72); -} - -int Utils::sp(float value) -{ - return dp(value); -} - -void Utils::showNotification(const QString &title, const QString &text) -{ - QAndroidJniObject jTitle = QAndroidJniObject::fromString(title); - QAndroidJniObject jText = QAndroidJniObject::fromString(text); - QAndroidJniObject::callStaticMethod("net/mkiol/kaktus/KaktusActivity", - "notify", - "(Ljava/lang/String;Ljava/lang/String;)V", - jTitle.object(), jText.object()); -} - -void Utils::setStatusBarColor(const QColor &color) -{ - int acolor = (color.alpha() << 24) | (color.red() << 16) | (color.green() << 8) | color.blue(); - QAndroidJniObject::callStaticMethod("net/mkiol/kaktus/KaktusActivity", - "setStatusBarColor", - "(I)V", acolor); -} - -#endif - -#ifdef BB10 -void Utils::launchBrowser(const QString &url) -{ - navigator_invoke(url.toStdString().c_str(),0); -} -#endif - -QString Utils::readAsset(const QString &path) -{ -#ifdef BB10 - QFile file("app/native/assets/" + path); -#endif -#ifdef ANDROID - QFile file(":/" + path); -#endif -#ifdef SAILFISH - QFile file(SailfishApp::pathTo(path).toLocalFile()); -#endif - if (!file.open(QIODevice::ReadOnly)) { - qWarning() << "Could not open" << path << "for reading: " << file.errorString(); - file.close(); - return ""; - } - - QString data = QString(file.readAll()); - file.close(); - - return data; -} - -void Utils::copyToClipboard(const QString &text) -{ -#ifdef BB10 - bb::system::Clipboard clipboard; - clipboard.clear(); - clipboard.insert("text/plain", text.toUtf8()); -#else -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - QClipboard *clipboard = QGuiApplication::clipboard(); -#else - QClipboard *clipboard = QApplication::clipboard(); -#endif - clipboard->setText(text); -#endif -} - -void Utils::resetQtWebKit() -{ -#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) - QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::DataLocation); - if(dataDirs.size() > 0) { - QDir dir(QDir(dataDirs.at(0)).filePath(".QtWebKit")); - qDebug() << dir.path(); - if (dir.exists()) - dir.removeRecursively(); - } -#else - QString value = QDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation)).path(); - value = value + "/.QtWebKit"; - removeDir(value); -#endif -} - -void Utils::log(const QString & data) -{ - int l = data.length(); - int n = 120; - QString d; - for (int i = 0; i < l; ++i) { - d += data.at(i); - if (i % n == 0) { - qDebug() << i << d; - d.clear(); - } - } -} - -QString Utils::formatHtml(const QString & data, bool offline, const QString & style) -{ - QRegExp rxImg("]*>", Qt::CaseInsensitive); - QRegExp rxWidth("\\s*width\\s*=\\s*(\"[^\"]*\"|'[^']*')", Qt::CaseInsensitive); - QRegExp rxTarget("\\s*target\\s*=\\s*(\"[^\"]*\"|'[^']*')", Qt::CaseInsensitive); - QRegExp rxHeight("\\s*height\\s*=\\s*(\"[^\"]*\"|'[^']*')", Qt::CaseInsensitive); - QRegExp rxSizes("\\s*sizes\\s*=\\s*(\"[^\"]*\"|'[^']*')", Qt::CaseInsensitive); - QRegExp rxA("]*>", Qt::CaseInsensitive); - QRegExp rxP("]*>

", Qt::CaseInsensitive); - - QString content = data; - - content.remove(rxTarget); - if (offline) { - content.remove(rxImg); content.remove("", Qt::CaseInsensitive); - content.remove(rxA); - content.remove(rxP); - } else { - content.remove(rxWidth); - content.remove(rxHeight); - content.remove(rxSizes); - } - - content = "" + - (style.isEmpty() ? "" : "") + - "" + content + ""; - - return content; -} - -/* - * Copyright (c) 2009 John Schember - * http://john.nachtimwald.com/2010/06/08/qt-remove-directory-and-its-contents/ - */ -bool Utils::removeDir(const QString &dirName) -{ - bool result = true; - QDir dir(dirName); - - if (dir.exists(dirName)) { - QFileInfoList infoList = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst); - foreach (const QFileInfo& info, infoList) { - if (info.isDir()) - result = removeDir(info.absoluteFilePath()); - else - result = QFile::remove(info.absoluteFilePath()); - if (!result) - return result; - } - result = dir.rmdir(dirName); - } - return result; -} - -#ifdef BB10 -// Source: http://hecgeek.blogspot.com/2014/10/blackberry-10-multiple-os-versions-from.html -bool Utils::checkOSVersion(int major, int minor, int patch, int build) -{ - bb::platform::PlatformInfo platformInfo; - const QString osVersion = platformInfo.osVersion(); - const QStringList parts = osVersion.split('.'); - const int partCount = parts.size(); - - if(partCount < 4) { - // Invalid OS version format, assume check failed - return false; - } - - // Compare the base OS version using the same method as the macros - // in bbndk.h, which are duplicated here for maximum compatibility. - int platformEncoded = (((parts[0].toInt())*1000000)+((parts[1].toInt())*1000)+(parts[2].toInt())); - int checkEncoded = (((major)*1000000)+((minor)*1000)+(patch)); - - if(platformEncoded < checkEncoded) { - return false; - } - else if(platformEncoded > checkEncoded) { - return true; - } - else { - // The platform and check OS versions are equal, so compare the build version - int platformBuild = parts[3].toInt(); - return platformBuild >= build; - } -} - -int Utils::du(float value) -{ - int width = display.pixelSize().width(); - int height = display.pixelSize().height(); - - /*qDebug() << "display id is " << display.displayId(); - qDebug() << "display name is " << display.displayName(); - qDebug() << "display size is " << display.pixelSize().width() << ", " - << display.pixelSize().height();*/ - - if (width==720 && height==1280) { - return value*8; - } - - if (width==720 && height==720) { - return value*8; - } - - if (width==768 && height==1280) { - return value*10; - } - - if (width==1440 && height==1440) { - return value*12; - } - - return 8*value; -} - -bb::cascades::Color Utils::background() -{ - bb::cascades::ColorTheme* colorTheme = bb::cascades::Application::instance()->themeSupport()->theme()->colorTheme(); - bool isOled = display.displayTechnology()==bb::device::DisplayTechnology::Oled; - bool is103 = checkOSVersion(10,3); - - switch (colorTheme->style()) { - case bb::cascades::VisualStyle::Bright: - if (is103) - return bb::cascades::Color::White; - if (isOled) - return bb::cascades::Color::fromARGB(0xfff2f2f2); - return bb::cascades::Color::fromARGB(0xfff8f8f8); - break; - case bb::cascades::VisualStyle::Dark: - if (is103) - return bb::cascades::Color::Black; - return bb::cascades::Color::fromARGB(0xff121212); - break; - } - - return bb::cascades::Color::Black; -} - -bb::cascades::Color Utils::plain() -{ - bb::cascades::ColorTheme* colorTheme = bb::cascades::Application::instance()->themeSupport()->theme()->colorTheme(); - - switch (colorTheme->style()) { - case bb::cascades::VisualStyle::Bright: - return bb::cascades::Color::fromARGB(0xfff0f0f0); - break; - case bb::cascades::VisualStyle::Dark: - return bb::cascades::Color::fromARGB(0xff323232); - break; - } - - return bb::cascades::Color::fromARGB(0xff323232); -} - -bb::cascades::Color Utils::plainBase() -{ - bb::cascades::ColorTheme* colorTheme = bb::cascades::Application::instance()->themeSupport()->theme()->colorTheme(); - - switch (colorTheme->style()) { - case bb::cascades::VisualStyle::Bright: - return bb::cascades::Color::fromARGB(0xffe6e6e6); - break; - case bb::cascades::VisualStyle::Dark: - return bb::cascades::Color::fromARGB(0xff282828); - break; - } - - return bb::cascades::Color::fromARGB(0xff282828); -} - -bb::cascades::Color Utils::text() -{ - bb::cascades::ColorTheme* colorTheme = bb::cascades::Application::instance()->themeSupport()->theme()->colorTheme(); - - switch (colorTheme->style()) { - case bb::cascades::VisualStyle::Bright: - return bb::cascades::Color::fromARGB(0xff323232); - break; - case bb::cascades::VisualStyle::Dark: - return bb::cascades::Color::fromARGB(0xfff0f0f0); - break; - } - - return bb::cascades::Color::fromARGB(0xfff0f0f0); -} - -bb::cascades::Color Utils::secondaryText() -{ - bb::cascades::ColorTheme* colorTheme = bb::cascades::Application::instance()->themeSupport()->theme()->colorTheme(); - - switch (colorTheme->style()) { - case bb::cascades::VisualStyle::Bright: - return bb::cascades::Color::fromARGB(0xff646464); - break; - case bb::cascades::VisualStyle::Dark: - return bb::cascades::Color::fromARGB(0xff969696); - break; - } - - return bb::cascades::Color::fromARGB(0xff969696); -} - -bb::cascades::Color Utils::primary() -{ - return bb::cascades::Color::fromARGB(0xff0092cc); -} - -bb::cascades::Color Utils::textOnPlain() -{ - return text(); -} - -/*float Utils::primaryTextFontSize() -{ - bb::cascades::TextStyle style = bb::cascades::SystemDefaults::TextStyles::primaryText(); - qDebug() << "primaryText:" << style.fontSize() << bb::cascades::FontSize::Medium; - return bb::cascades::SystemDefaults::TextStyles::primaryText().fontSizeValue(); -} - -QString Utils::primaryTextFontFamily() -{ - return bb::cascades::SystemDefaults::TextStyles::primaryText().fontFamily(); -} - -float Utils::titleTextFontSize() -{ - return bb::cascades::SystemDefaults::TextStyles::titleText().fontSizeValue(); -} - -QString Utils::titleTextFontFamily() -{ - return bb::cascades::SystemDefaults::TextStyles::titleText().fontFamily(); -}*/ -#endif - -void Utils::setRootModel() -{ - TabModel *oldTabModel = tabModel; - FeedModel *oldFeedModel = feedModel; - EntryModel *oldEntryModel = entryModel; - - //qDebug() << "utils tid:" << QThread::currentThreadId(); - - Settings *s = Settings::instance(); - int mode = s->getViewMode(); - - switch (mode) { - case 0: - // View mode: Tabs->Feeds->Entries - tabModel = new TabModel(); - tabModel->init(s->getDashboardInUse()); -#ifdef BB10 - s->qml->setContextProperty("tabModel", tabModel); -#else - s->context->setContextProperty("tabModel", tabModel); -#endif - if (oldTabModel != nullptr) { - delete oldTabModel; - } - if (feedModel != nullptr) { - delete feedModel; feedModel = nullptr; - } - if (entryModel != nullptr) { - delete entryModel; entryModel = nullptr; - } - break; - case 1: - // View mode: Tabs->Entries - tabModel = new TabModel(); - tabModel->init(s->getDashboardInUse()); -#ifdef BB10 - s->qml->setContextProperty("tabModel", tabModel); -#else - s->context->setContextProperty("tabModel", tabModel); -#endif - if (oldTabModel != nullptr) { - delete oldTabModel; - } - if (feedModel != nullptr) { - delete feedModel; feedModel = nullptr; - } - if (entryModel != nullptr) { - delete entryModel; entryModel = nullptr; - } - break; - case 2: - // View mode: Feeds->Entries - feedModel = new FeedModel(); - feedModel->init("root"); -#ifdef BB10 - s->qml->setContextProperty("feedModel", feedModel); -#else - s->context->setContextProperty("feedModel", feedModel); -#endif - if (tabModel != nullptr) { - delete tabModel; tabModel = nullptr; - } - if (oldFeedModel != nullptr) { - delete oldFeedModel; - } - if (entryModel != nullptr) { - delete entryModel; entryModel = nullptr; - } - break; - case 3: - // View mode: Entries - case 4: - // View mode: Saved - case 5: - // View mode: Slow - case 6: - // View mode: Liked - case 7: - // View mode: Broadcast - entryModel = new EntryModel(); - entryModel->init("root"); -#ifdef BB10 - s->qml->setContextProperty("entryModel", entryModel); -#else - s->context->setContextProperty("entryModel", entryModel); -#endif - if (tabModel != nullptr) { - delete tabModel; tabModel = nullptr; - } - if (feedModel != nullptr) { - delete feedModel; feedModel = nullptr; - } - if (oldEntryModel != nullptr) { - delete oldEntryModel; - } - break; - } -} - -void Utils::setFeedModel(const QString &tabId) -{ - FeedModel* oldFeedModel = feedModel; - Settings *s = Settings::instance(); - - feedModel = new FeedModel(); - feedModel->init(tabId); - -#ifdef BB10 - s->qml->setContextProperty("feedModel", feedModel); -#else - s->context->setContextProperty("feedModel", feedModel); -#endif - - if (oldFeedModel != nullptr) { - delete oldFeedModel; - } -} - -void Utils::setEntryModel(const QString &feedId) -{ - EntryModel* oldEntryModel = entryModel; - Settings *s = Settings::instance(); - - entryModel = new EntryModel(); - entryModel->initInThread(feedId); - -#ifdef BB10 - s->qml->setContextProperty("entryModel", entryModel); -#else - s->context->setContextProperty("entryModel", entryModel); -#endif - - if (oldEntryModel != nullptr) { - delete oldEntryModel; - } -} - -void Utils::setDashboardModel() -{ - DashboardModel* oldDashboardModel = dashboardModel; - Settings *s = Settings::instance(); - - dashboardModel = new DashboardModel(); - dashboardModel->init(); - -#ifdef BB10 - s->qml->setContextProperty("dashboardModel", dashboardModel); -#else - s->context->setContextProperty("dashboardModel", dashboardModel); -#endif - - if (oldDashboardModel != nullptr) - delete oldDashboardModel; -} - -void Utils::updateModels() -{ - if (dashboardModel != nullptr) - dashboardModel->init(); - - if (tabModel != nullptr) - tabModel->init(); - - if (feedModel != nullptr) - feedModel->init(); - - if (entryModel != nullptr) - entryModel->init(); -} - -Utils::~Utils() -{ - if (entryModel != nullptr) - delete entryModel; - - if (feedModel != nullptr) - delete feedModel; - - if (tabModel != nullptr) - delete tabModel; - - if (dashboardModel != nullptr) - delete dashboardModel; -} - -QList Utils::dashboards() -{ - auto db = DatabaseManager::instance(); - - QList simpleList; - QList list = db->readDashboards(); - QList::iterator i = list.begin(); - while (i != list.end()) { - simpleList.append((*i).title); - ++i; - } - return simpleList; -} - -QString Utils::defaultDashboardName() -{ - auto s = Settings::instance(); - auto db = DatabaseManager::instance(); - - DatabaseManager::Dashboard d = db->readDashboard(s->getDashboardInUse()); - return d.title; -} - -int Utils::countUnread() -{ - auto s = Settings::instance(); - auto db = DatabaseManager::instance(); - - return db->countEntriesUnreadByDashboard(s->getDashboardInUse()); -} - -QString Utils::getHumanFriendlySizeString(int size) -{ - if (size==0) { - return tr("empty"); - } - if (size<1024) { - return QString("%1 B").arg(size); - } - if (size<1048576) { - return QString("%1 kB").arg(qFloor(size/1024)); - } - if (size<1073741824) { - return QString("%1 MB").arg(qFloor(size/1048576)); - } - return QString("%1 GB").arg(size/1073741824); -} - -QString Utils::getHumanFriendlyTimeString(int date) -{ - QDateTime qdate = QDateTime::fromTime_t(date); - int secs = qdate.secsTo(QDateTime::currentDateTimeUtc()); - - //qDebug() << ">>>>>>>>date" << date << "QDateTime::fromTime_t(date)" << qdate; - //qDebug() << "QDateTime::currentDateTimeUtc()" << QDateTime::currentDateTimeUtc(); - //qDebug() << "qdate.secsTo(QDateTime::currentDateTimeUtc())" << secs; - - if (secs<=-18000) { - return tr("unknown date"); - } - if (secs<=0) { - return tr("just now"); - } - if (secs<60) { - return tr("%n second(s) ago", "", secs); - } - if (secs<3600) { - return tr("%n minute(s) ago", "", qFloor(secs/60)); - } - if (secs<86400) { - return tr("%n hour(s) ago", "", qFloor(secs/3600)); - } - - int days = qdate.daysTo(QDateTime::currentDateTimeUtc()); - - if (days<8) { - return tr("%n day(s) ago", "", days); - } - - return qdate.toString("dddd, d MMMM yy"); -} - -QString Utils::hash(const QString &url) -{ - return QString(QCryptographicHash::hash(url.toLatin1(), QCryptographicHash::Md5).toHex()); -} - -// Source: https://github.com/radekp/qtmoko -int Utils::monthsTo(const QDate &from, const QDate &to) -{ - int result = 12 * (to.year() - from.year()); - result += (to.month() - from.month()); - - return result; -} - -int Utils::yearsTo(const QDate &from, const QDate &to) -{ - return to.year() - from.year(); -} - -bool Utils::isSameWeek(const QDate &date1, const QDate &date2) -{ - int y1, y2; - int w1 = date1.weekNumber(&y1); - int w2 = date2.weekNumber(&y2); - //qDebug() << date1 << date2 << y1 << y2 << w1 << w2; - if (w1==w2 && y1==y2 && w1!=0 && w2!=0) - return true; - return false; -} - -void Utils::resetFetcher(int type) -{ - Settings *s = Settings::instance(); - - if (s->fetcher != nullptr) { - s->fetcher->disconnect(); - delete s->fetcher; - s->fetcher = nullptr; - } - - if (type == 1) { - // Netvibes fetcher - s->fetcher = new NvFetcher(); - } - - if (type == 2) { - // Old Reader fetcher - s->fetcher = new OldReaderFetcher(); - } - - if (type == 4) { - // Tiny Tiny Rss fetcher - s->fetcher = new TTRssFetcher(); - } - - if (s->fetcher != nullptr) -#ifdef BB10 - s->qml->setContextProperty("fetcher", s->fetcher); -#else - s->context->setContextProperty("fetcher", s->fetcher); -#endif -} - -QString Utils::nameFromPath(const QString &path) -{ - return QFileInfo(path).fileName(); -} - -void Utils::addExtension(const QString &contentType, QString &path) -{ - auto orig_ext = QFileInfo(path).suffix(); - - QString new_ext; - if (contentType == "image/jpeg") { - new_ext = "jpg"; - } else if (contentType == "image/png") { - new_ext = "png"; - } else if (contentType == "image/gif") { - new_ext = "gif"; - } else if (contentType == "image/svg+xml") { - new_ext = "svg"; - } else { - new_ext = orig_ext; - } - - if (new_ext != orig_ext) { - path.append("." + new_ext); - } -} diff --git a/sailfish/sailfishapp_i18n.pri b/sailfishapp_i18n.pri similarity index 100% rename from sailfish/sailfishapp_i18n.pri rename to sailfishapp_i18n.pri diff --git a/screenshots/00.png b/screenshots/00.png deleted file mode 100644 index 4b51f4f..0000000 Binary files a/screenshots/00.png and /dev/null differ diff --git a/screenshots/bb10/1.bmp b/screenshots/bb10/1.bmp deleted file mode 100644 index cf569c1..0000000 Binary files a/screenshots/bb10/1.bmp and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_01.png b/screenshots/bb10/bb10_kaktus_01.png deleted file mode 100644 index 944f744..0000000 Binary files a/screenshots/bb10/bb10_kaktus_01.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_02.png b/screenshots/bb10/bb10_kaktus_02.png deleted file mode 100644 index add0d68..0000000 Binary files a/screenshots/bb10/bb10_kaktus_02.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_03.png b/screenshots/bb10/bb10_kaktus_03.png deleted file mode 100644 index 0871cc6..0000000 Binary files a/screenshots/bb10/bb10_kaktus_03.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_04.png b/screenshots/bb10/bb10_kaktus_04.png deleted file mode 100644 index caaac10..0000000 Binary files a/screenshots/bb10/bb10_kaktus_04.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_05.png b/screenshots/bb10/bb10_kaktus_05.png deleted file mode 100644 index 4d9973e..0000000 Binary files a/screenshots/bb10/bb10_kaktus_05.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_06.png b/screenshots/bb10/bb10_kaktus_06.png deleted file mode 100644 index 5f7fe86..0000000 Binary files a/screenshots/bb10/bb10_kaktus_06.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_07.png b/screenshots/bb10/bb10_kaktus_07.png deleted file mode 100644 index 2270eb1..0000000 Binary files a/screenshots/bb10/bb10_kaktus_07.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_08.png b/screenshots/bb10/bb10_kaktus_08.png deleted file mode 100644 index 4e4933b..0000000 Binary files a/screenshots/bb10/bb10_kaktus_08.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_09.png b/screenshots/bb10/bb10_kaktus_09.png deleted file mode 100644 index f9de483..0000000 Binary files a/screenshots/bb10/bb10_kaktus_09.png and /dev/null differ diff --git a/screenshots/bb10/bb10_kaktus_10.png b/screenshots/bb10/bb10_kaktus_10.png deleted file mode 100644 index afc9561..0000000 Binary files a/screenshots/bb10/bb10_kaktus_10.png and /dev/null differ diff --git a/screenshots/sailfish/kaktus-01.png b/screenshots/sailfish/kaktus-01.png deleted file mode 100644 index e4b2d32..0000000 Binary files a/screenshots/sailfish/kaktus-01.png and /dev/null differ diff --git a/screenshots/sailfish/kaktus-02.png b/screenshots/sailfish/kaktus-02.png deleted file mode 100644 index 50d8963..0000000 Binary files a/screenshots/sailfish/kaktus-02.png and /dev/null differ diff --git a/screenshots/sailfish/kaktus-03.png b/screenshots/sailfish/kaktus-03.png deleted file mode 100644 index 3909161..0000000 Binary files a/screenshots/sailfish/kaktus-03.png and /dev/null differ diff --git a/screenshots/sailfish/kaktus-04.png b/screenshots/sailfish/kaktus-04.png deleted file mode 100644 index 339e8bf..0000000 Binary files a/screenshots/sailfish/kaktus-04.png and /dev/null differ diff --git a/sailfish/src/cacheserver.cpp b/src/cacheserver.cpp similarity index 100% rename from sailfish/src/cacheserver.cpp rename to src/cacheserver.cpp diff --git a/sailfish/src/cacheserver.h b/src/cacheserver.h similarity index 100% rename from sailfish/src/cacheserver.h rename to src/cacheserver.h diff --git a/sailfish/src/customnetworkaccessmanager.cpp b/src/customnetworkaccessmanager.cpp similarity index 100% rename from sailfish/src/customnetworkaccessmanager.cpp rename to src/customnetworkaccessmanager.cpp diff --git a/sailfish/src/customnetworkaccessmanager.h b/src/customnetworkaccessmanager.h similarity index 100% rename from sailfish/src/customnetworkaccessmanager.h rename to src/customnetworkaccessmanager.h diff --git a/sailfish/src/dashboardmodel.cpp b/src/dashboardmodel.cpp similarity index 100% rename from sailfish/src/dashboardmodel.cpp rename to src/dashboardmodel.cpp diff --git a/sailfish/src/dashboardmodel.h b/src/dashboardmodel.h similarity index 100% rename from sailfish/src/dashboardmodel.h rename to src/dashboardmodel.h diff --git a/sailfish/src/databasemanager.cpp b/src/databasemanager.cpp similarity index 100% rename from sailfish/src/databasemanager.cpp rename to src/databasemanager.cpp diff --git a/sailfish/src/databasemanager.h b/src/databasemanager.h similarity index 100% rename from sailfish/src/databasemanager.h rename to src/databasemanager.h diff --git a/sailfish/src/downloadmanager.cpp b/src/downloadmanager.cpp similarity index 100% rename from sailfish/src/downloadmanager.cpp rename to src/downloadmanager.cpp diff --git a/sailfish/src/downloadmanager.h b/src/downloadmanager.h similarity index 100% rename from sailfish/src/downloadmanager.h rename to src/downloadmanager.h diff --git a/sailfish/src/entrymodel.cpp b/src/entrymodel.cpp similarity index 100% rename from sailfish/src/entrymodel.cpp rename to src/entrymodel.cpp diff --git a/sailfish/src/entrymodel.h b/src/entrymodel.h similarity index 100% rename from sailfish/src/entrymodel.h rename to src/entrymodel.h diff --git a/sailfish/src/feedmodel.cpp b/src/feedmodel.cpp similarity index 100% rename from sailfish/src/feedmodel.cpp rename to src/feedmodel.cpp diff --git a/sailfish/src/feedmodel.h b/src/feedmodel.h similarity index 100% rename from sailfish/src/feedmodel.h rename to src/feedmodel.h diff --git a/sailfish/src/fetcher.cpp b/src/fetcher.cpp similarity index 100% rename from sailfish/src/fetcher.cpp rename to src/fetcher.cpp diff --git a/sailfish/src/fetcher.h b/src/fetcher.h similarity index 100% rename from sailfish/src/fetcher.h rename to src/fetcher.h diff --git a/sailfish/src/iconprovider.cpp b/src/iconprovider.cpp similarity index 97% rename from sailfish/src/iconprovider.cpp rename to src/iconprovider.cpp index 72a35eb..98287d2 100644 --- a/sailfish/src/iconprovider.cpp +++ b/src/iconprovider.cpp @@ -17,10 +17,8 @@ along with Kaktus. If not, see . */ -#ifdef SAILFISH #include #include -#endif #include #include #include @@ -36,7 +34,6 @@ IconProvider::IconProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) QString IconProvider::themeDirPath() { QString themeDir; -#ifdef SAILFISH double ratio = MGConfItem("/desktop/sailfish/silica/theme_pixel_ratio").value().toDouble(); if (ratio == 0) { qWarning() << "Pixel ratio is 0, defaulting to 1.0."; @@ -59,9 +56,6 @@ QString IconProvider::themeDirPath() qWarning() << "Theme" << themeDir << "for ratio" << ratio << "doesn't exist"; themeDir = SailfishApp::pathTo("images/z1.0").toString(QUrl::RemoveScheme); } -#else - //TODO theme dir for desktop -#endif return themeDir; } diff --git a/sailfish/src/iconprovider.h b/src/iconprovider.h similarity index 100% rename from sailfish/src/iconprovider.h rename to src/iconprovider.h diff --git a/src/info.h b/src/info.h new file mode 100644 index 0000000..ddc824f --- /dev/null +++ b/src/info.h @@ -0,0 +1,40 @@ +/* + Copyright (C) 2014-2022 Michal Kosciesza + + This file is part of Kaktus. + + Kaktus is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Kaktus is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Kaktus. If not, see . +*/ + +#ifndef INFO_H +#define INFO_H + +namespace Kaktus { +static constexpr const char* ORG = "org.mkiol"; +static constexpr const char* APP_ID = "kaktus"; +static constexpr const char* APP_BINARY_ID = "harbour-kaktus"; +static constexpr const char* APP_NAME = "Kaktus"; +static constexpr const char* APP_VERSION = "3.0.4"; +static constexpr const char* AUTHOR = "Michal Kosciesza"; +static constexpr const char* COPYRIGHT_YEAR = "2014-2022"; +static constexpr const char* AUTHOR1 = "Renaud Casenave-Péré"; +static constexpr const char* COPYRIGHT_YEAR1 = "2019-2022"; +static constexpr const char* SUPPORT_EMAIL = "kaktus@mkiol.net"; +static constexpr const char* PAGE = "https://github.com/mkiol/kaktus"; +static constexpr const char* LICENSE = "GNU General Public Licence version 3"; +static constexpr const char* LICENSE_URL = + "https://www.gnu.org/licenses/gpl-3.0.html"; +} // namespace Kaktus + +#endif // INFO_H diff --git a/src/key.h b/src/key.h new file mode 100644 index 0000000..d8c6da2 --- /dev/null +++ b/src/key.h @@ -0,0 +1,4 @@ +#include + +static const quint64 KEY = Q_UINT64_C(0x031cba4a598fa563); +static const QString pocket_consumer_key = "64686-73ae488f0e124fb6e414ce00"; diff --git a/sailfish/src/listmodel.cpp b/src/listmodel.cpp similarity index 100% rename from sailfish/src/listmodel.cpp rename to src/listmodel.cpp diff --git a/sailfish/src/listmodel.h b/src/listmodel.h similarity index 100% rename from sailfish/src/listmodel.h rename to src/listmodel.h diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..0ea4580 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,125 @@ +/* + Copyright (C) 2014-2022 Michal Kosciesza + + This file is part of Kaktus. + + Kaktus is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Kaktus is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Kaktus. If not, see . +*/ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "cacheserver.h" +#include "databasemanager.h" +#include "downloadmanager.h" +#include "iconprovider.h" +#include "info.h" +#include "networkaccessmanagerfactory.h" +#include "nviconprovider.h" +#include "settings.h" +#include "utils.h" + +static void registerTypes() { + qRegisterMetaType("CacheItem"); +} + +static void installTranslator() { + auto *translator = new QTranslator{qApp}; + auto transDir = + SailfishApp::pathTo(QStringLiteral("translations")).toLocalFile(); + if (!translator->load(QLocale{}, QStringLiteral("kaktus"), + QStringLiteral("_"), transDir, + QStringLiteral(".qm"))) { + qDebug() << "cannot load translation:" << QLocale::system().name() + << transDir; + if (!translator->load(QStringLiteral("kaktus_en"), transDir)) { + qDebug() << "cannot load default translation"; + delete translator; + return; + } + } + + QGuiApplication::installTranslator(translator); +} + +Q_DECL_EXPORT int main(int argc, char **argv) { + SailfishApp::application(argc, argv); + + QGuiApplication::setApplicationName(Kaktus::APP_ID); + QGuiApplication::setOrganizationName(Kaktus::ORG); + QGuiApplication::setApplicationDisplayName(Kaktus::APP_NAME); + QGuiApplication::setApplicationVersion(Kaktus::APP_VERSION); + + registerTypes(); + + auto *view = SailfishApp::createView(); + auto *context = view->rootContext(); + + context->setContextProperty(QStringLiteral("APP_NAME"), Kaktus::APP_NAME); + context->setContextProperty(QStringLiteral("APP_ID"), Kaktus::APP_ID); + context->setContextProperty(QStringLiteral("APP_VERSION"), + Kaktus::APP_VERSION); + context->setContextProperty(QStringLiteral("AUTHOR"), Kaktus::AUTHOR); + context->setContextProperty(QStringLiteral("COPYRIGHT_YEAR"), + Kaktus::COPYRIGHT_YEAR); + context->setContextProperty(QStringLiteral("AUTHOR1"), Kaktus::AUTHOR1); + context->setContextProperty(QStringLiteral("COPYRIGHT_YEAR1"), + Kaktus::COPYRIGHT_YEAR1); + context->setContextProperty(QStringLiteral("SUPPORT_EMAIL"), + Kaktus::SUPPORT_EMAIL); + context->setContextProperty(QStringLiteral("PAGE"), Kaktus::PAGE); + context->setContextProperty(QStringLiteral("LICENSE"), Kaktus::LICENSE); + context->setContextProperty(QStringLiteral("LICENSE_URL"), + Kaktus::LICENSE_URL); + installTranslator(); + + auto *settings = Settings::instance(); + + view->engine()->addImageProvider(QStringLiteral("icons"), + new IconProvider{}); + view->engine()->addImageProvider(QStringLiteral("nvicons"), + new NvIconProvider{}); + + settings->context = context; + + NetworkAccessManagerFactory namfactory{settings->getDmUserAgent()}; + view->engine()->setNetworkAccessManagerFactory(&namfactory); + + Utils utils; + + context->setContextProperty(QStringLiteral("db"), + DatabaseManager::instance()); + context->setContextProperty(QStringLiteral("utils"), &utils); + context->setContextProperty(QStringLiteral("dm"), + DownloadManager::instance()); + context->setContextProperty(QStringLiteral("cache"), + CacheServer::instance()); + context->setContextProperty(QStringLiteral("cserver"), + CacheServer::instance()); + context->setContextProperty(QStringLiteral("settings"), settings); + + view->setSource(SailfishApp::pathTo(QStringLiteral("qml/main.qml"))); + view->show(); + + return QGuiApplication::exec(); +} diff --git a/sailfish/src/networkaccessmanagerfactory.cpp b/src/networkaccessmanagerfactory.cpp similarity index 100% rename from sailfish/src/networkaccessmanagerfactory.cpp rename to src/networkaccessmanagerfactory.cpp diff --git a/sailfish/src/networkaccessmanagerfactory.h b/src/networkaccessmanagerfactory.h similarity index 100% rename from sailfish/src/networkaccessmanagerfactory.h rename to src/networkaccessmanagerfactory.h diff --git a/sailfish/src/nvfetcher.cpp b/src/nvfetcher.cpp similarity index 100% rename from sailfish/src/nvfetcher.cpp rename to src/nvfetcher.cpp diff --git a/sailfish/src/nvfetcher.h b/src/nvfetcher.h similarity index 100% rename from sailfish/src/nvfetcher.h rename to src/nvfetcher.h diff --git a/sailfish/src/nviconprovider.cpp b/src/nviconprovider.cpp similarity index 96% rename from sailfish/src/nviconprovider.cpp rename to src/nviconprovider.cpp index c304815..7daaef3 100644 --- a/sailfish/src/nviconprovider.cpp +++ b/src/nviconprovider.cpp @@ -17,17 +17,16 @@ along with Kaktus. If not, see . */ -#ifdef SAILFISH +#include "nviconprovider.h" + #include -#endif -#include -#include + #include #include +#include +#include #include -#include "nviconprovider.h" - const QString NvIconProvider::availableColors[6] = {"green", "blue", "orange", "pink", "grey", "purple"}; const QString NvIconProvider::spriteMap[5][10] = { {"plus","home","label-2","star","label","pin","sheet","power","diamond","folder"}, @@ -48,12 +47,7 @@ QPixmap NvIconProvider::requestPixmap(const QString &id, QSize *size, const QSiz parts = QStringList{"plus", "green"}; QString spriteImagePath; -#ifdef SAILFISH spriteImagePath = SailfishApp::pathTo("qml/sprite-icons.png").toString(QUrl::RemoveScheme); -#endif -#ifdef ANDROID - spriteImagePath = ":/images/sprite-icons.png"; -#endif QPixmap iconsPixmap{spriteImagePath}; QPixmap iconPixmap = iconsPixmap.copy(getPosition(parts.at(0), parts.at(1))); diff --git a/sailfish/src/nviconprovider.h b/src/nviconprovider.h similarity index 100% rename from sailfish/src/nviconprovider.h rename to src/nviconprovider.h diff --git a/sailfish/src/oldreaderfetcher.cpp b/src/oldreaderfetcher.cpp similarity index 100% rename from sailfish/src/oldreaderfetcher.cpp rename to src/oldreaderfetcher.cpp diff --git a/sailfish/src/oldreaderfetcher.h b/src/oldreaderfetcher.h similarity index 100% rename from sailfish/src/oldreaderfetcher.h rename to src/oldreaderfetcher.h diff --git a/sailfish/src/settings.cpp b/src/settings.cpp similarity index 99% rename from sailfish/src/settings.cpp rename to src/settings.cpp index 4c8ab30..830b552 100644 --- a/sailfish/src/settings.cpp +++ b/src/settings.cpp @@ -30,12 +30,12 @@ #include #endif -#include "settings.h" -#include "downloadmanager.h" -#include "databasemanager.h" #include "cacheserver.h" +#include "databasemanager.h" +#include "downloadmanager.h" +#include "key.h" +#include "settings.h" #include "simplecrypt.h" -#include "../key.h" Settings* Settings::m_instance = nullptr; diff --git a/sailfish/src/settings.h b/src/settings.h similarity index 100% rename from sailfish/src/settings.h rename to src/settings.h diff --git a/sailfish/src/simplecrypt.cpp b/src/simplecrypt.cpp similarity index 100% rename from sailfish/src/simplecrypt.cpp rename to src/simplecrypt.cpp diff --git a/sailfish/src/simplecrypt.h b/src/simplecrypt.h similarity index 100% rename from sailfish/src/simplecrypt.h rename to src/simplecrypt.h diff --git a/sailfish/src/tabmodel.cpp b/src/tabmodel.cpp similarity index 100% rename from sailfish/src/tabmodel.cpp rename to src/tabmodel.cpp diff --git a/sailfish/src/tabmodel.h b/src/tabmodel.h similarity index 100% rename from sailfish/src/tabmodel.h rename to src/tabmodel.h diff --git a/sailfish/src/ttrssfetcher.cpp b/src/ttrssfetcher.cpp similarity index 100% rename from sailfish/src/ttrssfetcher.cpp rename to src/ttrssfetcher.cpp diff --git a/sailfish/src/ttrssfetcher.h b/src/ttrssfetcher.h similarity index 100% rename from sailfish/src/ttrssfetcher.h rename to src/ttrssfetcher.h diff --git a/src/utils.cpp b/src/utils.cpp new file mode 100644 index 0000000..d69b37d --- /dev/null +++ b/src/utils.cpp @@ -0,0 +1,463 @@ +/* + Copyright (C) 2014-2022 Michal Kosciesza + + This file is part of Kaktus. + + Kaktus is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Kaktus is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Kaktus. If not, see . +*/ + +#include "utils.h" + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "databasemanager.h" +#include "fetcher.h" +#include "nvfetcher.h" +#include "oldreaderfetcher.h" +#include "ttrssfetcher.h" + +Utils::Utils(QObject *parent) : QObject(parent) { + dashboardModel = nullptr; + entryModel = nullptr; + tabModel = nullptr; + feedModel = nullptr; +} + +QString Utils::readAsset(const QString &path) { + QFile file(SailfishApp::pathTo(path).toLocalFile()); + + if (!file.open(QIODevice::ReadOnly)) { + qWarning() << "Could not open" << path + << "for reading: " << file.errorString(); + file.close(); + return ""; + } + + QString data = QString(file.readAll()); + file.close(); + + return data; +} + +void Utils::copyToClipboard(const QString &text) { + QClipboard *clipboard = QGuiApplication::clipboard(); + clipboard->setText(text); +} + +void Utils::resetQtWebKit() { + QStringList dataDirs = + QStandardPaths::standardLocations(QStandardPaths::DataLocation); + if (dataDirs.size() > 0) { + QDir dir(QDir(dataDirs.at(0)).filePath(".QtWebKit")); + qDebug() << dir.path(); + if (dir.exists()) dir.removeRecursively(); + } +} + +void Utils::log(const QString &data) { + int l = data.length(); + int n = 120; + QString d; + for (int i = 0; i < l; ++i) { + d += data.at(i); + if (i % n == 0) { + qDebug() << i << d; + d.clear(); + } + } +} + +QString Utils::formatHtml(const QString &data, bool offline, + const QString &style) { + QRegExp rxImg("]*>", Qt::CaseInsensitive); + QRegExp rxWidth("\\s*width\\s*=\\s*(\"[^\"]*\"|'[^']*')", + Qt::CaseInsensitive); + QRegExp rxTarget("\\s*target\\s*=\\s*(\"[^\"]*\"|'[^']*')", + Qt::CaseInsensitive); + QRegExp rxHeight("\\s*height\\s*=\\s*(\"[^\"]*\"|'[^']*')", + Qt::CaseInsensitive); + QRegExp rxSizes("\\s*sizes\\s*=\\s*(\"[^\"]*\"|'[^']*')", + Qt::CaseInsensitive); + QRegExp rxA("]*>", Qt::CaseInsensitive); + QRegExp rxP("]*>

", Qt::CaseInsensitive); + + QString content = data; + + content.remove(rxTarget); + if (offline) { + content.remove(rxImg); + content.remove("", Qt::CaseInsensitive); + content.remove(rxA); + content.remove(rxP); + } else { + content.remove(rxWidth); + content.remove(rxHeight); + content.remove(rxSizes); + } + + content = + "" + + (style.isEmpty() ? "" : "") + + "" + content + ""; + + return content; +} + +/* + * Copyright (c) 2009 John Schember + * http://john.nachtimwald.com/2010/06/08/qt-remove-directory-and-its-contents/ + */ +bool Utils::removeDir(const QString &dirName) { + bool result = true; + QDir dir(dirName); + + if (dir.exists(dirName)) { + QFileInfoList infoList = + dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | + QDir::Hidden | QDir::AllDirs | QDir::Files, + QDir::DirsFirst); + foreach (const QFileInfo &info, infoList) { + if (info.isDir()) + result = removeDir(info.absoluteFilePath()); + else + result = QFile::remove(info.absoluteFilePath()); + if (!result) return result; + } + result = dir.rmdir(dirName); + } + return result; +} + +void Utils::setRootModel() { + TabModel *oldTabModel = tabModel; + FeedModel *oldFeedModel = feedModel; + EntryModel *oldEntryModel = entryModel; + + // qDebug() << "utils tid:" << QThread::currentThreadId(); + + Settings *s = Settings::instance(); + int mode = s->getViewMode(); + + switch (mode) { + case 0: + // View mode: Tabs->Feeds->Entries + tabModel = new TabModel(); + tabModel->init(s->getDashboardInUse()); + s->context->setContextProperty("tabModel", tabModel); + if (oldTabModel != nullptr) { + delete oldTabModel; + } + if (feedModel != nullptr) { + delete feedModel; + feedModel = nullptr; + } + if (entryModel != nullptr) { + delete entryModel; + entryModel = nullptr; + } + break; + case 1: + // View mode: Tabs->Entries + tabModel = new TabModel(); + tabModel->init(s->getDashboardInUse()); + s->context->setContextProperty("tabModel", tabModel); + if (oldTabModel != nullptr) { + delete oldTabModel; + } + if (feedModel != nullptr) { + delete feedModel; + feedModel = nullptr; + } + if (entryModel != nullptr) { + delete entryModel; + entryModel = nullptr; + } + break; + case 2: + // View mode: Feeds->Entries + feedModel = new FeedModel(); + feedModel->init("root"); + s->context->setContextProperty("feedModel", feedModel); + if (tabModel != nullptr) { + delete tabModel; + tabModel = nullptr; + } + if (oldFeedModel != nullptr) { + delete oldFeedModel; + } + if (entryModel != nullptr) { + delete entryModel; + entryModel = nullptr; + } + break; + case 3: + // View mode: Entries + case 4: + // View mode: Saved + case 5: + // View mode: Slow + case 6: + // View mode: Liked + case 7: + // View mode: Broadcast + entryModel = new EntryModel(); + entryModel->init("root"); + s->context->setContextProperty("entryModel", entryModel); + if (tabModel != nullptr) { + delete tabModel; + tabModel = nullptr; + } + if (feedModel != nullptr) { + delete feedModel; + feedModel = nullptr; + } + if (oldEntryModel != nullptr) { + delete oldEntryModel; + } + break; + } +} + +void Utils::setFeedModel(const QString &tabId) { + FeedModel *oldFeedModel = feedModel; + Settings *s = Settings::instance(); + + feedModel = new FeedModel(); + feedModel->init(tabId); + + s->context->setContextProperty("feedModel", feedModel); + if (oldFeedModel != nullptr) { + delete oldFeedModel; + } +} + +void Utils::setEntryModel(const QString &feedId) { + EntryModel *oldEntryModel = entryModel; + Settings *s = Settings::instance(); + + entryModel = new EntryModel(); + entryModel->initInThread(feedId); + + s->context->setContextProperty("entryModel", entryModel); + + if (oldEntryModel != nullptr) { + delete oldEntryModel; + } +} + +void Utils::setDashboardModel() { + DashboardModel *oldDashboardModel = dashboardModel; + Settings *s = Settings::instance(); + + dashboardModel = new DashboardModel(); + dashboardModel->init(); + + s->context->setContextProperty("dashboardModel", dashboardModel); + + if (oldDashboardModel != nullptr) delete oldDashboardModel; +} + +void Utils::updateModels() { + if (dashboardModel != nullptr) dashboardModel->init(); + + if (tabModel != nullptr) tabModel->init(); + + if (feedModel != nullptr) feedModel->init(); + + if (entryModel != nullptr) entryModel->init(); +} + +Utils::~Utils() { + if (entryModel != nullptr) delete entryModel; + + if (feedModel != nullptr) delete feedModel; + + if (tabModel != nullptr) delete tabModel; + + if (dashboardModel != nullptr) delete dashboardModel; +} + +QList Utils::dashboards() { + auto db = DatabaseManager::instance(); + + QList simpleList; + QList list = db->readDashboards(); + QList::iterator i = list.begin(); + while (i != list.end()) { + simpleList.append((*i).title); + ++i; + } + return simpleList; +} + +QString Utils::defaultDashboardName() { + auto s = Settings::instance(); + auto db = DatabaseManager::instance(); + + DatabaseManager::Dashboard d = db->readDashboard(s->getDashboardInUse()); + return d.title; +} + +int Utils::countUnread() { + auto s = Settings::instance(); + auto db = DatabaseManager::instance(); + + return db->countEntriesUnreadByDashboard(s->getDashboardInUse()); +} + +QString Utils::getHumanFriendlySizeString(int size) { + if (size == 0) { + return tr("empty"); + } + if (size < 1024) { + return QString("%1 B").arg(size); + } + if (size < 1048576) { + return QString("%1 kB").arg(qFloor(size / 1024)); + } + if (size < 1073741824) { + return QString("%1 MB").arg(qFloor(size / 1048576)); + } + return QString("%1 GB").arg(size / 1073741824); +} + +QString Utils::getHumanFriendlyTimeString(int date) { + QDateTime qdate = QDateTime::fromTime_t(date); + int secs = qdate.secsTo(QDateTime::currentDateTimeUtc()); + + // qDebug() << ">>>>>>>>date" << date << "QDateTime::fromTime_t(date)" << + // qdate; qDebug() << "QDateTime::currentDateTimeUtc()" << + // QDateTime::currentDateTimeUtc(); qDebug() << + // "qdate.secsTo(QDateTime::currentDateTimeUtc())" << secs; + + if (secs <= -18000) { + return tr("unknown date"); + } + if (secs <= 0) { + return tr("just now"); + } + if (secs < 60) { + return tr("%n second(s) ago", "", secs); + } + if (secs < 3600) { + return tr("%n minute(s) ago", "", qFloor(secs / 60)); + } + if (secs < 86400) { + return tr("%n hour(s) ago", "", qFloor(secs / 3600)); + } + + int days = qdate.daysTo(QDateTime::currentDateTimeUtc()); + + if (days < 8) { + return tr("%n day(s) ago", "", days); + } + + return qdate.toString("dddd, d MMMM yy"); +} + +QString Utils::hash(const QString &url) { + return QString( + QCryptographicHash::hash(url.toLatin1(), QCryptographicHash::Md5) + .toHex()); +} + +// Source: https://github.com/radekp/qtmoko +int Utils::monthsTo(const QDate &from, const QDate &to) { + int result = 12 * (to.year() - from.year()); + result += (to.month() - from.month()); + + return result; +} + +int Utils::yearsTo(const QDate &from, const QDate &to) { + return to.year() - from.year(); +} + +bool Utils::isSameWeek(const QDate &date1, const QDate &date2) { + int y1, y2; + int w1 = date1.weekNumber(&y1); + int w2 = date2.weekNumber(&y2); + // qDebug() << date1 << date2 << y1 << y2 << w1 << w2; + if (w1 == w2 && y1 == y2 && w1 != 0 && w2 != 0) return true; + return false; +} + +void Utils::resetFetcher(int type) { + Settings *s = Settings::instance(); + + if (s->fetcher != nullptr) { + s->fetcher->disconnect(); + delete s->fetcher; + s->fetcher = nullptr; + } + + if (type == 1) { + // Netvibes fetcher + s->fetcher = new NvFetcher(); + } + + if (type == 2) { + // Old Reader fetcher + s->fetcher = new OldReaderFetcher(); + } + + if (type == 4) { + // Tiny Tiny Rss fetcher + s->fetcher = new TTRssFetcher(); + } + + if (s->fetcher != nullptr) + s->context->setContextProperty("fetcher", s->fetcher); +} + +QString Utils::nameFromPath(const QString &path) { + return QFileInfo(path).fileName(); +} + +void Utils::addExtension(const QString &contentType, QString &path) { + auto orig_ext = QFileInfo(path).suffix(); + + QString new_ext; + if (contentType == "image/jpeg") { + new_ext = "jpg"; + } else if (contentType == "image/png") { + new_ext = "png"; + } else if (contentType == "image/gif") { + new_ext = "gif"; + } else if (contentType == "image/svg+xml") { + new_ext = "svg"; + } else { + new_ext = orig_ext; + } + + if (new_ext != orig_ext) { + path.append("." + new_ext); + } +} diff --git a/sailfish/src/utils.h b/src/utils.h similarity index 53% rename from sailfish/src/utils.h rename to src/utils.h index 11bb883..79d97fc 100644 --- a/sailfish/src/utils.h +++ b/src/utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Michal Kosciesza + Copyright (C) 2014-2022 Michal Kosciesza This file is part of Kaktus. @@ -20,37 +20,24 @@ #ifndef UTILS_H #define UTILS_H -#include -#include -#include #include +#include +#include +#include -#ifdef ANDROID -#include -#include -#endif - -#ifdef BB10 -#include -#include -#endif - -#include "tabmodel.h" #include "dashboardmodel.h" -#include "feedmodel.h" #include "entrymodel.h" +#include "feedmodel.h" #include "settings.h" +#include "tabmodel.h" -class Utils : public QObject -{ +class Utils : public QObject { Q_OBJECT -public: - explicit Utils(QObject *parent = 0); + public: + explicit Utils(QObject *parent = nullptr); ~Utils(); - //static bool removeDir(const QString &dirName); - Q_INVOKABLE void setEntryModel(const QString &feedId); Q_INVOKABLE void setFeedModel(const QString &tabId); Q_INVOKABLE void setRootModel(); @@ -61,11 +48,10 @@ public: Q_INVOKABLE QString getHumanFriendlyTimeString(int date); Q_INVOKABLE QString getHumanFriendlySizeString(int size); Q_INVOKABLE int countUnread(); - Q_INVOKABLE bool isLight(); Q_INVOKABLE void resetQtWebKit(); Q_INVOKABLE void resetFetcher(int type); - //Q_INVOKABLE bool isOnline(); - Q_INVOKABLE QString formatHtml(const QString &data, bool offline, const QString &style = QString()); + Q_INVOKABLE QString formatHtml(const QString &data, bool offline, + const QString &style = QString()); Q_INVOKABLE QString readAsset(const QString &path); Q_INVOKABLE QString nameFromPath(const QString &path); @@ -76,49 +62,16 @@ public: static void addExtension(const QString &contentType, QString &path); Q_INVOKABLE static void log(const QString &data); -#ifdef ANDROID - Q_INVOKABLE int dp(float value); - Q_INVOKABLE int mm(float value); - Q_INVOKABLE int in(float value); - Q_INVOKABLE int pt(float value); - Q_INVOKABLE int sp(float value); - Q_INVOKABLE void showNotification(const QString &title, const QString &text); - Q_INVOKABLE void setStatusBarColor(const QColor &color); -#endif - -#ifdef BB10 - Q_INVOKABLE int du(float value); - Q_INVOKABLE bool checkOSVersion(int major, int minor, int patch = 0, int build = 0); - Q_INVOKABLE bb::cascades::Color background(); - Q_INVOKABLE bb::cascades::Color plain(); - Q_INVOKABLE bb::cascades::Color plainBase(); - Q_INVOKABLE bb::cascades::Color textOnPlain(); - Q_INVOKABLE bb::cascades::Color text(); - Q_INVOKABLE bb::cascades::Color secondaryText(); - Q_INVOKABLE bb::cascades::Color primary(); - /*Q_INVOKABLE float primaryTextFontSize(); - Q_INVOKABLE QString primaryTextFontFamily(); - Q_INVOKABLE float titleTextFontSize(); - Q_INVOKABLE QString titleTextFontFamily();*/ - Q_INVOKABLE void launchBrowser(const QString &url); -#endif - -public slots: + public slots: void updateModels(); -private: - EntryModel* entryModel; - FeedModel* feedModel; - TabModel* tabModel; - DashboardModel* dashboardModel; - //QNetworkConfigurationManager* ncm; -#ifdef ANDROID - QScreen* screen; -#endif -#ifdef BB10 - bb::device::DisplayInfo display; -#endif + private: + EntryModel *entryModel; + FeedModel *feedModel; + TabModel *tabModel; + DashboardModel *dashboardModel; + bool removeDir(const QString &dirName); }; -#endif // UTILS_H +#endif // UTILS_H diff --git a/sailfish/translations/kaktus_cs.ts b/translations/kaktus_cs.ts similarity index 84% rename from sailfish/translations/kaktus_cs.ts rename to translations/kaktus_cs.ts index 66f069e..663eb2f 100644 --- a/sailfish/translations/kaktus_cs.ts +++ b/translations/kaktus_cs.ts @@ -1,4 +1,6 @@ - + + + AboutPage @@ -27,12 +29,12 @@ Překlady byly poskytnuty: - + %1 is developed as an open source project under %2. %1 je vývojář projektu s otevřeným zdrojovým kódem poskytnutého pod %2 - + Libraries Knihovny @@ -72,8 +74,11 @@ - - + + + + + Version %1 Verze: %1 @@ -141,7 +146,11 @@ %n unread item(s) - jedna nepřečtená položka%n nepřečtené položky%n nepřečtených položek%n nepřečtených položek + + jedna nepřečtená položka + %n nepřečtené položky + %n nepřečtených položek + @@ -226,62 +235,62 @@ EntryDelegate - + Toggle Read Přepnout čtení - + Toggle Save Přepnout ukládání - + Toggle Star Přepnout ohvězdičkování - + Above as read Výše jako přečtené - + Viewer Prohlížeč - + Browser Prohlížeč - + Feed content Obsah kanálu - + Add to Pocket Přidat do Pocket - + Share link Sdílet odkaz - + Save image Uložit obrázek - + Toggle Like Přepnout zalíbení - + Toggle Share Přepnout sdílení @@ -327,93 +336,92 @@ EntryPage - + No unread items Žádné nepřečtené položky - + No items Žádné položky - + All feeds Všechny kanály - Launching a browser... - Spouští se prohlížeč... + Spouští se prohlížeč... - + Saved Uloženo - + Slow Zpomalit - + Liked Oblíbeno - + Shared Sdíleno - - + + Wait until current task is complete Počkejte, dokud nebude nynější úkol dokončen - + Offline version is not available Verze pro stav bez připojení k internetu není dostupná - + Enabling offline mode because network is disconnected Povoluje se kancelářský režim, protože síť je odpojena - + Network is disconnected Síť je odpojena - + No saved items Žádné neuložené položky - + Starred Ohvězdičkováno - + Wait until sync finish Počkejte, dokud nebude seřizování dokončeno - + No starred items Žádné ohvězdičkované položky - + No liked items Žádné oblíbené položky - + One-tap to open article, double-tap to mark as read Jedno klepnutí pro otevření článku, dvojité klepnutí pro označení článku jako přečteného @@ -470,37 +478,37 @@ FeedWebContentPage - + Back Zpět - + Toggle Read Přepnout čtení - + Toggle Save Přepnout ukládání - + Toggle Star Přepnout ohvězdičkování - + Viewer Prohlížeč - + Browser Prohlížeč - + Add to Pocket Přidat do Pocket @@ -510,27 +518,27 @@ Sdílet odkaz - + Toggle Like Přepnout zalíbení - + Toggle Share Přepnout sdílení - + URL was copied to the clipboard Adresa (URL) byla zkopírovaná do schránky - + Increase font Zvětšit písmo - + Decrease font Zmenšit písmo @@ -555,12 +563,11 @@ Síť je odpojena - Launching a browser... - Spouští se prohlížeč... + Spouští se prohlížeč... - + Copy URL Kopírovat adresu (URL) @@ -830,138 +837,138 @@ Přihlášený s - + Syncronization Seřízení - + Sync timeframe Seřídit časový rámec - + 1 Day 1 den - + 3 Days 3 dny - + 1 Week 1 týden - + 2 Weeks 2 týdny - + 1 Month 1 měsíc - + Wide as possible Co možná nejširší - + Never Nikdy - + WiFi only Pouze WiFi - + Always Vždy - + After sync the content of all items will be downloaded and cached for access in the offline mode. Po seřízení bude stažen a do vyrovnávací paměti uložen obsah všech položek pro přístup v režimu nepřipojen k internetu. - + Cache and cookies have been deleted Vyrovnávací paměť a koláčky byly smazány - + Clicking on article behaviour Klepnutí na chování článku - - + + External browser Vnější prohlížeč - + Feed content Obsah kanálu - + Disabled Zakázáno - + Unread or starred Nepřečteno nebo ohvězdičkováno - + Expanded items Rozbalené položky - + All article items on the list view be shown expanded. Všechny položky článků v pohledu se seznamem budou ukázány rozbalené. - + Double-pane reader Dvoupanelová čtečka - + Double-pane reader in landscape Dvoupanelová čtečka ve formátu na šířku - + View with the articles will be splited in to two colums. Pohled s články bude rozdělen do dvou sloupců. - + View with the articles in the landscape orientation will be splited in to two colums. Pohled s články v natočení na šířku bude rozdělen do dvou sloupců. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Budou povoleny následující společenské funkce Old Reader: Sledování složek, sdílení článků se stoupenci, volba Líbí se, zobrazení oblíbených článků. - + Delete cache Smazat vyrovnávací paměť - + Most recent articles will be syncronized according to the defined timeframe. Nejnovější články budou seřízeny podle stanoveného časového rámce. @@ -976,246 +983,246 @@ Přihlášen jako - + Regardless of the value, all starred, liked and shared items will be synced as well. Bez ohledu na hodnotu budou seřízeny veškeré ohvězdičkované, oblíbené a sdílené položky. - + Regardless of the value, all saved items will be synced as well. Bez ohledu na hodnotu budou seřízeny všechny uložené položky. - + Be aware, this parameter has significant impact on the speed of synchronization. Opatrně, tento parametr má podstatný dopad na rychlost seřizování. - + Sync read articles Seřídit přečtené články - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Vedle nepřečtených budou dále seřízeny i přečtené články. Zakázáním této volby dojde ke zrychlení seřizování, ale přečtené články nebudou z Kaktusu přístupny. - + Network mode Režim sítě - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. V režimu nepřipojen k internetu bude Kaktus k získání internetových stránek a obrázků používat pouze místní vyrovnávací paměť, takže síťové spojení nebude potřeba. - + Auto network mode Režim sítě automaticky - + Network mode will be switched automatically on network connection lost or restore. Režim sítě bude přepnut automaticky při ztrátě síťového spojení nebo při obnovení. - - - + + + Web viewer Prohlížeč internetu - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Určuje, jak se ve vestavěném prohlížeči internetových stránek řeší pohyb po nich. Odkazy lze zakázat, otevřít ve vnějším prohlížeči nebo otevřít v prohlížeči internetových stránek. - + Auto switch to Reader View Přepnout automaticky do čtenářského pohledu - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. Čtenářský pohled je funkce, která odstraní nepotřebná tlačítka, reklamy a obrázky na pozadí, a změní rozvržení strany pro lepší čitelnost. Povolením této volby bude přepnuto do pohledu na čtečku automaticky, když je strana nahrána do prohlížeče internetu. - + Auto switch to Night View Přepnout automaticky do nočního pohledu - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. Noční pohled sníží jas internetových stránek. Povolením této volby bude přepnuto do nočního pohledu automaticky, když je strana nahrána do prohlížeče internetu. - + Viewer font size level Úroveň velikosti písma prohlížeče - + Delete cookies Smazat koláčky - + Clear web viewer cache and cookies. Changes will take effect after restart. Vyprázdnit vyrovnávací paměť prohlížeče internetu a smazat koláčky. Změny se projeví po opětovném spuštění programu. - + Language Jazyk - + Default Výchozí - + Changes will take effect after you restart Kaktus Změny se projeví po opětovném spuštění Kaktusu - + View mode Režim zobrazení - + Tabs, feeds & articles Karty, kanály a články - + Folders, feeds & articles Složky, kanály a články - + Tabs & articles Karty a články - + Folders & articles Složky a články - - + + All articles Všechny články - + Saved Uloženo - + Starred Ohvězdičkováno - + Slow Zpomalit - + Liked Oblíbeno - + Sort order for list of articles Postup třídění článků - + Recent first Nejnovější první - + Oldest first Nejstarší první - + Pocket Pocket - + Pocket integration Začlenění Pocket - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket je internetový nástroj na ukládání článků pro pozdější přečtení. Začlenění provedené v Kaktusu poskytuje tlačítko Přidat do Pocket v seznamu článků a v prohlížeči internetových stránek. - - + + Default tags Výchozí značky - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. Seznam čárkou oddělených značek, které budou při přidání článku do Pocket automaticky vloženy. - + Quick adding Rychlé přidání - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Je-li povoleno, článek bude okamžitě odeslán do Pocket, poté co klepnete na tlačítko Přidat do Pocket, čili bez jakéhokoli potvrzovacího dialogu. Všechny značky z pole Výchozí značky budou přidány automaticky. - + Delete saved tags Smazat uložené značky - + Saved tags have been deleted Uložené značky byly smazány - + Other Jiné - + Ignore SSL errors Ignorovat chyby SSL - + Online Připojen - + Offline Nepřipojen - + Cache articles Ukládat články do vyrovnávací paměti @@ -1230,87 +1237,85 @@ Přihlásit se - + Cache Vyrovnávací paměť - + Current cache size Nynější velikost vyrovnávací paměti - + Social features Společenské funkce - Power save mode - Režim šetření energií + Režim šetření energií - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Když telefon nebo program přejde do stavu nečinnosti, všechny otevřené internetové stránky budou kvůli snížení spotřeby energie zavřeny. + Když telefon nebo program přejde do stavu nečinnosti, všechny otevřené internetové stránky budou kvůli snížení spotřeby energie zavřeny. - + Dynamic Dynamický - + UI Rozhraní - + Open link behaviour Otevřít chování odkazu - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Určuje chování pro klepnutí na položku článku. Článek může být otevřen ve vestavěném prohlížeči internetových stránek, ve vnějším prohlížeči nebo může být ukázán celý obsah kanálu RSS. - + List filtering Filtrování seznamu - + Unread or saved Nepřečteno nebouloženo - + Only unread Pouze nepřečtené - + List of articles can be filtered to display all articles, unread and saved or only unread. Seznam článků lze filtrovat k zobrazení všech článků, nepřečtených a uložených nebo pouze nepřečtených. - + List of articles can be filtered to display all articles, unread and starred or only unread. Seznam článků lze filtrovat k zobrazení všech článků, nepřečtených a ohvězdičkovaných nebo pouze nepřečtených. - + Orientation Natočení - + Portrait Na výšku - + Landscape Na šířku @@ -1440,12 +1445,12 @@ Označit vše jako nepřečtené - + Wait until sync finish Počkejte, dokud nebude seřizování dokončeno - + No tabs Žádné karty @@ -1465,7 +1470,7 @@ Sledování - + No folders Žádné složky @@ -1511,101 +1516,117 @@ Utils - + empty prázdné - + unknown date neznámé datum - + just now pouze nyní - + %n second(s) ago - před sekundoupřed %n sekundamipřed %n sekundamipřed %n sekundami + + před sekundou + před %n sekundami + před %n sekundami + - + %n minute(s) ago - před minutoupřed %n minutamipřed %n minutamipřed %n minutami + + před minutou + před %n minutami + před %n minutami + - + %n hour(s) ago - před hodinoupřed %n hodinamipřed %n hodinamipřed %n hodinami + + před hodinou + před %n hodinami + před %n hodinami + - + %n day(s) ago - včerapřed %n dnypřed %n dnypřed %n dny + + včera + před %n dny + před %n dny + WebPreviewPage - - + + Loading page content... Nahrává se obsah stránky... - + Failed to load page from local cache Nepodařilo se nahrát stránku z místní vyrovnávací paměti - + Failed to load page content Nepodařilo se nahrát obsah stránky - + Back Zpět - + Toggle Read Přepnout čtení - + Toggle Save Přepnout ukládání - + Toggle Star Přepnout ohvězdičkování - + Toggle Reader View Přepnout čtenářský pohled - + Toggle Night View Přepnout noční pohled - + Browser Prohlížeč - + Add to Pocket Přidat do Pocket - + Share link Sdílet odkaz @@ -1630,10 +1651,8 @@ Zmenšit písmo - - Launching a browser... - Spouští se prohlížeč... + Spouští se prohlížeč... @@ -1654,112 +1673,112 @@ main - + Feeds Kanály - + Caching... %1 of %2 Ukládá se do vyrovnávací paměti... %1 z %2 - + Caching... Ukládá se do vyrovnávací paměti... - + Removing cache data... %1 of %2 Odstraňují se data uložená ve vyrovnávací paměti... %1 z %2 - + Access through API is disabled on a server Přístup přes API je zakázaný na serveru - + Problem with SSL certificate Problém s SSL certifikátem - + Unknown error Neznámá chyba - + Restart the app to rebuild cache data Spusťte program znovu, aby byla data ve vyrovnávací paměti znovu sestavena - + Download has failed because network is disconnected Stahování selhalo, protože síť je odpojena - + Unable to sign in Nelze se přihlásit - + Network connection is unavailable Síťové připojení není k dispozici - - + + The user name or password is incorrect Uživatelské jméno nebo heslo není správné - + Cannot save image in gallery Nelze uložit obrázek do galerie - + Image already exists in gallery Obrázek v galerii již existuje - + You are signed in Jste přihlášení v - + Receiving data... Příjímá data... - - + + Sending data... Posílají se data... - + Initiating... Spouští se... - + Updating... Aktualizuje se... - + Signing in... Přihlašuje se... - + Waiting for network... Čeká se na síť... diff --git a/sailfish/translations/kaktus_de.ts b/translations/kaktus_de.ts similarity index 86% rename from sailfish/translations/kaktus_de.ts rename to translations/kaktus_de.ts index 4b1f715..af023d2 100644 --- a/sailfish/translations/kaktus_de.ts +++ b/translations/kaktus_de.ts @@ -74,9 +74,11 @@ - - - + + + + + Version %1 Version %1 @@ -232,62 +234,62 @@ EntryDelegate - + Toggle Read Auf Gelesen umschalten - + Toggle Save Auf Gespeichert umschalten - + Toggle Star Auf Favorit umschalten - + Above as read Obere als Gelesen - + Viewer Betrachter - + Browser Browser - + Feed content Feedinhalt - + Add to Pocket Speichere in Pocket - + Share link Teile Link - + Save image Speichere Bild - + Toggle Like Als Gefällt mir markieren - + Toggle Share Als Geteilt markieren @@ -333,93 +335,92 @@ EntryPage - + No unread items Keine ungelesenen Artikel - + No items Keine Artikel - + All feeds Alles Feeds - Launching a browser... - Starte einen Browser... + Starte einen Browser... - + Saved Gespeichert - + Slow Langsam - + Liked Gefällt - + Shared Geteilt - - + + Wait until current task is complete Warte bis der aktuelle Vorgang beendet ist - + Offline version is not available Offline Version ist nicht verfügbar - + Enabling offline mode because network is disconnected Aktiviere Offline Modus, weil keine Netzwerkverbindung besteht - + Network is disconnected Keine Netzwerkverbindung - + No saved items Keine gespeicherten Elemente - + Starred mit Stern versehen - + Wait until sync finish Warte bis Synchronisation beendet ist - + No starred items Keine mit Stern versehen Artikel - + No liked items Keine Gefällt-Mir Artikel - + One-tap to open article, double-tap to mark as read Einmal Klicken zum Öffnen, Doppelklicken um als Gelesen zu markieren @@ -476,37 +477,37 @@ FeedWebContentPage - + Back Zurück - + Toggle Read Auf Gelesen umschalten - + Toggle Save Auf Gespeichert umschalten - + Toggle Star Auf Favorit umschalten - + Viewer Betrachter - + Browser Browser - + Add to Pocket Speichere in Pocket @@ -516,27 +517,27 @@ Teile Link - + Toggle Like Als Gefällt mir markieren - + Toggle Share Als Geteilt markieren - + URL was copied to the clipboard URL in die Zwischenablage kopiert - + Increase font Vergrößere die Schriftart - + Decrease font Verkleinere die Schriftart @@ -561,12 +562,11 @@ Keine Netzwerkverbindung - Launching a browser... - Starte einen Browser... + Starte einen Browser... - + Copy URL Kopiere URL @@ -836,138 +836,138 @@ Angemeldet mittels - + Syncronization Synchronisation - + Sync timeframe Synchronisiere Zeitfenster - + 1 Day 1 Tag - + 3 Days 3 Tage - + 1 Week 1 Woche - + 2 Weeks 2 Wochen - + 1 Month 1 Monat - + Wide as possible Soweit wie möglich - + Never Nie - + WiFi only Nur Wlan - + Always Ständig - + After sync the content of all items will be downloaded and cached for access in the offline mode. Nach der Synchronisation wird der Inhalt aller Artikel geladen und für den Zugriff im Offline Modus zwischengespeichert. - + Cache and cookies have been deleted Cache und Cookies wurden gelöscht - + Clicking on article behaviour Verhalten bei Auswahl des Artikels - - + + External browser Externer Browser - + Feed content Feedinhalt - + Disabled Gesperrt - + Unread or starred Ungelesen oder mit Stern versehen - + Expanded items Erweiterter Einträge - + All article items on the list view be shown expanded. Alle Artikeleinträge in der List werden erweitert. - + Double-pane reader Doppelfenster Leser - + Double-pane reader in landscape Zweispaltiger Lesemodus im Querformat - + View with the articles will be splited in to two colums. Ansicht bei der ein Artikel in 2 Spalten angezeigt wird. - + View with the articles in the landscape orientation will be splited in to two colums. Ansicht, bei der Artikel im Querformat in 2 Spalten angezeigt wird. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Folgende Old Reader soziale Netzwerkfunkionen werden angeschalten: Follower Verzeichnis, Teile Artikel mit Followern, Gefällt mir Option, Gefällt-Mir Artikelansichtsmodus. - + Delete cache Lösche Zwischenspeicher - + Most recent articles will be syncronized according to the defined timeframe. Neueste Artikel werden entsprechen des definierten Zeitfensters synchronisiert. @@ -982,246 +982,246 @@ Angemeldet als - + Regardless of the value, all starred, liked and shared items will be synced as well. Trotzdem werden alle mit Stern versehen, Gefällt-Mir und geteilten Einträge auch synchronisiert. - + Regardless of the value, all saved items will be synced as well. Trotzdem werden alle gespeicherten Einträge auch synchronisiert. - + Be aware, this parameter has significant impact on the speed of synchronization. Vorsicht, dieser Parameter hat einen bedeutenden Einfluss auf die Geschwindigkeit der Synchronisation. - + Sync read articles Gelesene Artikel synchronisieren - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Zusätzlich zu den ungelesenen werden auch die gelesenen Artikel synchronisiert. Das Ausschalten der Option beschleunigt die Synchronisation, aber gelesen Artikel werden nicht in Kaktus verfügbar. - + Network mode Netzwerkmodus - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. Im Offline-Modus wird Kaktus nur den lokalen Zwischenspeicher für Webseiten und Bilder verwenden, eine Netzwerkverbindung ist nicht erforderlich. - + Auto network mode Auto Netzwerkmodus - + Network mode will be switched automatically on network connection lost or restore. Der Netzwerkmodus wechselt automatisch bei Netzwerkverlust oder -verbindung. - - - + + + Web viewer Web Betrachter - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Definiert das Navigationsverhalten im eingebauten Web-Betrachter. Hyperlinks können gesperrt, im externen oder internen Web-Betrachter geöffnet werden. - + Auto switch to Reader View Autowechsel in die Leseansicht - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. Die Leseansicht ist eine Funktion, welche Like-Buttons, Werbung und Hintergrundbilder ausblendet und die Seitenansicht besser lesbar macht. Mit dem Anschalten der Version wird die Leseansicht automatisch ausgewählt, wenn eine Seite im Web-Betrachter geladen wird. - + Auto switch to Night View Autowechsel in den Nachtansicht - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. Die Nachtansicht verringert die Helligkeit von Webseiten. Das Anschalten der Option bewirkt den automatischen Wechsel in die Nachtansicht beim Laden einer Seite im Web-Betrachter. - + Viewer font size level Ansicht Schriftgröße - + Delete cookies Lösche Cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. Lösche Cache und Cookies des Web Viewers. Die Änderungen werden nach einem Neustart übernommen. - + Language Sprache - + Default Standard - + Changes will take effect after you restart Kaktus Die Änderungen werden nach einem Neustart von Kaktus übernommen - + View mode Anzeigemodus - + Tabs, feeds & articles Tabs, Feeds & Artikel - + Folders, feeds & articles Verzeichnisse, Feeds & Artikel - + Tabs & articles Tabs & Artikel - + Folders & articles Verzeichnisse & Artikel - - + + All articles Alle Artikel - + Saved Gesichert - + Starred mit Stern versehen - + Slow Langsam - + Liked Gefällt - + Sort order for list of articles Sortiere die Reihenfolge in der Artikelliste - + Recent first Neueste Zuerst - + Oldest first Älteste Zuerst - + Pocket Pocket - + Pocket integration Pocket Integration - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket ist ein Web-Tool um Artikel zu speichern um sie später zu lesen. Die in Kaktus implementiere Integration stellt einen "In Pocket hinzufügen" Button in der Artikelliste und im Web Viewer zur Verfügung. - - + + Default tags Voreingestellte Tags - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. Liste von durch Komma getrennten Tags welche automatisch eingefügt wird wenn ein Artikel in Pocket hinzugefügt wird. - + Quick adding Schnelles Hinzufügen - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Wenn aktiviert, wird der Artikel unmittelbar nach dem Klick auf "In Pocket hinzufügen" zu Pocket gesendet, ohne weiteren Bestätigungs-Dialog. Alle Tags vom Feld "Voreingestellte Tags" werden automatisch hinzugefügt. - + Delete saved tags Lösche gespeicherte Tags - + Saved tags have been deleted Gespeicherte Tags wurden gelöscht - + Other Andere - + Ignore SSL errors Ignoriere SSL-Fehler - + Online Online - + Offline Abgemeldet - + Cache articles Zwischengespeicherte Artikel @@ -1236,17 +1236,17 @@ Anmelden - + Cache Zwischenspeicher - + Current cache size Derzeitige Zwischenspeichergrösse - + Social features soziale Merkmale @@ -1259,62 +1259,62 @@ Wenn das Telefon oder die App pausieren, werden alle geöffneten Webseiten geschlossen um die Energiebedarf zu reduzieren. - + Dynamic Dynamisch - + UI Bedienoberfläche - + Open link behaviour Öffne Link Verhalten - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Definiert das Verhalten beim Klicken auf einen Artikel. Artikel werden im eingebauten Webbetrachter, externen Broweser geöffnet oder als voller RSS Feed Inhalt angezeigt. - + List filtering Liste wird gefiltert - + Unread or saved Ungelesene oder Gespeicherte - + Only unread Nur Ungelesene - + List of articles can be filtered to display all articles, unread and saved or only unread. Artikelliste kann nach alle Artikel, Ungelesene, Gespeichert oder nur Ungelesene gefiltert werden. - + List of articles can be filtered to display all articles, unread and starred or only unread. Artikelliste kann nach alle Artikel, Ungelesen, mit Stern markierte oder nur Ungelesene gefiltert werden. - + Orientation Orientierung - + Portrait Hochformat - + Landscape Landscape @@ -1444,12 +1444,12 @@ Alle als ungelesen markieren - + Wait until sync finish Warte bis Synchronisation beendet ist - + No tabs Keine Tabs @@ -1469,7 +1469,7 @@ Folgen - + No folders Keine Ordner @@ -1515,22 +1515,22 @@ Utils - + empty leer - + unknown date unbekanntes Datum - + just now gerade jetzt - + %n second(s) ago vor einer Sekunde @@ -1538,7 +1538,7 @@ - + %n minute(s) ago vor einer Minute @@ -1546,7 +1546,7 @@ - + %n hour(s) ago vor einer Stunde @@ -1554,7 +1554,7 @@ - + %n day(s) ago vor einem Tag @@ -1565,63 +1565,63 @@ WebPreviewPage - - + + Loading page content... Der Seiteninhalt wird geladen... - + Failed to load page from local cache Das Laden der Seite aus dem Zwischenspeicher ist fehlgeschlagen - + Failed to load page content Das Laden des Seiteninhaltes ist fehlgeschlagen - + Back Zurück - + Toggle Read Auf Gelesen umschalten - + Toggle Save Auf Gespeichert umschalten - + Toggle Star Auf Favorit umschalten - + Toggle Reader View Auswahl Lesenansicht - + Toggle Night View Auswahl Nachtansicht - + Browser Browser - + Add to Pocket Speichere in Pocket - + Share link Teile Link @@ -1646,10 +1646,8 @@ Verkleiner die Schriftart - - Launching a browser... - Starte einen Browser... + Starte einen Browser... @@ -1670,112 +1668,112 @@ main - + Feeds Feeds - + Caching... %1 of %2 Caching...%1 von %2 - + Caching... Zwischenspeichern... - + Removing cache data... %1 of %2 Entferne Zwischenspeicherdaten... %1 von %2 - + Access through API is disabled on a server Der Zugriff über die API ist auf einem Server deaktiviert - + Problem with SSL certificate Problem mit dem SSL Zertifikat - + Unknown error Unbekannter Fehler - + Restart the app to rebuild cache data Neustart der App um Zwischenspeicher neu aufzubauen - + Download has failed because network is disconnected Download ist wegen fehlender Netzwerkverbindung fehlgeschlagen - + Unable to sign in Anmeldung nicht möglich - + Network connection is unavailable Keine Verbindung zum Netzwerk - - + + The user name or password is incorrect Benutzername oder Kennwort falsch - + Cannot save image in gallery Bild kann nicht in der Galerie gespeichert werden - + Image already exists in gallery Bild existiert bereits in der Galerie - + You are signed in Du bist angemeldet - + Receiving data... Daten werden empfangen... - - + + Sending data... Daten werden übermittelt... - + Initiating... Intialisiere... - + Updating... Wird aktualisiert... - + Signing in... Anmelden... - + Waiting for network... Wartet auf Verbindung... diff --git a/sailfish/translations/kaktus_en.ts b/translations/kaktus_en.ts similarity index 84% rename from sailfish/translations/kaktus_en.ts rename to translations/kaktus_en.ts index 47bd663..a787a89 100644 --- a/sailfish/translations/kaktus_en.ts +++ b/translations/kaktus_en.ts @@ -29,12 +29,12 @@ - + %1 is developed as an open source project under %2. - + Libraries @@ -74,8 +74,11 @@ - - + + + + + Version %1 @@ -231,62 +234,62 @@ EntryDelegate - + Toggle Read - + Toggle Save - + Toggle Star - + Above as read - + Viewer - + Browser - + Feed content - + Add to Pocket - + Share link - + Save image - + Toggle Like - + Toggle Share @@ -332,93 +335,88 @@ EntryPage - + No unread items - + No items - + All feeds - - Launching a browser... - - - - + Saved - + Slow - + Liked - + Shared - - + + Wait until current task is complete - + Offline version is not available - + Enabling offline mode because network is disconnected - + Network is disconnected - + No saved items - + Starred - + Wait until sync finish - + No starred items - + No liked items - + One-tap to open article, double-tap to mark as read @@ -475,37 +473,37 @@ FeedWebContentPage - + Back - + Toggle Read - + Toggle Save - + Toggle Star - + Viewer - + Browser - + Add to Pocket @@ -515,27 +513,27 @@ - + Toggle Like - + Toggle Share - + URL was copied to the clipboard - + Increase font - + Decrease font @@ -560,12 +558,7 @@ - - Launching a browser... - - - - + Copy URL @@ -835,138 +828,138 @@ - + Syncronization - + Sync timeframe - + 1 Day - + 3 Days - + 1 Week - + 2 Weeks - + 1 Month - + Wide as possible - + Never - + WiFi only - + Always - + After sync the content of all items will be downloaded and cached for access in the offline mode. - + Cache and cookies have been deleted - + Clicking on article behaviour - - + + External browser - + Feed content - + Disabled - + Unread or starred - + Expanded items - + All article items on the list view be shown expanded. - + Double-pane reader - + Double-pane reader in landscape - + View with the articles will be splited in to two colums. - + View with the articles in the landscape orientation will be splited in to two colums. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. - + Delete cache - + Most recent articles will be syncronized according to the defined timeframe. @@ -981,246 +974,246 @@ - + Regardless of the value, all starred, liked and shared items will be synced as well. - + Regardless of the value, all saved items will be synced as well. - + Be aware, this parameter has significant impact on the speed of synchronization. - + Sync read articles - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. - + Network mode - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - + Auto network mode - + Network mode will be switched automatically on network connection lost or restore. - - - + + + Web viewer - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. - + Auto switch to Reader View - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. - + Auto switch to Night View - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. - + Viewer font size level - + Delete cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. - + Language - + Default - + Changes will take effect after you restart Kaktus - + View mode - + Tabs, feeds & articles - + Folders, feeds & articles - + Tabs & articles - + Folders & articles - - + + All articles - + Saved - + Starred - + Slow - + Liked - + Sort order for list of articles - + Recent first - + Oldest first - + Pocket - + Pocket integration - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. - - + + Default tags - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. - + Quick adding - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. - + Delete saved tags - + Saved tags have been deleted - + Other - + Ignore SSL errors - + Online - + Offline - + Cache articles @@ -1235,87 +1228,77 @@ - + Cache - + Current cache size - + Social features - - Power save mode - - - - - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - - - - + Dynamic - + UI - + Open link behaviour - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. - + List filtering - + Unread or saved - + Only unread - + List of articles can be filtered to display all articles, unread and saved or only unread. - + List of articles can be filtered to display all articles, unread and starred or only unread. - + Orientation - + Portrait - + Landscape @@ -1445,12 +1428,12 @@ - + Wait until sync finish - + No tabs @@ -1470,7 +1453,7 @@ - + No folders @@ -1516,22 +1499,22 @@ Utils - + empty - + unknown date - + just now - + %n second(s) ago second ago @@ -1539,7 +1522,7 @@ - + %n minute(s) ago minute ago @@ -1547,7 +1530,7 @@ - + %n hour(s) ago hour ago @@ -1555,7 +1538,7 @@ - + %n day(s) ago day ago @@ -1566,63 +1549,63 @@ WebPreviewPage - - + + Loading page content... - + Failed to load page from local cache - + Failed to load page content - + Back - + Toggle Read - + Toggle Save - + Toggle Star - + Toggle Reader View - + Toggle Night View - + Browser - + Add to Pocket - + Share link @@ -1646,12 +1629,6 @@ Decrease font - - - - Launching a browser... - - URL was copied to the clipboard @@ -1671,112 +1648,112 @@ main - + Feeds - - Caching... %1 of %2 - - - - - Caching... - - - - - Removing cache data... %1 of %2 - - - - - Access through API is disabled on a server - - - - - Problem with SSL certificate - - - - - Unknown error - - - - + Restart the app to rebuild cache data - + + Caching... %1 of %2 + + + + + Caching... + + + + Download has failed because network is disconnected - - Unable to sign in + + Removing cache data... %1 of %2 + Unable to sign in + + + + Network connection is unavailable - - + + The user name or password is incorrect - + + Access through API is disabled on a server + + + + + Problem with SSL certificate + + + + Cannot save image in gallery - + Image already exists in gallery - + + Unknown error + + + + You are signed in - + Receiving data... - - + + Sending data... - + Initiating... - + Updating... - + Signing in... - + Waiting for network... diff --git a/sailfish/translations/kaktus_es.ts b/translations/kaktus_es.ts similarity index 86% rename from sailfish/translations/kaktus_es.ts rename to translations/kaktus_es.ts index 89952e1..faa960c 100644 --- a/sailfish/translations/kaktus_es.ts +++ b/translations/kaktus_es.ts @@ -74,8 +74,11 @@ - - + + + + + Version %1 Versión: %1 @@ -231,62 +234,62 @@ EntryDelegate - + Toggle Read Leído - + Toggle Save Guardado - + Toggle Star Favorito - + Above as read Hacia arriba como leídos - + Viewer Visor - + Browser Navegador - + Feed content Contenido del canal - + Add to Pocket Añadir a Pocket - + Share link Compartir enlace - + Save image Guardar imagen - + Toggle Like Me gusta - + Toggle Share Compartir @@ -332,93 +335,92 @@ EntryPage - + No unread items No hay artículos sin leer - + No items No hay artículos - + All feeds Todos los canales - Launching a browser... - Abriendo navegador... + Abriendo navegador... - + Saved Guardado - + Slow Lento - + Liked Me gusta - + Shared Compartido - - + + Wait until current task is complete Espera a que la tarea en curso finalice - + Offline version is not available Versión sin conexión no disponible - + Enabling offline mode because network is disconnected Activando modo sin conexión porque no hay conexión de red - + Network is disconnected No hay conexión de red - + No saved items No hay artículos guardados - + Starred Favoritos - + Wait until sync finish Espera a que finalice la sincronización - + No starred items No hay artículos favoritos - + No liked items No hay elementos que te gusten - + One-tap to open article, double-tap to mark as read Un toque para abrir artículo, doble toque para marcar como leído @@ -475,37 +477,37 @@ FeedWebContentPage - + Back Volver - + Toggle Read Leído - + Toggle Save Guardado - + Toggle Star Favorito - + Viewer Visor - + Browser Navegador - + Add to Pocket Añadir a Pocket @@ -515,27 +517,27 @@ Compartir enlace - + Toggle Like Me gusta - + Toggle Share Compartir - + URL was copied to the clipboard U - + Increase font Aumentar fuente - + Decrease font Disminuir fuente @@ -560,12 +562,11 @@ No hay conexión de red - Launching a browser... - Abriendo navegador... + Abriendo navegador... - + Copy URL Copiar URL @@ -835,138 +836,138 @@ Sesión iniciada con - + Syncronization Sincronización - + Sync timeframe Frecuencia de sincronización - + 1 Day 1 día - + 3 Days 3 días - + 1 Week 1 semana - + 2 Weeks 2 semanas - + 1 Month 1 mes - + Wide as possible El más largo posible - + Never Nunca - + WiFi only Sólo por WiFi - + Always Siempre - + After sync the content of all items will be downloaded and cached for access in the offline mode. Después de sincronizar, el contenido de todos los artículos se descargará y guardará en la caché para su uso en el modo sin conexión. - + Cache and cookies have been deleted Se han borrado la caché y cookies - + Clicking on article behaviour Comportamiento al abrir artículo - - + + External browser Navegador externo - + Feed content Contenido del canal - + Disabled Desactivado - + Unread or starred No leídos o favoritos - + Expanded items Artículos ampliados - + All article items on the list view be shown expanded. Todos los artículos de la lista deberían mostrarse ampliados. - + Double-pane reader Lector doble-panel - + Double-pane reader in landscape Lector doble-panel en modo apaisado - + View with the articles will be splited in to two colums. La vista de los artículos se dividirá en dos columnas. - + View with the articles in the landscape orientation will be splited in to two colums. Con la orientación apaisada la vista de los artículos se dividirá en dos columnas. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Se habilitarán las carácteristicas de seguimiento de Old Reader: Carpeta de seguidos, Compartir artículo con seguidores, Botón Me gusta, Vista de artículos que te gustan. - + Delete cache Borrar caché - + Most recent articles will be syncronized according to the defined timeframe. Los artículos más recientes se sincronizarán de acuerdo a la frecuencia definida. @@ -981,246 +982,246 @@ Registrado como - + Regardless of the value, all starred, liked and shared items will be synced as well. Independientemente del valor, todos los artículos favoritos, que me gustan y compartidos también se sincronizarán. - + Regardless of the value, all saved items will be synced as well. Independientemente del valor, todos los artículos guardados también se sincronizarán. - + Be aware, this parameter has significant impact on the speed of synchronization. Ten en cuenta que este parámetro tiene un impacto importante en la velocidad de sincronización. - + Sync read articles Sincronizar artículos leídos - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Además de los no leídos también se sincronizarán los leídos. Al deshabilitar ésta opción se acelerará la sincronización, pero los artículos leídos no serán accesibles desde Kaktus. - + Network mode Modo de red - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. En el modo sin conexión, Kaktus sólo usará la caché local para cargar las páginas Web e imágenes, por lo tanto, no es necesaria la conexión a la red. - + Auto network mode Modo de red automático - + Network mode will be switched automatically on network connection lost or restore. El modo de red se cambiará automáticamente cuando la conexión de red se pierda o restablezca. - - - + + + Web viewer Visor Web - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Define cómo funciona la navegación dentro del visor Web. Se pueden deshabilitar los hipervínculos, abrirlos en un navegador externo o abrirlos dentro del visor Web. - + Auto switch to Reader View Vista Lector automático - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. La Vista Lector es una funcionalidad que proporciona una vista más limpia, eliminando los botones, anuncios e imágenes de fondo y cambiando el diseño de la página para una mejor legibilidad. Al activar esta opción, la Vista Lector se activará automáticamente cuando se cargue la página en el visor Web. - + Auto switch to Night View Modo Nocturno automático - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. El Modo Nocturno reduce el brillo de las páginas Web. Al activar esta opción, el Modo Nocturno se cambiará automáticamente cuando la página se cargue en el visor Web. - + Viewer font size level Tamaño de la fuente en el visor - + Delete cookies Borrar cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. Limpiar caché y cookies del visor Web. Los cambios tendrán efectos después de reiniciar. - + Language Idioma - + Default Por defecto - + Changes will take effect after you restart Kaktus Los cambios tendrán efecto después de reiniciar Kaktus - + View mode Modo de vista - + Tabs, feeds & articles Fichas, canales y artículos - + Folders, feeds & articles Carpetas, canales y artículos - + Tabs & articles Fichas y artículos - + Folders & articles Carpetas y artículos - - + + All articles Todos los artículos - + Saved Guardado - + Starred Favoritos - + Slow Lento - + Liked Me gusta - + Sort order for list of articles Ordenar por lista de artículos - + Recent first Recientes primero - + Oldest first Antiguos primero - + Pocket Pocket - + Pocket integration Integración de Pocket - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket es una herramienta de Internet que permite guardar artículos para leerlos después. La integración implementada en Kaktus proporciona el botón "Añadir a Pocket" en la lista de artículos y en el visor Web. - - + + Default tags Etiquetas por defecto - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. La lista de etiquetas separadas por comas se insertarán automáticamente al añadir un artículo a Pocket. - + Quick adding Añadir rápido - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Si está activado, el artículo se enviará inmediatamente a Pocket después de hacer clic en el botón "Añadir a Pocket" sin ningún diálogo de confirmación. Todas las etiquetas del campo "Etiquetas por defecto" se añadirán automáticamente. - + Delete saved tags Borrar etiquetas guardadas - + Saved tags have been deleted Se han borrado las etiquetas guardadas - + Other Otro - + Ignore SSL errors Ignorar errores SSL - + Online Conectado - + Offline Sin conexión - + Cache articles Artículos en caché @@ -1235,87 +1236,85 @@ Iniciar sesión - + Cache Caché - + Current cache size Tamaño de la caché - + Social features Características sociales - Power save mode - Modo de ahorro de energía + Modo de ahorro de energía - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Cuando el teléfono o la aplicación estén en modo reposo, todas las páginas Web abiertas se cerrarán para reducir el consumo de energía. + Cuando el teléfono o la aplicación estén en modo reposo, todas las páginas Web abiertas se cerrarán para reducir el consumo de energía. - + Dynamic Dinámico - + UI Interfaz - + Open link behaviour Comportamiento al abrir enlace - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Define el comportamiento al hacer clic sobre un artículo. El artículo puede abrirse en el visor Web integrado, en un navegador externo o se puede mostrar el contenido completo del canal RSS. - + List filtering Filtrar lista - + Unread or saved No leídos o guardados - + Only unread Sólo no leídos - + List of articles can be filtered to display all articles, unread and saved or only unread. Es posible filtrar la lista de artículos, mostrando todos los artículos, los no leídos y guardados o sólo los no leídos. - + List of articles can be filtered to display all articles, unread and starred or only unread. Es posible filtrar la lista de artículos, mostrando todos los artículos, los no leídos y favoritos o sólo los no leídos. - + Orientation Orientación - + Portrait Horizontal - + Landscape Apaisado @@ -1445,12 +1444,12 @@ Marcar todo como no leído - + Wait until sync finish Espera a que finalice la sincronización - + No tabs No hay fichas @@ -1470,7 +1469,7 @@ Siguiendo - + No folders No hay carpetas @@ -1516,22 +1515,22 @@ Utils - + empty Vacío - + unknown date fecha desconocida - + just now justo ahora - + %n second(s) ago hace %n segundo @@ -1539,7 +1538,7 @@ - + %n minute(s) ago hace %n minuto @@ -1547,7 +1546,7 @@ - + %n hour(s) ago hace %n hora @@ -1555,7 +1554,7 @@ - + %n day(s) ago hace %n día @@ -1566,63 +1565,63 @@ WebPreviewPage - - + + Loading page content... Cargando contenido... - + Failed to load page from local cache Error al cargar página desde caché local - + Failed to load page content Error al cargar contenido de página - + Back Volver - + Toggle Read Leído - + Toggle Save Guardado - + Toggle Star Favorito - + Toggle Reader View Modo Vista Lector - + Toggle Night View Modo Nocturno - + Browser Navegador - + Add to Pocket Añadir a Pocket - + Share link Compartir enlace @@ -1647,10 +1646,8 @@ Disminuir fuente - - Launching a browser... - Abriendo navegador... + Abriendo navegador... @@ -1671,112 +1668,112 @@ main - + Feeds Canales - + Caching... %1 of %2 Almacenando en caché... %1 de %2 - + Caching... Almacenando en caché... - + Removing cache data... %1 of %2 Eliminando datos en caché...%1 de %2 - + Access through API is disabled on a server Acceso a través de API desactivada en un servidor - + Problem with SSL certificate Problema con certificado SSL - + Unknown error Error desconocido - + Restart the app to rebuild cache data Reinicia la aplicación para reconstruir datos de caché - + Download has failed because network is disconnected La descarga ha fallado porque no hay conexión de red - + Unable to sign in Imposible iniciar sesión - + Network connection is unavailable No hay conexión de red - - + + The user name or password is incorrect El nombre de usuario o contraseña no es correcta - + Cannot save image in gallery No se pudo guardar imagen en galería - + Image already exists in gallery La imagen ya existe en la galería - + You are signed in Has iniciado sesión - + Receiving data... Recibiendo datos... - - + + Sending data... Enviando información... - + Initiating... Iniciando... - + Updating... Actualizando... - + Signing in... Iniciando sesión... - + Waiting for network... Esperando la conexión... diff --git a/sailfish/translations/kaktus_fa.ts b/translations/kaktus_fa.ts similarity index 100% rename from sailfish/translations/kaktus_fa.ts rename to translations/kaktus_fa.ts diff --git a/sailfish/translations/kaktus_fi.ts b/translations/kaktus_fi.ts similarity index 100% rename from sailfish/translations/kaktus_fi.ts rename to translations/kaktus_fi.ts diff --git a/sailfish/translations/kaktus_fr.ts b/translations/kaktus_fr.ts similarity index 100% rename from sailfish/translations/kaktus_fr.ts rename to translations/kaktus_fr.ts diff --git a/sailfish/translations/kaktus_it.ts b/translations/kaktus_it.ts similarity index 88% rename from sailfish/translations/kaktus_it.ts rename to translations/kaktus_it.ts index 0b68539..95a76ed 100644 --- a/sailfish/translations/kaktus_it.ts +++ b/translations/kaktus_it.ts @@ -29,12 +29,12 @@ - + %1 is developed as an open source project under %2. - + Libraries @@ -90,8 +90,11 @@ - - + + + + + Version %1 Versione: %1 @@ -261,62 +264,62 @@ EntryDelegate - + Toggle Read Letto - + Toggle Save Salvato - + Toggle Star Preferito - + Above as read Precedenti come letti - + Viewer Lettore - + Browser Browser - + Feed content Contenuto del feed - + Add to Pocket Aggiungi a Pocket - + Share link Condividi collegamento - + Save image - + Toggle Like Mi piace - + Toggle Share Condivisione @@ -362,73 +365,68 @@ EntryPage - + No unread items Nessun articolo non letto - + No items Nessun articolo - + All feeds Tutti i feed - - Launching a browser... - - - - + Saved Salvato - + Slow Lento - + Liked Ti piace - + Shared Condiviso - - + + Wait until current task is complete - + Offline version is not available - + Enabling offline mode because network is disconnected - + Network is disconnected - + No saved items Nessun articolo salvato - + Starred Preferito @@ -453,22 +451,22 @@ Rete disconnessa. - + Wait until sync finish Attendi la fine della sincronizzazione - + No starred items Nessun preferito - + No liked items Nessun mi piace - + One-tap to open article, double-tap to mark as read Un tap per aprire l'articolo, un doppio tap per segnarlo come letto @@ -549,37 +547,37 @@ Apertura in browser esterno... - + Back Indietro - + Toggle Read Letto - + Toggle Save Salvato - + Toggle Star Preferito - + Viewer Lettore - + Browser Browser - + Add to Pocket Aggiungi a Pocket @@ -589,17 +587,17 @@ Condividi collegamento - + Toggle Like Mi piace - + Toggle Share Condivisione - + URL was copied to the clipboard @@ -608,12 +606,12 @@ URL copiata negli appunti - + Increase font Ingrandisci caratteri - + Decrease font Riduci caratteri @@ -638,12 +636,7 @@ - - Launching a browser... - - - - + Copy URL Copia URL @@ -1131,138 +1124,138 @@ nelle impostazioni. Loggato con - + Syncronization Sincronizzazione - + Sync timeframe Recupera articoli vecchi di - + 1 Day 1 giorno - + 3 Days 3 giorni - + 1 Week 1 settimana - + 2 Weeks 2 settimane - + 1 Month 1 mese - + Wide as possible Vecchi quanto possibile - + Never Mai - + WiFi only Solo WiFi - + Always Sempre - + After sync the content of all items will be downloaded and cached for access in the offline mode. Dopo la sincronizzazione tutti gli articoli saranno scaricati e salvati per l'accesso in modalità offline. - + Cache and cookies have been deleted - + Clicking on article behaviour Comportamento del click sugli articoli - - + + External browser Browser esterno - + Feed content Contenuto del feed - + Disabled Disabilitato - + Unread or starred Non letto o preferito - + Expanded items Articoli espansi - + All article items on the list view be shown expanded. Tutti gli articoli nella lista verranno mostrati espansi. - + Double-pane reader Lettore a doppia colonna - + Double-pane reader in landscape Lettore a due colonne in modalità panoramica - + View with the articles will be splited in to two colums. La schermata con gli articoli verrà divisa su due colonne. - + View with the articles in the landscape orientation will be splited in to two colums. La schermata degli articoli verrà divisa su due colonne quando in modalità panoramica. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Le seguenti funzionalità social di Old Reader verranno attivate: Cartelle seguite, Condivisione articolo con i follower, Mi piace e modalità di visualizzazione mi piace. - + Delete cache Elimina cache - + Most recent articles will be syncronized according to the defined timeframe. Verranno recuperati gli articoli più recenti come impostato. @@ -1277,69 +1270,69 @@ nelle impostazioni. - + Regardless of the value, all starred, liked and shared items will be synced as well. Verranno sincronizzati anche tutti gli articoli preferiti, piaciuti e condivisi. - + Regardless of the value, all saved items will be synced as well. Verranno sincronizzati anche tutti gli articoli salvati. - + Be aware, this parameter has significant impact on the speed of synchronization. Attento, questa opzione avrà un impatto significativo nella velocità della sincronizzazione. - + Sync read articles Sincronizza articoli letti - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Oltre agli articoli da leggere anche gli articoli letti verranno sincronizzati. Disattivando questa opzione la sincronizzazione sarà più veloce, ma non potrai accedere agli articoli letti. - + Network mode Modlità rete - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. Nella modalità offline, Kaktus utilizzerà solo la cache locale per visualizzare pagine web e immagini, non è necessaria nessuna connessione internet. - + Auto network mode Modo rete automatico - + Network mode will be switched automatically on network connection lost or restore. La modalità di rete viene commutata automaticamente quando la connessione cade o torna. - - - + + + Web viewer Vista web - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Definisce come la navigazione viene gestita nel lettore interno. I collegamenti possono venire disabilitati, aperti in un browser esterno oppure nel lettore interno. - + Auto switch to Reader View Cambio automatico alla Vista Lettura - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. La Vista Lettura elimina tutte le distrazioni come pulsanti, pubblicità e sfondi, e modifica l'impaginazione per migliorarne la lettura. Abilitando questa opzione, la Vista Lettura verrà automaticamente attivata quando una pagina viene caricata nella vista web. @@ -1360,27 +1353,27 @@ nelle impostazioni. Chiaro - + Auto switch to Night View Cambio automatico alla Vista Notturna - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. La Vista Notturna riduce la luminosità di siti web. Abilitando questa opzione, la Vista Notturna verrà automaticamente attivata quando una pagina viene caricata nella vista web. - + Viewer font size level Dim. caratteri nel lettore - + Delete cookies Cancella i cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. Elimina la cache ed i cookie della vista web. Le modifiche avranno effetto dopo il riavvio. @@ -1389,124 +1382,124 @@ nelle impostazioni. Cache e cookie sono stati eliminati. - + Language Lingua - + Default Sistema - + Changes will take effect after you restart Kaktus - + View mode Modalità visualizzazione - + Tabs, feeds & articles Schede, feed & articoli - + Folders, feeds & articles Cartelle, feed & articoli - + Tabs & articles Schede & articoli - + Folders & articles Cartelle & articoli - - + + All articles Tutti gli articoli - + Saved Salvati - + Starred Preferito - + Slow Lento - + Liked Ti piace - + Sort order for list of articles Ordine lista articoli - + Recent first Recenti prima - + Oldest first Più vecchi prima - + Pocket Pocket - + Pocket integration Integrazione con Pocket - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket è uno strumento in rete in cui salvare gli articoli per una lettura differita. L'integrazione implementata in Kaktus mette a disposizione un pulsante "Aggiungi a Pocket" nella lista articoli e nella vista web. - - + + Default tags Tag predefiniti - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. - + Saved tags have been deleted - + Other - + Ignore SSL errors @@ -1515,17 +1508,17 @@ nelle impostazioni. Lista di tag separati da virgole che verranno inseriti automaticamente all'aggiunta di articoli su Pocket. - + Quick adding Aggiunta rapida - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Se abilitato, l'articolo verrà inviato su Pocket subito dopo aver premuto "Aggiungi a Pocket", senza richiedere conferme. Verranno aggiunti automaticamente tutti i tag del campo "Tag predefiniti". - + Delete saved tags Elimina i tag salvati @@ -1542,17 +1535,17 @@ nelle impostazioni. Riavvia Kaktus per applicare i cambiamenti. - + Online Online - + Offline Offline - + Cache articles Cache articoli @@ -1567,87 +1560,85 @@ nelle impostazioni. Login - + Cache Cache - + Current cache size Dimensione cache attuale - + Social features Funzioni social - Power save mode - Risparmio energetico + Risparmio energetico - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Quando il telefono o l'app vanno in standby tutte le pagine web aperte vengono chiuse per risparmiare batteria. + Quando il telefono o l'app vanno in standby tutte le pagine web aperte vengono chiuse per risparmiare batteria. - + Dynamic Dinamico - + UI Interfaccia - + Open link behaviour Comportamento dei collegamenti - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Definisce il comportamento del clic sugli articoli. L'articolo più essere aperto nel lettore web incorporato, in un browser esterno, oppure è possibile visualizzate l'intero contenuto del feed RSS. - + List filtering Filtro liste - + Unread or saved Non letto o salvato - + Only unread Solo non letto - + List of articles can be filtered to display all articles, unread and saved or only unread. Le liste degli articoli possono venire filtrate per mostrare tutti gli articoli, non letti e salvati o solo non letti. - + List of articles can be filtered to display all articles, unread and starred or only unread. Le liste degli articoli possono venire filtrate per mostrare tutti gli articoli, non letti e preferiti o solo non letti. - + Orientation Orientamento - + Portrait Ritratto - + Landscape Panoramico @@ -1797,12 +1788,12 @@ nelle impostazioni. Segna tutto come non letto - + Wait until sync finish Attendi la fine della sincronizzazione - + No tabs Nessuna cheda @@ -1822,7 +1813,7 @@ nelle impostazioni. Seguiti - + No folders Nessuna cartella @@ -1868,22 +1859,22 @@ nelle impostazioni. Utils - + empty vuoto - + unknown date data sconosciuta - + just now ora - + %n second(s) ago @@ -1891,7 +1882,7 @@ nelle impostazioni. - + %n minute(s) ago @@ -1899,7 +1890,7 @@ nelle impostazioni. - + %n hour(s) ago @@ -1907,7 +1898,7 @@ nelle impostazioni. - + %n day(s) ago @@ -1974,38 +1965,38 @@ nelle impostazioni. WebPreviewPage - - + + Loading page content... Caricamento contenuto pagina... - + Failed to load page from local cache - + Failed to load page content - + Back Indietro - + Toggle Read Letto - + Toggle Save Salvato - + Toggle Star Preferito @@ -2022,27 +2013,27 @@ nelle impostazioni. Impossibile caricare il contenuto della pagina, - + Toggle Reader View Commuta Vista Lettura - + Toggle Night View Commuta Vista Notturna - + Browser Browser - + Add to Pocket Aggiungi a Pocket - + Share link Condividi collegamento @@ -2070,12 +2061,6 @@ nelle impostazioni. Decrease font Riduci caratteri - - - - Launching a browser... - - URL was copied to the clipboard @@ -2095,7 +2080,7 @@ nelle impostazioni. main - + Feeds Feed @@ -2104,12 +2089,12 @@ nelle impostazioni. Riavvia l'app per ricostruire la cache. - + Caching... %1 of %2 Salvo in cache... %1 di %2 - + Caching... Salvo in cache... @@ -2132,7 +2117,7 @@ Connessione di rete non disponibile. Qualcosa è andato storto! - + Removing cache data... %1 of %2 Eliminazione dati cache... %1 di %2 @@ -2144,21 +2129,6 @@ Connessione di rete non disponibile. An unknown error occurred. Errore sconosciuto. - - - Access through API is disabled on a server - - - - - Problem with SSL certificate - - - - - Unknown error - - The user name or password is incorrect. Nome utente o password non corretti. @@ -2167,82 +2137,97 @@ Connessione di rete non disponibile. You are signed in. Sei loggato. - - - Restart the app to rebuild cache data - - - - - Download has failed because network is disconnected - - - - - Unable to sign in - - - - - Network connection is unavailable - - - - - - The user name or password is incorrect - - - - - Cannot save image in gallery - - - - - Image already exists in gallery - - - - - You are signed in - - - - - Receiving data... - - Receiving data... Ricezione dati... - - + + Restart the app to rebuild cache data + + + + + Download has failed because network is disconnected + + + + + Unable to sign in + + + + + Network connection is unavailable + + + + + + The user name or password is incorrect + + + + + Access through API is disabled on a server + + + + + Problem with SSL certificate + + + + + Cannot save image in gallery + + + + + Image already exists in gallery + + + + + Unknown error + + + + + You are signed in + + + + + Receiving data... + + + + + Sending data... Invio dati... - + Initiating... Avvio... - + Updating... Aggiornamento... - + Signing in... Login... - + Waiting for network... In attesa della connessione... diff --git a/sailfish/translations/kaktus_nl_BE.ts b/translations/kaktus_nl_BE.ts similarity index 86% rename from sailfish/translations/kaktus_nl_BE.ts rename to translations/kaktus_nl_BE.ts index 954af93..ca6b5e5 100644 --- a/sailfish/translations/kaktus_nl_BE.ts +++ b/translations/kaktus_nl_BE.ts @@ -74,8 +74,11 @@ - - + + + + + Version %1 Versie: %1 @@ -231,62 +234,62 @@ EntryDelegate - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/nie opslaan - + Toggle Star Ster toevoegen/verwijderen - + Above as read Bovenstaande als gelezen - + Viewer Weergave - + Browser Browser - + Feed content Feedinhoud - + Add to Pocket Toevoegen aan Pocket - + Share link Koppeling delen - + Save image Afbeelding opslaan - + Toggle Like Duim toevoegen/verwijderen - + Toggle Share Delen/nie delen @@ -332,93 +335,92 @@ EntryPage - + No unread items Geen ongelezen items - + No items Geen items - + All feeds Alle feeds - Launching a browser... - Browser wordt gestart… + Browser wordt gestart… - + Saved Opgeslagen - + Slow Traag - + Liked Geduimd - + Shared Gedeeld - - + + Wait until current task is complete Wacht totda de huidige taak is afgerond - + Offline version is not available De offline-versie is nie beschikbaar - + Enabling offline mode because network is disconnected Netwerkverbinding verbroken; offlinemodus wordt ingeschakeld - + Network is disconnected De netwerkverbinding is verbroken - + No saved items Geen opgeslagen items - + Starred Me ster - + Wait until sync finish Wacht totda de synchronisatie is voltooid - + No starred items Geen items me ster - + No liked items Geen geduimde items - + One-tap to open article, double-tap to mark as read Tikt ene keer voor ’t artikel te openen, dubbeltikt voor ’t te markeren als gelezen @@ -475,37 +477,37 @@ FeedWebContentPage - + Back Terug - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/nie opslaan - + Toggle Star Ster toevoegen/verwijderen - + Viewer Weergave - + Browser Browser - + Add to Pocket Toevoegen aan Pocket @@ -515,27 +517,27 @@ Koppeling delen - + Toggle Like Duim toevoegen/verwijderen - + Toggle Share Delen/nie delen - + URL was copied to the clipboard Den URL is gekopieerd naar ’t klembord - + Increase font Lettertype vergroten - + Decrease font Lettertype verkleinen @@ -560,12 +562,11 @@ De netwerkverbinding is verbroken - Launching a browser... - Browser wordt gestart… + Browser wordt gestart… - + Copy URL URL kopiëren @@ -835,138 +836,138 @@ Aangemeld me - + Syncronization Synchronisatie - + Sync timeframe Tijdspanne van synchronisatie - + 1 Day 1 dag - + 3 Days 3 dagen - + 1 Week 1 week - + 2 Weeks 2 weken - + 1 Month 1 maand - + Wide as possible Zo breed mogelijk - + Never Nooit - + WiFi only Alleen via wifi - + Always Altijd - + After sync the content of all items will be downloaded and cached for access in the offline mode. Na ’t synchroniseren gaat den inhoud van alle items worden gedownload en in ’t cachegeheugen worden opgeslagen zoda ge der in de offline-modus bij kunt. - + Cache and cookies have been deleted De cookies en ’t cachegeheugen zijn verwijderd. - + Clicking on article behaviour Gedrag bij tikken op artikel - - + + External browser Externen browser - + Feed content Feedinhoud - + Disabled Uitgeschakeld - + Unread or starred Ongelezen of me ster - + Expanded items Uitgeklapte items - + All article items on the list view be shown expanded. Hierdoor worden alle artikelitems in de lijstweergave uitgeklapt. - + Double-pane reader Lezer me dubbel paneel - + Double-pane reader in landscape Lezer me dubbel paneel in landschapsmodus - + View with the articles will be splited in to two colums. De artikelweergave gaat gesplitst worden in twee kolommen. - + View with the articles in the landscape orientation will be splited in to two colums. De artikelweergave gaat gesplitst worden in twee kolommen in landschapsmodus. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. De volgende functies van Old Reader gaan ingeschakeld worden: ’t volgen van een map, ’t delen van een artikel me volgers, duimoptie en de weergavemodus voor geduimde artikels. - + Delete cache Cachegeheugen wissen - + Most recent articles will be syncronized according to the defined timeframe. De meest recente artikels gaan gesynchroniseerd worden in de opgegeven tijdsvolgorde. @@ -981,246 +982,246 @@ Aangemeld als - + Regardless of the value, all starred, liked and shared items will be synced as well. Alle items me ster of duim of gedeelde items worden ook gesynchroniseerd, ongeacht de waarde. - + Regardless of the value, all saved items will be synced as well. Alle opgeslagen items worden ook gesynchroniseerd, ongeacht de waarde. - + Be aware, this parameter has significant impact on the speed of synchronization. Let op: deze parameter heeft ne groten impact op de synchronisatiesnelheid. - + Sync read articles Gelezen artikels synchroniseren - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Zowel ongelezen als gelezen artikels gaan gesynchroniseerd worden. Door deze optie uit te schakelen gaat de synchronisatiesnelheid verbeteren maar gaan gelezen artikels nie beschikbaar zijn in Kaktus. - + Network mode Netwerkmodus - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. In de offlinemodus gaat Kaktus alleen ’t lokaal cachegeheugen gebruiken voor webpagina’s en afbeeldingen te verkrijgen zoda ge nie verbonden moet zijn me ’t internet. - + Auto network mode Automatische netwerkmodus - + Network mode will be switched automatically on network connection lost or restore. Schakelt de modus in of uit, afhankelijk van de netwerkverbindingsstatus. - - - + + + Web viewer Webweergave - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Bepaald hoe da de navigatie verloopt binnen de ingebouwde weergave. Hyperlinks kunnen uitgeschakeld worden, geopend in nen externen browser of geopend in de ingebouwde weergave. - + Auto switch to Reader View Automatisch overschakelen naar Leesmodus - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. Leesmodus is een functie die chaotische dingens gelijk knoppen, advertenties en achtergrondafbeeldingen verbergt en de pagina aanpast naar een leesvriendelijke versie. Door deze optie in te schakelen gaat de Leesmodus automatisch ingeschakeld worden in de webweergave. - + Auto switch to Night View Automatisch overschakelen naar nachtmodus - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. Nachtmodus reduceert de helderheid van websites. Door deze optie in te schakelen gaat de Nachtmodus automatisch ingeschakeld worden in de webweergave. - + Viewer font size level Lettergrootte van weergave - + Delete cookies Cookies verwijderen - + Clear web viewer cache and cookies. Changes will take effect after restart. Wist cookies en ’t cachegeheugen van de webweergave. Wijzigingen gaan toegepast worden nada den app is herstart. - + Language Taal - + Default Standaard - + Changes will take effect after you restart Kaktus De wijzigingen gaan toegepast worden nada Kaktus is herstart - + View mode Weergavemodus - + Tabs, feeds & articles Tabbladen, feeds & artikels - + Folders, feeds & articles Mappen, feeds & artikels - + Tabs & articles Tabbladen & artikels - + Folders & articles Mappen & artikels - - + + All articles Alle artikels - + Saved Opgeslagen - + Starred Me ster - + Slow Traag - + Liked Geduimd - + Sort order for list of articles Sorteervolgorde van artikellijst - + Recent first Recentste bovenaan - + Oldest first Oudste bovenaan - + Pocket Pocket - + Pocket integration Pocketintegratie - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket is een internethulpmiddel voor ’t opslaan van artikels voor ze later te kunnen lezen. Pocket is geïntegreerd in Kaktus en biedt ne knop ‘Toevoegen aan Pocket’ in de artikellijst en de webweergave. - - + + Default tags Standaardlabels - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. Lijst van komma-gescheiden labels die automatisch gaan ingevoerd worden bij toevoegen van een artikel aan Pocket. - + Quick adding Rap toevoegen - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Als dit is ingeschakeld gaat een artikel direct verstuurd worden naar Pocket na te tikken op de knop ‘Toevoegen aan Pocket’, zonder bevestiging. Alle labels uit de lijst me ‘Standaardlabels’ worden automatisch toegevoegd. - + Delete saved tags Opgeslagen labels verwijderen - + Saved tags have been deleted De opgeslagen labels zijn verwijderd - + Other Overige - + Ignore SSL errors SSL-fouten negeren - + Online Online - + Offline Offline - + Cache articles Artikels in cachegeheugen @@ -1235,87 +1236,85 @@ Aanmelden - + Cache Cachegeheugen - + Current cache size Huidige grootte van cachegeheugen - + Social features Sociale functies - Power save mode - Energiebesparingsmodus + Energiebesparingsmodus - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Wanneer da de gsm of den app hem in een inactieve staat bevindt, aan alle openstaande webpagina’s gesloten worden voor energie te besparen. + Wanneer da de gsm of den app hem in een inactieve staat bevindt, aan alle openstaande webpagina’s gesloten worden voor energie te besparen. - + Dynamic Dynamisch - + UI Uiterlijk - + Open link behaviour Gedrag van ’t openen van koppelingen - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Bepaalt ’t gedrag wanneer da der op een artikelitem wordt getikt. ’t Artikel kan geopend worden in de ingebouwde weergave of in nen externen browser, of de gansen RSS-feed kan weergegeven worden. - + List filtering Lijstfiltering - + Unread or saved Ongelezen of opgeslagen - + Only unread Alleen ongelezen - + List of articles can be filtered to display all articles, unread and saved or only unread. Den artikellijst kan gefilterd worden op ’t weergeven van alle, ongelezen en opgeslagen of enkel ongelezen items. - + List of articles can be filtered to display all articles, unread and starred or only unread. Den artikellijst kan gefilterd worden op ’t weergeven van alle, ongelezen en me ster of enkel ongelezen items. - + Orientation Oriëntatie - + Portrait Portret - + Landscape Landschap @@ -1445,12 +1444,12 @@ Alles markeren als ongelezen - + Wait until sync finish Wacht totda de synchronisatie is voltooid - + No tabs Geen tabbladen @@ -1470,7 +1469,7 @@ Volgend - + No folders Geen mappen @@ -1516,22 +1515,22 @@ Utils - + empty leeg - + unknown date onbekenden datum - + just now nu just - + %n second(s) ago seconde geleden @@ -1539,7 +1538,7 @@ - + %n minute(s) ago minuut geleden @@ -1547,7 +1546,7 @@ - + %n hour(s) ago uur geleden @@ -1555,7 +1554,7 @@ - + %n day(s) ago dag geleden @@ -1566,63 +1565,63 @@ WebPreviewPage - - + + Loading page content... Paginainhoud wordt geladen… - + Failed to load page from local cache ’t Laden van ’t item uit ’t lokaal cachegeheugen is mislukt - + Failed to load page content ’t Laden van de paginainhoud is mislukt - + Back Terug - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/nie opslaan - + Toggle Star Ster toevoegen/verwijderen - + Toggle Reader View Leesmodus inschakelen/uitschakelen - + Toggle Night View Nachtmodus inschakelen/uitschakelen - + Browser Browser - + Add to Pocket Toevoegen aan Pocket - + Share link Koppeling delen @@ -1647,10 +1646,8 @@ Lettertype verkleinen - - Launching a browser... - Browser wordt gestart… + Browser wordt gestart… @@ -1671,112 +1668,112 @@ main - + Feeds Feeds - + Caching... %1 of %2 Bezig me opslaan in cachegeheugen… %1 van %2 - + Caching... Bezig me opslaan in cachegeheugen… - + Removing cache data... %1 of %2 Bezig me’ verwijderen van cacheinhoud… %1 van %2 - + Access through API is disabled on a server Toegang via API is uitgeschakeld op ne server - + Problem with SSL certificate Probleem me ’t SSL-certificaat - + Unknown error Onbekende fout - + Restart the app to rebuild cache data Herstart den app voor de cacheinhoud herop te bouwen. - + Download has failed because network is disconnected ’t Downloaden is mislukt omda de netwerkverbinding is verbroken - + Unable to sign in Kan nie aanmelden - + Network connection is unavailable Der is geen netwerkverbinding nie beschikbaar - - + + The user name or password is incorrect De gebruikersnaam of ’t wachtwoord is onjuist - + Cannot save image in gallery Kan afbeelding nie opslaan in galerij - + Image already exists in gallery Afbeelding bestaat al in galerij - + You are signed in Ge zijt aangemeld - + Receiving data... Bezig me verkrijgen van gegevens… - - + + Sending data... Bezig me versturen van gegevens… - + Initiating... Bezig me initialiseren… - + Updating... Bezig me bijwerken… - + Signing in... Bezig me aanmelden… - + Waiting for network... Wachten op netwerk… diff --git a/sailfish/translations/kaktus_nl_NL.ts b/translations/kaktus_nl_NL.ts similarity index 86% rename from sailfish/translations/kaktus_nl_NL.ts rename to translations/kaktus_nl_NL.ts index 4131655..9cd080c 100644 --- a/sailfish/translations/kaktus_nl_NL.ts +++ b/translations/kaktus_nl_NL.ts @@ -74,8 +74,11 @@ - - + + + + + Version %1 Versie %1 @@ -231,62 +234,62 @@ EntryDelegate - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/Niet opslaan - + Toggle Star Toevoegen aan/Verwijderen uit favorieten - + Above as read Bovenstaande als gelezen - + Viewer Weergave - + Browser Webbrowser - + Feed content Feedinhoud - + Add to Pocket Toevoegen aan Pocket - + Share link Link delen - + Save image Afbeelding opslaan - + Toggle Like Leuk vinden/Niet meer leuk vinden - + Toggle Share Delen/Niet delen @@ -332,93 +335,92 @@ EntryPage - + No unread items Geen ongelezen items - + No items Geen items - + All feeds Alle feeds - Launching a browser... - Bezig met opstarten van browser... + Bezig met opstarten van browser... - + Saved Opgeslagen - + Slow Sloom - + Liked Leuk bevonden - + Shared Gedeeld - - + + Wait until current task is complete Wacht totdat de huidige taak is afgerond - + Offline version is not available De offline-versie is niet beschikbaar - + Enabling offline mode because network is disconnected Netwerkverbinding verbroken; bezig met inschakelen van offline-modus - + Network is disconnected De netwerkverbinding is verbroken - + No saved items Geen opgeslagen items - + Starred Toegevoegd aan favorieten - + Wait until sync finish Wacht totdat de synchronisatie is voltooid - + No starred items Geen favoriete items - + No liked items Geen leuk bevonden items - + One-tap to open article, double-tap to mark as read Eenmaal aanraken om het artikel te openen, tweemaal om het te markeren als gelezen @@ -475,37 +477,37 @@ FeedWebContentPage - + Back Terug - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/Niet opslaan - + Toggle Star Toevoegen aan/Verwijderen uit favorieten - + Viewer Weergave - + Browser Webbrowser - + Add to Pocket Toevoegen aan Pocket @@ -515,27 +517,27 @@ Link delen - + Toggle Like Leuk vinden/Niet meer leuk vinden - + Toggle Share Delen/Niet delen - + URL was copied to the clipboard De URL is gekopieerd naar het klembord - + Increase font Lettertype vergroten - + Decrease font Lettertype verkleinen @@ -560,12 +562,11 @@ De netwerkverbinding is verbroken - Launching a browser... - Bezig met opstarten van browser... + Bezig met opstarten van browser... - + Copy URL URL kopiëren @@ -835,138 +836,138 @@ Ingelogd op - + Syncronization Synchronisatie - + Sync timeframe Tijdspanne van synchronisatie - + 1 Day 1 dag - + 3 Days 3 dagen - + 1 Week 1 week - + 2 Weeks 2 weken - + 1 Month 1 maand - + Wide as possible Zo breed mogelijk - + Never Nooit - + WiFi only Alleen via Wi-Fi - + Always Altijd - + After sync the content of all items will be downloaded and cached for access in the offline mode. Na het synchroniseren wordt de inhoud van alle items gedownload en in de cache opgeslagen voor toegang in de offline-modus. - + Cache and cookies have been deleted De cookies en cache zijn verwijderd - + Clicking on article behaviour Actie bij drukken op artikel - - + + External browser Externe browser - + Feed content Feedinhoud - + Disabled Uitgeschakeld - + Unread or starred Ongelezen of favorieten - + Expanded items Uitgeklapte items - + All article items on the list view be shown expanded. Hierdoor worden alle artikelen in de lijstweergave uitgeklapt. - + Double-pane reader Lezer met twee panelen - + Double-pane reader in landscape Lezer met twee panelen in horizontale modus - + View with the articles will be splited in to two colums. De artikelweergave wordt gesplitst in twee kolommen. - + View with the articles in the landscape orientation will be splited in to two colums. De artikelweergave wordt gesplitst in twee kolommen in horizontale modus. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. De volgende functies van Old Reader worden ingeschakeld: het volgen van een map, het delen van een artikel met volgers, de vind ik leuk-optie en de leuk bevonden artikelen-weergavemodus. - + Delete cache Cache wissen - + Most recent articles will be syncronized according to the defined timeframe. De recentste artikelen binnen de opgegeven tijdspanne worden gesynchroniseerd. @@ -981,246 +982,246 @@ Ingelogd als - + Regardless of the value, all starred, liked and shared items will be synced as well. Alle gefavoriete, geleukte en gedeelde items worden gesynchroniseerd, ongeacht de waarde. - + Regardless of the value, all saved items will be synced as well. Alle opgeslagen items worden ook gesynchroniseerd, ongeacht de waarde. - + Be aware, this parameter has significant impact on the speed of synchronization. Let op: deze parameter heeft grote impact op de synchronisatiesnelheid. - + Sync read articles Gelezen artikelen synchroniseren - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Zowel ongelezen als gelezen artikelen worden gesynchroniseerd. Door deze optie uit te schakelen wordt de synchronisatiesnelheid verbeterd, maar zijn gelezen artikelen niet beschikbaar in Kaktus. - + Network mode Netwerkmodus - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. In de offline-modus gebruikt Kaktus alleen de lokale cache om webpagina's en afbeeldingen op te halen zodat je niet verbonden hoeft te zijn met het internet. - + Auto network mode Automatische netwerkmodus - + Network mode will be switched automatically on network connection lost or restore. Schakelt de modus in of uit, afhankelijk van de netwerkverbindingsstatus. - - - + + + Web viewer Webweergave - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Bepaalt hoe de navigatie verloopt binnen de ingebouwde weergave. Hyperlinks kunnen worden uitgeschakeld, geopend in een externe browser of in de ingebouwde weergave. - + Auto switch to Reader View Automatisch overschakelen naar Leesmodus - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. Leesmodus is een functie die chaotische dingen zoals knoppen, reclame en achtergrondafbeeldingen verbergt en de pagina-indeling optimaliseert. Door deze optie in te schakelen wordt de Leesmodus automatisch ingeschakeld in de webweergave. - + Auto switch to Night View Automatisch overschakelen naar nachtmodus - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. Nachtmodus verlaagt de helderheid van websites. Door deze optie in te schakelen wordt de Nachtmodus automatisch ingeschakeld in de webweergave. - + Viewer font size level Lettertypegrootte van weergavemodus - + Delete cookies Cookies verwijderen - + Clear web viewer cache and cookies. Changes will take effect after restart. Wis cookies en de webweergavecache. Wijzigingen worden toegepast nadat de app is herstart. - + Language Taal - + Default Standaard - + Changes will take effect after you restart Kaktus De wijzigingen worden toegepast nadat Kaktus is herstart - + View mode Weergavemodus - + Tabs, feeds & articles Tabbladen, feeds en artikelen - + Folders, feeds & articles Mappen, feeds en artikelen - + Tabs & articles Tabbladen en artikelen - + Folders & articles Mappen en artikelen - - + + All articles Alle artikelen - + Saved Opgeslagen - + Starred Favoriete artikelen - + Slow Sloom - + Liked Leuk bevonden - + Sort order for list of articles Sorteervolgorde van artikellijst - + Recent first Recentste bovenaan - + Oldest first Oudste bovenaan - + Pocket Pocket - + Pocket integration Pocket-integratie - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket is een internethulpmiddel voor het opslaan van artikelen voor later. Pocket is geïntegreerd in Kaktus en biedt een "Toevoegen aan Pocket"-knop in de artikellijst en webweergave. - - + + Default tags Standaardlabels - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. Lijst met kommagescheiden labels die automatisch worden ingevoerd tijdens het toevoegen van een artikel aan Pocket. - + Quick adding Snel toevoegen - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Als dit wordt ingeschakeld, dan wordt een artikel direct verstuurd naar Pocket na het drukken op "Toevoegen aan Pocket". Alle labels uit de lijst met "standaardlabels" worden automatisch toegevoegd. - + Delete saved tags Opgeslagen labels verwijderen - + Saved tags have been deleted De opgeslagen labels zijn verwijderd - + Other Overig - + Ignore SSL errors SSL-fouten negeren - + Online Online - + Offline Offline - + Cache articles Gecachete artikelen @@ -1235,87 +1236,85 @@ Inloggen - + Cache Cache - + Current cache size Huidige cachegrootte - + Social features Sociale functies - Power save mode - Energiebesparingsmodus + Energiebesparingsmodus - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Als de telefoon of app inactief is, dan worden alle openstaande webpagina's gesloten om energie te besparen. + Als de telefoon of app inactief is, dan worden alle openstaande webpagina's gesloten om energie te besparen. - + Dynamic Dynamisch - + UI Uiterlijk - + Open link behaviour Actie bij openen van links - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Bepaalt wat er gebeurt als op een artikelitem wordt gedrukt. Het artikel kan worden geopend in de ingebouwde weergave, externe browser of de volledige RSS-feed kan worden getoond. - + List filtering Lijstfiltering - + Unread or saved Ongelezen of opgeslagen - + Only unread Alleen ongelezen - + List of articles can be filtered to display all articles, unread and saved or only unread. De artikellijst kan worden gefilterd op het tonen van alle, ongelezen en opgeslagen of ongelezen items. - + List of articles can be filtered to display all articles, unread and starred or only unread. De artikellijst kan worden gefilterd op het tonen van alle, ongelezen en gefavoriete of ongelezen items. - + Orientation Oriëntatie - + Portrait Verticaal - + Landscape Horizontaal @@ -1445,12 +1444,12 @@ Alles markeren als ongelezen - + Wait until sync finish Wacht totdat de synchronisatie is voltooid - + No tabs Geen tabbladen @@ -1470,7 +1469,7 @@ Volgend - + No folders Geen mappen @@ -1516,22 +1515,22 @@ Utils - + empty leeg - + unknown date onbekende datum - + just now zojuist - + %n second(s) ago seconde geleden @@ -1539,7 +1538,7 @@ - + %n minute(s) ago minuut geleden @@ -1547,7 +1546,7 @@ - + %n hour(s) ago uur geleden @@ -1555,7 +1554,7 @@ - + %n day(s) ago dag geleden @@ -1566,63 +1565,63 @@ WebPreviewPage - - + + Loading page content... Bezig met laden van paginainhoud... - + Failed to load page from local cache Kan pagina niet laden uit lokale cache - + Failed to load page content Kan paginainhoud niet laden - + Back Terug - + Toggle Read Markeren als gelezen/ongelezen - + Toggle Save Opslaan/Niet opslaan - + Toggle Star Toevoegen aan/Verwijderen uit favorieten - + Toggle Reader View Leesmodus in-/uitschakelen - + Toggle Night View Nachtmodus in-/uitschakelen - + Browser Webbrowser - + Add to Pocket Toevoegen aan Pocket - + Share link Link delen @@ -1647,10 +1646,8 @@ Lettertype verkleinen - - Launching a browser... - Bezig met opstarten van browser... + Bezig met opstarten van browser... @@ -1671,112 +1668,112 @@ main - + Feeds Feeds - + Caching... %1 of %2 Bezig met opslaan in cache... %1 van %2 - + Caching... Bezig met opslaan in cache... - + Removing cache data... %1 of %2 Bezig met verwijderen van cacheinhoud... %1 van %2 - + Access through API is disabled on a server De API-toegang is uitgeschakeld op een server - + Problem with SSL certificate SSL-certificaatprobleem - + Unknown error Onbekende fout - + Restart the app to rebuild cache data Herstart de app om de cacheinhoud opnieuw op te bouwen - + Download has failed because network is disconnected Het downloaden is mislukt omdat de netwerkverbinding verbroken is - + Unable to sign in Kan niet inloggen - + Network connection is unavailable Netwerkverbinding is niet beschikbaar - - + + The user name or password is incorrect De gebruikersnaam of het wachtwoord is onjuist - + Cannot save image in gallery Kan afbeelding niet opslaan naar galerij - + Image already exists in gallery Afbeelding bevindt zich al in de galerij - + You are signed in Je bent ingelogd - + Receiving data... Bezig met ophalen van gegevens... - - + + Sending data... Bezig met versturen van gegevens... - + Initiating... Bezig met initialiseren... - + Updating... Bezig met bijwerken... - + Signing in... Bezig met inloggen... - + Waiting for network... Bezig met wachten op netwerk... diff --git a/sailfish/translations/kaktus_pl.ts b/translations/kaktus_pl.ts similarity index 55% rename from sailfish/translations/kaktus_pl.ts rename to translations/kaktus_pl.ts index f02e391..9233840 100644 --- a/sailfish/translations/kaktus_pl.ts +++ b/translations/kaktus_pl.ts @@ -29,36 +29,20 @@ Tłumaczenia przygotowali: - + %1 is developed as an open source project under %2. %1 jest tworzony jako oprogramowanie Open Source zgodnie z licencją %2. - + Libraries Wykorzystane biblioteki - - Version: %1 - Wersja: %1 - Changelog Lista zmian - - Multi services feed reader, specially designed to work offline. - Czytnik kanałów RSS dla serwisu Netvibes i Old Reader. - - - Launching an external browser... - Uruchamianie zewnętrznej przeglądarki... - - - This software is distributed under the terms of the GNU General Public Licence version 3. - Oprogramowanie jest dystrybuowane na zasadach licencji GNU General Public Licence version 3. - AccountsDialog @@ -90,20 +74,17 @@ - - + + + + + Version %1 Wersja %1 ControlBar - - Can't switch to Online mode. -Network connection is unavailable. - Nie można przejść do trybu Online. -Brak połączenia sieciowego. - Marking tabs as read @@ -162,39 +143,11 @@ Brak połączenia sieciowego. All read Wszytkie przeczytane - - Unread item - Nieprzeczytany - - - Unread items - less than 5 articles are unread - Nieprzeczytane - - - Unread items - more or equal 5 articles are unread - Nieprzeczytanych - - - unread item - nieprzeczyt. artykuł - - - unread items - less than 5 articles are unread - nieprzeczyt. artykuły - - - unread items - more or equal 5 articles are unread - nieprzeczyt. artykułów - %n unread item(s) - %n nieprzeczytany + jeden nieprzeczytany %n nieprzeczytane %n nieprzeczytanych @@ -240,53 +193,6 @@ Brak połączenia sieciowego. %1 z %2 - - CoverPageOld - - Not signed in - Niezalogowany - - - All read - Wszytkie przeczytane - - - Unread item - Nieprzeczytany - - - Syncing - Aktualizacja - - - Uploading - Wysyłanie - - - Initiating - Inicjacja - - - Updating - Aktualizacja - - - Signing in - Logowanie - - - Waiting - Oczekiwanie - - - Caching - Tworzenie kopii - - - %1 of %2 - %1 z %2 - - DashboardDialog @@ -329,133 +235,65 @@ Brak połączenia sieciowego. EntryDelegate - + Toggle Read Przełącz Przeczytany - + Toggle Save Przełącz Zapisany - + Toggle Star Przełącz Ogwiazdkowany - + Above as read Powyższe jako przeczytane - + Viewer Podgląd - + Browser Przeglądarka - + Feed content Zawartość RSS - + Add to Pocket Dodaj do Pocket - + Share link Udostępnij - + Save image Zapisz obraz - + Toggle Like Przełącz Lubię - + Toggle Share Przełącz Udostępniony - - Mark above as read - Oznacz powyższe jako przeczytane - - - Unsave - Usuń z zapisanych - - - Save - Zapisz - - - Unstar - Usuń gwiazdkę - - - Star - Ogwiazdkuj - - - Unlike - Nie lubię - - - Like - Lubię - - - Unshare - Przestań udostępniać - - - Open in viewer - Otwórz stronę - - - Open in browser - Otwórz w przeglądarce - - - Show feed content - Pokaż zawartość RSS - - - Share with followers - Udostepnij obserwującym - - - Share - Udostępnij - - - Collapse - Zwiń - - - Expand - Rozwiń - - - Mark as unread - Oznacz jako nieprzeczytane - - - Mark as read - Oznacz jako przeczytane - EntryModel @@ -498,159 +336,92 @@ Brak połączenia sieciowego. EntryPage - + No unread items Brak nieprzeczytanych artykułów - + No items Brak artykułów - + All feeds Wszystkie kanały - Launching an external browser... - Uruchamianie zewnętrznej przeglądarki... + Launching a browser... + Uruchamianie przeglądarki... - Marking all liked articles as read - Oznaczanie wszystkich polubionych artykułów jako przeczytane - - - Marking all shared articles as read - Oznaczanie wszystkich udostępnionych artykułów jako przeczytane - - - + Saved Zapisane - + Slow Rzadko aktualizowane - + Liked Polubione - + Shared Udostępnione - - + + Wait until current task is complete Zaczekaj do zakończenia obecnego zadania - + Offline version is not available Brak pobranej kopii offline - + Enabling offline mode because network is disconnected Tryb offline został włączony ponieważ utracono połączenie sieciowe - + Network is disconnected Brak połączenia sieciowego - Please wait until current task is complete. - Zaczekaj do zakończenia obecnego zadania. - - - Offline version not available. - Brak kopii Offline. - - - Network connection is unavailable. -Switching to Offline mode. - Brak połączenia sieciowego. -Został włączony tryb Offline. - - - Network connection is unavailable. - Brak połączenia sieciowego. - - - + No saved items Brak zapisanych artykułów - Wait until Sync finish. - Zaczekaj do zakończenia aktualizacji. - - - Marking articles as read - Oznaczanie artykułów jako przeczytane - - - Marking all your articles as read - Oznaczanie wszystkie artykułów jako przeczytane - - - Marking all saved articles as read - Oznaczanie wszystkich zapisanych artykułów jako przeczytane - - - Marking all starred articles as read - Oznaczanie wszystkich ogwiazdkowanych artykułów jako przeczytane - - - - Launching a browser... - Uruchamianie przeglądarki... - - - + Starred Ogwiazdkowane - Wait until current task is complete. - Zaczekaj do zakończenia obecnego zadania. - - - Offline version is not available. - Brak pobranej kopii offline. - - - Enabling offline mode because network is disconnected. - Tryb offline został włączony ponieważ utracono połączenie sieciowe. - - - Network is disconnected. - Brak połączenia sieciowego. - - - + Wait until sync finish Zaczekaj do zakończenia aktualizacji - + No starred items Brak ogwiazdkowanych artykułów - + No liked items Brak polubionych artykułów - + One-tap to open article, double-tap to mark as read Pojedyńcze pacnięcie otwiera artykuł, a podwójne oznacza jako przeczytany @@ -675,43 +446,6 @@ Został włączony tryb Offline. Sorry, something went wrong :-( Coś poszło nie tak :-( - - Sorry, something went wrong! - Coś poszło nie tak! - - - Sorry, something's gone wrong :-( - Przepraszamy, coś poszło nie tak :-( - - - - FeedContentPage - - Please wait until current task is complete. - Zaczekaj do zakończenia obecnego zadania. - - - Offline version not available. - Brak kopii Offline. - - - Network connection is unavailable. -Switching to Offline mode. - Brak połączenia sieciowego. -Został włączony tryb Offline. - - - Network connection is unavailable. - Brak połączenia sieciowego. - - - Launching an external browser... - Uruchamianie zewnętrznej przeglądarki... - - - URL copied to clipboard - Adres URL został skopiowany - FeedPage @@ -740,88 +474,41 @@ Został włączony tryb Offline. Feeds Kanały - - Wait until Sync finish. - Zaczekaj do zakończenia aktualizacji. - - - Marking feeds as read - Oznaczanie kanałów jako przeczytane - FeedWebContentPage - Please wait until current task is complete. - Zaczekaj do zakończenia obecnego zadania. - - - Offline version not available. - Brak kopii Offline. - - - Network connection is unavailable. -Switching to Offline mode. - Brak połączenia sieciowego. -Został włączony tryb Offline. - - - Network connection is unavailable. - Brak połączenia sieciowego. - - - Launching an external browser... - Uruchamianie zewnętrznej przeglądarki... - - - Wait until current task is complete. - Zaczekaj do zakończenia obecnego zadania. - - - Enabling offline mode because network is disconnected. - Tryb offline został włączony ponieważ utracono połączenie sieciowe. - - - Network is disconnected. - Brak połączenia sieciowego. - - - - Launching a browser... - Uruchamianie przeglądarki... - - - + Back Cofnij - + Toggle Read Przełącz Przeczytany - + Toggle Save Przełącz Zapisany - + Toggle Star Przełącz Ogwiazdkowany - + Viewer Podgląd - + Browser Przeglądarka - + Add to Pocket Dodaj do Pocket @@ -831,31 +518,27 @@ Został włączony tryb Offline. Udostępnij - + Toggle Like Przełącz Lubię - + Toggle Share Przełącz Udostępniony - + URL was copied to the clipboard Adres URL został skopiowany - URL was copied to the clipboard. - Adres URL został skopiowany. - - - + Increase font Powiększ - + Decrease font Zmniejsz @@ -880,36 +563,17 @@ Został włączony tryb Offline. Brak połączenia sieciowego - + Launching a browser... + Uruchamianie przeglądarki... + + + Copy URL Kopiuj URL - - URL copied to clipboard - Adres URL został skopiowany - - - - FeedlySignInDialog - - Sign In - Zaloguj - - - Sign in - Zaloguj - FirstPage - - Wait until Sync finish. - Zaczekaj do zakończenia aktualizacji. - - - To do feeds synchronisation, pull down and select Sync. - Aby wykonać synchronizacje, wybierz Aktualizuj z górnego menu. - Add account @@ -945,186 +609,9 @@ Został włączony tryb Offline. You are not signed in to any account, pull down to add one Nie skonfigurowano żadnego konta. Wybierz 'Dodaj konto' z górnego menu - - You are not signed in to any account. Pull down to add one. - Nie skonfigurowano żadnego konta. Wybierz 'Dodaj konto' z górnego menu. - - - - Guide - - Tap anywhere to continue. - Pacnij gdziekolwiek aby kontunuować. - - - This guide will explain you how to use bottom bar and view modes. - Ten przewodnik wyjaśni jak korzystać z dolnego paska narzędzi oraz różnych trybów przeglądania. - - - Bottom bar also contains network indicator. - -This indicator enables you to switch between the online and offline mode. In the offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - Dolny pasek zawiera także wskaźnik trybu sieci. - -Wskaźnik pozwala na przełączanie pomiędzy trybem online i offline. W trybie offline, Kaktus będzie korzystał tylko z lokalnej kopii aby pobrać stronę internetową lub obrazki. Połączenie sieciowe nie będzie wtedy potrzebne. - - - Bottom bar lets you switch between 4 view modes. - - Dolny pasek narzędzi pozwala przełączać się pomiędzy 4 trybami przeglądania. - - - Bottom bar lets you switch between 5 view modes. - - Dolny pasek narzędzi pozwala przełączać się pomiędzy 5 trybami przeglądania. - - - Mode #1 - -Lists all your tabs. Feeds are grouped by the tabs they belong to and articles are grouped in the feeds. - Tryb #1 - -Wyświetla wszystkie zakładki. Kanały są pogrupowane w odpowiadających im zakładkach a artykuły znajdują się wewnątrz kanałów. - - - Mode #1 - -Lists all your folders. Feeds are grouped by the folders they belong to and articles are grouped in the feeds. - Tryb #1 - -Wyświetla wszystkie foldery. Kanały są pogrupowane w odpowiadających im falderach a artykuły znajdują się wewnątrz kanałów. - - - Mode #2 - -Lists all your tabs. Articles are grouped by the tabs they belong to. - Tryb #2 - -Wyświetla wszystkie zakładki. Artykuły pogrupowane są w odpowiadająch im zakładkach. - - - Mode #2 - -Lists all your folders. Articles are grouped by the folders they belong to. - Tryb #2 - -Wyświetla wszystkie foldery. Artykuły pogrupowane są w odpowiadająch im folderach. - - - Mode #3 - -Lists all articles from all your feeds in one list. Items are ordered by publication date. - Tryb #3 - -Wyświetla artykuły ze wszystkich kanałów na jednej liście. Artykuły są posortowane datą publikacji. - - - Mode #4 - -Lists all articles you have saved. - Tryb #4 - -Wyświetla wszystkie artykuły, które zapisałeś. - - - Mode #4 - -Lists all articles you have starred. - Tryb #4 - -Wyświetla wszystkie artykuły oznaczone gwiazdką. - - - Mode #5 "Slow" - -List articles from less frequently updated feeds. A feed is considered "slow" when it publishes less than 5 articles in a month. - Tryb #5 "Rzadko aktualizowane" - -Wyświetla artykuły z kanałów, ktore są rzadko aktualizowane. Kanał należy do tej kategorii jeśli publikuje artykuły rzadziej niż 5 w ciągu miesiąca. - - - Mode #5 - -Lists all articles you have liked. - Tryb #5 - -Wyświetla wszystkie artykuły, które polubiłeś. - - - Bottom bar also contains "Mark as read" button. - -With this button you can quickly mark all your tabs, feeds or articles as read. - Dolny pasek narzędzi zawiera także przycisk "Oznacz jako przeczytane". - - - Bottom bar also contains "Mark as read" button. - -With this button you can quickly mark all your folders, feeds or articles as read. - Dolny pasek narzędzi zawiera także przycisk "Oznacz jako przeczytane". - -Przy pomocy tego przycisku możesz szybko oznaczyć wszystkie foldery, kanały i artykuły jako przeczytane. - - - Pull-down menu contains network mode switcher. - -This switcher enables you to change between the online and offline mode. In the offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - Górne menu zawiera opcję zmiany trybu sieci. - -Opcja pozwala na przełączanie pomiędzy trybem online i offline. W trybie offline, Kaktus będzie korzystał tylko z lokalnej kopii aby pobrać stronę internetową lub obrazki. Połączenie sieciowe nie będzie wtedy potrzebne. - - - That's all!<br/><br/>If you want to see this guide one more time, click on -<i>Show User Guide</i> -on the settings page. - To wszystkie informacje!<br/><br/> -Jeśli chcesz zobaczyć ten przewodnik jeszcze raz, naciśnij <i>Pokaż przewodnik</i> na stronie z ustawieniami. - - - - NewCoverPage - - All read - Wszytkie przeczytane - - - Syncing - Aktualizacja - - - Uploading - Wysyłanie - - - Initiating - Inicjacja - - - Updating - Aktualizacja - - - Signing in - Logowanie - - - Waiting - Oczekiwanie - - - Caching - Tworzenie kopii - - - Not signed in - Niezalogowany - NvSignInDialog - - Sign In - Zaloguj - @@ -1132,10 +619,6 @@ Jeśli chcesz zobaczyć ten przewodnik jeszcze raz, naciśnij <i>Pokaż pr Sign in Zaloguj - - Netvibes - Netvibes - Enter username @@ -1156,86 +639,34 @@ Jeśli chcesz zobaczyć ten przewodnik jeszcze raz, naciśnij <i>Pokaż pr Sign in with other account Zaloguj używając innych kont - - Enter username and password below. - Podaj poniżej nazwę użytkownika oraz hasło. - - - Enter username here! - Wprowadź nazwę użytkownika! - - - Username (your e-mail) - Nazwa użytkownika (e-mail) - - - Enter password here! - Wprowadź hasło! - Password Hasło - - Third party services - Inne sieci społecznościowe - - - Sign in with Twitter - Zaloguj używając Twitter - - - Sign in with Facebook - Zaloguj używając Facebook - OldReaderSignInDialog - - Sign In - Zaloguj - Sign in Zaloguj - - - Username - Nazwa użytkownika - - - Old Reader - Old Reader - Enter username Wprowadź nazwę użytkownika + + + Username + Nazwa użytkownika + Enter password Wprowadź hasło - - Enter username and password below. - Podaj poniżej nazwę użytkownika oraz hasło. - - - Enter username here! - Wprowadź nazwę użytkownika! - - - Username (your e-mail) - Nazwa użytkownika (e-mail) - - - Enter password here! - Wprowadź hasło! - Password @@ -1254,23 +685,6 @@ Jeśli chcesz zobaczyć ten przewodnik jeszcze raz, naciśnij <i>Pokaż pr Settings Ustawienia - - - Cannot switch to online mode because network is disconnected - Nie można przejść do trybu online ponieważ sieć jest rozłączona - - - Can't switch to online mode because network is disconnected. - Nie można przejść do trybu online ponieważ sieć jest rozłączona. - - - Sync - Aktualizuj - - - Busy... - Zajęty... - Network mode: offline @@ -1282,48 +696,23 @@ Jeśli chcesz zobaczyć ten przewodnik jeszcze raz, naciśnij <i>Pokaż pr Sieć: online - Can't switch to Online mode. -Network connection is unavailable. - Nie można przejść do trybu Online. -Brak połączenia sieciowego. - - - Showing: only unread - Filtr: tylko nieprzeczytane - - - Showing: all articles - Filtr: wszystkie artykuły - - - - You have never synced - Jeszcze nie wykonałeś aktualizacji - - - Mark all as read - Oznacz jako przeczytane - - - Mark all as unread - Oznacz jako nieprzeczytane + + Cannot switch to online mode because network is disconnected + Nie można przejść do trybu online ponieważ sieć jest rozłączona Last sync: %1 Ostatnia aktualizacja: %1 + + + You have never synced + Jeszcze nie wykonałeś aktualizacji + Pocket - - Pocket authorization has failed. - Autoryzacja Pocket nie udała się. - - - Pocket authorization was successful. - Autoryzacja Pocket powiodła się. - @@ -1345,14 +734,6 @@ Brak połączenia sieciowego. Error while adding article to Pocket Wystąpił błąd podczas dodawania artykułu do Pocket - - Article has been successfully added to Pocket. - Pomyślnie dodano artykuł do Pocket. - - - Error while adding article to Pocket. - Wystąpił błąd podczas dodawania artykułu do Pocket. - PocketAuthWebViewPage @@ -1450,647 +831,493 @@ Brak połączenia sieciowego. Change Zmień - - Not signed in - Niezalogowany - Signed in with Zalogowano poprzez - + Syncronization Synchronizacja - + Sync timeframe Zakres synchronizacji - + 1 Day 1 Dzień - + 3 Days 3 Dni - + 1 Week 1 Tydzień - + 2 Weeks 2 Tygodnie - + 1 Month 1 Miesiąc - + Wide as possible Wszystko - In the offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - W trybie offline, Kaktus będzie korzystał tylko z lokalnej kopii aby pobrać stronę internetową lub obrazki. Połączenie sieciowe nie będzie wtedy potrzebne. - - - + Never Nigdy - + WiFi only Tylko przy WiFi - + Always Zawsze - + After sync the content of all items will be downloaded and cached for access in the offline mode. Każdorazowo podczas aktualizacji, treść artykułów będzie pobierana i zapisywana lokalnie, tak aby była dostępna podczas pracy w trybie offline. - Click on article action - Akcja dla kliknięcia w artykuł + + Cache and cookies have been deleted + Cache i pliki cookie zostały usunięte - Open in viewer - Otwórz stronę + + Clicking on article behaviour + Obsługa kliknięcia w artykuł - Open external browser - Otwórz w przeglądarce - - - Show feed content - Pokaż zawartość RSS - - - Read mode - Tryb Czytnika - - - Web pages will be reformatted into an easy to read version. - Strony zostaną przeformatowane tak aby były łatwiejsze do czytania. - - - - Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. - Następujące funkcje zostaną włączone: Folder obserwowani, Udostępnianie obserwującym, Opcja Lubię, Tryb przeglądania tylko polubionych artykułów. - - - Web viewer font size - Rozmiar czcionki w przeglądarce - - - -50% - -50% - - - Normal - Standardowy - - - +50% - +50% - - - - Delete cache - Usuń lokalną kopię - - - - Most recent articles will be syncronized according to the defined timeframe. - Najnowsze artykuły będą pobierane zgodnie z określonym zakresem synchronizacji. - - - - Signed in as - Zalogowano jako - - - - Regardless of the value, all starred, liked and shared items will be synced as well. - Niezależnie od ustawienia, wszystkie ogwiazdkowane, polubione oraz udostępnione artykuły, będą także pobrane. - - - - Regardless of the value, all saved items will be synced as well. - Niezależnie od ustawienia, wszystkie zapisane artykuły, będą także pobrane. - - - - Be aware, this parameter has significant impact on the speed of synchronization. - Uwaga, to ustawienie ma znaczący wpływ na szybkość synchronizacji. - - - - Sync read articles - Synchronizuj już przeczytane artykuły - - - - In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. - Oprócz nieprzeczytanych także przeczytane artykuły będą pobierane. Wyłączenie tej opcji przyspieszy synchronizację ale przeczytane artukuły nie będą dostępne w Kaktusie. - - - - Network mode - Tryb sieci - - - - In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - W trybie offline, Kaktus będzie korzystał tylko z lokalnej kopii aby pobrać stronę internetową lub obrazki. Połączenie sieciowe nie będzie wtedy potrzebne. - - - - Auto network mode - Automatyczny tryb sieci - - - - Network mode will be switched automatically on network connection lost or restore. - Tryb sieci zostanie ustawiony automatycznie w oparciu o aktualny stan połączenia w urządzeniu. - - - - - - Web viewer - Podgląd strony - - - - Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. - Określa jak jest obsługiwana nawigacja w widoku z podglądem strony. Kliknięcia na odnośniki mogą być zablokowane, otwierane w zewnętrznej przeglądarce lub otwierane we wbudownym poglądzie. - - - - Auto switch to Reader View - Automatyczny tryb czytnika - - - - Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. - Tryb czytnika usuwa zbędne elementy takie jak przyciski, reklamy i obrazki tak aby poprawić czytelność strony. Włączenie tej opcji spowoduje, że tryb czytnika będzie automatycznie uruchamiany po wczytaniu strony. - - - Reader View theme - Temat w trybie czytnika - - - Style of theme which will be used to display articles in Reader View. - Styl kolorów, który bedzie używany w trybie czytnika. - - - Dark - Ciemny - - - Light - Jasny - - - - Auto switch to Night View - Automatyczny tryb nocny - - - - Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. - Tryb nocny redukuje jasność stron. Włączenie tej opcji spowoduje, że tryb nocny będzie automatycznie uruchamiany po wczytaniu strony. - - - - Viewer font size level - Wielkość czcionek - - - - Delete cookies - Usuń cookies - - - - Clear web viewer cache and cookies. Changes will take effect after restart. - Usuwa podręczny cache i pliki cookie wbudowanej przeglądarki. Zmiany będą widoczne po restarcie. - - - Cache and cookies have been deleted. - Cache i pliki cookie zostały usunięte. - - - - Language - Język - - - - Default - Domyślny - - - Changes will take effect after you restart Kaktus. - Zmiany zadziałają po ponownym uruchomieniu Kaktusa. - - - - Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. - Określa co ma się stać po kliknięciu w artykuł. Możliwe zachowania to: otwarcie artykułu poprzez wbudowany w aplikacji podgląd, otwarcie w zewnetrznej przeglądarce lub pokazanie całej zawartości kanału RSS. - - - - List filtering - Filtr listy artykułów - - - - Unread or saved - Nieprzeczytane lub zapisane - - - - Unread or starred - Nieprzeczytane lub ogwiazdkowane - - - - Only unread - Tylko nieprzeczytane - - - - List of articles can be filtered to display all articles, unread and saved or only unread. - List artykułów może być fitrowana aby pokazywać wszystkie artykuły, nieprzeczytane i zapisane albo tylko same nieprzeczytane. - - - - List of articles can be filtered to display all articles, unread and starred or only unread. - List artykułów może być fitrowana aby pokazywać wszystkie artykuły, nieprzeczytane i ogwiazdkowane albo tylko same nieprzeczytane. - - - - Pocket - Pocket - - - - Pocket integration - Integracja z Pocket - - - - Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. - Pocket jest internetowym narzędziem do zapisywania artykułów lub robienia zakładek. Integracja zaimplementowana w Kaktusie dodaje przycisk "Dodaj do Pocket" widoczny na liście z artykułami oraz w podglądzie strony. - - - - - Default tags - Domyślne tagi - - - - List of comma seperated tags that will be automatically inserted when you add article to Pocket. - Lista tagów rozdzielonych przecinkami, które będą automatycznie dodane przy zapisywaniu artykułu w Pocket. - - - - Saved tags have been deleted - Zapamiętane tagi zostały usunięte - - - - Ignore SSL errors - Ignoruj błędy SSL - - - List of comma separated tags that will be automatically inserted when you add article to Pocket. - Lista tagów rozdzielonych przecinkami, które będą automatycznie dodane przy zapisywaniu artykułu w Pocket. - - - - Quick adding - Szybkie dodawanie - - - - If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. - Artykuł zostanie natychmiastowo przesłany do Pocket od razu po tym jak naciśnięty zostanie przycisk "Dodaj do Pocket". Pominiętę zostanie pytanie o potwierdzenie. Wszystkie "Domyślne tagi" zostaną automatycznie dodane. - - - - Delete saved tags - Usuń zapamiętane tagi - - - Saved tags have been deleted. - Zapamiętane tagi zostały usunięte. - - - Experimental - Eksperymenty - - - Build-in viewer - Wbudowany podgląd - - - - + + External browser Zewnętrzna przeglądarka - + Feed content Zawartość RSS - Defines the behavior for clicking on an article item. Article can be opened in the built-in viewer, opened in an external browser or full RSS feed content can be shown. - Określa co ma się stać po kliknięciu w artykuł. Możliwe zachowania to: otwarcie artykułu poprzez wbudowany w aplikacji podgląd, otwarcie w zewnetrznej przeglądarce lub pokazanie całej zawartości kanału RSS. + + Disabled + Blokada - - Open link behaviour - Obsługa odnośników + + Unread or starred + Nieprzeczytane lub ogwiazdkowane - Show images - Pokazuj obrazki - - - + Expanded items Zawsze rozwinięte artykuły - + All article items on the list view be shown expanded. Wszystkie elementy znajdujące się na liście z artykułami będą zawsze rozwinięte. - Viewer font size - Wielkość liter w podglądzie + + Double-pane reader + Widok w dwóch panelach - Show User Guide - Pokaż przewodnik + + Double-pane reader in landscape + Widok w dwóch panelach w trybie poziomym - - Online - Online + + View with the articles will be splited in to two colums. + Widok z artykułami będzie podzielony na dwie kolumny. - - Offline - Offline + + View with the articles in the landscape orientation will be splited in to two colums. + Widok z artykułami w trybie poziomym będzie podzielony na dwie kolumny. - - Sign out - Wyloguj + + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. + Następujące funkcje zostaną włączone: Folder obserwowani, Udostępnianie obserwującym, Opcja Lubię, Tryb przeglądania tylko polubionych artykułów. + + + + Delete cache + Usuń lokalną kopię + + + + Most recent articles will be syncronized according to the defined timeframe. + Najnowsze artykuły będą pobierane zgodnie z określonym zakresem synchronizacji. Not signed in Niezalogowany + + + Signed in as + Zalogowano jako + + + + Regardless of the value, all starred, liked and shared items will be synced as well. + Niezależnie od ustawienia, wszystkie ogwiazdkowane, polubione oraz udostępnione artykuły, będą także pobrane. + + + + Regardless of the value, all saved items will be synced as well. + Niezależnie od ustawienia, wszystkie zapisane artykuły, będą także pobrane. + + + + Be aware, this parameter has significant impact on the speed of synchronization. + Uwaga, to ustawienie ma znaczący wpływ na szybkość synchronizacji. + + + + Sync read articles + Synchronizuj już przeczytane artykuły + + + + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. + Oprócz nieprzeczytanych także przeczytane artykuły będą pobierane. Wyłączenie tej opcji przyspieszy synchronizację ale przeczytane artukuły nie będą dostępne w Kaktusie. + + + + Network mode + Tryb sieci + + + + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. + W trybie offline, Kaktus będzie korzystał tylko z lokalnej kopii aby pobrać stronę internetową lub obrazki. Połączenie sieciowe nie będzie wtedy potrzebne. + + + + Auto network mode + Automatyczny tryb sieci + + + + Network mode will be switched automatically on network connection lost or restore. + Tryb sieci zostanie ustawiony automatycznie w oparciu o aktualny stan połączenia w urządzeniu. + + + + + + Web viewer + Podgląd strony + + + + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. + Określa jak jest obsługiwana nawigacja w widoku z podglądem strony. Kliknięcia na odnośniki mogą być zablokowane, otwierane w zewnętrznej przeglądarce lub otwierane we wbudownym poglądzie. + + + + Auto switch to Reader View + Automatyczny tryb czytnika + + + + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. + Tryb czytnika usuwa zbędne elementy takie jak przyciski, reklamy i obrazki tak aby poprawić czytelność strony. Włączenie tej opcji spowoduje, że tryb czytnika będzie automatycznie uruchamiany po wczytaniu strony. + + + + Auto switch to Night View + Automatyczny tryb nocny + + + + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. + Tryb nocny redukuje jasność stron. Włączenie tej opcji spowoduje, że tryb nocny będzie automatycznie uruchamiany po wczytaniu strony. + + + + Viewer font size level + Wielkość czcionek + + + + Delete cookies + Usuń cookies + + + + Clear web viewer cache and cookies. Changes will take effect after restart. + Usuwa podręczny cache i pliki cookie wbudowanej przeglądarki. Zmiany będą widoczne po restarcie. + + + + Language + Język + + + + Default + Domyślny + + + + Changes will take effect after you restart Kaktus + Zmiany zadziałają po ponownym uruchomieniu + + + + View mode + Tryb przeglądania + + + + Tabs, feeds & articles + Zakładki, kanały i artykuły + + + + Folders, feeds & articles + Foldery, kanały i artykuły + + + + Tabs & articles + Zakładki i artykuły + + + + Folders & articles + Foldery i artykuły + + + + + All articles + Wszystkie artykuły + + + + Saved + Zapisane + + + + Starred + Ogwiazdkowane + + + + Slow + Rzadko aktualizowane + + + + Liked + Polubione + + + + Sort order for list of articles + Kolejność sortowania artykułów + + + + Recent first + Najnowsze są pierwsze + + + + Oldest first + Najstarsze są pierwsze + + + + Pocket + Pocket + + + + Pocket integration + Integracja z Pocket + + + + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. + Pocket jest internetowym narzędziem do zapisywania artykułów lub robienia zakładek. Integracja zaimplementowana w Kaktusie dodaje przycisk "Dodaj do Pocket" widoczny na liście z artykułami oraz w podglądzie strony. + + + + + Default tags + Domyślne tagi + + + + List of comma seperated tags that will be automatically inserted when you add article to Pocket. + Lista tagów rozdzielonych przecinkami, które będą automatycznie dodane przy zapisywaniu artykułu w Pocket. + + + + Quick adding + Szybkie dodawanie + + + + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. + Artykuł zostanie natychmiastowo przesłany do Pocket od razu po tym jak naciśnięty zostanie przycisk "Dodaj do Pocket". Pominiętę zostanie pytanie o potwierdzenie. Wszystkie "Domyślne tagi" zostaną automatycznie dodane. + + + + Delete saved tags + Usuń zapamiętane tagi + + + + Saved tags have been deleted + Zapamiętane tagi zostały usunięte + + + + Other + Inne + + + + Ignore SSL errors + Ignoruj błędy SSL + + + + Online + Online + + + + Offline + Offline + + + + Cache articles + Twórz lokalną kopię + + + + Sign out + Wyloguj + Sign in Zaloguj - - Cache and cookies have been deleted - Cache i pliki cookie zostały usunięte - - - - Changes will take effect after you restart Kaktus - Zmiany zadziałają po ponownym uruchomieniu - - - - View mode - Tryb przeglądania - - - - Tabs, feeds & articles - Zakładki, kanały i artykuły - - - - Folders, feeds & articles - Foldery, kanały i artykuły - - - - Tabs & articles - Zakładki i artykuły - - - - Folders & articles - Foldery i artykuły - - - - - All articles - Wszystkie artykuły - - - - Saved - Zapisane - - - - Starred - Ogwiazdkowane - - - - Slow - Rzadko aktualizowane - - - - Liked - Polubione - - - - Sort order for list of articles - Kolejność sortowania artykułów - - - - Recent first - Najnowsze są pierwsze - - - - Oldest first - Najstarsze są pierwsze - - - Context menu style - Styl menu podręcznego - - - Icons - Ikony - - - Text - Tekst - - - Open articles in browser - Otwieraj artykuły w przeglądarce - - - Instead built-in web viewer, web pages will be opened in an external browser. - Zamiast wewnątrz aplikacji, strony internetowe będą otwierane za pomocą zewnętrznej przeglądarki. - - - - Double-pane reader - Widok w dwóch panelach - - - - Double-pane reader in landscape - Widok w dwóch panelach w trybie poziomym - - - - View with the articles will be splited in to two colums. - Widok z artykułami będzie podzielony na dwie kolumny. - - - - View with the articles in the landscape orientation will be splited in to two colums. - Widok z artykułami w trybie poziomym będzie podzielony na dwie kolumny. - - - - Social features - Funkcje społecznościowe - - - - Power save mode - Tryb oszczędności energii - - - - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Gdy aplikacja przełączy się w tryb nieaktywny, wszystkie otwarte strony internetowe zostaną zamknięte aby zmniejszyć zużycie energii. - - - - Orientation - Orientacja - - - - Dynamic - Dynamiczna - - - - Portrait - Pionowa - - - - Landscape - Pozioma - - - - Other - Inne - - - + Cache Lokalna kopia - + Current cache size Rozmiar lokalnej kopii - - Cache articles - Twórz lokalną kopię + + Social features + Funkcje społecznościowe - + Power save mode + Tryb oszczędności energii + + + When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. + Gdy aplikacja przełączy się w tryb nieaktywny, wszystkie otwarte strony internetowe zostaną zamknięte aby zmniejszyć zużycie energii. + + + + Dynamic + Dynamiczna + + + UI Interfejs - - Clicking on article behaviour - Obsługa kliknięcia w artykuł + + Open link behaviour + Obsługa odnośników - Built-in viewer - Wbudowany podgląd + + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. + Określa co ma się stać po kliknięciu w artykuł. Możliwe zachowania to: otwarcie artykułu poprzez wbudowany w aplikacji podgląd, otwarcie w zewnetrznej przeglądarce lub pokazanie całej zawartości kanału RSS. - Navigation in viewer - Nawigacja w podglądzie + + List filtering + Filtr listy artykułów - - Disabled - Blokada + + Unread or saved + Nieprzeczytane lub zapisane - Defines how navigation is handled inside built-in viewer. Hyperlinks could be disabled, opened in an external browser or opened inside viewer. - Określa jak jest obsługiwana nawigacja w widoku z podglądem strony. Kliknięcia na odnośniki mogą być zablokowane, otwierane w zewnętrznej przeglądarce lub otwierane we wbudownym poglądzie. + + Only unread + Tylko nieprzeczytane - Show only unread articles - Pokazuj tylko nieprzeczytane artykuły + + List of articles can be filtered to display all articles, unread and saved or only unread. + List artykułów może być fitrowana aby pokazywać wszystkie artykuły, nieprzeczytane i zapisane albo tylko same nieprzeczytane. - Black - Czarny + + List of articles can be filtered to display all articles, unread and starred or only unread. + List artykułów może być fitrowana aby pokazywać wszystkie artykuły, nieprzeczytane i ogwiazdkowane albo tylko same nieprzeczytane. - White - Biały + + Orientation + Orientacja - Offline viewer style - Styl wyświetlania w trybie Offline + + Portrait + Pionowa + + + + Landscape + Pozioma @@ -2151,18 +1378,6 @@ Brak połączenia sieciowego. Disconnect Tiny Tiny RSS account? Czy chcesz się wylogować z konta Tiny Tiny RSS? - - Disconnect Kaktus from your Feedly account? - Czy chcesz się wylogować z konta Feedly? - - - Disconnect Kaktus from your Old Reader account? - Czy chcesz się wylogować z konta Old Reader? - - - Disconnect Kaktus from your Netvibes account? - Czy chcesz się wylogować z konta Netvibes? - TTRssSignInDialog @@ -2184,26 +1399,18 @@ Brak połączenia sieciowego. Enter password - + Wprowadź hasło Server Url URL serwera - - Enter username here! - Wprowadź nazwę użytkownika! - Username Nazwa użytkownika - - Enter password here! - Wprowadź hasło! - Password @@ -2222,10 +1429,6 @@ Brak połączenia sieciowego. Tabs Zakładki - - Wait until Sync finish. - Zaczekaj do zakończenia aktualizacji. - Uncategorized @@ -2242,12 +1445,12 @@ Brak połączenia sieciowego. Oznacz jako nieprzeczytane - + Wait until sync finish Zaczekaj do zakończenia aktualizacji - + No tabs Brak zakładek @@ -2267,7 +1470,7 @@ Brak połączenia sieciowego. Obserwowani - + No folders Brak folderów @@ -2313,31 +1516,31 @@ Brak połączenia sieciowego. Utils - + empty pusta - + unknown date nieznana data - + just now w tej chwili - + %n second(s) ago - %n sekundę temu + sekundę temu %n sekundy temu %n sekund temu - + %n minute(s) ago minutę temu @@ -2346,7 +1549,7 @@ Brak połączenia sieciowego. - + %n hour(s) ago godzinę temu @@ -2355,7 +1558,7 @@ Brak połączenia sieciowego. - + %n day(s) ago dzień temu @@ -2363,141 +1566,67 @@ Brak połączenia sieciowego. %n dni temu - - 1 second ago - sekundę temu - - - %1 seconds ago - less than 5 seconds - %1 sekundy temu - - - %1 seconds ago - more or equal 5 seconds - %1 sekund temu - - - 1 minute ago - minutę temu - - - %1 minutes ago - less than 5 minutes - %1 minuty temu - - - %1 minutes ago - more or equal 5 minutes - %1 minut temu - - - 1 hour ago - godzinę temu - - - %1 hours ago - less than 5 hours - %1 godziny temu - - - %1 hours ago - more or equal 5 hours - %1 godzin temu - - - day ago - dzień temu - - - %1 days ago - less than 5 days - %1 dni temu - - - %1 days ago - more or equal 5 days - %1 dni temu - WebPreviewPage - - + + Loading page content... Wczytywanie artykułu... - Failed to load item from local cache :-( - Nie udało się pobrać artykułu z lokalnej kopii :-( + + Failed to load page from local cache + Nie udało się pobrać artykułu z lokalnej kopii - Failed to load page content :-( - Nie udało się pobrać treści :-( + + Failed to load page content + Nie udało się pobrać treści - Launching an external browser... - Uruchamianie zewnętrznej przeglądarki... - - - Failed to switch to Reader mode :-( - Nie udało się włączyć trybu Czytnika :-( - - - + Back Cofnij - + Toggle Read Przełącz Przeczytany - + Toggle Save Przełącz Zapisany - + Toggle Star Przełącz Ogwiazdkowany - Toggle Read mode - Przełącz Tryb Czytnika - - - Failed to load page from local cache. - Nie udało się pobrać artykułu z lokalnej kopii. - - - Failed to load page content. - Nie udało się pobrać treści. - - - + Toggle Reader View Przełącz tryb czytnika - + Toggle Night View Przełącz tryb nocny - + Browser Przeglądarka - + Add to Pocket Dodaj do Pocket - + Share link Udostępnij @@ -2511,10 +1640,6 @@ Brak połączenia sieciowego. Toggle Share Przełącz Udostępniony - - URL was copied to the clipboard. - Adres URL został skopiowany. - Increase font @@ -2526,20 +1651,8 @@ Brak połączenia sieciowego. Zmniejsz - - Launching a browser... - Uruchamianie przeglądarki... - - - - Failed to load page from local cache - Nie udało się pobrać artykułu z lokalnej kopii - - - - Failed to load page content - Nie udało się pobrać treści + Uruchamianie przeglądarki... @@ -2556,198 +1669,118 @@ Brak połączenia sieciowego. Copy URL Kopiuj URL - - URL copied to clipboard - Adres URL został skopiowany - main - + Feeds Kanały - Restart the app to rebuild cache data. - Ponownie uruchom aplikacje aby odbudować strukturę danych. - - - Something went wrong :-( - Coś poszło nie tak :-( - - - + Caching... %1 of %2 Tworzenie kopii... %1 z %2 - + Caching... Tworzenie kopii... - Download failed! -Network connection is unavailable. - Nie udało się pobrać! -Brak połączenia sieciowego. - - - Sync failed! -Network connection is unavailable. - Aktualizacja nie powiodła się! -Brak połączenia sieciowego. - - - The user name or password is incorrect! - Nazwa użytkownika lub hasło jest niepoprawne! - - - You are signed in! - Zalogowany! - - - Something went wrong! - Coś poszło nie tak! - - - Download has failed because network is disconnected. - Nie udało się pobrać ponieważ utracono połączenie sieciowe. - - - + Removing cache data... %1 of %2 Czyszczenie lokalnej kopii... %1 z %2 - Something went wrong. Unable to sign in! - Coś poszło nie tak. Nie udało się zalogować! - - - An unknown error occurred. - Wystąpił nieznany błąd. - - - + Access through API is disabled on a server Dostęp poprzez API jest wyłączony na serwerze - + Problem with SSL certificate Problem z certyfikatem SSL - + Unknown error Wystąpił nieznany błąd - The user name or password is incorrect. - Nazwa użytkownika lub hasło jest niepoprawne. - - - You are signed in. - Zalogowany - - - + Restart the app to rebuild cache data Ponownie uruchom aplikacje aby odbudować strukturę danych - + Download has failed because network is disconnected Nie udało się pobrać ponieważ utracono połączenie sieciowe - + Unable to sign in Nie można się zalogować - + Network connection is unavailable Brak połączenia sieciowego - - + + The user name or password is incorrect Nazwa użytkownika lub hasło jest niepoprawne - + Cannot save image in gallery Nie można zapisać obrazu - + Image already exists in gallery Obraz już jest zapisany - + You are signed in Zalogowany - + Receiving data... Pobieranie danych... - Receiving data... - Pobieranie danych... - - - - + + Sending data... Wysyłanie danych... - + Initiating... Pierwsza aktualizacja... - + Updating... Aktualizacja... - + Signing in... Logowanie... - + Waiting for network... Oczekiwanie na połączenie... - - Something went wrong :-( -Restart the app to rebuild cache data. - Coś poszło nie tak :-( -Ponownie uruchom aplikacje aby naprawić problem. - - - Something goes wrong. Unable to sign in! :-( - Coś poszło nie tak. Nie udało się zalogować. - - - Something went wrong :-( -An unknown error occurred. - Coś poszło nie tak :-( -Wystąpił nieznany błąd. - - - Removing cache data... - Czyszczenie lokalnej kopii... - diff --git a/sailfish/translations/kaktus_ru.ts b/translations/kaktus_ru.ts similarity index 87% rename from sailfish/translations/kaktus_ru.ts rename to translations/kaktus_ru.ts index f6a19c0..daba4d0 100644 --- a/sailfish/translations/kaktus_ru.ts +++ b/translations/kaktus_ru.ts @@ -74,8 +74,11 @@ - - + + + + + Version %1 Версия %1 @@ -232,62 +235,62 @@ EntryDelegate - + Toggle Read Прочитанное / непрочитанное - + Toggle Save Сохранить - + Toggle Star Избранное - + Above as read Отметить предыдущие как прочитанные - + Viewer Встроенный браузер - + Browser Браузер - + Feed content Показать содержание - + Add to Pocket Добавить в Pocket - + Share link Поделиться ссылкой - + Save image Сохранить изображение - + Toggle Like Нравится - + Toggle Share Примечание @@ -333,93 +336,92 @@ EntryPage - + No unread items Нет новых статей - + No items Нет статей - + All feeds Все записи - Launching a browser... - Запуск браузера... + Запуск браузера... - + Saved Закладки - + Slow Редкие - + Liked Понравилось - + Shared Вы поделились - - + + Wait until current task is complete Подождите завершения текущей задачи - + Offline version is not available Оффлайн версия недоступна - + Enabling offline mode because network is disconnected Включение автономного режима, так как сеть недоступна - + Network is disconnected Сеть отключена - + No saved items Здесь пока нет записей - + Starred Закладки - + Wait until sync finish Дождитесь окончания синхронизации - + No starred items Здесь пока нет записей - + No liked items Здесь пока нет записей - + One-tap to open article, double-tap to mark as read Одно нажатие чтобы открыть статью, двойное нажатие чтобы отметить как прочитанное @@ -476,67 +478,67 @@ FeedWebContentPage - + Back Назад - + Toggle Read Прочитанное / непрочитанное - + Toggle Save Сохранить - + Toggle Star Избранное - + Viewer Встроенный браузер - + Browser Браузер - + Add to Pocket Добавить в Pocket - + Share link Поделиться ссылкой - + Toggle Like Нравится - + Toggle Share Примечание - + URL was copied to the clipboard URL скопирована в буфер обмена - + Increase font Увеличить размер шрифта - + Decrease font Уменьшить размер шрифта @@ -561,12 +563,11 @@ Сеть отключена - Launching a browser... - Запуск браузера... + Запуск браузера... - + Copy URL Скопировать адрес ссылки @@ -837,138 +838,138 @@ Вошли как - + Syncronization Синхронизация - + Sync timeframe Интервал синхронизации - + 1 Day 1 день - + 3 Days 3 дня - + 1 Week 1 неделя - + 2 Weeks 2 недели - + 1 Month 1 месяц - + Wide as possible Очень редко - + Never Никогда - + WiFi only Только по WiFi - + Always Всегда - + After sync the content of all items will be downloaded and cached for access in the offline mode. После синхронизации содержание всех записей будет загружено для доступа в автономном режиме. - + Cache and cookies have been deleted Кеш и куки были удалены - + Clicking on article behaviour При клике по статье - - + + External browser Системный браузер - + Feed content Показать содержание - + Disabled Игнорировать - + Unread or starred Непрочитанные или избранные - + Expanded items Расширенный вид - + All article items on the list view be shown expanded. Все статьи будут показаны в расширенном виде. - + Double-pane reader Двухпанельный режим - + Double-pane reader in landscape Двухпанельный режим в альбомной ориентации - + View with the articles will be splited in to two colums. Статьи будут отображаться в две колонки. - + View with the articles in the landscape orientation will be splited in to two colums. В альбомной ориентации экрана статьи будут отображаться в две колонки. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Включает социальные функции Old Reader: возможность ставить лайки и делиться записями с читателями. - + Delete cache Очистить кэш - + Most recent articles will be syncronized according to the defined timeframe. Последние статьи будут синхронизированы с заданным интервалом. @@ -983,246 +984,246 @@ Вы вошли как - + Regardless of the value, all starred, liked and shared items will be synced as well. Ваши закладки, понравившиеся записи, а также записи, которыми вы поделились, будут синхронизироваться независимо от выбранного значения. - + Regardless of the value, all saved items will be synced as well. Независимо от значения все ваши закладки будут синхронизироваться также. - + Be aware, this parameter has significant impact on the speed of synchronization. Внимание, этот параметр оказывает существенное влияние на скорость синхронизации. - + Sync read articles Синхронизировать прочитанные записи - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. Прочитанные записи будут синхронизироваться также, как и новые. Отключение этой опции позволит ускорить синхронизацию, но прочитанные записи не будут доступны. - + Network mode Режим сети - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. Для отображения веб-страниц и изображений в автономном режиме Kaktus будет использовать только локальный кэш без необходимости сетевого соединения. - + Auto network mode Автоматический режим сети - + Network mode will be switched automatically on network connection lost or restore. Сетевой режим будет переключаться автоматически при изменении доступности сети. - - - + + + Web viewer Встроенный браузер - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. Данная опция определяет поведение гиперссылок внутри встроенного браузера. Они могут быть отключены, открыты во внешнем браузере или внутри встроенного браузера. - + Auto switch to Reader View Автоматическое переключение в режим чтения - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. Режим чтения - это функция, которая убирает беспорядок, рекламу, фоновые изображения и изменяет внешний вид страницы для лучшего восприятия. При активации данной функции режим чтения будет автоматически включаться, когда страница загружается в веб-браузере. - + Auto switch to Night View Автоматическое переключение в ночной режим - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. Ночной режим уменьшает яркость сайтов. При активации данной функции ночной режим будет автоматически включаться, когда страница загружается в веб-браузере. - + Viewer font size level Размер шрифта в режиме чтения - + Delete cookies Очистить куки - + Clear web viewer cache and cookies. Changes will take effect after restart. Очистить кэш веб-просмотра и файлы cookie. Изменения вступят в силу после перезагрузки. - + Language Язык - + Default Системный - + Changes will take effect after you restart Kaktus Для применения изменений перезапустите Kaktus - + View mode Режим просмотра - + Tabs, feeds & articles Категории, ленты и статьи - + Folders, feeds & articles Папки, ленты и статьи - + Tabs & articles Категории и статьи - + Folders & articles Папки и статьи - - + + All articles Все статьи - + Saved Закладки - + Starred Закладки - + Slow Редкие - + Liked Понравилось - + Sort order for list of articles Сортировка записей в ленте - + Recent first Сначала новые - + Oldest first Сначала старые - + Pocket Pocket - + Pocket integration Интеграция с Pocket - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket - это удобный сервис для сохранения статей для чтения "на потом". Интеграция предлагает кнопку "Добавить в Pocket" в списке статей и в веб-просмотре. - - + + Default tags Теги по умолчанию - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. Список разделенных запятыми тегов, которые будут установлены автоматически при добавлении статьи в Pocket. - + Quick adding Быстрое добавление - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. Если включено, то статья будет отправлена в Pocket сразу же после нажатия на кнопку "Добавить в Pocket" без диалогового окно подтверждения с присвоением тега "по умолчанию". - + Delete saved tags Удалить сохраненные теги - + Saved tags have been deleted Сохраненные теги были удалены - + Other Разное - + Ignore SSL errors Игнорировать ошибки SSL - + Online Онлайн - + Offline Оффлайн - + Cache articles Кэширование статей @@ -1237,17 +1238,17 @@ Вход - + Cache Кэш - + Current cache size Размер кэша - + Social features Социальные функции @@ -1260,62 +1261,62 @@ Когда телефон или приложение переходит в спящий режим, все открытые веб-страницы будут закрыты с целью снижения энергопотребления. - + Dynamic Свободная - + UI Интерфейс - + Open link behaviour При клике по ссылке - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. Определяет поведение при нажатии на статью. Статья может быть открыта в встроенном браузере, во внешнем браузере или может быть показано полное содержание RSS. - + List filtering Фильтр записей - + Unread or saved Непрочитанные или сохраненные - + Only unread Только непрочитанные - + List of articles can be filtered to display all articles, unread and saved or only unread. Список статей может быть отфильтрован для отображения всех статей, прочитанных и сохраненных или только непрочитанных. - + List of articles can be filtered to display all articles, unread and starred or only unread. Список статей может быть отфильтрован для отображения всех статей, прочитанных и сохраненных или только непрочитанных. - + Orientation Ориентация экрана - + Portrait Книжная - + Landscape Альбомная @@ -1445,12 +1446,12 @@ Отметить все как непрочитанные - + Wait until sync finish Дождитесь окончания синхронизации - + No tabs Нет категорий @@ -1470,7 +1471,7 @@ Следующий - + No folders Здесь еще нет папок @@ -1516,22 +1517,22 @@ Utils - + empty пусто - + unknown date неизвестная дата - + just now только что - + %n second(s) ago секунду назад @@ -1540,7 +1541,7 @@ - + %n minute(s) ago минуту назад @@ -1549,7 +1550,7 @@ - + %n hour(s) ago час назад @@ -1558,7 +1559,7 @@ - + %n day(s) ago день назад @@ -1570,104 +1571,102 @@ WebPreviewPage - - + + Loading page content... Загрузка страницы... - + Failed to load page from local cache Не удалось загрузить страницу из локального кэша - + Failed to load page content Не удалось загрузить страницу - + Back Назад - + Toggle Read Прочитанное / непрочитанное - + Toggle Save Сохранить - + Toggle Star Избранное - + Toggle Reader View Включить режим чтения - + Toggle Night View Включить ночной режим - + Browser Браузер - + Add to Pocket Добавить в Pocket - + Share link Поделиться ссылкой - + Toggle Like Нравиться - + Toggle Share Примечание - + Increase font Увеличить размер шрифта - + Decrease font Уменьшить размер шрифта - - Launching a browser... - Запуск браузера... + Запуск браузера... - + URL was copied to the clipboard URL скопирована в буфер обмена - + Hide toolbar Скрыть панель инструментов - + Copy URL Скопировать ссылку @@ -1675,112 +1674,112 @@ main - + Feeds Ленты - + Caching... %1 of %2 Кеширование... %1 of %2 - + Caching... Кеширование... - + Removing cache data... %1 of %2 Удаление кэша данных... %1 of %2 - + Access through API is disabled on a server Доступ по API выключен на сервере - + Problem with SSL certificate Ошибка сертификата SSL - + Unknown error Неизвестная ошибка - + Restart the app to rebuild cache data Перезапустите приложение для обновления кэша - + Download has failed because network is disconnected Загрузка не удалась из-за проблемы сети - + Unable to sign in Невозможно войти - + Network connection is unavailable Отсутствует соединение с сетью - - + + The user name or password is incorrect Неверное имя пользователя или пароль - + Cannot save image in gallery Невозможно сохранить изображение в галерею - + Image already exists in gallery Изображение уже в галерее - + You are signed in Вы вошли - + Receiving data... Загрузка данных... - - + + Sending data... Отправка данных... - + Initiating... Инициирование... - + Updating... Обновление... - + Signing in... Выполняется вход... - + Waiting for network... Ожидание подключения к сети diff --git a/sailfish/translations/kaktus_tr.ts b/translations/kaktus_tr.ts similarity index 88% rename from sailfish/translations/kaktus_tr.ts rename to translations/kaktus_tr.ts index 9b79df7..6960e11 100644 --- a/sailfish/translations/kaktus_tr.ts +++ b/translations/kaktus_tr.ts @@ -29,12 +29,12 @@ - + %1 is developed as an open source project under %2. - + Libraries @@ -90,8 +90,11 @@ - - + + + + + Version %1 Versiyon %1 @@ -337,62 +340,62 @@ Network connection is unavailable. Okunmuş işaretle - + Toggle Read - + Toggle Save - + Toggle Star - + Above as read - + Viewer - + Browser - + Feed content - + Add to Pocket - + Share link - + Save image - + Toggle Like - + Toggle Share @@ -438,17 +441,17 @@ Network connection is unavailable. EntryPage - + No unread items Okunmamış yok - + No items Öğe yok - + All feeds Tüm beslemeler @@ -457,43 +460,43 @@ Network connection is unavailable. Orjinal tarayıcı açılıyor.. - + Saved Kaydedildi - + Slow Yavaş - + Liked - + Shared - - + + Wait until current task is complete - + Offline version is not available - + Enabling offline mode because network is disconnected - + Network is disconnected @@ -516,7 +519,7 @@ Switching to Offline mode. Bağlantı mevcut değil. - + No saved items Kaydedilmiş öğe yok @@ -541,32 +544,27 @@ Switching to Offline mode. Yıldızlanmış makaleler okunmuş işaretleniyor - - Launching a browser... - - - - + Starred Yıldızlılar - + Wait until sync finish - + No starred items Yıldızlı öğe yok - + No liked items - + One-tap to open article, double-tap to mark as read Tık tıkla makaleyi aç, çift tıkla okunmuş işaretle @@ -686,42 +684,37 @@ Switching to Offline mode. Orjinal tarayıcı açılıyor.. - - Launching a browser... - - - - + Back - + Toggle Read - + Toggle Save - + Toggle Star - + Viewer - + Browser - + Add to Pocket @@ -731,27 +724,27 @@ Switching to Offline mode. - + Toggle Like - + Toggle Share - + URL was copied to the clipboard - + Increase font - + Decrease font @@ -776,7 +769,7 @@ Switching to Offline mode. - + Copy URL @@ -1317,42 +1310,42 @@ Network connection is unavailable. Giriş yapıldı - + Syncronization Eşleme - + Sync timeframe Eşleme süreci - + 1 Day 1 gün - + 3 Days 3 gün - + 1 Week 1 hafta - + 2 Weeks 2 hafta - + 1 Month 1 ay - + Wide as possible Mümkün olduğunca geniş @@ -1361,43 +1354,43 @@ Network connection is unavailable. Çevrimdışı modda, Kaktus yalnızca ağ bağlantısı gerekli değil web sayfaları ve görüntüleri, almak için yerel önbelleği kullanır. - + Never Asla - + WiFi only Sadece Wifi - + Always Her zaman - + After sync the content of all items will be downloaded and cached for access in the offline mode. - + Clicking on article behaviour - - + + External browser - + Feed content - + Disabled @@ -1410,37 +1403,37 @@ Network connection is unavailable. Web sayfaları kolay okunabilir versiyona geçti. - + Expanded items - + All article items on the list view be shown expanded. - + Double-pane reader - + Double-pane reader in landscape - + View with the articles will be splited in to two colums. - + View with the articles in the landscape orientation will be splited in to two colums. - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. @@ -1461,12 +1454,12 @@ Network connection is unavailable. +50% - + Delete cache Önbelleği sil - + Most recent articles will be syncronized according to the defined timeframe. @@ -1481,226 +1474,226 @@ Network connection is unavailable. - + Regardless of the value, all starred, liked and shared items will be synced as well. - + Regardless of the value, all saved items will be synced as well. - + Be aware, this parameter has significant impact on the speed of synchronization. - + Sync read articles - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. - + Network mode Bağlantı modu - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. - + Auto network mode - + Network mode will be switched automatically on network connection lost or restore. - - - + + + Web viewer - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. - + Auto switch to Reader View - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. - + Auto switch to Night View - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. - + Viewer font size level - + Delete cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. - + Language Dil - + Default Varsayılan - + Changes will take effect after you restart Kaktus - + View mode - + Tabs, feeds & articles - + Folders, feeds & articles - + Tabs & articles - + Folders & articles - - + + All articles - + Saved Kaydedildi - + Starred Yıldızlılar - + Slow Yavaş - + Liked - + Sort order for list of articles - + Recent first - + Oldest first - + Pocket - + Pocket integration - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. - - + + Default tags - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. - + Quick adding - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. - + Delete saved tags - + Saved tags have been deleted - + Ignore SSL errors @@ -1713,7 +1706,7 @@ Network connection is unavailable. Görüntüleri göster - + Other Diğer @@ -1722,17 +1715,17 @@ Network connection is unavailable. Kullanıcı Kılavuzunu Göster - + Online Çevrimiçi - + Offline Çevrimdışı - + Cache articles Makaleleri önbellekle @@ -1751,97 +1744,95 @@ Network connection is unavailable. Giriş - + Cache Önbellek - + Current cache size Mevcut önbellek boyutu - + Unread or starred - + Social features - Power save mode - Güç tasarruf modu + Güç tasarruf modu - When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption. - Telefon veya uygulaması için boşta çalışma durumuna girdiğinde, tüm açılan web sayfaları daha düşük güç tüketimi için kapalıdır. + Telefon veya uygulaması için boşta çalışma durumuna girdiğinde, tüm açılan web sayfaları daha düşük güç tüketimi için kapalıdır. - + Dynamic Dinamik - + UI Arayüz - + Open link behaviour - + Cache and cookies have been deleted - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. - + List filtering - + Unread or saved - + Only unread - + List of articles can be filtered to display all articles, unread and saved or only unread. - + List of articles can be filtered to display all articles, unread and starred or only unread. - + Orientation Ekran durumu - + Portrait Düz - + Landscape Yan @@ -2003,12 +1994,12 @@ Network connection is unavailable. Tüm. okunmamış işaretle - + Wait until sync finish - + No tabs Sekme yok @@ -2028,7 +2019,7 @@ Network connection is unavailable. Takip - + No folders Klasör yok @@ -2074,43 +2065,43 @@ Network connection is unavailable. Utils - + empty boş - + unknown date - + just now şimdi - + %n second(s) ago - + %n minute(s) ago - + %n hour(s) ago - + %n day(s) ago @@ -2176,8 +2167,8 @@ Network connection is unavailable. WebPreviewPage - - + + Loading page content... Sayfa verisi yükleniyor... @@ -2198,53 +2189,47 @@ Network connection is unavailable. Okuyucu moduna geçilemedi :-( - + Back - + Toggle Read - + Toggle Save - + Toggle Star - - - Launching a browser... - - - - + Toggle Reader View - + Toggle Night View - + Browser - + Add to Pocket - + Share link @@ -2269,12 +2254,12 @@ Network connection is unavailable. - + Failed to load page from local cache - + Failed to load page content @@ -2301,7 +2286,7 @@ Network connection is unavailable. main - + Feeds Beslemeler @@ -2325,112 +2310,112 @@ Bağlantı mevcut değil. You are signed in! Giriş yapıldı! - - - Caching... %1 of %2 - - - - - Caching... - - - - - Removing cache data... %1 of %2 - - - - - Access through API is disabled on a server - - - - - Problem with SSL certificate - - - - - Unknown error - - - - - Restart the app to rebuild cache data - - - - - Download has failed because network is disconnected - - - - - Unable to sign in - - - - - Network connection is unavailable - - - - - - The user name or password is incorrect - - - - - Cannot save image in gallery - - - - - Image already exists in gallery - - - - - You are signed in - - - - - Receiving data... - - Receiving data... Veri alınıyor... - - + + Restart the app to rebuild cache data + + + + + Caching... %1 of %2 + + + + + Caching... + + + + + Download has failed because network is disconnected + + + + + Removing cache data... %1 of %2 + + + + + Unable to sign in + + + + + Network connection is unavailable + + + + + + The user name or password is incorrect + + + + + Access through API is disabled on a server + + + + + Problem with SSL certificate + + + + + Cannot save image in gallery + + + + + Image already exists in gallery + + + + + Unknown error + + + + + You are signed in + + + + + Receiving data... + + + + + Sending data... Veri gönderiliyor... - + Initiating... Yükleniyor... - + Updating... Güncelleniyor - + Signing in... Giriş yapılıyor... - + Waiting for network... Bağlantı bekleniyor... diff --git a/sailfish/translations/kaktus_zh_CN.ts b/translations/kaktus_zh_CN.ts similarity index 86% rename from sailfish/translations/kaktus_zh_CN.ts rename to translations/kaktus_zh_CN.ts index 96607fd..cff3da0 100644 --- a/sailfish/translations/kaktus_zh_CN.ts +++ b/translations/kaktus_zh_CN.ts @@ -74,9 +74,11 @@ - - - + + + + + Version %1 版本 %1 @@ -231,62 +233,62 @@ EntryDelegate - + Toggle Read 切换阅读 - + Toggle Save 切换保存 - + Toggle Star 切换星标 - + Above as read 以上已读 - + Viewer 阅读器 - + Browser 浏览器 - + Feed content 订阅内容 - + Add to Pocket 添加到Pocket - + Share link 分享链接 - + Save image 爆粗图片 - + Toggle Like 切换喜欢 - + Toggle Share 切换分享 @@ -332,93 +334,92 @@ EntryPage - + No unread items 没有未读项 - + No items 没有项 - + All feeds 所有订阅 - Launching a browser... - 正在打开浏览器 + 正在打开浏览器 - + Saved 已存 - + Slow 慢 - + Liked 喜欢 - + Shared 分享 - - + + Wait until current task is complete 等待当前任务完成 - + Offline version is not available 离线版本不可用 - + Enabling offline mode because network is disconnected 由于网络断开连接，因此启用脱机模式 - + Network is disconnected 未连接到网络 - + No saved items 没有保存的项 - + Starred 已加星 - + Wait until sync finish 等待同步完成 - + No starred items 未加星项 - + No liked items 没有喜欢的项目 - + One-tap to open article, double-tap to mark as read 单击打开文章，双击标为已读 @@ -475,37 +476,37 @@ FeedWebContentPage - + Back 返回 - + Toggle Read 切换阅读 - + Toggle Save 切换保存 - + Toggle Star 切换星标 - + Viewer 阅读器 - + Browser 浏览器 - + Add to Pocket 添加到Pocket @@ -515,27 +516,27 @@ 分享链接 - + Toggle Like 切换喜欢 - + Toggle Share 切换分享 - + URL was copied to the clipboard 链接已复制到剪贴板 - + Increase font 加大字体 - + Decrease font 缩小字体 @@ -560,12 +561,11 @@ 未连接到网络 - Launching a browser... - 正在打开浏览器 + 正在打开浏览器 - + Copy URL 复制网址 @@ -835,138 +835,138 @@ 登录方式 - + Syncronization 同步 - + Sync timeframe 同步时间范围 - + 1 Day 一天 - + 3 Days 三天 - + 1 Week 一周 - + 2 Weeks 两周 - + 1 Month 一月 - + Wide as possible 尽可能长 - + Never 绝不 - + WiFi only 仅限WiFi - + Always 总是 - + After sync the content of all items will be downloaded and cached for access in the offline mode. 同步后，将下载并缓存所有项目的内容，以便在离线模式下阅读。 - + Cache and cookies have been deleted 已删除缓存及Cookie - + Clicking on article behaviour 单击文章行为 - - + + External browser 外部浏览器 - + Feed content 订阅内容 - + Disabled 已禁用 - + Unread or starred 未读或星标 - + Expanded items 展开项目 - + All article items on the list view be shown expanded. 列表视图上的所有文章项都会展开。 - + Double-pane reader 双面板阅读器 - + Double-pane reader in landscape 横屏双面板阅读器 - + View with the articles will be splited in to two colums. 文章视图将分为两列 - + View with the articles in the landscape orientation will be splited in to two colums. 横向文章阅读文章时，视图将分为两列。 - + Following Old Reader's social features will be enabled: Following folder, Sharing article with followers, Like option, Liked articles view mode. Old Reader 的社交功能将会添加：关注文件夹，与关注者共享文章，喜欢选项，喜欢文章查看模式。 - + Delete cache 删除缓存 - + Most recent articles will be syncronized according to the defined timeframe. 绝大多数最新文章将根据设定的时间进行同步。 @@ -981,246 +981,246 @@ 登录方式 - + Regardless of the value, all starred, liked and shared items will be synced as well. 无论值如何，所有星标，喜欢和共享的文章也将同步。 - + Regardless of the value, all saved items will be synced as well. 无论值如何，所有保存的文章也将同步。 - + Be aware, this parameter has significant impact on the speed of synchronization. 请注意，此参数对同步速度有极大影响。 - + Sync read articles 同步已读文章 - + In addition to unread also read articles will be synced. Disabling this option will speed up synchronization, but read articles will not be accessible form Kaktus. 除了未读文章之外，还会同步已读文章。 禁用此选项将加快同步速度，但是Kaktus无法访问已读文章。 - + Network mode 网络模式 - + In offline mode, Kaktus will only use local cache to get web pages and images, so network connection won't be needed. 在离线模式下，Kaktus将仅使用本地缓存来获取网页和图像，因此不需要网络连接。 - + Auto network mode 自动网络模式 - + Network mode will be switched automatically on network connection lost or restore. 网络模式将在断开网络连接或恢复时自动切换。 - - - + + + Web viewer 网络浏览器 - + Defines how navigation is handled inside built-in web viewer. Hyperlinks could be disabled, opened in an external browser or opened inside web viewer. 确定如何在内置Web查看器中处理导航。 可以禁用Hyperlinks，在外部浏览器中打开或在内置Web查看器中打开超链接。 - + Auto switch to Reader View 自动切换到阅读视图 - + Reader View is a feature that strips away clutter like buttons, ads and background images, and changes the page's layout for better readability. By enabling this option, Reader View will be automatically switch on when page is loaded in the web viewer. 阅读视图是一项功能，可以消除按钮，广告和背景图像等杂乱的内容，并更改页面布局以提高可读性。 通过启用此选项，在Web查看器中加载页面时，将自动打开阅读视图。 - + Auto switch to Night View 自动切换到夜间视图 - + Night View reduces the brightness of websites. By enabling this option, Night View will be automatically switch on when page is loaded in the web viewer. 夜间视图会降低网站的亮度。 如果启用此选项，在Web查看器中加载页面时，将自动打开夜间模式。 - + Viewer font size level 阅读器字体大小水平 - + Delete cookies 删除cookies - + Clear web viewer cache and cookies. Changes will take effect after restart. 清除Web查看器缓存和Cookie。 修改将在重新启动后生效。 - + Language 语言 - + Default 默认 - + Changes will take effect after you restart Kaktus 修改将在重启Kaktus后生效 - + View mode 视图模式 - + Tabs, feeds & articles 标签, 源 & 文章 - + Folders, feeds & articles 文件夹，订阅源和文章 - + Tabs & articles 标签及文章 - + Folders & articles 文件夹及文章 - - + + All articles 所有文章 - + Saved 已存 - + Starred 已加星 - + Slow 慢 - + Liked 喜欢 - + Sort order for list of articles 文章列表排序 - + Recent first 优先显示最新 - + Oldest first 优先显示最旧 - + Pocket Pocket - + Pocket integration Pocket集成 - + Pocket is an Internet tool for saving articles to read later. Integration implemented in Kaktus provides "Add to Pocket" button in the articles list and in the web viewer. Pocket是一种用于保存文章以便稍后阅读的互联网工具。 在Kaktus中实现在文章列表和Web查看器中提供“添加到Pocket”按钮。 - - + + Default tags 默认标签 - + List of comma seperated tags that will be automatically inserted when you add article to Pocket. 将文章添加到Pocket时将自动插入的逗号分隔标记列表。 - + Quick adding 快速添加 - + If enabled, article will be send to Pocket immediately after you click on "Add to Pocket" button, so without any confirmation dialog. All tags from "Default tags" field will be automatically added. 如果启用，在您点击·“添加到Pocket”按钮后，文章将立即发送到Pocket，因此没有任何确认对话框。 “默认标签”字段中的所有标签都将自动添加。 - + Delete saved tags 删除储存的标签 - + Saved tags have been deleted 已删除储存的标签 - + Other 其它 - + Ignore SSL errors 忽略SSL错误 - + Online 在线 - + Offline 离线 - + Cache articles 文章缓存 @@ -1235,17 +1235,17 @@ 登陆 - + Cache 缓存 - + Current cache size 当前缓存大小 - + Social features 社交功能 @@ -1258,62 +1258,62 @@ 当手机或应用程序进入空闲状态时，所有打开的网页都将关闭以降低功耗。 - + Dynamic 动态 - + UI 界面 - + Open link behaviour 打开链接行为 - + Defines the behavior for clicking on an article item. Article can be opened in the built-in web viewer, opened in an external browser or full RSS feed content can be shown. 定义点击文章项目的行为。 文章可以在内置的Web查看器中打开，在外部浏览器中打开或者可以显示完整的RSS feed内容。 - + List filtering 列表筛选 - + Unread or saved 未读或储存 - + Only unread 仅未读 - + List of articles can be filtered to display all articles, unread and saved or only unread. 可以过滤文章列表以显示所有文章，未读和已保存或仅未读。 - + List of articles can be filtered to display all articles, unread and starred or only unread. 可以过滤文章列表以显示所有文章，未读和星标或仅未读。 - + Orientation 方向 - + Portrait 竖屏 - + Landscape 横屏 @@ -1443,12 +1443,12 @@ 标记全部为未读 - + Wait until sync finish 等到同步完成 - + No tabs 无标签 @@ -1468,7 +1468,7 @@ 关注 - + No folders 无文件夹 @@ -1514,43 +1514,43 @@ Utils - + empty 空空如也 - + unknown date 日期未知 - + just now 刚刚 - + %n second(s) ago %n 秒前 - + %n minute(s) ago %n 分钟前 - + %n hour(s) ago %n 小时前 - + %n day(s) ago %n 天前 @@ -1560,63 +1560,63 @@ WebPreviewPage - - + + Loading page content... 正在载入页面…… - + Failed to load page from local cache 无法从本地缓存加载页面 - + Failed to load page content 页面无法显示 - + Back 返回 - + Toggle Read 切换阅读 - + Toggle Save 切换保存 - + Toggle Star 切换星标 - + Toggle Reader View 切换到阅读视图 - + Toggle Night View 切换到夜间视图 - + Browser 浏览器 - + Add to Pocket 添加到Pocket - + Share link 分享链接 @@ -1641,10 +1641,8 @@ 缩小字体 - - Launching a browser... - 正在打开浏览器 + 正在打开浏览器 @@ -1665,112 +1663,112 @@ main - + Feeds 订阅 - + Caching... %1 of %2 缓存... %1 of %2 - + Caching... 正在缓存 - + Removing cache data... %1 of %2 正在移除缓存数据... %1 of %2 - + Access through API is disabled on a server 通过API访问已在服务器上禁用 - + Problem with SSL certificate SSL证书出现问题 - + Unknown error 未知错误 - + Restart the app to rebuild cache data 重新启动应用程序以重建缓存数据 - + Download has failed because network is disconnected 由于网络断开连接，下载失败 - + Unable to sign in 无法登陆 - + Network connection is unavailable 网络连接不可用 - - + + The user name or password is incorrect 用户名或密码错误 - + Cannot save image in gallery 无法保存图片到图库 - + Image already exists in gallery 图片已存在于图库 - + You are signed in 你已登录 - + Receiving data... 正在获取数据 - - + + Sending data... 正在发送数据 - + Initiating... 正在初始化 - + Updating... 正在更新 - + Signing in... 正在登陆 - + Waiting for network... 等候网络