sfos/ttrss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into ubuntu

Browse source
This commit is contained in:
Alberto Mardegan 2015-07-24 17:02:47 +03:00
commit 4e128b84e9
32 changed files with 374 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
harbour-ttrss-cnlpete.pro
View file

@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see
# http://www.gnu.org/licenses/.
VERSION = 0.5.1
##VERSION = 0.5.2
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += Q_OS_SAILFISH

97
i18n/harbour-ttrss-cnlpete.ts
View file

@ -141,24 +141,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="64"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="77"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="77"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="79"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories to display</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="80"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories have unread items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="81"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="72"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="17"/>
<source>Tiny Tiny RSS Reader</source>
<translation type="unfinished"></translation>
</message>
@ -172,6 +176,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ComboBoxList</name>
@ -297,7 +311,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="336"/>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="337"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="80"/>
<source>Assign Labels</source>
<translation type="unfinished"></translation>
@ -365,11 +379,19 @@
<context>
<name>FeedItemModel</name>
<message>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="84"/>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="104"/>
<source>Today</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItemSwipe</name>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItemSwipe.qml" line="101"/>
<source>Open in Browser</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItems</name>
<message>
@ -383,18 +405,21 @@
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="101"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="149"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="118"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No items in feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No unread items in feed</source>
<translation type="unfinished"></translation>
</message>
@ -461,6 +486,16 @@
<source>Marking all loaded as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedModel</name>
@ -480,18 +515,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="75"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="144"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>No feeds in category</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>Category has no unread items</source>
<translation type="unfinished"></translation>
</message>
@ -568,6 +606,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GenericUpdateCover</name>
@ -602,22 +650,26 @@
<name>MainPage</name>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="51"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="68"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="71"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="82"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="92"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="93"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="114"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="108"/>
<source>Ignore SSL Errors</source>
<translation type="unfinished"></translation>
</message>
@ -625,12 +677,15 @@
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="116"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="137"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="121"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="64"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="103"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="139"/>
<source>Login</source>
<translation type="unfinished"></translation>
</message>
@ -683,6 +738,12 @@
<source>The supplied login credentials did not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NoteEditor</name>
@ -715,6 +776,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="40"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="28"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
@ -722,6 +784,7 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="115"/>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="143"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="78"/>
<source>Minimum Ssl Version</source>
<translation type="unfinished"></translation>
</message>
@ -734,18 +797,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="131"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="92"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="83"/>
<source>Any</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="132"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="93"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="84"/>
<source>SslV2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="95"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="85"/>
<source>SslV3</source>
<translation type="unfinished"></translation>
</message>
@ -772,24 +838,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="155"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="128"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="127"/>
<source>Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="131"/>
<source>Newest First</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="133"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="132"/>
<source>Oldest First</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="200"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="172"/>
<source>Font Size</source>
<translation type="unfinished"></translation>
</message>
@ -801,6 +871,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="180"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="110"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="101"/>
<source>Show Icons</source>
<translation type="unfinished"></translation>
</message>
@ -812,6 +883,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="66"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="60"/>
<source>Automatically Login</source>
<translation type="unfinished"></translation>
</message>
@ -833,6 +905,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="72"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="61"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="56"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
@ -844,6 +917,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="151"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="192"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="141"/>
<source>Items</source>
<translation type="unfinished"></translation>
</message>
@ -864,6 +938,7 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="227"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="175"/>
<source>Tiny</source>
<translation type="unfinished"></translation>
</message>
@ -921,31 +996,37 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="97"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="86"/>
<source>TlsV1.0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="98"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="87"/>
<source>TlsV1.1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="99"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="88"/>
<source>TlsV1.2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="105"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="97"/>
<source>Feeds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="117"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="110"/>
<source>White Background on Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="123"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="122"/>
<source>Item List</source>
<translation type="unfinished"></translation>
</message>
@ -988,16 +1069,19 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="197"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="145"/>
<source>Automatically Mark as Read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="204"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="153"/>
<source>Show Images</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="210"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="161"/>
<source>Strip invisible Images</source>
<translation type="unfinished"></translation>
</message>
@ -1008,24 +1092,33 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="230"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="176"/>
<source>Small</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="233"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="177"/>
<source>Medium</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="236"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="178"/>
<source>Large</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="239"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="179"/>
<source>Huge</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsItem</name>

BIN
i18n/qml-translation.cs.qm
View file

Binary file not shown.

22
i18n/qml-translation.cs.ts
View file

@ -177,12 +177,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Nepřečtené</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Všechny</translation>
</message>
</context>
<context>
@ -487,12 +487,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Nepřečtené</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Všechny</translation>
</message>
</context>
<context>
@ -607,12 +607,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Nepřečtené</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Všechny</translation>
</message>
</context>
<context>
@ -740,7 +740,7 @@
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"/>
<translation>Další</translation>
</message>
</context>
<context>
@ -783,13 +783,13 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="110"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="72"/>
<source>Navigate to special page after login</source>
<translation type="unfinished"/>
<translation>Stránka po přihlášení</translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="98"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="77"/>
<source>Standard</source>
<translation type="unfinished"/>
<translation>Běžná</translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="99"/>
@ -807,7 +807,7 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="101"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="80"/>
<source>Special/Fresh Articles</source>
<translation type="unfinished"/>
<translation>Speciální/Nové články</translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="102"/>
@ -1115,7 +1115,7 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"/>
<translation>Ukázat &quot;Všechny kanály&quot;</translation>
</message>
</context>
<context>

BIN
i18n/qml-translation.de.qm
View file

Binary file not shown.

BIN
i18n/qml-translation.en.qm
View file

Binary file not shown.

BIN
i18n/qml-translation.es.qm
View file

Binary file not shown.

BIN
i18n/qml-translation.fr.qm
View file

Binary file not shown.

16
i18n/qml-translation.fr.ts
View file

@ -177,12 +177,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Non-lu</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Tous</translation>
</message>
</context>
<context>
@ -487,12 +487,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Non_lu</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Tous</translation>
</message>
</context>
<context>
@ -607,12 +607,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Non-lu</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Tous</translation>
</message>
</context>
<context>
@ -741,7 +741,7 @@ Vous pouvez les créer dans le menu.</translation>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"/>
<translation>Suivant</translation>
</message>
</context>
<context>
@ -1118,7 +1118,7 @@ Votre serveur peut également ne pas supporter les derniers protocoles.</transla
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"/>
<translation>Montre tous les flux</translation>
</message>
</context>
<context>

BIN
i18n/qml-translation.nl_NL.qm
View file

Binary file not shown.

16
i18n/qml-translation.nl_NL.ts
View file

@ -177,12 +177,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Ongelezen</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Alles</translation>
</message>
</context>
<context>
@ -487,12 +487,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Ongelezen</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Alles</translation>
</message>
</context>
<context>
@ -607,12 +607,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Ongelezen</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Alles</translation>
</message>
</context>
<context>
@ -740,7 +740,7 @@
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"/>
<translation>Volgende</translation>
</message>
</context>
<context>
@ -1115,7 +1115,7 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"/>
<translation>&apos;Alle feeds&apos; weergeven</translation>
</message>
</context>
<context>

BIN
i18n/qml-translation.ro.qm
View file

Binary file not shown.

2
i18n/qml-translation.ro.ts
View file

@ -387,7 +387,7 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItemSwipe.qml" line="101"/>
<source>Open in Browser</source>
<translation type="unfinished"/>
<translation>Deschide in browser web</translation>
</message>
</context>
<context>

BIN
i18n/qml-translation.ru.qm
View file

Binary file not shown.

14
i18n/qml-translation.ru.ts
View file

@ -177,12 +177,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Непрочитанные</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Все</translation>
</message>
</context>
<context>
@ -487,12 +487,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Непрочитанные</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Все</translation>
</message>
</context>
<context>
@ -607,12 +607,12 @@
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"/>
<translation>Непрочитанные</translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"/>
<translation>Все</translation>
</message>
</context>
<context>
@ -740,7 +740,7 @@
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"/>
<translation>Дальше</translation>
</message>
</context>
<context>

BIN
i18n/qml-translation.sv.qm
View file

Binary file not shown.

BIN
i18n/qml-translation.zh_CN.qm
View file

Binary file not shown.

97
i18n/ttrss-noshare.ts
View file

@ -141,24 +141,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="64"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="77"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="77"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="79"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories to display</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="80"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories have unread items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="81"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="72"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="17"/>
<source>Tiny Tiny RSS Reader</source>
<translation type="unfinished"></translation>
</message>
@ -172,6 +176,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ComboBoxList</name>
@ -288,7 +302,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="331"/>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="332"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="80"/>
<source>Assign Labels</source>
<translation type="unfinished"></translation>
@ -360,11 +374,19 @@
<context>
<name>FeedItemModel</name>
<message>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="84"/>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="104"/>
<source>Today</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItemSwipe</name>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItemSwipe.qml" line="101"/>
<source>Open in Browser</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItems</name>
<message>
@ -378,18 +400,21 @@
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="101"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="149"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="118"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No items in feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No unread items in feed</source>
<translation type="unfinished"></translation>
</message>
@ -456,6 +481,16 @@
<source>Marking all loaded as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedModel</name>
@ -475,18 +510,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="75"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="144"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>No feeds in category</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>Category has no unread items</source>
<translation type="unfinished"></translation>
</message>
@ -563,6 +601,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GenericUpdateCover</name>
@ -597,22 +645,26 @@
<name>MainPage</name>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="51"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="68"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="71"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="82"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="92"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="93"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="114"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="108"/>
<source>Ignore SSL Errors</source>
<translation type="unfinished"></translation>
</message>
@ -620,12 +672,15 @@
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="116"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="137"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="121"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="64"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="103"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="139"/>
<source>Login</source>
<translation type="unfinished"></translation>
</message>
@ -678,6 +733,12 @@
<source>The supplied login credentials did not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NoteEditor</name>
@ -710,18 +771,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="40"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="28"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="72"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="61"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="56"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="66"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="60"/>
<source>Automatically Login</source>
<translation type="unfinished"></translation>
</message>
@ -771,6 +835,7 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="115"/>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="143"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="78"/>
<source>Minimum Ssl Version</source>
<translation type="unfinished"></translation>
</message>
@ -783,18 +848,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="131"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="92"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="83"/>
<source>Any</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="132"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="93"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="84"/>
<source>SslV2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="95"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="85"/>
<source>SslV3</source>
<translation type="unfinished"></translation>
</message>
@ -806,24 +874,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="151"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="192"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="141"/>
<source>Items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="155"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="128"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="127"/>
<source>Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="131"/>
<source>Newest First</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="133"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="132"/>
<source>Oldest First</source>
<translation type="unfinished"></translation>
</message>
@ -845,6 +917,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="180"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="110"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="101"/>
<source>Show Icons</source>
<translation type="unfinished"></translation>
</message>
@ -871,6 +944,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="200"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="172"/>
<source>Font Size</source>
<translation type="unfinished"></translation>
</message>
@ -911,31 +985,37 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="97"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="86"/>
<source>TlsV1.0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="98"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="87"/>
<source>TlsV1.1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="99"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="88"/>
<source>TlsV1.2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="105"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="97"/>
<source>Feeds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="117"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="110"/>
<source>White Background on Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="123"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="122"/>
<source>Item List</source>
<translation type="unfinished"></translation>
</message>
@ -978,16 +1058,19 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="197"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="145"/>
<source>Automatically Mark as Read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="204"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="153"/>
<source>Show Images</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="210"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="161"/>
<source>Strip invisible Images</source>
<translation type="unfinished"></translation>
</message>
@ -998,29 +1081,39 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="227"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="175"/>
<source>Tiny</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="230"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="176"/>
<source>Small</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="233"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="177"/>
<source>Medium</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="236"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="178"/>
<source>Large</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="239"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="179"/>
<source>Huge</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsItem</name>

101
i18n/ttrss.ts
View file

@ -141,24 +141,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="64"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="77"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="77"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="79"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories to display</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="80"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="78"/>
<source>No categories have unread items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Categories.qml" line="81"/>
<location filename="../qml/ttrss/sailfish/pages/Categories.qml" line="72"/>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="17"/>
<source>Tiny Tiny RSS Reader</source>
<translation type="unfinished"></translation>
</message>
@ -172,6 +176,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Categories.qml" line="28"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ComboBoxList</name>
@ -303,7 +317,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="336"/>
<location filename="../qml/ttrss/harmattan/FeedItem.qml" line="337"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="80"/>
<source>Assign Labels</source>
<translation type="unfinished"></translation>
@ -365,11 +379,19 @@
<context>
<name>FeedItemModel</name>
<message>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="84"/>
<location filename="../qml/ttrss/models/FeedItemModel.qml" line="104"/>
<source>Today</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItemSwipe</name>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItemSwipe.qml" line="101"/>
<source>Open in Browser</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedItems</name>
<message>
@ -383,18 +405,21 @@
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="101"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="149"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="118"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No items in feed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/FeedItems.qml" line="102"/>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="150"/>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="119"/>
<source>No unread items in feed</source>
<translation type="unfinished"></translation>
</message>
@ -461,16 +486,26 @@
<source>Marking all loaded as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/FeedItems.qml" line="36"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedModel</name>
<message>
<location filename="../qml/ttrss/models/FeedModel.qml" line="87"/>
<location filename="../qml/ttrss/models/FeedModel.qml" line="86"/>
<source>Less than an hour ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/models/FeedModel.qml" line="90"/>
<location filename="../qml/ttrss/models/FeedModel.qml" line="89"/>
<source>Today</source>
<translation type="unfinished"></translation>
</message>
@ -480,18 +515,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="75"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="144"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>No feeds in category</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Feeds.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="88"/>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="145"/>
<source>Category has no unread items</source>
<translation type="unfinished"></translation>
</message>
@ -568,6 +606,16 @@
<source>Update</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>Unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Feeds.qml" line="40"/>
<source>All</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GenericUpdateCover</name>
@ -602,22 +650,26 @@
<name>MainPage</name>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="51"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="68"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="71"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="82"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="92"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="93"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="114"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="108"/>
<source>Ignore SSL Errors</source>
<translation type="unfinished"></translation>
</message>
@ -625,12 +677,15 @@
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="116"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="65"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="137"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="121"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/MainPage.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="64"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="103"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="139"/>
<source>Login</source>
<translation type="unfinished"></translation>
</message>
@ -683,6 +738,12 @@
<source>The supplied login credentials did not work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="63"/>
<location filename="../qml/ttrss/ubuntu-touch/MainPage.qml" line="84"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NoteEditor</name>
@ -715,12 +776,14 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="40"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="54"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="28"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="72"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="61"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="56"/>
<source>Startup</source>
<translation type="unfinished"></translation>
</message>
@ -765,6 +828,7 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="115"/>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="143"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="78"/>
<source>Minimum Ssl Version</source>
<translation type="unfinished"></translation>
</message>
@ -777,18 +841,21 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="131"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="92"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="83"/>
<source>Any</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="132"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="93"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="84"/>
<source>SslV2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="133"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="95"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="85"/>
<source>SslV3</source>
<translation type="unfinished"></translation>
</message>
@ -800,6 +867,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="151"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="192"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="141"/>
<source>Items</source>
<translation type="unfinished"></translation>
</message>
@ -846,24 +914,28 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="155"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="128"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="127"/>
<source>Order</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="131"/>
<source>Newest First</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="157"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="133"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="132"/>
<source>Oldest First</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="200"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="172"/>
<source>Font Size</source>
<translation type="unfinished"></translation>
</message>
@ -875,6 +947,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="180"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="110"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="101"/>
<source>Show Icons</source>
<translation type="unfinished"></translation>
</message>
@ -886,6 +959,7 @@
<message>
<location filename="../qml/ttrss/harmattan/Settings.qml" line="76"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="66"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="60"/>
<source>Automatically Login</source>
<translation type="unfinished"></translation>
</message>
@ -916,31 +990,37 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="97"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="86"/>
<source>TlsV1.0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="98"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="87"/>
<source>TlsV1.1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="99"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="88"/>
<source>TlsV1.2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="105"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="97"/>
<source>Feeds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="117"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="110"/>
<source>White Background on Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="123"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="122"/>
<source>Item List</source>
<translation type="unfinished"></translation>
</message>
@ -983,16 +1063,19 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="197"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="145"/>
<source>Automatically Mark as Read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="204"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="153"/>
<source>Show Images</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="210"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="161"/>
<source>Strip invisible Images</source>
<translation type="unfinished"></translation>
</message>
@ -1003,29 +1086,39 @@
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="227"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="175"/>
<source>Tiny</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="230"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="176"/>
<source>Small</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="233"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="177"/>
<source>Medium</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="236"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="178"/>
<source>Large</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="239"/>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="179"/>
<source>Huge</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/ttrss/ubuntu-touch/Settings.qml" line="68"/>
<source>Show &quot;All Feeds&quot;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsItem</name>

4
mynetworkmanager.cpp
View file

@ -51,7 +51,6 @@ QNetworkAccessManager* MyNetworkManager::create(QObject *parent) {
connect(nam, SIGNAL(started()), this, SLOT(onStarted()));
connect(nam, SIGNAL(error()), this, SLOT(onError()));
#if !defined(Q_OS_SAILFISH)
QNetworkDiskCache* diskCache = new QNetworkDiskCache(parent);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
@ -61,7 +60,6 @@ QNetworkAccessManager* MyNetworkManager::create(QObject *parent) {
diskCache->setCacheDirectory(cachePath);
diskCache->setMaximumCacheSize(5*1024*1024); // 5Mo
nam->setCache(diskCache);
#endif
return nam;
}
@ -78,7 +76,7 @@ QNetworkReply *MyNetworkAccessManager::createRequest( QNetworkAccessManager::Ope
Settings* settings = Settings::instance();
if (settings->isMinSSlVersionGreaterThan(protocol)) {
sslConfig.setProtocol(settings->getMinSSLVersion());
qDebug() << "ssl protocol is now " << sslConfig.protocol();
//qDebug() << "ssl protocol is now " << sslConfig.protocol();
}
request.setSslConfiguration(sslConfig);

6
qml/ttrss/harmattan/FeedItem.qml
View file

@ -327,6 +327,7 @@ Page {
text: qsTr("Edit Note")
enabled: !network.loading
onClicked: {
var noteEditor = noteEditorComponent.createObject(root)
noteEditor.previousNote = root.note
noteEditor.feedItemPage = root
noteEditor.open()
@ -355,7 +356,8 @@ Page {
}
}
NoteEditor {
id: noteEditor
Component {
id: noteEditorComponent
NoteEditor { }
}
}

1
qml/ttrss/models/FeedItemModel.qml
View file

@ -42,6 +42,7 @@ ListModel {
function update() {
if (requestServerUpdate) {
var ttrss = rootWindow.getTTRSS();
ttrss.trace(2, "requesting the server to update the feed " + feed.feedId);
ttrss.updateFeed(feed.feedId,
function(successful, errorMessage) {
if (successful) {

3
qml/ttrss/models/FeedModel.qml
View file

@ -109,7 +109,7 @@ ListModel {
totalUnreadCount += parseInt(feeds[feed].unread)
}
}
if (root.count >= 2&& root.category.categoryId !== ttrss.constants['categories']['SPECIAL'])
if (root.count >= 2 && root.category.categoryId !== ttrss.constants['categories']['SPECIAL']) {
root.insert(0, {
title: constant.allArticles,
unreadcount: totalUnreadCount,
@ -119,6 +119,7 @@ ListModel {
icon: '',
lastUpdated: ''
})
}
}
}

4
qml/ttrss/models/tinytinyrss.js
View file

@ -80,7 +80,7 @@ function initState(showAll) {
'pref': { },
'showall': false, // see getter/setter for documentation
'closeIfEmpty': false, // Should pages close if they have no content to display
'tracelevel': 1, // 1 = errors, 2 = key info, 3 = network traffic,
'tracelevel': 2, // 1 = errors, 2 = key info, 3 = network traffic,
// 4 = info, 5 = high detail
'categorycache': {},
'feedcache': {},
@ -128,7 +128,7 @@ function initState(showAll) {
*/
function trace(level, text) {
if(level <= state['tracelevel']) {
console.log(text + '\n');
console.log(level + '\t - ' + text);
}
}

2
qml/ttrss/sailfish/pages/FeedItemDelegate.qml
View file

@ -92,7 +92,7 @@ ListItem {
maximumLineCount: settings.lengthOfTitle
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
truncationMode: TruncationMode.Fade
textFormat: Text.StyledText
textFormat: Text.RichText
font.weight: Font.Bold
font.pixelSize: Theme.fontSizeMedium
}

6
qtc_packaging/debian_harmattan/changelog
View file

@ -1,3 +1,9 @@
ttrss (0.5.2) unstable; urgency=low
* updated translations from transifex
* added reloading of server feed when update returns without new items
-- Hauke Schade <cnlpete@cnlpete.de> Sat, 30 May 2015 11:40:42 +0200
ttrss (0.5.1) unstable; urgency=low
* added svedish and dutch translations
* updated translations from transifex

5
rpm/harbour-ttrss-cnlpete.changes
View file

@ -1,3 +1,8 @@
* Sat May 02 2015 Hauke Schade <cnlpete@cnlpete.de> 0.5.2-1-dev
- updated translations from transifex
- added reloading of server feed when update returns without new items
- enabled the QNetworkCache
* Wed Mar 18 2015 Hauke Schade <cnlpete@cnlpete.de> 0.5.1-1
- updated translations from transifex
- added dutch and svedish translations

6
rpm/harbour-ttrss-cnlpete.spec
View file

@ -13,7 +13,7 @@ Name: harbour-ttrss-cnlpete
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tiny Tiny RSS Reader
Version: 0.5.1
Version: 0.5.2
Release: 1
Group: Applications/Internet
License: GPLv2+
@ -43,7 +43,9 @@ API.
# >> build pre
# << build pre
%qtc_qmake5
%qtc_qmake5 \
VERSION=%{version} \
RELEASE=%{release}
%qtc_make %{?_smp_mflags}

5
rpm/harbour-ttrss-cnlpete.yaml
View file

@ -1,6 +1,6 @@
Name: harbour-ttrss-cnlpete
Summary: Tiny Tiny RSS Reader
Version: 0.5.1
Version: 0.5.2
Release: 1
Group: Applications/Internet
URL: http://ttrss.cnlpete.de/
@ -13,6 +13,9 @@ Description: |-
API.
Configure: none
Builder: qtc5
QMakeOptions:
- VERSION=%{version}
- RELEASE=%{release}
PkgConfigBR:
- Qt5Quick
- Qt5Qml

11
ttrss-noshare.desktop Normal file
View file

@ -0,0 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Name=Tiny Tiny RSS
Exec=/usr/bin/invoker --splash=/opt/ttrss/splash/ttrss-splash-portrait.jpg --splash-landscape=/opt/ttrss/splash/ttrss-splash-landscape.jpg --type=d -s /opt/ttrss/bin/ttrss
Icon=/usr/share/icons/hicolor/80x80/apps/ttrss80.png
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable

9
ttrss-noshare.pro
View file

@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see
# http://www.gnu.org/licenses/.
VERSION = 0.5.1-noshare
VERSION = 0.5.2-noshare
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += TARGET=\\\"$$TARGET\\\"
@ -97,7 +97,8 @@ OTHER_FILES += \
qtc_packaging/debian_harmattan/changelog \
$$files(qml/ttrss/sailfish/*.qml) \
$$files(qml/ttrss/sailfish/pages/*.qml) \
$$files(qml/ttrss/sailfish/items/*.qml)
$$files(qml/ttrss/sailfish/items/*.qml) \
*.desktop
TS_FILE = $${_PRO_FILE_PWD_}/i18n/$${TARGET}.ts
@ -139,4 +140,8 @@ contains(MEEGO_EDITION,harmattan) {
splash.files = images/ttrss-splash-portrait.jpg images/ttrss-splash-landscape.jpg
splash.path = /opt/$${TARGET}/splash
INSTALLS += splash
desktopfile.files = ttrss_harmattan.desktop
desktopfile.path = /usr/share/applications
INSTALLS += desktopfile
}

5
ttrss.pro
View file

@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see
# http://www.gnu.org/licenses/.
VERSION = 0.5.1
VERSION = 0.5.2
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += TARGET=\\\"$$TARGET\\\"
@ -97,7 +97,8 @@ OTHER_FILES += \
qtc_packaging/debian_harmattan/changelog \
$$files(qml/ttrss/sailfish/*.qml) \
$$files(qml/ttrss/sailfish/pages/*.qml) \
$$files(qml/ttrss/sailfish/items/*.qml)
$$files(qml/ttrss/sailfish/items/*.qml) \
*.desktop
TS_FILE = $${_PRO_FILE_PWD_}/i18n/$${TARGET}.ts