Merge branch 'master' into ubuntu

2015-03-27 19:22:06 +02:00 · 2015-03-27 19:22:06 +02:00 · 2b2d3f3e92
commit 2b2d3f3e92
parent 1b382a92b9 009b4bacb7
14 changed files with 357 additions and 147 deletions
--- a/harbour-ttrss-cnlpete.pro
+++ b/harbour-ttrss-cnlpete.pro
@ -68,6 +68,7 @@ SOURCES += main.cpp \

 OTHER_FILES += rpm/$${TARGET}.spec \
    rpm/$${TARGET}.yaml \
+    rpm/$${TARGET}.changes \
    $$files(rpm/*) \
    $$files(qml/ttrss/harmattan/*) \
    $$files(qml/ttrss/components/*)
--- a/i18n/harbour-ttrss-cnlpete.ts
+++ b/i18n/harbour-ttrss-cnlpete.ts
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.1">
 <context>
    <name>AboutItem</name>
    <message>
@ -717,31 +717,31 @@
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="88"/>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="116"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="79"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
        <source>Minimum Ssl Version</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="93"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="81"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="89"/>
        <source>Specify a minimum protocol version for your SSL connection. This might be necessary when your server does not allow connections with older (insecure) protocols. However, your server might not support the newest protocol.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="104"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="84"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="92"/>
        <source>Any</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="105"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="85"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="93"/>
        <source>SslV2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="106"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="95"/>
        <source>SslV3</source>
        <translation type="unfinished"></translation>
    </message>
@ -767,25 +767,25 @@
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="128"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="120"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="128"/>
        <source>Order</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="130"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="124"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
        <source>Newest First</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="130"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="125"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="133"/>
        <source>Oldest First</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="173"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="211"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
        <source>Font Size</source>
        <translation type="unfinished"></translation>
    </message>
@ -796,7 +796,7 @@
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="153"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="102"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="110"/>
        <source>Show Icons</source>
        <translation type="unfinished"></translation>
    </message>
@ -833,13 +833,13 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="73"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="74"/>
        <source>You need to restart the App for this to take effect.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="124"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="184"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="192"/>
        <source>Items</source>
        <translation type="unfinished"></translation>
    </message>
@ -859,7 +859,7 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="227"/>
        <source>Tiny</source>
        <translation type="unfinished"></translation>
    </message>
@ -880,113 +880,138 @@
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="72"/>
-        <source>Show &quot;All Feeds&quot;</source>
+        <source>Navigate to special page after login</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="89"/>
-        <source>TlsV1.0</source>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="77"/>
+        <source>Standard</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="90"/>
-        <source>TlsV1.1</source>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="78"/>
+        <source>All Feeds</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="91"/>
-        <source>TlsV1.2</source>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="79"/>
+        <source>Special</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="80"/>
+        <source>Special/Fresh Articles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="81"/>
+        <source>Labels</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="97"/>
+        <source>TlsV1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="98"/>
+        <source>TlsV1.1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="99"/>
+        <source>TlsV1.2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="105"/>
        <source>Feeds</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="109"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="117"/>
        <source>White Background on Icons</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="115"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="123"/>
        <source>Item List</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="140"/>
        <source>Max. Length of Title (in Lines)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="137"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="154"/>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="178"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="145"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="162"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="186"/>
        <source>No Limit</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="142"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="150"/>
        <source>Show Excerpt</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="149"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="157"/>
        <source>Max. Length of Excerpt (in Lines)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="160"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="168"/>
        <source>Show Labels</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="166"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="174"/>
        <source>Show Note</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="173"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="181"/>
        <source>Max. Length of Note (in Lines)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="189"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="197"/>
        <source>Automatically Mark as Read</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="196"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="204"/>
        <source>Show Images</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="202"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="210"/>
        <source>Strip invisible Images</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="203"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="211"/>
        <source>height or width &lt; 2</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="222"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="230"/>
        <source>Small</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="225"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="233"/>
        <source>Medium</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="228"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="236"/>
        <source>Large</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="231"/>
+        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="239"/>
        <source>Huge</source>
        <translation type="unfinished"></translation>
    </message>
--- a/i18n/qml-translation.cs.ts
+++ b/i18n/qml-translation.cs.ts
@ -284,19 +284,19 @@
        <location filename="../qml/ttrss/harmattan/FeedItem.qml" line="327"/>
        <location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="68"/>
        <source>Edit Note</source>
-        <translation type="unfinished"/>
+        <translation>Upravit poznámku</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/FeedItem.qml" line="336"/>
        <location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="80"/>
        <source>Assign Labels</source>
-        <translation type="unfinished"/>
+        <translation>Přiřadit štítky</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/FeedItem.qml" line="103"/>
        <location filename="../qml/ttrss/sailfish/pages/FeedItem.qml" line="173"/>
        <source>Note: %1</source>
-        <translation type="unfinished"/>
+        <translation>Poznámka: %1</translation>
    </message>
 </context>
 <context>
@ -304,7 +304,7 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItemDelegate.qml" line="117"/>
        <source>Note: %1</source>
-        <translation type="unfinished"/>
+        <translation>Poznámka: %1</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItemDelegate.qml" line="151"/>
@ -339,7 +339,7 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItemDelegate.qml" line="166"/>
        <source>Mark all above read</source>
-        <translation type="unfinished"/>
+        <translation>Označit vše výše jako přečtené</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItemDelegate.qml" line="173"/>
@ -349,7 +349,7 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItemDelegate.qml" line="199"/>
        <source>Marking all above as read</source>
-        <translation type="unfinished"/>
+        <translation>Označování všeho výše jako přečtené</translation>
    </message>
 </context>
 <context>
@ -426,7 +426,7 @@
    <message>
        <location filename="../qml/ttrss/harmattan/FeedItems.qml" line="178"/>
        <source>Mark all above read</source>
-        <translation type="unfinished"/>
+        <translation>Označit vše výše jako prečtené</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/FeedItems.qml" line="184"/>
@ -443,17 +443,17 @@
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="69"/>
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="77"/>
        <source>Mark all loaded read</source>
-        <translation type="unfinished"/>
+        <translation>Označit vše načtené jako přečtené</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="140"/>
        <source>Last updated: %1</source>
-        <translation type="unfinished"/>
+        <translation>Naposledy aktualizováno: %1</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="179"/>
        <source>Marking all loaded as read</source>
-        <translation type="unfinished"/>
+        <translation>Označovat všechny načtené jako přečtené</translation>
    </message>
 </context>
 <context>
@ -461,7 +461,7 @@
    <message>
        <location filename="../qml/ttrss/models/FeedModel.qml" line="87"/>
        <source>Less than an hour ago</source>
-        <translation type="unfinished"/>
+        <translation>Před méně než hodinou</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/models/FeedModel.qml" line="90"/>
@ -550,7 +550,7 @@
        <location filename="../qml/ttrss/harmattan/Feeds.qml" line="211"/>
        <location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="171"/>
        <source>An error occurred while subscribing to the feed</source>
-        <translation type="unfinished"/>
+        <translation>Nastala chyba při přihlašování ke kanálu.</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Feeds.qml" line="49"/>
@ -577,7 +577,7 @@
        <location filename="../qml/ttrss/harmattan/LabelUpdater.qml" line="39"/>
        <location filename="../qml/ttrss/sailfish/pages/LabelUpdater.qml" line="49"/>
        <source>Update Labels</source>
-        <translation type="unfinished"/>
+        <translation>Aktualizovat štítky</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/LabelUpdater.qml" line="105"/>
@ -589,7 +589,7 @@
        <location filename="../qml/ttrss/harmattan/LabelUpdater.qml" line="106"/>
        <location filename="../qml/ttrss/sailfish/pages/LabelUpdater.qml" line="113"/>
        <source>You have no label defined. You can create them in the webview.</source>
-        <translation type="unfinished"/>
+        <translation>Nemáte definovány žádné šťítky. Vytvořit je můžete ve webovém rozhraní.</translation>
    </message>
 </context>
 <context>
@ -670,12 +670,12 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="219"/>
        <source>The API is disabled. You have to enable it in the webinterface.</source>
-        <translation type="unfinished"/>
+        <translation>API je deaktivované. Aktivujte ho ve webovém rozhraní.</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="222"/>
        <source>The supplied login credentials did not work.</source>
-        <translation type="unfinished"/>
+        <translation>Zadané přihlašovací údaje nebyly funkční.</translation>
    </message>
 </context>
 <context>
@ -683,19 +683,19 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/NoteEditor.qml" line="45"/>
        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation>Obnovit</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/NoteEditor.qml" line="46"/>
        <location filename="../qml/ttrss/sailfish/pages/NoteEditor.qml" line="56"/>
        <source>Edit Note</source>
-        <translation type="unfinished"/>
+        <translation>Upravit poznámku</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/NoteEditor.qml" line="30"/>
        <location filename="../qml/ttrss/sailfish/pages/NoteEditor.qml" line="57"/>
        <source>Save Note</source>
-        <translation type="unfinished"/>
+        <translation>Uložit poznámku</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/NoteEditor.qml" line="31"/>
@ -717,36 +717,36 @@
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="116"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="79"/>
        <source>Minimum Ssl Version</source>
-        <translation type="unfinished"/>
+        <translation>Minimální verze SSL</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="93"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="81"/>
        <source>Specify a minimum protocol version for your SSL connection. This might be necessary when your server does not allow connections with older (insecure) protocols. However, your server might not support the newest protocol.</source>
-        <translation type="unfinished"/>
+        <translation>Vyberte minimální verzi protokolu pro vaše SSL připojení. Toto může být potřeba, pokud váš server nepovoluje připojení staršími (nezabezpečenými) protokoly. Je nicméně možné, že váš server podporuje ten nejnovější protokol.</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="104"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="84"/>
        <source>Any</source>
-        <translation type="unfinished"/>
+        <translation>Jakékoli</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="105"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="85"/>
        <source>SslV2</source>
-        <translation type="unfinished"/>
+        <translation>SslV2</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="106"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="87"/>
        <source>SslV3</source>
-        <translation type="unfinished"/>
+        <translation>SslV3</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="107"/>
        <source>TlsV1</source>
-        <translation type="unfinished"/>
+        <translation>TlsV1</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/Settings.qml" line="167"/>
@ -859,84 +859,84 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="72"/>
        <source>Show &quot;All Feeds&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Ukázat &quot;Všechny kanály&quot;</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="89"/>
        <source>TlsV1.0</source>
-        <translation type="unfinished"/>
+        <translation>TlsV1.0</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="90"/>
        <source>TlsV1.1</source>
-        <translation type="unfinished"/>
+        <translation>TlsV1.1</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="91"/>
        <source>TlsV1.2</source>
-        <translation type="unfinished"/>
+        <translation>TlsV1.2</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="97"/>
        <source>Feeds</source>
-        <translation type="unfinished"/>
+        <translation>Kanály</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="109"/>
        <source>White Background on Icons</source>
-        <translation type="unfinished"/>
+        <translation>Bílé pozadí pod ikonami</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="115"/>
        <source>Item List</source>
-        <translation type="unfinished"/>
+        <translation>Seznam položek</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="132"/>
        <source>Max. Length of Title (in Lines)</source>
-        <translation type="unfinished"/>
+        <translation>Max. délka názvu (řádků)</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="137"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="154"/>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="178"/>
        <source>No Limit</source>
-        <translation type="unfinished"/>
+        <translation>Bez omezení</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="142"/>
        <source>Show Excerpt</source>
-        <translation type="unfinished"/>
+        <translation>Ukázat výňatek</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="149"/>
        <source>Max. Length of Excerpt (in Lines)</source>
-        <translation type="unfinished"/>
+        <translation>Max. délka výňatku (řádků)</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="160"/>
        <source>Show Labels</source>
-        <translation type="unfinished"/>
+        <translation>Ukázat štítky</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="166"/>
        <source>Show Note</source>
-        <translation type="unfinished"/>
+        <translation>Ukázat poznámky</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="173"/>
        <source>Max. Length of Note (in Lines)</source>
-        <translation type="unfinished"/>
+        <translation>Max. délka poznámky (řádků)</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="189"/>
        <source>Automatically Mark as Read</source>
-        <translation type="unfinished"/>
+        <translation>Automaticky označovat položky jako přečtené</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="196"/>
        <source>Show Images</source>
-        <translation type="unfinished"/>
+        <translation>Ukázat obrázky</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="202"/>
@ -946,7 +946,7 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="203"/>
        <source>height or width &lt; 2</source>
-        <translation type="unfinished"/>
+        <translation>Výška či šířka menší, než 2 pixely</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="219"/>
--- a/i18n/qml-translation.zh_CN.ts
+++ b/i18n/qml-translation.zh_CN.ts
@ -448,7 +448,7 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="140"/>
        <source>Last updated: %1</source>
-        <translation type="unfinished"/>
+        <translation>上次更新：%1</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="179"/>
@ -461,7 +461,7 @@
    <message>
        <location filename="../qml/ttrss/models/FeedModel.qml" line="87"/>
        <source>Less than an hour ago</source>
-        <translation type="unfinished"/>
+        <translation>一小时以内</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/models/FeedModel.qml" line="90"/>
@ -620,7 +620,7 @@
        <location filename="../qml/ttrss/harmattan/MainPage.qml" line="133"/>
        <location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="64"/>
        <source>Login</source>
-        <translation>登陆</translation>
+        <translation>登录</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/harmattan/MainPage.qml" line="168"/>
@ -670,12 +670,12 @@
    <message>
        <location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="219"/>
        <source>The API is disabled. You have to enable it in the webinterface.</source>
-        <translation type="unfinished"/>
+        <translation>API被禁用。你需要在网页界面上将其启用。</translation>
    </message>
    <message>
        <location filename="../qml/ttrss/sailfish/pages/MainPage.qml" line="222"/>
        <source>The supplied login credentials did not work.</source>
-        <translation type="unfinished"/>
+        <translation>登录信息无效</translation>
    </message>
 </context>
 <context>
--- a/qml/ttrss/harmattan/MainPage.qml
+++ b/qml/ttrss/harmattan/MainPage.qml
@ -214,6 +214,54 @@ Page {
        rootWindow.getTTRSS().getConfig(configDone);
    }

+    function buildPages(index) {
+        var ttrss = rootWindow.getTTRSS()
+        var pages = []
+
+        // add root categories page if enabled
+        var hasCategoriesEnabled = ttrss.getPref(ttrss.constants['prefKeys']['categories'])
+        if (hasCategoriesEnabled === true || hasCategoriesEnabled === undefined) {
+            pages.push(Qt.resolvedUrl("Categories.qml"))
+        }
+
+        switch (index) {
+        default:
+        case 0:
+            // categories is already added
+            break
+        case 1:
+            // all feeds
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getAllFeedsCategory()})
+            break
+        case 2:
+        case 3:
+            // Special
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getSpecialCategory()})
+
+            if (index == 3) {
+                var freshparams = {
+                    feed: {
+                        feedId:     ttrss.constants['feeds']['fresh'],
+                        categoryId: ttrss.constants['categories']['SPECIAL'],
+                        title:      constant.freshArticles,
+                        unreadcount: 0,
+                        isCat:       false,
+                        icon:        settings.displayIcons ? ttrss.getIconUrl(ttrss.constants['feeds']['fresh']) : '',
+                        lastUpdated: ''
+                    }
+                }
+                pages.push({page: Qt.resolvedUrl("FeedItems.qml"), properties: freshparams })
+            }
+            break
+        case 4:
+            // Labels
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getLabelsCategory()})
+            break
+        }
+
+        return pages.length === 0 ? buildPages(1) : pages;
+    }
+
    function configDone(successful, errorMessage) {
        if(!successful) {
            // Let the user know
@ -224,18 +272,7 @@ Page {

        categories.update()
        //Now show the categories View
-        var pages = [Qt.resolvedUrl("Categories.qml")]
-        if (settings.useAllFeedsOnStartup) {
-            var ttrss = rootWindow.getTTRSS()
-            var params = {
-                category: {
-                    categoryId: ttrss.constants['categories']['ALL'],
-                    title: constant.allFeeds,
-                    unreadcount: 0
-                }
-            }
-            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: params })
-        }
+        var pages = buildPages(settings.startpage)
        pageStack.push(pages)
    }

--- a/qml/ttrss/harmattan/Settings.qml
+++ b/qml/ttrss/harmattan/Settings.qml
@ -82,6 +82,33 @@ Page {
                checked: settings.useAllFeedsOnStartup
                onCheckedChanged: settings.useAllFeedsOnStartup = checked
            }
+            Label {
+                width: parent.width
+                text: qsTr("Navigate to special page after login")
+                font.pixelSize: MyTheme.fontSizeSmall
+            }
+            ListModel {
+                id: possibleStartpages
+                ListElement { value: 0; name: "" }
+                ListElement { value: 1; name: "" }
+                ListElement { value: 2; name: "" }
+                ListElement { value: 3; name: "" }
+                ListElement { value: 4; name: "" }
+                Component.onCompleted: {
+                    possibleStartpages.setProperty(0, "name", qsTr("Standard"))
+                    possibleStartpages.setProperty(1, "name", qsTr("All Feeds"))
+                    possibleStartpages.setProperty(2, "name", qsTr("Special"))
+                    possibleStartpages.setProperty(3, "name", qsTr("Special/Fresh Articles"))
+                    possibleStartpages.setProperty(4, "name", qsTr("Labels"))
+                }
+            }
+            ComboBoxList {
+                id: startPage
+                initialValue: settings.startpage
+                model: possibleStartpages
+                onCurrentIndexChanged: settings.startpage = currentIndex
+                title: qsTr("Navigate to special page after login")
+            }

            Label {
                width: parent.width
--- a/qml/ttrss/models/CategoryModel.qml
+++ b/qml/ttrss/models/CategoryModel.qml
@ -84,7 +84,7 @@ ListModel {
                            });
            }

-            if(totalUnreadCount > 0 || showAll) {
+            if(!woSpecialCategories && (totalUnreadCount > 0 || showAll)) {
                //Add the "All" category
                root.insert(0, {
                                title:       constant.allFeeds,
@ -98,6 +98,42 @@ ListModel {
        updateFinished()
    }

+    function getAllFeedsCategory() {
+        var ttrss = rootWindow.getTTRSS()
+        var allfeedsparams = {
+            category: {
+                categoryId: ttrss.constants['categories']['ALL'],
+                title: constant.allFeeds,
+                unreadcount: 0
+            }
+        }
+        return allfeedsparams
+    }
+
+    function getSpecialCategory() {
+        var ttrss = rootWindow.getTTRSS()
+        var specialparams = {
+            category: {
+                categoryId: ttrss.constants['categories']['SPECIAL'],
+                title: constant.specialCategory,
+                unreadcount: 0
+            }
+        }
+        return specialparams
+    }
+
+    function getLabelsCategory() {
+        var ttrss = rootWindow.getTTRSS()
+        var labelsparams = {
+            category: {
+                categoryId: ttrss.constants['categories']['LABELS'],
+                title: constant.labelsCategory,
+                unreadcount: 0
+            }
+        }
+        return labelsparams
+    }
+
    function getAllCategories() {
        root.load(true)
    }
--- a/qml/ttrss/models/FeedModel.qml
+++ b/qml/ttrss/models/FeedModel.qml
@ -116,7 +116,8 @@ ListModel {
                                feedId:      parseInt(root.category.categoryId),
                                categoryId:  parseInt(root.category.categoryId),
                                isCat:       true,
-                                icon:        ''
+                                icon:        '',
+                                lastUpdated: ''
                            })
        }
    }
--- a/qml/ttrss/sailfish/pages/MainPage.qml
+++ b/qml/ttrss/sailfish/pages/MainPage.qml
@ -248,6 +248,54 @@ Dialog {
        rootWindow.getTTRSS().getConfig(configDone)
    }

+    function buildPages(index) {
+        var ttrss = rootWindow.getTTRSS()
+        var pages = []
+
+        // add root categories page if enabled
+        var hasCategoriesEnabled = ttrss.getPref(ttrss.constants['prefKeys']['categories'])
+        if (hasCategoriesEnabled === true || hasCategoriesEnabled === undefined) {
+            pages.push(Qt.resolvedUrl("Categories.qml"))
+        }
+
+        switch (index) {
+        default:
+        case 0:
+            // categories is already added
+            break
+        case 1:
+            // all feeds
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getAllFeedsCategory()})
+            break
+        case 2:
+        case 3:
+            // Special
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getSpecialCategory()})
+
+            if (index == 3) {
+                var freshparams = {
+                    feed: {
+                        feedId:     ttrss.constants['feeds']['fresh'],
+                        categoryId: ttrss.constants['categories']['SPECIAL'],
+                        title:      constant.freshArticles,
+                        unreadcount: 0,
+                        isCat:       false,
+                        icon:        settings.displayIcons ? ttrss.getIconUrl(ttrss.constants['feeds']['fresh']) : '',
+                        lastUpdated: ''
+                    }
+                }
+                pages.push({page: Qt.resolvedUrl("FeedItems.qml"), properties: freshparams })
+            }
+            break
+        case 4:
+            // Labels
+            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: categoryModel.getLabelsCategory()})
+            break
+        }
+
+        return pages.length === 0 ? buildPages(1) : pages;
+    }
+
    function configDone(successful, errorMessage) {
        if(!successful) {
            // Let the user know
@ -260,46 +308,7 @@ Dialog {

        var ttrss = rootWindow.getTTRSS()

-        var pages = []
-
-        var hasCategoriesEnabled = ttrss.getPref(ttrss.constants['prefKeys']['categories'])
-        if (hasCategoriesEnabled === true || hasCategoriesEnabled === undefined) {
-            pages.push(Qt.resolvedUrl("Categories.qml"))
-        }
-
-        if (settings.useAllFeedsOnStartup || pages.count === 0) {
-            var params = {
-                category: {
-                    categoryId: ttrss.constants['categories']['ALL'],
-                    title: constant.allFeeds,
-                    unreadcount: 0
-                }
-            }
-            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: params })
-        }
-        /*else if (settings.useSpecialFeedOnStartup) {
-            var ttrss = rootWindow.getTTRSS()
-            var params = {
-                category: {
-                    categoryId: ttrss.constants['categories']['SPECIAL'],
-                    title: constant.specialCategory,
-                    name: constant.specialCategory,
-                    unreadcount: 0
-                }
-            }
-            pages.push({page: Qt.resolvedUrl("Feeds.qml"), properties: params })
-            params = {
-                feed: {
-                    feedId:     ttrss.constants['feeds']['fresh'],
-                    categoryId: ttrss.constants['categories']['SPECIAL'],
-                    title:      constant.freshArticles,
-                    unreadcount: 0,
-                    isCat:       false,
-                    icon:        settings.displayIcons ? ttrss.getIconUrl(ttrss.constants['feeds']['fresh']) : ''
-                }
-            }
-            pages.push({page: Qt.resolvedUrl("FeedItems.qml"), properties: params })
-        }*/
+        var pages = buildPages(settings.startpage)
        pageStack.replace(pages)
    }

--- a/qml/ttrss/sailfish/pages/RescalingRichText.qml
+++ b/qml/ttrss/sailfish/pages/RescalingRichText.qml
@ -60,7 +60,7 @@ Item {
        visible: false
        width: parent.width
        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        textFormat: Text.RichText
+        textFormat: Text.AutoText

        text: "<style>* { font-size: 1px }</style>" + parent.text

--- a/qml/ttrss/sailfish/pages/Settings.qml
+++ b/qml/ttrss/sailfish/pages/Settings.qml
@ -67,11 +67,19 @@ Dialog {
                checked: settings.useAutologin
            }

-            TextSwitch {
-                id: useAllFeedsOnStartupSetting
-                text: qsTr('Show "All Feeds"')
+            ComboBox {
+                id: startPage
+                label: qsTr("Navigate to special page after login")
+                currentIndex: settings.startpage
                description: qsTr('You need to restart the App for this to take effect.')
-                checked: settings.useAllFeedsOnStartup
+
+                menu: ContextMenu {
+                    MenuItem { text: qsTr("Standard") }
+                    MenuItem { text: qsTr("All Feeds") }
+                    MenuItem { text: qsTr("Special") }
+                    MenuItem { text: qsTr("Special/Fresh Articles") }
+                    MenuItem { text: qsTr("Labels") }
+                }
            }

            ComboBox {
@ -243,7 +251,8 @@ Dialog {
    onAccepted: {
        // Startup
        settings.useAutologin = autoLoginSetting.checked
-        settings.useAllFeedsOnStartup = useAllFeedsOnStartupSetting.checked
+        //settings.useAllFeedsOnStartup = useAllFeedsOnStartupSetting.checked
+        settings.startpage = startPage.currentIndex
        settings.minSSLVersion = minimumSSLVersionSetting.currentIndex

        // Feeds
--- a/rpm/harbour-ttrss-cnlpete.changes
+++ b/rpm/harbour-ttrss-cnlpete.changes
@ -0,0 +1,48 @@
+* Sun Feb 08 2015 Hauke Schade <cnlpete@cnlpete.de> 0.5.0-1
+- updated translations from transifex
+- added an "mark all above read" option for feed items
+- [bugfix] allow special chars for usernames
+- only load the categories page if the user has categories enabled
+
+* Mon Nov 10 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.7-1
+- Hotfix to allow minimum SSLVersion setting (for servers that have SSLV3 disabled)
+
+* Mon Nov 10 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.6-1
+- bugfixes
+- updated translations
+- added ui for assigning labels thanks to Michael Käufl
+- added support for notes
+- lots of refactoring and small UI changes
+
+* Sun Oct 19 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.5-1
+- proper config-path
+
+* Sun Oct 12 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.4-1
+- Updated translations
+- Added 'Display Labels in Item List' option
+- Added feed subscription
+- UI improvements
+- Added a logout action from pulley menu
+- added various options in the settings page for hiding images
+- show assigned labels for feed items
+- Added romanian translation
+
+* Sat Jun 21 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.3-1
+- updated translations
+- added loading indicators for icons
+- removed the FancyScroller since the OS now provides one
+
+* Sat May 27 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.2-1
+- updated translations
+- small UI improvements
+- added the FancyScroller
+
+* Fri Apr 18 2014 Hauke Schade <cnlpete@cnlpete.de> 0.4.1-1
+- now using the RescalingRichText by Martin Grimme instead of WebView
+- added Ignore SSL cert option to login MainView
+- remember the ShowAll option
+- UI improvements
+- various bugfixes
+
+* Tue Feb 18 2014 Hauke Schade <cnlpete@cnlpete.de> 0.3.5-1
+- initial sailfish version
--- a/settings.cpp
+++ b/settings.cpp
@ -197,6 +197,14 @@ void Settings::setUseAllFeedsOnStartup(bool useAllFeedsOnStartup) {
    }
 }

+void Settings::setStartpage(int index) {
+    if (_startpage != index) {
+        _startpage = index;
+        m_settings->setValue("startpage", _startpage);
+        emit startpageChanged();
+    }
+}
+
 // Feeds
 void Settings::setDisplayIcons(bool displayIcons) {
    if (_displayIcons != displayIcons) {
@ -336,6 +344,7 @@ Settings::Settings(QObject *parent) : QObject(parent), m_settings(new QSettings(
    _autologin = m_settings->value("autologin", false).toBool();
    _useAutologin = m_settings->value("useAutologin", true).toBool();
    _useAllFeedsOnStartup = m_settings->value("useAllFeedsOnStartup", false).toBool();
+    _startpage = m_settings->value("startpage", _useAllFeedsOnStartup ? 1 : 0).toInt();

    // Feeds
    _displayIcons = m_settings->value("displayIcons", true).toBool();
--- a/settings.hh
+++ b/settings.hh
@ -45,6 +45,7 @@ class Settings : public QObject
    // Startup
    Q_PROPERTY(bool autologin READ hasAutologin WRITE setAutologin NOTIFY autologinChanged)
    Q_PROPERTY(bool useAutologin READ hasUseAutologin WRITE setUseAutologin NOTIFY useAutologinChanged)
+    Q_PROPERTY(int startpage READ startpage WRITE setStartpage NOTIFY startpageChanged)
    Q_PROPERTY(bool useAllFeedsOnStartup READ useAllFeedsOnStartup WRITE setUseAllFeedsOnStartup NOTIFY useAllFeedsOnStartupChanged)

    // Feeds
@ -129,6 +130,11 @@ public:
    }
    void setUseAllFeedsOnStartup(bool useAllFeedsOnStartup);

+    int startpage() const {
+        return this->_startpage;
+    }
+    void setStartpage(int index);
+
    // Feeds
    bool displayIcons() const {
        return this->_displayIcons;
@ -222,6 +228,7 @@ signals:
    // Startup
    void autologinChanged();
    void useAutologinChanged();
+    void startpageChanged();
    void useAllFeedsOnStartupChanged();

    // Feeds
@ -270,6 +277,7 @@ private:
    bool _autologin;
    bool _useAutologin;
    bool _useAllFeedsOnStartup;
+    int _startpage;

    // Feeds
    bool _displayIcons;