[Oldreader] Following folder & share action

This commit is contained in:
mkiol 2015-06-06 16:37:57 +02:00
parent 07471a087c
commit 1abd792d45
21 changed files with 917 additions and 509 deletions

View file

@ -286,42 +286,52 @@ Network connection is unavailable.</source>
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="456"/>
<source>Unsave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="456"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="457"/>
<source>Unstar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="457"/>
<source>Star</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="468"/>
<source>Unshare</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="468"/>
<source>Share</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="481"/>
<source>Collapse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="481"/>
<source>Expand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="441"/>
<source>Mark as unread</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="441"/>
<source>Mark as read</source>
<translation type="unfinished"></translation>
</message>
@ -397,7 +407,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="193"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/sailfish/EntryPage.qml" line="268"/>
<location filename="../qml/symbian/EntryPage.qml" line="192"/>
<source>No unread items</source>
<translation type="unfinished"></translation>
@ -405,7 +415,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/sailfish/EntryPage.qml" line="268"/>
<location filename="../qml/symbian/EntryPage.qml" line="193"/>
<source>No items</source>
<translation type="unfinished"></translation>
@ -437,7 +447,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="82"/>
<location filename="../qml/harmattan/EntryPage.qml" line="131"/>
<location filename="../qml/sailfish/EntryPage.qml" line="181"/>
<location filename="../qml/sailfish/EntryPage.qml" line="183"/>
<location filename="../qml/symbian/EntryPage.qml" line="131"/>
<source>Please wait until current task is complete.</source>
<translation type="unfinished"></translation>
@ -445,7 +455,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="88"/>
<location filename="../qml/harmattan/EntryPage.qml" line="137"/>
<location filename="../qml/sailfish/EntryPage.qml" line="187"/>
<location filename="../qml/sailfish/EntryPage.qml" line="189"/>
<location filename="../qml/symbian/EntryPage.qml" line="137"/>
<source>Offline version not available.</source>
<translation type="unfinished"></translation>
@ -453,7 +463,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="96"/>
<location filename="../qml/harmattan/EntryPage.qml" line="145"/>
<location filename="../qml/sailfish/EntryPage.qml" line="195"/>
<location filename="../qml/sailfish/EntryPage.qml" line="197"/>
<location filename="../qml/symbian/EntryPage.qml" line="145"/>
<source>Network connection is unavailable.
Switching to Offline mode.</source>
@ -462,7 +472,7 @@ Switching to Offline mode.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="100"/>
<location filename="../qml/harmattan/EntryPage.qml" line="149"/>
<location filename="../qml/sailfish/EntryPage.qml" line="199"/>
<location filename="../qml/sailfish/EntryPage.qml" line="201"/>
<location filename="../qml/symbian/EntryPage.qml" line="149"/>
<source>Network connection is unavailable.</source>
<translation type="unfinished"></translation>
@ -470,7 +480,7 @@ Switching to Offline mode.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="276"/>
<location filename="../qml/harmattan/EntryPage.qml" line="192"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="267"/>
<location filename="../qml/symbian/EntryPage.qml" line="191"/>
<source>No saved items</source>
<translation type="unfinished"></translation>
@ -489,7 +499,7 @@ Switching to Offline mode.</source>
</message>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="275"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="266"/>
<source>Wait until Sync finish.</source>
<translation type="unfinished"></translation>
</message>
@ -519,10 +529,15 @@ Switching to Offline mode.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="267"/>
<source>No starred items</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="289"/>
<source>One-tap to open article, double-tap to mark as read</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ErrorPage</name>
@ -1720,7 +1735,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="157"/>
<location filename="../qml/sailfish/TabPage.qml" line="244"/>
<location filename="../qml/sailfish/TabPage.qml" line="255"/>
<location filename="../qml/symbian/TabPage.qml" line="154"/>
<source>Wait until Sync finish.</source>
<translation type="unfinished"></translation>
@ -1733,14 +1748,14 @@ Network connection is unavailable</source>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="138"/>
<location filename="../qml/sailfish/TabPage.qml" line="222"/>
<location filename="../qml/sailfish/TabPage.qml" line="233"/>
<location filename="../qml/symbian/TabPage.qml" line="135"/>
<source>Mark all as read</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="145"/>
<location filename="../qml/sailfish/TabPage.qml" line="230"/>
<location filename="../qml/sailfish/TabPage.qml" line="241"/>
<location filename="../qml/symbian/TabPage.qml" line="142"/>
<source>Mark all as unread</source>
<translation type="unfinished"></translation>
@ -1748,7 +1763,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="156"/>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/sailfish/TabPage.qml" line="256"/>
<location filename="../qml/symbian/TabPage.qml" line="153"/>
<source>No tabs</source>
<translation type="unfinished"></translation>
@ -1760,13 +1775,20 @@ Network connection is unavailable</source>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="131"/>
<location filename="../qml/sailfish/TabPage.qml" line="208"/>
<location filename="../qml/sailfish/TabPage.qml" line="212"/>
<location filename="../qml/sailfish/TabPage.qml" line="219"/>
<location filename="../qml/sailfish/TabPage.qml" line="223"/>
<source>Subscriptions</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/sailfish/TabPage.qml" line="132"/>
<location filename="../qml/sailfish/TabPage.qml" line="219"/>
<location filename="../qml/sailfish/TabPage.qml" line="223"/>
<source>Following</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="256"/>
<source>No folders</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View file

@ -1,4 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="it">
<context>
<name>AboutPage</name>
<message>
@ -34,7 +36,7 @@
<message>
<location filename="../qml/sailfish/AboutPage.qml" line="81"/>
<source>Multi services feed reader, specially designed to work offline.</source>
<translation type="unfinished"/>
<translation>Un lettore di feed compatibile con diversi servizi, disegnato per l&apos;uso offline.</translation>
</message>
<message>
<location filename="../qml/sailfish/AboutPage.qml" line="106"/>
@ -179,7 +181,7 @@
<name>ControlBar</name>
<message>
<location filename="../qml/sailfish/ControlBar.qml" line="179"/>
<source>Can't switch to Online mode.
<source>Can&apos;t switch to Online mode.
Network connection is unavailable.</source>
<translation>Impossibile attivare la modalità online.
Connessione di rete non disponibile.</translation>
@ -285,42 +287,42 @@ Connessione di rete non disponibile.</translation>
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Unsave</source>
<translation>Annulla</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Save</source>
<translation>Salva</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Unstar</source>
<translation type="unfinished"/>
<translation>Rimuovi preferito</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Star</source>
<translation type="unfinished"/>
<translation>Preferito</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Collapse</source>
<translation>Riduci</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Expand</source>
<translation>Espandi</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as unread</source>
<translation>Segna come non letto</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as read</source>
<translation>Segna come letto</translation>
</message>
@ -328,37 +330,37 @@ Connessione di rete non disponibile.</translation>
<context>
<name>EntryModel</name>
<message>
<location filename="../src/entrymodel.cpp" line="194"/>
<location filename="../src/entrymodel.cpp" line="195"/>
<source>Today</source>
<translation>Oggi</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="197"/>
<location filename="../src/entrymodel.cpp" line="198"/>
<source>Yesterday</source>
<translation>Ieri</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="200"/>
<location filename="../src/entrymodel.cpp" line="201"/>
<source>Current week</source>
<translation>Questa settimana</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="203"/>
<location filename="../src/entrymodel.cpp" line="204"/>
<source>Current month</source>
<translation>Questo mese</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="206"/>
<location filename="../src/entrymodel.cpp" line="207"/>
<source>Previous month</source>
<translation>Mese scorso</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="209"/>
<location filename="../src/entrymodel.cpp" line="210"/>
<source>Current year</source>
<translation>Quest&apos;anno</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="212"/>
<location filename="../src/entrymodel.cpp" line="213"/>
<source>Previous year &amp; older</source>
<translation>Anno scorso e precedenti</translation>
</message>
@ -396,7 +398,7 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="193"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="192"/>
<source>No unread items</source>
<translation>Nessun elemento non letto</translation>
@ -404,7 +406,7 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="193"/>
<source>No items</source>
<translation>Nessun elemento</translation>
@ -436,7 +438,7 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="82"/>
<location filename="../qml/harmattan/EntryPage.qml" line="131"/>
<location filename="../qml/sailfish/EntryPage.qml" line="180"/>
<location filename="../qml/sailfish/EntryPage.qml" line="181"/>
<location filename="../qml/symbian/EntryPage.qml" line="131"/>
<source>Please wait until current task is complete.</source>
<translation>Attendi.</translation>
@ -444,7 +446,7 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="88"/>
<location filename="../qml/harmattan/EntryPage.qml" line="137"/>
<location filename="../qml/sailfish/EntryPage.qml" line="186"/>
<location filename="../qml/sailfish/EntryPage.qml" line="187"/>
<location filename="../qml/symbian/EntryPage.qml" line="137"/>
<source>Offline version not available.</source>
<translation>Versione offline non disponibile.</translation>
@ -452,7 +454,7 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="96"/>
<location filename="../qml/harmattan/EntryPage.qml" line="145"/>
<location filename="../qml/sailfish/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="195"/>
<location filename="../qml/symbian/EntryPage.qml" line="145"/>
<source>Network connection is unavailable.
Switching to Offline mode.</source>
@ -462,7 +464,7 @@ Caricamento modalità online.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="100"/>
<location filename="../qml/harmattan/EntryPage.qml" line="149"/>
<location filename="../qml/sailfish/EntryPage.qml" line="198"/>
<location filename="../qml/sailfish/EntryPage.qml" line="199"/>
<location filename="../qml/symbian/EntryPage.qml" line="149"/>
<source>Network connection is unavailable.</source>
<translation>Connessione di rete non disponibile.</translation>
@ -470,7 +472,7 @@ Caricamento modalità online.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="276"/>
<location filename="../qml/harmattan/EntryPage.qml" line="192"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/symbian/EntryPage.qml" line="191"/>
<source>No saved items</source>
<translation>Nessun elemento salvato</translation>
@ -489,7 +491,7 @@ Caricamento modalità online.</translation>
</message>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="275"/>
<location filename="../qml/sailfish/EntryPage.qml" line="255"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<source>Wait until Sync finish.</source>
<translation>Attendi la fine della sincronizzazione.</translation>
</message>
@ -511,17 +513,17 @@ Caricamento modalità online.</translation>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="75"/>
<source>Marking all starred articles as read</source>
<translation type="unfinished"/>
<translation>Segna tutti gli articoli preferiti come letti</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="111"/>
<source>Starred</source>
<translation type="unfinished"/>
<translation>Preferito</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<source>No starred items</source>
<translation type="unfinished"/>
<translation>Nessun preferito</translation>
</message>
</context>
<context>
@ -541,14 +543,14 @@ Caricamento modalità online.</translation>
<name>FeedPage</name>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="145"/>
<location filename="../qml/sailfish/FeedPage.qml" line="220"/>
<location filename="../qml/sailfish/FeedPage.qml" line="217"/>
<location filename="../qml/symbian/FeedPage.qml" line="143"/>
<source>Mark all as read</source>
<translation>Segna tutti come letti</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="153"/>
<location filename="../qml/sailfish/FeedPage.qml" line="228"/>
<location filename="../qml/sailfish/FeedPage.qml" line="225"/>
<location filename="../qml/symbian/FeedPage.qml" line="151"/>
<source>Mark all as unread</source>
<translation>Segna tutti come non letti</translation>
@ -556,7 +558,7 @@ Caricamento modalità online.</translation>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/harmattan/FeedPage.qml" line="114"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<location filename="../qml/symbian/FeedPage.qml" line="113"/>
<source>No feeds</source>
<translation>Nessun feed</translation>
@ -581,7 +583,7 @@ Caricamento modalità online.</translation>
</message>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<source>Wait until Sync finish.</source>
<translation>Attendi la fine della sincronizzazione.</translation>
</message>
@ -753,67 +755,83 @@ L&apos;indicatore permette di cambiare tra le modalità online e offline. In mod
<location filename="../qml/sailfish/Guide.qml" line="182"/>
<source>Bottom bar lets you switch between 5 view modes.
</source>
<translation type="unfinished"/>
<translation>La barra in basso permette di attivare 5 modalità di visualizzazione.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="205"/>
<source>Mode #1
Lists all your tabs. Feeds are grouped by the tabs they belong to and articles are grouped in the feeds.</source>
<translation type="unfinished"/>
<translation>Modalità #1
Visualizza tutte le schede. I feed sono raggrupati nelle schede a cui appartengono e gli articoli sono raggrupati nei feed.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="206"/>
<source>Mode #1
Lists all your folders. Feeds are grouped by the folders they belong to and articles are grouped in the feeds.</source>
<translation type="unfinished"/>
<translation>Modalità #1
Visualizza tutte le cartelle. I feed sono raggrupati nelle cartelle a cui appartengono e gli articoli sono raggrupati nei feed.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="228"/>
<source>Mode #2
Lists all your tabs. Articles are grouped by the tabs they belong to.</source>
<translation type="unfinished"/>
<translation>Modalità #2
Visualizza tutte le schede. Gli articoli sono raggrupati nelle schede a cui appartengono.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="229"/>
<source>Mode #2
Lists all your folders. Articles are grouped by the folders they belong to.</source>
<translation type="unfinished"/>
<translation>Modalità #2
Visualizza tutte le cartelle. Gli articoli sono raggrupati nelle cartelle a cui appartengono.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="252"/>
<source>Mode #3
Lists all articles from all your feeds in one list. Items are ordered by publication date.</source>
<translation type="unfinished"/>
<translation>Modalità #3
Visualizza tutti gli articoli dei feed. Gli elementi sono ordinati in base alla data.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="275"/>
<source>Mode #4
Lists all articles you have saved.</source>
<translation type="unfinished"/>
<translation>Modalità #4
Visualizza tutti gli articoli salvati.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="276"/>
<source>Mode #4
Lists all articles you have starred.</source>
<translation type="unfinished"/>
<translation>Modalità #4
Visualizza tutti gli articoli preferiti.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="299"/>
<source>Mode #5 &quot;Slow&quot;
List articles from less frequently updated feeds. A feed is considered &quot;slow&quot; when it publishes less than 5 articles in a month.</source>
<translation type="unfinished"/>
<translation>Modalità #5 - Lenta
Visualizza gli articoli dai feed aggiornati meno frequentemente. Un feed è considerato lento quando pubblica meno di 5 articoli in un mese.</translation>
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="350"/>
<source>That's all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
<source>That&apos;s all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
&lt;i&gt;Show User Guide&lt;/i&gt;
on the settings page.</source>
<translation>&amp;Egrave; tutto!&lt;br/&gt;&lt;br/&gt;Se vuoi visualizzare ancora questa guida, clicca su
@ -1039,7 +1057,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/NvSignInDialog.qml" line="96"/>
<source>Enter username and password below.</source>
<translation type="unfinished"/>
<translation>Inserisci nome utente e password.</translation>
</message>
<message>
<location filename="../qml/sailfish/NvSignInDialog.qml" line="131"/>
@ -1077,14 +1095,6 @@ Connessione di rete non disponibile</translation>
<translation>Login con Facebook</translation>
</message>
</context>
<context>
<name>OldReaderFetcher</name>
<message>
<location filename="../src/oldreaderfetcher.cpp" line="835"/>
<source>Subscriptions</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OldReaderSignInDialog</name>
<message>
@ -1095,12 +1105,12 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/OldReaderSignInDialog.qml" line="76"/>
<source>Old Reader</source>
<translation type="unfinished"/>
<translation>Old Reader</translation>
</message>
<message>
<location filename="../qml/sailfish/OldReaderSignInDialog.qml" line="91"/>
<source>Enter username and password below.</source>
<translation type="unfinished"/>
<translation>Inserisci nome utente e password.</translation>
</message>
<message>
<location filename="../qml/sailfish/OldReaderSignInDialog.qml" line="130"/>
@ -1248,7 +1258,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/ReadAllDialog.qml" line="73"/>
<source>Mark all starred articles as read?</source>
<translation type="unfinished"/>
<translation>Segna tutti gli articoli preferiti come letti?</translation>
</message>
</context>
<context>
@ -1264,7 +1274,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard in use</source>
<translation>Bacheca in uso</translation>
@ -1272,67 +1282,61 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard not selected</source>
<translation>Non selezionata</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="75"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="155"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="153"/>
<source>Change</source>
<translation>Cambia</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="50"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="66"/>
<source>Netvibes account</source>
<translation>Account Netvibes</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="67"/>
<source>Old Reader account</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="89"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="87"/>
<source>Not signed in </source>
<translation>Non loggato</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="93"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="91"/>
<source>Signed in with</source>
<translation>Loggato con</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="225"/>
<source>Never</source>
<translation>Mai</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="228"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="226"/>
<source>WiFi only</source>
<translation>Solo WiFi</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="229"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<source>Always</source>
<translation>Sempre</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="401"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="399"/>
<source>Read mode</source>
<translation>Modalità lettura</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="402"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="400"/>
<source>Web pages will be reformatted into an easy to read version.</source>
<translation>Le pagine web verranno riformattate in una versione facile da leggere.</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="299"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="328"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="478"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="476"/>
<location filename="../qml/symbian/SettingsPage.qml" line="345"/>
<source>Web viewer font size</source>
<translation>Dim. carattere visuale web</translation>
@ -1340,7 +1344,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="304"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="333"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="480"/>
<location filename="../qml/symbian/SettingsPage.qml" line="350"/>
<source>-50%</source>
<translation>-50%</translation>
@ -1348,7 +1352,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="309"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="334"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="483"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="481"/>
<location filename="../qml/symbian/SettingsPage.qml" line="351"/>
<source>Normal</source>
<translation>Normale</translation>
@ -1356,7 +1360,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="314"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="335"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="484"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/symbian/SettingsPage.qml" line="352"/>
<source>+50%</source>
<translation>+50%</translation>
@ -1364,7 +1368,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="96"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="97"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="194"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="192"/>
<location filename="../qml/symbian/SettingsPage.qml" line="102"/>
<source>Delete cache</source>
<translation>Elimina cache</translation>
@ -1372,7 +1376,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="105"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="106"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="205"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="203"/>
<location filename="../qml/symbian/SettingsPage.qml" line="111"/>
<source>Network mode</source>
<translation>Modlità rete</translation>
@ -1380,7 +1384,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="128"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="126"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="236"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="234"/>
<location filename="../qml/symbian/SettingsPage.qml" line="142"/>
<source>After sync the content of all items will be downloaded and cached for access in the Offline mode.</source>
<translation>Dopo la sincronizzazione il contenuto degli articoli verrà scaricato e salvato per essere utilizzato in modalità offline.</translation>
@ -1388,7 +1392,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="149"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="247"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="245"/>
<location filename="../qml/symbian/SettingsPage.qml" line="157"/>
<source>Language</source>
<translation>Lingua</translation>
@ -1396,7 +1400,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="154"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="163"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="280"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="278"/>
<location filename="../qml/symbian/SettingsPage.qml" line="179"/>
<source>Default</source>
<translation>Sistema</translation>
@ -1404,7 +1408,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="195"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="204"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="344"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="342"/>
<location filename="../qml/symbian/SettingsPage.qml" line="220"/>
<source>Changes will take effect after you restart Kaktus.</source>
<translation>Riavvia Kaktus per applicare i cambiamenti.</translation>
@ -1463,21 +1467,21 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="213"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="262"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="413"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="411"/>
<location filename="../qml/symbian/SettingsPage.qml" line="278"/>
<source>Show images</source>
<translation>Mostra immagini</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="345"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="493"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="491"/>
<location filename="../qml/symbian/SettingsPage.qml" line="362"/>
<source>Other</source>
<translation>Altro</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="350"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="497"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="495"/>
<location filename="../qml/symbian/SettingsPage.qml" line="367"/>
<source>Show User Guide</source>
<translation>Visualizza guida utente</translation>
@ -1485,7 +1489,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="111"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="111"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="209"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="207"/>
<location filename="../qml/symbian/SettingsPage.qml" line="116"/>
<source>Online</source>
<translation>Online</translation>
@ -1493,7 +1497,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="117"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="112"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="210"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="208"/>
<location filename="../qml/symbian/SettingsPage.qml" line="117"/>
<source>Offline</source>
<translation>Offline</translation>
@ -1501,7 +1505,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="127"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="125"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="223"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="221"/>
<location filename="../qml/symbian/SettingsPage.qml" line="141"/>
<source>Cache articles</source>
<translation>Cache articoli</translation>
@ -1509,7 +1513,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="204"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="252"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="391"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="389"/>
<location filename="../qml/symbian/SettingsPage.qml" line="268"/>
<source>Show only unread articles</source>
<translation>Mostra solo articoli non letti</translation>
@ -1537,7 +1541,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign out</source>
<translation>Logout</translation>
@ -1545,7 +1549,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign in</source>
<translation>Login</translation>
@ -1558,7 +1562,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="84"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="87"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="165"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="163"/>
<location filename="../qml/symbian/SettingsPage.qml" line="92"/>
<source>Cache</source>
<translation>Cache</translation>
@ -1566,28 +1570,28 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="94"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="91"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="183"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="181"/>
<location filename="../qml/symbian/SettingsPage.qml" line="96"/>
<source>Current cache size</source>
<translation>Dimensione cache attuale</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="272"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="423"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="421"/>
<location filename="../qml/symbian/SettingsPage.qml" line="288"/>
<source>Power save mode</source>
<translation>Risparmio energetico</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="273"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="424"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="422"/>
<location filename="../qml/symbian/SettingsPage.qml" line="289"/>
<source>When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption.</source>
<translation>Quando il telefono o l&apos;app vanno in standby tutte le pagine web aperte vengono chiuse per risparmiare batteria.</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="288"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="438"/>
<location filename="../qml/symbian/SettingsPage.qml" line="304"/>
<source>Dynamic</source>
<translation>Dinamico</translation>
@ -1595,28 +1599,28 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="138"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="137"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="241"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="239"/>
<location filename="../qml/symbian/SettingsPage.qml" line="153"/>
<source>UI</source>
<translation>UI</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="283"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="436"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="434"/>
<location filename="../qml/symbian/SettingsPage.qml" line="299"/>
<source>Orientation</source>
<translation>Orientamento</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="289"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="441"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="439"/>
<location filename="../qml/symbian/SettingsPage.qml" line="305"/>
<source>Portrait</source>
<translation>Ritratto</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="290"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="442"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/symbian/SettingsPage.qml" line="306"/>
<source>Landscape</source>
<translation>Panoramico</translation>
@ -1624,7 +1628,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="280"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="300"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="450"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="448"/>
<location filename="../qml/symbian/SettingsPage.qml" line="316"/>
<source>Offline viewer style</source>
<translation>Stile visuale web</translation>
@ -1632,7 +1636,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="285"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="310"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="460"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="458"/>
<location filename="../qml/symbian/SettingsPage.qml" line="327"/>
<source>Black</source>
<translation>Nero</translation>
@ -1640,7 +1644,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="290"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="311"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="461"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="459"/>
<location filename="../qml/symbian/SettingsPage.qml" line="328"/>
<source>White</source>
<translation>Bianco</translation>
@ -1716,7 +1720,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/SignOutDialog.qml" line="64"/>
<source>Disconnect Kaktus from your Old Reader account?</source>
<translation type="unfinished"/>
<translation>Disconnettere Kaktus dal tuo account Old Reader?</translation>
</message>
<message>
<location filename="../qml/bb10/SignOutDialog.qml" line="29"/>
@ -1753,7 +1757,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="157"/>
<location filename="../qml/sailfish/TabPage.qml" line="246"/>
<location filename="../qml/sailfish/TabPage.qml" line="244"/>
<location filename="../qml/symbian/TabPage.qml" line="154"/>
<source>Wait until Sync finish.</source>
<translation>Attendi la fine della sincronizzazione.</translation>
@ -1766,14 +1770,14 @@ Connessione di rete non disponibile</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="138"/>
<location filename="../qml/sailfish/TabPage.qml" line="224"/>
<location filename="../qml/sailfish/TabPage.qml" line="222"/>
<location filename="../qml/symbian/TabPage.qml" line="135"/>
<source>Mark all as read</source>
<translation>Segna tutti come letti</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="145"/>
<location filename="../qml/sailfish/TabPage.qml" line="232"/>
<location filename="../qml/sailfish/TabPage.qml" line="230"/>
<location filename="../qml/symbian/TabPage.qml" line="142"/>
<source>Mark all as unread</source>
<translation>Segna tutti come non letti</translation>
@ -1781,7 +1785,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="156"/>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/symbian/TabPage.qml" line="153"/>
<source>No tabs</source>
<translation>Nessuna cheda</translation>
@ -1789,20 +1793,27 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="81"/>
<source>Folders</source>
<translation type="unfinished"/>
<translation>Cartelle</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="131"/>
<location filename="../qml/sailfish/TabPage.qml" line="208"/>
<location filename="../qml/sailfish/TabPage.qml" line="212"/>
<source>Subscriptions</source>
<translation>Iscrizioni</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<source>No folders</source>
<translation type="unfinished"/>
<translation>Nessuna cartella</translation>
</message>
</context>
<context>
<name>TourPage</name>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="61"/>
<source/>
<translation type="unfinished"/>
<source></source>
<translation></translation>
</message>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="66"/>
@ -1836,7 +1847,7 @@ Connessione di rete non disponibile</translation>
<message>
<location filename="../qml/sailfish/UnreadAllDialog.qml" line="73"/>
<source>Mark all starred articles as unread?</source>
<translation type="unfinished"/>
<translation>Segna tutti gli articoli preferiti come non letti?</translation>
</message>
<message>
<location filename="../qml/bb10/UnreadAllDialog.qml" line="29"/>
@ -2131,7 +2142,7 @@ Connessione di rete non disponibile.</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="149"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<location filename="../qml/sailfish/main.qml" line="230"/>
<location filename="../qml/symbian/main.qml" line="146"/>
<source>Sync failed!
Network connection is unavailable.</source>
@ -2141,8 +2152,8 @@ Connessione di rete non disponibile.</translation>
<message>
<location filename="../qml/harmattan/main.qml" line="160"/>
<location filename="../qml/harmattan/main.qml" line="170"/>
<location filename="../qml/sailfish/main.qml" line="237"/>
<location filename="../qml/sailfish/main.qml" line="259"/>
<location filename="../qml/sailfish/main.qml" line="241"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/symbian/main.qml" line="157"/>
<location filename="../qml/symbian/main.qml" line="167"/>
<source>The user name or password is incorrect!</source>
@ -2150,43 +2161,43 @@ Connessione di rete non disponibile.</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="174"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/symbian/main.qml" line="171"/>
<source>You are signed in!</source>
<translation>Sei loggato!</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="178"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/sailfish/main.qml" line="271"/>
<location filename="../qml/symbian/main.qml" line="175"/>
<source>Receiving data... </source>
<translation>Ricezione dati...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="183"/>
<location filename="../qml/sailfish/main.qml" line="272"/>
<location filename="../qml/sailfish/main.qml" line="276"/>
<location filename="../qml/symbian/main.qml" line="180"/>
<source>Sending data...</source>
<translation>Invio dati...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="189"/>
<location filename="../qml/sailfish/main.qml" line="282"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/symbian/main.qml" line="186"/>
<source>Initiating...</source>
<translation>Caricamento...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="193"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/symbian/main.qml" line="190"/>
<source>Updating...</source>
<translation>Aggiornamento...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="197"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/sailfish/main.qml" line="294"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/symbian/main.qml" line="194"/>
<source>Signing in...</source>
<translation>Login...</translation>
@ -2195,9 +2206,9 @@ Connessione di rete non disponibile.</translation>
<location filename="../qml/harmattan/main.qml" line="201"/>
<location filename="../qml/harmattan/main.qml" line="205"/>
<location filename="../qml/harmattan/main.qml" line="209"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/sailfish/main.qml" line="302"/>
<location filename="../qml/sailfish/main.qml" line="306"/>
<location filename="../qml/sailfish/main.qml" line="310"/>
<location filename="../qml/symbian/main.qml" line="198"/>
<location filename="../qml/symbian/main.qml" line="202"/>
<location filename="../qml/symbian/main.qml" line="206"/>
@ -2214,19 +2225,19 @@ Restart the app to rebuild cache data.</source>
Riavvia l&apos;app per ricostruire la cache.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="222"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<source>Something goes wrong. Unable to sign in! :-(</source>
<translation>Qualcosa è andato storto. Impossibile accedere :-(</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="254"/>
<location filename="../qml/sailfish/main.qml" line="258"/>
<source>Something went wrong :-(
An unknown error occurred.</source>
<translation>Qualcosa è andato storto :-(
Errore sconosciuto.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="467"/>
<location filename="../qml/sailfish/main.qml" line="471"/>
<source>Removing cache data...</source>
<translation>Eliminazione cache...</translation>
</message>
@ -2251,4 +2262,4 @@ Connessione di rete non disponibile.</translation>
<translation>Esci</translation>
</message>
</context>
</TS>
</TS>

Binary file not shown.

View file

@ -1,4 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="nl_NL">
<context>
<name>AboutPage</name>
<message>
@ -179,7 +181,7 @@
<name>ControlBar</name>
<message>
<location filename="../qml/sailfish/ControlBar.qml" line="179"/>
<source>Can't switch to Online mode.
<source>Can&apos;t switch to Online mode.
Network connection is unavailable.</source>
<translation>Kan niet overschakelen naar Online-modus.
Netwerkverbinding is niet beschikbaar.</translation>
@ -285,42 +287,42 @@ Netwerkverbinding is niet beschikbaar.</translation>
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Unsave</source>
<translation>Opslaan ongedaan maken</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Save</source>
<translation>Opslaan</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Unstar</source>
<translation>Uit favorieten verwijderen</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Star</source>
<translation>Aan favorieten toevoegen</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Collapse</source>
<translation>Inklappen</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Expand</source>
<translation>Uitklappen</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as unread</source>
<translation>Markeren als ongelezen</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as read</source>
<translation>Markeren als gelezen</translation>
</message>
@ -328,37 +330,37 @@ Netwerkverbinding is niet beschikbaar.</translation>
<context>
<name>EntryModel</name>
<message>
<location filename="../src/entrymodel.cpp" line="194"/>
<location filename="../src/entrymodel.cpp" line="195"/>
<source>Today</source>
<translation>Vandaag</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="197"/>
<location filename="../src/entrymodel.cpp" line="198"/>
<source>Yesterday</source>
<translation>Gisteren</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="200"/>
<location filename="../src/entrymodel.cpp" line="201"/>
<source>Current week</source>
<translation>Huidige week</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="203"/>
<location filename="../src/entrymodel.cpp" line="204"/>
<source>Current month</source>
<translation>Huidige maand</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="206"/>
<location filename="../src/entrymodel.cpp" line="207"/>
<source>Previous month</source>
<translation>Vorige maand</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="209"/>
<location filename="../src/entrymodel.cpp" line="210"/>
<source>Current year</source>
<translation>Huidig jaar</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="212"/>
<location filename="../src/entrymodel.cpp" line="213"/>
<source>Previous year &amp; older</source>
<translation>Vorig jaar en ouder</translation>
</message>
@ -396,7 +398,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="193"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="192"/>
<source>No unread items</source>
<translation>Geen ongelezen items</translation>
@ -404,7 +406,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="193"/>
<source>No items</source>
<translation>Geen items</translation>
@ -436,7 +438,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="82"/>
<location filename="../qml/harmattan/EntryPage.qml" line="131"/>
<location filename="../qml/sailfish/EntryPage.qml" line="180"/>
<location filename="../qml/sailfish/EntryPage.qml" line="181"/>
<location filename="../qml/symbian/EntryPage.qml" line="131"/>
<source>Please wait until current task is complete.</source>
<translation>Wacht alstublieft totdat de huidige taak is afgerond.</translation>
@ -444,7 +446,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="88"/>
<location filename="../qml/harmattan/EntryPage.qml" line="137"/>
<location filename="../qml/sailfish/EntryPage.qml" line="186"/>
<location filename="../qml/sailfish/EntryPage.qml" line="187"/>
<location filename="../qml/symbian/EntryPage.qml" line="137"/>
<source>Offline version not available.</source>
<translation>Offline-versie niet beschikbaar.</translation>
@ -452,7 +454,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="96"/>
<location filename="../qml/harmattan/EntryPage.qml" line="145"/>
<location filename="../qml/sailfish/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="195"/>
<location filename="../qml/symbian/EntryPage.qml" line="145"/>
<source>Network connection is unavailable.
Switching to Offline mode.</source>
@ -462,7 +464,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="100"/>
<location filename="../qml/harmattan/EntryPage.qml" line="149"/>
<location filename="../qml/sailfish/EntryPage.qml" line="198"/>
<location filename="../qml/sailfish/EntryPage.qml" line="199"/>
<location filename="../qml/symbian/EntryPage.qml" line="149"/>
<source>Network connection is unavailable.</source>
<translation>Netwerkverbinding is niet beschikbaar.</translation>
@ -470,7 +472,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="276"/>
<location filename="../qml/harmattan/EntryPage.qml" line="192"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/symbian/EntryPage.qml" line="191"/>
<source>No saved items</source>
<translation>Geen opgeslagen items</translation>
@ -489,7 +491,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
</message>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="275"/>
<location filename="../qml/sailfish/EntryPage.qml" line="255"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<source>Wait until Sync finish.</source>
<translation>Wacht totdat de synchronisatie is voltooid.</translation>
</message>
@ -519,7 +521,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
<translation>Gefavoriet</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<source>No starred items</source>
<translation>Geen favoriete items</translation>
</message>
@ -541,14 +543,14 @@ Bezig met overschakelen naar Offline-modus.</translation>
<name>FeedPage</name>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="145"/>
<location filename="../qml/sailfish/FeedPage.qml" line="220"/>
<location filename="../qml/sailfish/FeedPage.qml" line="217"/>
<location filename="../qml/symbian/FeedPage.qml" line="143"/>
<source>Mark all as read</source>
<translation>Alles markeren als gelezen</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="153"/>
<location filename="../qml/sailfish/FeedPage.qml" line="228"/>
<location filename="../qml/sailfish/FeedPage.qml" line="225"/>
<location filename="../qml/symbian/FeedPage.qml" line="151"/>
<source>Mark all as unread</source>
<translation>Alles markeren als ongelezen</translation>
@ -556,7 +558,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/harmattan/FeedPage.qml" line="114"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<location filename="../qml/symbian/FeedPage.qml" line="113"/>
<source>No feeds</source>
<translation>Geen feeds</translation>
@ -581,7 +583,7 @@ Bezig met overschakelen naar Offline-modus.</translation>
</message>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<source>Wait until Sync finish.</source>
<translation>Wacht totdat de synchronisatie is voltooid.</translation>
</message>
@ -831,7 +833,7 @@ Lijst van alle artikelen van minder frequent bijgewerkte feeds. Een feed is aang
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="350"/>
<source>That's all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
<source>That&apos;s all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
&lt;i&gt;Show User Guide&lt;/i&gt;
on the settings page.</source>
<translation>Dat was het!&lt;br/&gt;&lt;br/&gt;Als u deze handleiding opnieuw wilt bekijken, druk dan op &lt;i&gt;Gebruikershandleiding weergeven&lt;/i&gt;
@ -1094,14 +1096,6 @@ Netwerkverbinding is niet beschikbaar.</translation>
<translation>Inloggen met uw Facebook-account</translation>
</message>
</context>
<context>
<name>OldReaderFetcher</name>
<message>
<location filename="../src/oldreaderfetcher.cpp" line="835"/>
<source>Subscriptions</source>
<translation>Abonnementen</translation>
</message>
</context>
<context>
<name>OldReaderSignInDialog</name>
<message>
@ -1281,7 +1275,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard in use</source>
<translation>Huidig gebruikt overzichtspaneel</translation>
@ -1289,67 +1283,61 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard not selected</source>
<translation>Geen overzichtspaneel geselecteerd</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="75"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="155"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="153"/>
<source>Change</source>
<translation>Wijzigen</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="50"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="66"/>
<source>Netvibes account</source>
<translation>Netvibes-account</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="67"/>
<source>Old Reader account</source>
<translation>Oude lezer-account</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="89"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="87"/>
<source>Not signed in </source>
<translation>Niet ingelogd</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="93"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="91"/>
<source>Signed in with</source>
<translation>Ingelogd met</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="225"/>
<source>Never</source>
<translation>Nooit</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="228"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="226"/>
<source>WiFi only</source>
<translation>Alleen via WiFi</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="229"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<source>Always</source>
<translation>Altijd</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="401"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="399"/>
<source>Read mode</source>
<translation>Leesmodus</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="402"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="400"/>
<source>Web pages will be reformatted into an easy to read version.</source>
<translation>Webpagina&apos;s zullen worden heropgemaakt zodat ze makkelijk te lezen zijn.</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="299"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="328"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="478"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="476"/>
<location filename="../qml/symbian/SettingsPage.qml" line="345"/>
<source>Web viewer font size</source>
<translation>Lettertypegrootte van webweergave</translation>
@ -1357,7 +1345,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="304"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="333"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="480"/>
<location filename="../qml/symbian/SettingsPage.qml" line="350"/>
<source>-50%</source>
<translation>-50%</translation>
@ -1365,7 +1353,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="309"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="334"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="483"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="481"/>
<location filename="../qml/symbian/SettingsPage.qml" line="351"/>
<source>Normal</source>
<translation>Normaal</translation>
@ -1373,7 +1361,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="314"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="335"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="484"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/symbian/SettingsPage.qml" line="352"/>
<source>+50%</source>
<translation>+50%</translation>
@ -1381,7 +1369,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="96"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="97"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="194"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="192"/>
<location filename="../qml/symbian/SettingsPage.qml" line="102"/>
<source>Delete cache</source>
<translation>Cache wissen</translation>
@ -1389,7 +1377,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="105"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="106"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="205"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="203"/>
<location filename="../qml/symbian/SettingsPage.qml" line="111"/>
<source>Network mode</source>
<translation>Netwerkmodus</translation>
@ -1397,7 +1385,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="128"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="126"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="236"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="234"/>
<location filename="../qml/symbian/SettingsPage.qml" line="142"/>
<source>After sync the content of all items will be downloaded and cached for access in the Offline mode.</source>
<translation>Na de synchronisatie zal de inhoud van alle items worden gedowload en gechached voor toegang in de offlinemodus.</translation>
@ -1405,7 +1393,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="149"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="247"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="245"/>
<location filename="../qml/symbian/SettingsPage.qml" line="157"/>
<source>Language</source>
<translation>Taal</translation>
@ -1413,7 +1401,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="154"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="163"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="280"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="278"/>
<location filename="../qml/symbian/SettingsPage.qml" line="179"/>
<source>Default</source>
<translation>Standaard</translation>
@ -1421,7 +1409,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="195"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="204"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="344"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="342"/>
<location filename="../qml/symbian/SettingsPage.qml" line="220"/>
<source>Changes will take effect after you restart Kaktus.</source>
<translation>De wijzigingen zullen worden toegepast nadat Kaktus is herstart.</translation>
@ -1480,21 +1468,21 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="213"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="262"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="413"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="411"/>
<location filename="../qml/symbian/SettingsPage.qml" line="278"/>
<source>Show images</source>
<translation>Afbeeldingen weergeven</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="345"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="493"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="491"/>
<location filename="../qml/symbian/SettingsPage.qml" line="362"/>
<source>Other</source>
<translation>Overig</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="350"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="497"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="495"/>
<location filename="../qml/symbian/SettingsPage.qml" line="367"/>
<source>Show User Guide</source>
<translation>Gebruikershandleiding weergeven</translation>
@ -1502,7 +1490,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="111"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="111"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="209"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="207"/>
<location filename="../qml/symbian/SettingsPage.qml" line="116"/>
<source>Online</source>
<translation>Online</translation>
@ -1510,7 +1498,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="117"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="112"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="210"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="208"/>
<location filename="../qml/symbian/SettingsPage.qml" line="117"/>
<source>Offline</source>
<translation>Offline</translation>
@ -1518,7 +1506,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="127"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="125"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="223"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="221"/>
<location filename="../qml/symbian/SettingsPage.qml" line="141"/>
<source>Cache articles</source>
<translation>Gecachete artikelen</translation>
@ -1526,7 +1514,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="204"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="252"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="391"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="389"/>
<location filename="../qml/symbian/SettingsPage.qml" line="268"/>
<source>Show only unread articles</source>
<translation>Alleen ongelezen artikelen weergeven</translation>
@ -1554,7 +1542,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign out</source>
<translation>Uitloggen</translation>
@ -1562,7 +1550,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign in</source>
<translation>Inloggen</translation>
@ -1575,7 +1563,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="84"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="87"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="165"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="163"/>
<location filename="../qml/symbian/SettingsPage.qml" line="92"/>
<source>Cache</source>
<translation>Cache</translation>
@ -1583,28 +1571,28 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="94"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="91"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="183"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="181"/>
<location filename="../qml/symbian/SettingsPage.qml" line="96"/>
<source>Current cache size</source>
<translation>Huidige cachegrootte</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="272"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="423"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="421"/>
<location filename="../qml/symbian/SettingsPage.qml" line="288"/>
<source>Power save mode</source>
<translation>Energiebesparingsmodus</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="273"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="424"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="422"/>
<location filename="../qml/symbian/SettingsPage.qml" line="289"/>
<source>When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption.</source>
<translation>Wanneer de telefoon of app in een inactieve staat verkeert, zullen alle openstaande webpagina&apos;s gesloten worden om energie te besparen.</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="288"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="438"/>
<location filename="../qml/symbian/SettingsPage.qml" line="304"/>
<source>Dynamic</source>
<translation>Dynamisch</translation>
@ -1612,28 +1600,28 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="138"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="137"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="241"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="239"/>
<location filename="../qml/symbian/SettingsPage.qml" line="153"/>
<source>UI</source>
<translation>Uiterlijk</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="283"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="436"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="434"/>
<location filename="../qml/symbian/SettingsPage.qml" line="299"/>
<source>Orientation</source>
<translation>Oriëntatie</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="289"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="441"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="439"/>
<location filename="../qml/symbian/SettingsPage.qml" line="305"/>
<source>Portrait</source>
<translation>Portret</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="290"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="442"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/symbian/SettingsPage.qml" line="306"/>
<source>Landscape</source>
<translation>Landschap</translation>
@ -1641,7 +1629,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="280"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="300"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="450"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="448"/>
<location filename="../qml/symbian/SettingsPage.qml" line="316"/>
<source>Offline viewer style</source>
<translation>Stijl van offlineweergave</translation>
@ -1649,7 +1637,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="285"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="310"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="460"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="458"/>
<location filename="../qml/symbian/SettingsPage.qml" line="327"/>
<source>Black</source>
<translation>Zwart</translation>
@ -1657,7 +1645,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="290"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="311"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="461"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="459"/>
<location filename="../qml/symbian/SettingsPage.qml" line="328"/>
<source>White</source>
<translation>Wit</translation>
@ -1770,7 +1758,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="157"/>
<location filename="../qml/sailfish/TabPage.qml" line="246"/>
<location filename="../qml/sailfish/TabPage.qml" line="244"/>
<location filename="../qml/symbian/TabPage.qml" line="154"/>
<source>Wait until Sync finish.</source>
<translation>Wacht totdat de synchronisatie is afgerond.</translation>
@ -1783,14 +1771,14 @@ Netwerkverbinding is niet beschikbaar.</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="138"/>
<location filename="../qml/sailfish/TabPage.qml" line="224"/>
<location filename="../qml/sailfish/TabPage.qml" line="222"/>
<location filename="../qml/symbian/TabPage.qml" line="135"/>
<source>Mark all as read</source>
<translation>Alles markeren als gelezen</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="145"/>
<location filename="../qml/sailfish/TabPage.qml" line="232"/>
<location filename="../qml/sailfish/TabPage.qml" line="230"/>
<location filename="../qml/symbian/TabPage.qml" line="142"/>
<source>Mark all as unread</source>
<translation>Alles markeren als ongelezen</translation>
@ -1798,7 +1786,7 @@ Netwerkverbinding is niet beschikbaar.</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="156"/>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/symbian/TabPage.qml" line="153"/>
<source>No tabs</source>
<translation>Geen tabbladen</translation>
@ -1809,7 +1797,14 @@ Netwerkverbinding is niet beschikbaar.</translation>
<translation>Mappen</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="131"/>
<location filename="../qml/sailfish/TabPage.qml" line="208"/>
<location filename="../qml/sailfish/TabPage.qml" line="212"/>
<source>Subscriptions</source>
<translation>Abonnementen</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<source>No folders</source>
<translation>Geen mappen</translation>
</message>
@ -1818,8 +1813,8 @@ Netwerkverbinding is niet beschikbaar.</translation>
<name>TourPage</name>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="61"/>
<source/>
<translation type="unfinished"/>
<source></source>
<translation></translation>
</message>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="66"/>
@ -2148,7 +2143,7 @@ Er is geen netwerkverbinding beschikbaar.</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="149"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<location filename="../qml/sailfish/main.qml" line="230"/>
<location filename="../qml/symbian/main.qml" line="146"/>
<source>Sync failed!
Network connection is unavailable.</source>
@ -2158,8 +2153,8 @@ Er is geen netwerkverbinding beschikbaar.</translation>
<message>
<location filename="../qml/harmattan/main.qml" line="160"/>
<location filename="../qml/harmattan/main.qml" line="170"/>
<location filename="../qml/sailfish/main.qml" line="237"/>
<location filename="../qml/sailfish/main.qml" line="259"/>
<location filename="../qml/sailfish/main.qml" line="241"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/symbian/main.qml" line="157"/>
<location filename="../qml/symbian/main.qml" line="167"/>
<source>The user name or password is incorrect!</source>
@ -2167,43 +2162,43 @@ Er is geen netwerkverbinding beschikbaar.</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="174"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/symbian/main.qml" line="171"/>
<source>You are signed in!</source>
<translation>U bent ingelogd!</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="178"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/sailfish/main.qml" line="271"/>
<location filename="../qml/symbian/main.qml" line="175"/>
<source>Receiving data... </source>
<translation>Bezig met verkrijgen van data...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="183"/>
<location filename="../qml/sailfish/main.qml" line="272"/>
<location filename="../qml/sailfish/main.qml" line="276"/>
<location filename="../qml/symbian/main.qml" line="180"/>
<source>Sending data...</source>
<translation>Bezig met versturen van data...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="189"/>
<location filename="../qml/sailfish/main.qml" line="282"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/symbian/main.qml" line="186"/>
<source>Initiating...</source>
<translation>Bezig met initialiseren...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="193"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/symbian/main.qml" line="190"/>
<source>Updating...</source>
<translation>Bezig met bijwerken...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="197"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/sailfish/main.qml" line="294"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/symbian/main.qml" line="194"/>
<source>Signing in...</source>
<translation>Bezig met inloggen...</translation>
@ -2212,9 +2207,9 @@ Er is geen netwerkverbinding beschikbaar.</translation>
<location filename="../qml/harmattan/main.qml" line="201"/>
<location filename="../qml/harmattan/main.qml" line="205"/>
<location filename="../qml/harmattan/main.qml" line="209"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/sailfish/main.qml" line="302"/>
<location filename="../qml/sailfish/main.qml" line="306"/>
<location filename="../qml/sailfish/main.qml" line="310"/>
<location filename="../qml/symbian/main.qml" line="198"/>
<location filename="../qml/symbian/main.qml" line="202"/>
<location filename="../qml/symbian/main.qml" line="206"/>
@ -2231,19 +2226,19 @@ Restart the app to rebuild cache data.</source>
Herstart de app om de cacheinhoud opnieuw op te bouwen.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="222"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<source>Something goes wrong. Unable to sign in! :-(</source>
<translation>Er is iets misgegaan en daardoor is het inloggen mislukt! :-(</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="254"/>
<location filename="../qml/sailfish/main.qml" line="258"/>
<source>Something went wrong :-(
An unknown error occurred.</source>
<translation>Er ging iets mis :-(
Er trad een onbekende fout op.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="467"/>
<location filename="../qml/sailfish/main.qml" line="471"/>
<source>Removing cache data...</source>
<translation>Bezig met verwijderen van cacheinhoud...</translation>
</message>
@ -2268,4 +2263,4 @@ Netwerkverbinding is niet beschikbaar.</translation>
<translation>Afsluiten</translation>
</message>
</context>
</TS>
</TS>

Binary file not shown.

View file

@ -291,42 +291,52 @@ Brak połączenia sieciowego.</translation>
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="456"/>
<source>Unsave</source>
<translation>Usuń z zapisanych</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="456"/>
<source>Save</source>
<translation>Zapisz</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="457"/>
<source>Unstar</source>
<translation>Usuń gwiazdkę</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="457"/>
<source>Star</source>
<translation>Ogwiazdkuj</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="468"/>
<source>Unshare</source>
<translation>Przestań udostępniać</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="468"/>
<source>Share</source>
<translation>Udostępnij</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="481"/>
<source>Collapse</source>
<translation>Zwiń</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="481"/>
<source>Expand</source>
<translation>Rozwiń</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="441"/>
<source>Mark as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="441"/>
<source>Mark as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
@ -439,7 +449,7 @@ Został włączony tryb Offline</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="193"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/sailfish/EntryPage.qml" line="268"/>
<location filename="../qml/symbian/EntryPage.qml" line="192"/>
<source>No unread items</source>
<translation>Brak nieprzeczytanych artykułów</translation>
@ -447,7 +457,7 @@ Został włączony tryb Offline</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/sailfish/EntryPage.qml" line="268"/>
<location filename="../qml/symbian/EntryPage.qml" line="193"/>
<source>No items</source>
<translation>Brak artykułów</translation>
@ -479,7 +489,7 @@ Został włączony tryb Offline</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="82"/>
<location filename="../qml/harmattan/EntryPage.qml" line="131"/>
<location filename="../qml/sailfish/EntryPage.qml" line="181"/>
<location filename="../qml/sailfish/EntryPage.qml" line="183"/>
<location filename="../qml/symbian/EntryPage.qml" line="131"/>
<source>Please wait until current task is complete.</source>
<translation>Zaczekaj do zakończenia obecnego zadania.</translation>
@ -487,7 +497,7 @@ Został włączony tryb Offline</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="88"/>
<location filename="../qml/harmattan/EntryPage.qml" line="137"/>
<location filename="../qml/sailfish/EntryPage.qml" line="187"/>
<location filename="../qml/sailfish/EntryPage.qml" line="189"/>
<location filename="../qml/symbian/EntryPage.qml" line="137"/>
<source>Offline version not available.</source>
<translation>Brak kopii Offline.</translation>
@ -495,7 +505,7 @@ Został włączony tryb Offline</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="96"/>
<location filename="../qml/harmattan/EntryPage.qml" line="145"/>
<location filename="../qml/sailfish/EntryPage.qml" line="195"/>
<location filename="../qml/sailfish/EntryPage.qml" line="197"/>
<location filename="../qml/symbian/EntryPage.qml" line="145"/>
<source>Network connection is unavailable.
Switching to Offline mode.</source>
@ -505,7 +515,7 @@ Został włączony tryb Offline.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="100"/>
<location filename="../qml/harmattan/EntryPage.qml" line="149"/>
<location filename="../qml/sailfish/EntryPage.qml" line="199"/>
<location filename="../qml/sailfish/EntryPage.qml" line="201"/>
<location filename="../qml/symbian/EntryPage.qml" line="149"/>
<source>Network connection is unavailable.</source>
<translation>Brak połączenia sieciowego.</translation>
@ -513,7 +523,7 @@ Został włączony tryb Offline.</translation>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="276"/>
<location filename="../qml/harmattan/EntryPage.qml" line="192"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="267"/>
<location filename="../qml/symbian/EntryPage.qml" line="191"/>
<source>No saved items</source>
<translation>Brak zapisanych artykułów</translation>
@ -532,7 +542,7 @@ Został włączony tryb Offline.</translation>
</message>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="275"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="266"/>
<source>Wait until Sync finish.</source>
<translation>Zaczekaj do zakończenia aktualizacji.</translation>
</message>
@ -566,10 +576,15 @@ Został włączony tryb Offline.</translation>
<translation>Ogwiazdkowane</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="267"/>
<source>No starred items</source>
<translation>Brak ogwiazdkowanych artykułów</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="289"/>
<source>One-tap to open article, double-tap to mark as read</source>
<translation>Pojedyńcze pacnięcie otwiera artykuł, a podwójne oznacza jako przeczytany</translation>
</message>
</context>
<context>
<name>ErrorPage</name>
@ -1922,7 +1937,7 @@ Brak połączenia sieciowego</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="157"/>
<location filename="../qml/sailfish/TabPage.qml" line="244"/>
<location filename="../qml/sailfish/TabPage.qml" line="255"/>
<location filename="../qml/symbian/TabPage.qml" line="154"/>
<source>Wait until Sync finish.</source>
<translation>Zaczekaj do zakończenia aktualizacji.</translation>
@ -1935,14 +1950,14 @@ Brak połączenia sieciowego</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="138"/>
<location filename="../qml/sailfish/TabPage.qml" line="222"/>
<location filename="../qml/sailfish/TabPage.qml" line="233"/>
<location filename="../qml/symbian/TabPage.qml" line="135"/>
<source>Mark all as read</source>
<translation>Oznacz jako przeczytane</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="145"/>
<location filename="../qml/sailfish/TabPage.qml" line="230"/>
<location filename="../qml/sailfish/TabPage.qml" line="241"/>
<location filename="../qml/symbian/TabPage.qml" line="142"/>
<source>Mark all as unread</source>
<translation>Oznacz jako nieprzeczytane</translation>
@ -1950,7 +1965,7 @@ Brak połączenia sieciowego</translation>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="156"/>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/sailfish/TabPage.qml" line="256"/>
<location filename="../qml/symbian/TabPage.qml" line="153"/>
<source>No tabs</source>
<translation>Brak zakładek</translation>
@ -1974,13 +1989,20 @@ Brak połączenia sieciowego</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="131"/>
<location filename="../qml/sailfish/TabPage.qml" line="208"/>
<location filename="../qml/sailfish/TabPage.qml" line="212"/>
<location filename="../qml/sailfish/TabPage.qml" line="219"/>
<location filename="../qml/sailfish/TabPage.qml" line="223"/>
<source>Subscriptions</source>
<translation>Subskrypcje</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/sailfish/TabPage.qml" line="132"/>
<location filename="../qml/sailfish/TabPage.qml" line="219"/>
<location filename="../qml/sailfish/TabPage.qml" line="223"/>
<source>Following</source>
<translation>Obserwowani</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="256"/>
<source>No folders</source>
<translation>Brak folderów</translation>
</message>

Binary file not shown.

View file

@ -1,4 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ru">
<context>
<name>AboutPage</name>
<message>
@ -179,7 +181,7 @@
<name>ControlBar</name>
<message>
<location filename="../qml/sailfish/ControlBar.qml" line="179"/>
<source>Can't switch to Online mode.
<source>Can&apos;t switch to Online mode.
Network connection is unavailable.</source>
<translation>Невозможно переключиться в режим онлайн.
Отсутствует соединение с сетью</translation>
@ -285,42 +287,42 @@ Network connection is unavailable.</source>
<context>
<name>EntryDelegate</name>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Unsave</source>
<translation>Убрать из закладок</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="391"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="394"/>
<source>Save</source>
<translation>В закладки</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Unstar</source>
<translation>Убрать из закладок</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="392"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="395"/>
<source>Star</source>
<translation>В закладки</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Collapse</source>
<translation>Свернуть</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="404"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="407"/>
<source>Expand</source>
<translation>Развернуть</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as unread</source>
<translation>Отметить как непрочитанное</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryDelegate.qml" line="376"/>
<location filename="../qml/sailfish/EntryDelegate.qml" line="379"/>
<source>Mark as read</source>
<translation>Отметить как прочитанное</translation>
</message>
@ -328,37 +330,37 @@ Network connection is unavailable.</source>
<context>
<name>EntryModel</name>
<message>
<location filename="../src/entrymodel.cpp" line="194"/>
<location filename="../src/entrymodel.cpp" line="195"/>
<source>Today</source>
<translation>Сегодня</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="197"/>
<location filename="../src/entrymodel.cpp" line="198"/>
<source>Yesterday</source>
<translation>Вчера</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="200"/>
<location filename="../src/entrymodel.cpp" line="201"/>
<source>Current week</source>
<translation>На этой неделе</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="203"/>
<location filename="../src/entrymodel.cpp" line="204"/>
<source>Current month</source>
<translation>В этом меяце</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="206"/>
<location filename="../src/entrymodel.cpp" line="207"/>
<source>Previous month</source>
<translation>В прошлом месяце</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="209"/>
<location filename="../src/entrymodel.cpp" line="210"/>
<source>Current year</source>
<translation>В этом году</translation>
</message>
<message>
<location filename="../src/entrymodel.cpp" line="212"/>
<location filename="../src/entrymodel.cpp" line="213"/>
<source>Previous year &amp; older</source>
<translation>В прошлом году и раньше</translation>
</message>
@ -396,7 +398,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="193"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="192"/>
<source>No unread items</source>
<translation>Нет новых статей</translation>
@ -404,7 +406,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="277"/>
<location filename="../qml/harmattan/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/sailfish/EntryPage.qml" line="258"/>
<location filename="../qml/symbian/EntryPage.qml" line="193"/>
<source>No items</source>
<translation>Нет статей</translation>
@ -436,7 +438,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="82"/>
<location filename="../qml/harmattan/EntryPage.qml" line="131"/>
<location filename="../qml/sailfish/EntryPage.qml" line="180"/>
<location filename="../qml/sailfish/EntryPage.qml" line="181"/>
<location filename="../qml/symbian/EntryPage.qml" line="131"/>
<source>Please wait until current task is complete.</source>
<translation>Подождите, пока текущая задача не завершится</translation>
@ -444,7 +446,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="88"/>
<location filename="../qml/harmattan/EntryPage.qml" line="137"/>
<location filename="../qml/sailfish/EntryPage.qml" line="186"/>
<location filename="../qml/sailfish/EntryPage.qml" line="187"/>
<location filename="../qml/symbian/EntryPage.qml" line="137"/>
<source>Offline version not available.</source>
<translation>Офлайн версия недоступна</translation>
@ -452,7 +454,7 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="96"/>
<location filename="../qml/harmattan/EntryPage.qml" line="145"/>
<location filename="../qml/sailfish/EntryPage.qml" line="194"/>
<location filename="../qml/sailfish/EntryPage.qml" line="195"/>
<location filename="../qml/symbian/EntryPage.qml" line="145"/>
<source>Network connection is unavailable.
Switching to Offline mode.</source>
@ -462,7 +464,7 @@ Switching to Offline mode.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="100"/>
<location filename="../qml/harmattan/EntryPage.qml" line="149"/>
<location filename="../qml/sailfish/EntryPage.qml" line="198"/>
<location filename="../qml/sailfish/EntryPage.qml" line="199"/>
<location filename="../qml/symbian/EntryPage.qml" line="149"/>
<source>Network connection is unavailable.</source>
<translation>Отсутствует соединение с сетью</translation>
@ -470,7 +472,7 @@ Switching to Offline mode.</source>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="276"/>
<location filename="../qml/harmattan/EntryPage.qml" line="192"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<location filename="../qml/symbian/EntryPage.qml" line="191"/>
<source>No saved items</source>
<translation>Здесь пока нет записей</translation>
@ -489,7 +491,7 @@ Switching to Offline mode.</source>
</message>
<message>
<location filename="../qml/bb10/EntryPage.qml" line="275"/>
<location filename="../qml/sailfish/EntryPage.qml" line="255"/>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<source>Wait until Sync finish.</source>
<translation>Дождитесь окончания синхронизации</translation>
</message>
@ -519,7 +521,7 @@ Switching to Offline mode.</source>
<translation>Закладки</translation>
</message>
<message>
<location filename="../qml/sailfish/EntryPage.qml" line="256"/>
<location filename="../qml/sailfish/EntryPage.qml" line="257"/>
<source>No starred items</source>
<translation>Здесь пока нет записей</translation>
</message>
@ -541,14 +543,14 @@ Switching to Offline mode.</source>
<name>FeedPage</name>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="145"/>
<location filename="../qml/sailfish/FeedPage.qml" line="220"/>
<location filename="../qml/sailfish/FeedPage.qml" line="217"/>
<location filename="../qml/symbian/FeedPage.qml" line="143"/>
<source>Mark all as read</source>
<translation>Отметить все как прочитанные</translation>
</message>
<message>
<location filename="../qml/harmattan/FeedPage.qml" line="153"/>
<location filename="../qml/sailfish/FeedPage.qml" line="228"/>
<location filename="../qml/sailfish/FeedPage.qml" line="225"/>
<location filename="../qml/symbian/FeedPage.qml" line="151"/>
<source>Mark all as unread</source>
<translation>Отметить все как непрочитанные</translation>
@ -556,7 +558,7 @@ Switching to Offline mode.</source>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/harmattan/FeedPage.qml" line="114"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<location filename="../qml/symbian/FeedPage.qml" line="113"/>
<source>No feeds</source>
<translation>Записей пока нет</translation>
@ -581,7 +583,7 @@ Switching to Offline mode.</source>
</message>
<message>
<location filename="../qml/bb10/FeedPage.qml" line="141"/>
<location filename="../qml/sailfish/FeedPage.qml" line="241"/>
<location filename="../qml/sailfish/FeedPage.qml" line="238"/>
<source>Wait until Sync finish.</source>
<translation>Дождитесь окончания синхронизации</translation>
</message>
@ -830,7 +832,7 @@ List articles from less frequently updated feeds. A feed is considered &quot;slo
</message>
<message>
<location filename="../qml/sailfish/Guide.qml" line="350"/>
<source>That's all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
<source>That&apos;s all!&lt;br/&gt;&lt;br/&gt;If you want to see this guide one more time, click on
&lt;i&gt;Show User Guide&lt;/i&gt;
on the settings page.</source>
<translation>Вот и все!&lt;br/&gt;&lt;br/&gt;Если вы хотите увидеть это руководство еще раз, нажмите на
@ -1093,14 +1095,6 @@ Network connection is unavailable</source>
<translation>Войти с помощью Facebook</translation>
</message>
</context>
<context>
<name>OldReaderFetcher</name>
<message>
<location filename="../src/oldreaderfetcher.cpp" line="835"/>
<source>Subscriptions</source>
<translation>Подписки</translation>
</message>
</context>
<context>
<name>OldReaderSignInDialog</name>
<message>
@ -1280,7 +1274,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard in use</source>
<translation>Рабочий стол</translation>
@ -1288,67 +1282,61 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="73"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="77"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="139"/>
<location filename="../qml/symbian/SettingsPage.qml" line="82"/>
<source>Dashboard not selected</source>
<translation>Рабочий стол не выбран</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="75"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="155"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="153"/>
<source>Change</source>
<translation>Изменить</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="50"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="66"/>
<source>Netvibes account</source>
<translation>Аккаунт Netvibes </translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="67"/>
<source>Old Reader account</source>
<translation>Аккаунт Old Reader</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="89"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="87"/>
<source>Not signed in </source>
<translation>Вход не выполнен</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="93"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="91"/>
<source>Signed in with</source>
<translation>Вошли как</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="225"/>
<source>Never</source>
<translation>Никогда</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="228"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="226"/>
<source>WiFi only</source>
<translation>Только по WiFi </translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="229"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="227"/>
<source>Always</source>
<translation>Всегда</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="401"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="399"/>
<source>Read mode</source>
<translation>Режим чтения</translation>
</message>
<message>
<location filename="../qml/sailfish/SettingsPage.qml" line="402"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="400"/>
<source>Web pages will be reformatted into an easy to read version.</source>
<translation>Веб-страницы будут отформатированы в удобную для чтения версию</translation>
</message>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="299"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="328"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="478"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="476"/>
<location filename="../qml/symbian/SettingsPage.qml" line="345"/>
<source>Web viewer font size</source>
<translation>Размер шрифта</translation>
@ -1356,7 +1344,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="304"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="333"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="480"/>
<location filename="../qml/symbian/SettingsPage.qml" line="350"/>
<source>-50%</source>
<translation>-50%</translation>
@ -1364,7 +1352,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="309"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="334"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="483"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="481"/>
<location filename="../qml/symbian/SettingsPage.qml" line="351"/>
<source>Normal</source>
<translation>Обычный</translation>
@ -1372,7 +1360,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="314"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="335"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="484"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="482"/>
<location filename="../qml/symbian/SettingsPage.qml" line="352"/>
<source>+50%</source>
<translation>+50%</translation>
@ -1380,7 +1368,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="96"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="97"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="194"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="192"/>
<location filename="../qml/symbian/SettingsPage.qml" line="102"/>
<source>Delete cache</source>
<translation>Очистить кэш</translation>
@ -1388,7 +1376,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="105"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="106"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="205"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="203"/>
<location filename="../qml/symbian/SettingsPage.qml" line="111"/>
<source>Network mode</source>
<translation>Режим сети</translation>
@ -1396,7 +1384,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="128"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="126"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="236"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="234"/>
<location filename="../qml/symbian/SettingsPage.qml" line="142"/>
<source>After sync the content of all items will be downloaded and cached for access in the Offline mode.</source>
<translation>После синхронизации все данные будут загружаться и кэшироваться для доступа в автономном режиме</translation>
@ -1404,7 +1392,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="149"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="141"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="247"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="245"/>
<location filename="../qml/symbian/SettingsPage.qml" line="157"/>
<source>Language</source>
<translation>Язык</translation>
@ -1412,7 +1400,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="154"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="163"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="280"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="278"/>
<location filename="../qml/symbian/SettingsPage.qml" line="179"/>
<source>Default</source>
<translation>По умолчанию</translation>
@ -1420,7 +1408,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="195"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="204"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="344"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="342"/>
<location filename="../qml/symbian/SettingsPage.qml" line="220"/>
<source>Changes will take effect after you restart Kaktus.</source>
<translation>Для применения изменений перезапустите Kaktus</translation>
@ -1479,21 +1467,21 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="213"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="262"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="413"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="411"/>
<location filename="../qml/symbian/SettingsPage.qml" line="278"/>
<source>Show images</source>
<translation>Показывать изображения</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="345"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="493"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="491"/>
<location filename="../qml/symbian/SettingsPage.qml" line="362"/>
<source>Other</source>
<translation>Разное</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="350"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="497"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="495"/>
<location filename="../qml/symbian/SettingsPage.qml" line="367"/>
<source>Show User Guide</source>
<translation>Руководство пользователя</translation>
@ -1501,7 +1489,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="111"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="111"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="209"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="207"/>
<location filename="../qml/symbian/SettingsPage.qml" line="116"/>
<source>Online</source>
<translation>Онлайн</translation>
@ -1509,7 +1497,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="117"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="112"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="210"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="208"/>
<location filename="../qml/symbian/SettingsPage.qml" line="117"/>
<source>Offline</source>
<translation>Офлайн</translation>
@ -1517,7 +1505,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="127"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="125"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="223"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="221"/>
<location filename="../qml/symbian/SettingsPage.qml" line="141"/>
<source>Cache articles</source>
<translation>Кэширование статей</translation>
@ -1525,7 +1513,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="204"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="252"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="391"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="389"/>
<location filename="../qml/symbian/SettingsPage.qml" line="268"/>
<source>Show only unread articles</source>
<translation>Показывать только непрочитанные статьи</translation>
@ -1553,7 +1541,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign out</source>
<translation>Выйти</translation>
@ -1561,7 +1549,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="62"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="66"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="110"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="108"/>
<location filename="../qml/symbian/SettingsPage.qml" line="65"/>
<source>Sign in</source>
<translation>Вход</translation>
@ -1574,7 +1562,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="84"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="87"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="165"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="163"/>
<location filename="../qml/symbian/SettingsPage.qml" line="92"/>
<source>Cache</source>
<translation>Кэш</translation>
@ -1582,28 +1570,28 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="94"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="91"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="183"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="181"/>
<location filename="../qml/symbian/SettingsPage.qml" line="96"/>
<source>Current cache size</source>
<translation>Размер кэша</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="272"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="423"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="421"/>
<location filename="../qml/symbian/SettingsPage.qml" line="288"/>
<source>Power save mode</source>
<translation>Режим экономии энергии</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="273"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="424"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="422"/>
<location filename="../qml/symbian/SettingsPage.qml" line="289"/>
<source>When the phone or app goes to the idle state, all opened web pages will be closed to lower power consumption.</source>
<translation>Когда телефон или приложение переходит в спящий режим, все открытые веб-страницы будут закрыты с целью снижения энергопотребления</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="288"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="438"/>
<location filename="../qml/symbian/SettingsPage.qml" line="304"/>
<source>Dynamic</source>
<translation>Свободная</translation>
@ -1611,28 +1599,28 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="138"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="137"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="241"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="239"/>
<location filename="../qml/symbian/SettingsPage.qml" line="153"/>
<source>UI</source>
<translation>Интерфейс</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="283"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="436"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="434"/>
<location filename="../qml/symbian/SettingsPage.qml" line="299"/>
<source>Orientation</source>
<translation>Ориентация экрана</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="289"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="441"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="439"/>
<location filename="../qml/symbian/SettingsPage.qml" line="305"/>
<source>Portrait</source>
<translation>Портретная</translation>
</message>
<message>
<location filename="../qml/harmattan/SettingsPage.qml" line="290"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="442"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="440"/>
<location filename="../qml/symbian/SettingsPage.qml" line="306"/>
<source>Landscape</source>
<translation>Ландшафтная</translation>
@ -1640,7 +1628,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="280"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="300"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="450"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="448"/>
<location filename="../qml/symbian/SettingsPage.qml" line="316"/>
<source>Offline viewer style</source>
<translation>Стиль офлайн просмотра</translation>
@ -1648,7 +1636,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="285"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="310"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="460"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="458"/>
<location filename="../qml/symbian/SettingsPage.qml" line="327"/>
<source>Black</source>
<translation>Черный</translation>
@ -1656,7 +1644,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/SettingsPage.qml" line="290"/>
<location filename="../qml/harmattan/SettingsPage.qml" line="311"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="461"/>
<location filename="../qml/sailfish/SettingsPage.qml" line="459"/>
<location filename="../qml/symbian/SettingsPage.qml" line="328"/>
<source>White</source>
<translation>Белый</translation>
@ -1769,7 +1757,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="157"/>
<location filename="../qml/sailfish/TabPage.qml" line="246"/>
<location filename="../qml/sailfish/TabPage.qml" line="244"/>
<location filename="../qml/symbian/TabPage.qml" line="154"/>
<source>Wait until Sync finish.</source>
<translation>Дождитесь окончания синхронизации</translation>
@ -1782,14 +1770,14 @@ Network connection is unavailable</source>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="138"/>
<location filename="../qml/sailfish/TabPage.qml" line="224"/>
<location filename="../qml/sailfish/TabPage.qml" line="222"/>
<location filename="../qml/symbian/TabPage.qml" line="135"/>
<source>Mark all as read</source>
<translation>Отметить все как прочитанные</translation>
</message>
<message>
<location filename="../qml/harmattan/TabPage.qml" line="145"/>
<location filename="../qml/sailfish/TabPage.qml" line="232"/>
<location filename="../qml/sailfish/TabPage.qml" line="230"/>
<location filename="../qml/symbian/TabPage.qml" line="142"/>
<source>Mark all as unread</source>
<translation>Отметить все как непрочитанные</translation>
@ -1797,7 +1785,7 @@ Network connection is unavailable</source>
<message>
<location filename="../qml/bb10/TabPage.qml" line="147"/>
<location filename="../qml/harmattan/TabPage.qml" line="156"/>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<location filename="../qml/symbian/TabPage.qml" line="153"/>
<source>No tabs</source>
<translation>Нет категорий</translation>
@ -1808,7 +1796,14 @@ Network connection is unavailable</source>
<translation>Папки</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="247"/>
<location filename="../qml/sailfish/TabPage.qml" line="131"/>
<location filename="../qml/sailfish/TabPage.qml" line="208"/>
<location filename="../qml/sailfish/TabPage.qml" line="212"/>
<source>Subscriptions</source>
<translation>Подписки</translation>
</message>
<message>
<location filename="../qml/sailfish/TabPage.qml" line="245"/>
<source>No folders</source>
<translation>Здесь еще нет папок</translation>
</message>
@ -1817,8 +1812,8 @@ Network connection is unavailable</source>
<name>TourPage</name>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="61"/>
<source/>
<translation type="unfinished"/>
<source></source>
<translation></translation>
</message>
<message>
<location filename="../qml/sailfish/TourPage.qml" line="66"/>
@ -2147,7 +2142,7 @@ Network connection is unavailable.</source>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="149"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<location filename="../qml/sailfish/main.qml" line="230"/>
<location filename="../qml/symbian/main.qml" line="146"/>
<source>Sync failed!
Network connection is unavailable.</source>
@ -2156,8 +2151,8 @@ Network connection is unavailable.</source>
<message>
<location filename="../qml/harmattan/main.qml" line="160"/>
<location filename="../qml/harmattan/main.qml" line="170"/>
<location filename="../qml/sailfish/main.qml" line="237"/>
<location filename="../qml/sailfish/main.qml" line="259"/>
<location filename="../qml/sailfish/main.qml" line="241"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/symbian/main.qml" line="157"/>
<location filename="../qml/symbian/main.qml" line="167"/>
<source>The user name or password is incorrect!</source>
@ -2165,43 +2160,43 @@ Network connection is unavailable.</source>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="174"/>
<location filename="../qml/sailfish/main.qml" line="263"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/symbian/main.qml" line="171"/>
<source>You are signed in!</source>
<translation>Вы вошли!</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="178"/>
<location filename="../qml/sailfish/main.qml" line="267"/>
<location filename="../qml/sailfish/main.qml" line="271"/>
<location filename="../qml/symbian/main.qml" line="175"/>
<source>Receiving data... </source>
<translation>Загрузка данных...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="183"/>
<location filename="../qml/sailfish/main.qml" line="272"/>
<location filename="../qml/sailfish/main.qml" line="276"/>
<location filename="../qml/symbian/main.qml" line="180"/>
<source>Sending data...</source>
<translation>Отправка данных...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="189"/>
<location filename="../qml/sailfish/main.qml" line="282"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/symbian/main.qml" line="186"/>
<source>Initiating...</source>
<translation>Инициирование...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="193"/>
<location filename="../qml/sailfish/main.qml" line="286"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/symbian/main.qml" line="190"/>
<source>Updating...</source>
<translation>Обновление...</translation>
</message>
<message>
<location filename="../qml/harmattan/main.qml" line="197"/>
<location filename="../qml/sailfish/main.qml" line="290"/>
<location filename="../qml/sailfish/main.qml" line="294"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/symbian/main.qml" line="194"/>
<source>Signing in...</source>
<translation>Выполняется вход...</translation>
@ -2210,9 +2205,9 @@ Network connection is unavailable.</source>
<location filename="../qml/harmattan/main.qml" line="201"/>
<location filename="../qml/harmattan/main.qml" line="205"/>
<location filename="../qml/harmattan/main.qml" line="209"/>
<location filename="../qml/sailfish/main.qml" line="298"/>
<location filename="../qml/sailfish/main.qml" line="302"/>
<location filename="../qml/sailfish/main.qml" line="306"/>
<location filename="../qml/sailfish/main.qml" line="310"/>
<location filename="../qml/symbian/main.qml" line="198"/>
<location filename="../qml/symbian/main.qml" line="202"/>
<location filename="../qml/symbian/main.qml" line="206"/>
@ -2229,19 +2224,19 @@ Restart the app to rebuild cache data.</source>
Перезапустите приложение для восстановления данных кэша.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="222"/>
<location filename="../qml/sailfish/main.qml" line="226"/>
<source>Something goes wrong. Unable to sign in! :-(</source>
<translation>Что-то пошло не так. Не удается выполнить вход :-(</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="254"/>
<location filename="../qml/sailfish/main.qml" line="258"/>
<source>Something went wrong :-(
An unknown error occurred.</source>
<translation>Что-то пошло не так :-(
Произошла неизвестная ошибка.</translation>
</message>
<message>
<location filename="../qml/sailfish/main.qml" line="467"/>
<location filename="../qml/sailfish/main.qml" line="471"/>
<source>Removing cache data...</source>
<translation>Удаление данных кэша...</translation>
</message>
@ -2266,4 +2261,4 @@ Network connection is unavailable.</source>
<translation>Выход</translation>
</message>
</context>
</TS>
</TS>

View file

@ -35,6 +35,8 @@ ListItem {
property int maxWords: 20
property int maxChars: 200
property bool cached: false
property bool broadcast
property bool liked
property bool fresh
property bool expanded: false
property int index
@ -50,6 +52,8 @@ ListItem {
signal markedAsUnread
signal markedReadlater
signal unmarkedReadlater
signal markedBroadcast
signal unmarkedBroadcast
enabled: !last && !daterow
@ -121,6 +125,38 @@ ListItem {
}
}
/*BackgroundItem {
id: like
anchors.right: background.right; anchors.top: star.bottom
height: Theme.iconSizeSmall+2*Theme.paddingMedium
width: height
visible: root.liked
Image {
anchors.centerIn: parent;
width: Theme.iconSizeSmall
height: Theme.iconSizeSmall
source: root.down ? "image://theme/icon-m-like?"+Theme.highlightColor :
"image://theme/icon-m-like?"+Theme.primaryColor
}
}
BackgroundItem {
id: broadcast
anchors.right: background.right; anchors.top: star.bottom
height: Theme.iconSizeSmall+2*Theme.paddingMedium
width: height
visible: root.broadcast
Image {
anchors.centerIn: parent;
width: Theme.iconSizeSmall
height: Theme.iconSizeSmall
source: root.down ? "image://theme/icon-m-share?"+Theme.highlightColor :
"image://theme/icon-m-share?"+Theme.primaryColor
}
}*/
Item {
id: dateRowbox
visible: daterow
@ -350,19 +386,45 @@ ListItem {
visible: box.expandable
}
Label {
Column {
id: expanderLabel
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left; anchors.right: expanderIcon.left;
anchors.leftMargin: Theme.paddingLarge
anchors.rightMargin: Theme.paddingMedium
font.pixelSize: Theme.fontSizeExtraSmall
color: root.down ? Theme.secondaryHighlightColor : Theme.secondaryColor
truncationMode: TruncationMode.Fade
text: root.author!=""
? utils.getHumanFriendlyTimeString(date)+" • "+root.author
: utils.getHumanFriendlyTimeString(date)
Row {
anchors.left: parent.left
visible: !root.hidden || root.expanded
spacing: Theme.paddingMedium
Image {
width: Theme.iconSizeSmall
height: Theme.iconSizeSmall
visible: root.liked
source: root.down ? "image://theme/icon-m-like?"+Theme.secondaryHighlightColor :
"image://theme/icon-m-like?"+Theme.secondaryColor
}
Image {
width: Theme.iconSizeSmall
height: Theme.iconSizeSmall
visible: root.broadcast
source: root.down ? "image://theme/icon-m-share?"+Theme.secondaryHighlightColor :
"image://theme/icon-m-share?"+Theme.secondaryColor
}
}
Label {
anchors.left: parent.left; anchors.right: parent.right
font.pixelSize: Theme.fontSizeExtraSmall
color: root.down ? Theme.secondaryHighlightColor : Theme.secondaryColor
truncationMode: TruncationMode.Fade
text: root.author!=""
? utils.getHumanFriendlyTimeString(date)+" • "+root.author
: utils.getHumanFriendlyTimeString(date)
}
}
onClicked: {
@ -402,6 +464,18 @@ ListItem {
}
}
MenuItem {
text: broadcast ? qsTr("Unshare") : qsTr("Share")
enabled: settings.signinType >= 10
onClicked: {
if (broadcast) {
root.unmarkedBroadcast();
} else {
root.markedBroadcast();
}
}
}
MenuItem {
visible: box.expandable
text: root.expanded ? qsTr("Collapse") : qsTr("Expand")

View file

@ -128,7 +128,8 @@ Page {
color: listItem.down ?
(model.unread ? Theme.highlightColor : Theme.secondaryHighlightColor) :
(model.unread ? Theme.primaryColor : Theme.secondaryColor)
text: model.uid=="subscriptions" ? qsTr("Subscriptions") : model.title
text: model.uid=="subscriptions" ? qsTr("Subscriptions") :
model.uid=="friends" ? qsTr("Following") : model.title
}
}
@ -185,6 +186,11 @@ Page {
Connections {
target: settings
onShowTabIconsChanged: {
/*if (model.uid=="friends") {
image.source = "image://theme/icon-m-service-generic?"+Theme.primaryColor;
return;
}*/
if (iconUrl=="") {
image.source = "";
return;
@ -194,6 +200,11 @@ Page {
}
Component.onCompleted: {
/*if (model.uid=="friends") {
image.source = "image://theme/icon-m-service-generic?"+Theme.primaryColor;
return;
}*/
if (iconUrl=="") {
image.source = "";
return;
@ -205,11 +216,11 @@ Page {
if (!listItem.last) {
if (settings.viewMode == 0) {
utils.setFeedModel(uid);
pageStack.push(Qt.resolvedUrl("FeedPage.qml"),{"title": model.uid=="subscriptions" ? qsTr("Subscriptions") : title, "index": model.index});
pageStack.push(Qt.resolvedUrl("FeedPage.qml"),{"title": model.uid=="subscriptions" ? qsTr("Subscriptions") : model.uid=="friends" ? qsTr("Following") : title, "index": model.index});
}
if (settings.viewMode == 1) {
utils.setEntryModel(uid);
pageStack.push(Qt.resolvedUrl("EntryPage.qml"),{"title": model.uid=="subscriptions" ? qsTr("Subscriptions") : title, "readlater": false});
pageStack.push(Qt.resolvedUrl("EntryPage.qml"),{"title": model.uid=="subscriptions" ? qsTr("Subscriptions") : model.uid=="friends" ? qsTr("Following") : title, "readlater": false});
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -14,7 +14,7 @@ Name: harbour-kaktus
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Kaktus
Version: 2.0
Release: 3
Release: 4
Group: Qt/Qt
License: LICENSE
URL: https://github.com/mkiol/kaktus
@ -76,6 +76,11 @@ desktop-file-install --delete-original \
%changelog
* Sat Jun 06 2015 Michal Kosciesza 2.0-4
- Following folder & share action for Oldreader
- Hint panel
- BUG FIX: Some Netvibes tab icons are not displayed
* Sun May 31 2015 Michal Kosciesza 2.0-3
- Many small bug fixes

View file

@ -22,7 +22,7 @@
#include "databasemanager.h"
const QString DatabaseManager::version = QString("2.0");
const QString DatabaseManager::version = QString("21");
DatabaseManager::DatabaseManager(QObject *parent) :
QObject(parent)
@ -127,7 +127,7 @@ bool DatabaseManager::isTableExists(const QString &name)
return false;
}
bool DatabaseManager::alterDB_19to20()
bool DatabaseManager::alterDB_19to21()
{
bool ret = true;
if (db.isOpen()) {
@ -136,10 +136,13 @@ bool DatabaseManager::alterDB_19to20()
query.exec("PRAGMA journal_mode = MEMORY");
query.exec("PRAGMA synchronous = OFF");
ret = query.exec("ALTER TABLE entries ADD COLUMN annotations TEXT;");
ret = query.exec("ALTER TABLE entries ADD COLUMN fresh_or INTEGER DEFAULT 0;");
ret = query.exec("ALTER TABLE entries ADD COLUMN liked INTEGER DEFAULT 0;");
ret = query.exec("ALTER TABLE entries ADD COLUMN broadcast INTEGER DEFAULT 0;");
ret = query.exec("ALTER TABLE entries ADD COLUMN timestamp TIMESTAMP;");
ret = query.exec("ALTER TABLE entries ADD COLUMN crawl_time TIMESTAMP;");
ret = query.exec("ALTER TABLE actions ADD COLUMN text TEXT;");
if (!ret) {
checkError(query.lastError());
@ -191,13 +194,45 @@ bool DatabaseManager::alterDB_19to20()
ret = query.exec("CREATE INDEX IF NOT EXISTS entries_read_and_liked_by_stream_last_update "
"ON entries(stream_id, read, liked, last_update);");
if (!ret) {
checkError(query.lastError());
return ret;
}
ret = query.exec("UPDATE parameters SET value='21';");
if (!ret) {
checkError(query.lastError());
return ret;
}
ret = query.exec("UPDATE parameters SET value='2.0';");
} else {
qWarning() << "DB is not opened!";
return false;
}
return ret;
}
bool DatabaseManager::alterDB_20to21()
{
bool ret = true;
if (db.isOpen()) {
QSqlQuery query(db);
query.exec("PRAGMA journal_mode = MEMORY");
query.exec("PRAGMA synchronous = OFF");
ret = query.exec("ALTER TABLE entries ADD COLUMN annotations TEXT;");
ret = query.exec("ALTER TABLE entries ADD COLUMN broadcast INTEGER DEFAULT 0;");
ret = query.exec("ALTER TABLE actions ADD COLUMN text TEXT;");
if (!ret) {
checkError(query.lastError());
return ret;
}
ret = query.exec("UPDATE parameters SET value='21';");
if (!ret) {
checkError(query.lastError());
@ -230,12 +265,19 @@ bool DatabaseManager::checkParameters()
if (query.value(0).toString() != version) {
qWarning() << "DB version mismatch!";
if (version == "2.0" && query.value(0).toString() == "1.9") {
if (!alterDB_19to20()) {
qWarning() << "DB migration 1.9->2.0 failed!";
if (version == "21" && query.value(0).toString() == "1.9") {
if (!alterDB_19to21()) {
qWarning() << "DB migration 19->21 failed!";
createDB = true;
} else {
qDebug() << "DB migration 1.9->2.0 succeed!";
qDebug() << "DB migration 19->21 succeed!";
}
} else if (version == "21" && query.value(0).toString() == "2.0") {
if (!alterDB_20to21()) {
qWarning() << "DB migration 20->21 failed!";
createDB = true;
} else {
qDebug() << "DB migration 20->21 succeed!";
}
} else {
createDB = true;
@ -348,6 +390,7 @@ bool DatabaseManager::createActionsStructure()
"id1 VARCHAR(50), "
"id2 VARCHAR(50), "
"id3 VARCHAR(50), "
"text TEXT, "
"date1 TIMESTAMP, "
"date2 TIMESTAMP, "
"date3 TIMESTAMP"
@ -578,12 +621,14 @@ bool DatabaseManager::createEntriesStructure()
"content TEXT, "
"link TEXT, "
"image TEXT, "
"annotations TEXT, "
"fresh INTEGER DEFAULT 0, "
"fresh_or INTEGER DEFAULT 0, "
"read INTEGER DEFAULT 0, "
"saved INTEGER DEFAULT 0, "
"liked INTEGER DEFAULT 0, "
"cached INTEGER DEFAULT 0, "
"broadcast INTEGER DEFAULT 0, "
"created_at TIMESTAMP, "
"published_at TIMESTAMP, "
"cached_at TIMESTAMP, "
@ -731,12 +776,13 @@ void DatabaseManager::writeAction(const Action &item)
{
if (db.isOpen()) {
QSqlQuery query(db);
bool ret = query.exec(QString("INSERT INTO actions (type, id1, id2, id2, date1, date2, date3) "
"VALUES(%1,'%2','%3','%4',%5,%6,%7);")
bool ret = query.exec(QString("INSERT INTO actions (type, id1, id2, id2, text, date1, date2, date3) "
"VALUES(%1,'%2','%3','%4','%5',%6,%7,%8);")
.arg(static_cast<int>(item.type))
.arg(item.id1)
.arg(item.id2)
.arg(item.id3)
.arg(QString(item.text.toUtf8().toBase64()))
.arg(item.date1)
.arg(QDateTime::currentDateTimeUtc().toTime_t())
.arg(QDateTime::currentDateTimeUtc().toTime_t()));
@ -870,8 +916,8 @@ void DatabaseManager::writeEntry(const Entry &item)
QSqlQuery query(db);
bool ret = query.exec(QString("INSERT INTO entries (id, stream_id, title, author, content, link, image, "
"fresh, fresh_or, read, saved, liked, cached, created_at, published_at, crawl_time, timestamp, last_update) "
"VALUES ('%1','%2','%3','%4','%5','%6','%7',%8,%9,%10,%11,%12,%13,%14,%15,%16,%17,%18);")
"fresh, fresh_or, read, saved, liked, cached, broadcast, created_at, published_at, crawl_time, timestamp, last_update) "
"VALUES ('%1','%2','%3','%4','%5','%6','%7',%8,%9,%10,%11,%12,%13,%14,%15,%16,%17,%18,%19);")
.arg(item.id)
.arg(item.streamId)
.arg(QString(item.title.toUtf8().toBase64()))
@ -885,6 +931,7 @@ void DatabaseManager::writeEntry(const Entry &item)
.arg(item.saved)
.arg(item.liked)
.arg(item.cached)
.arg(item.broadcast)
.arg(item.createdAt)
.arg(item.publishedAt)
.arg(item.crawlTime)
@ -892,7 +939,7 @@ void DatabaseManager::writeEntry(const Entry &item)
.arg(QDateTime::currentDateTimeUtc().toTime_t()));
if(!ret) {
ret = query.exec(QString("UPDATE entries SET title='%1',author='%2',content='%3',link='%4',image='%5',fresh_or=%6,liked=%7,read=%8,saved=%9,timestamp=%10,last_update=%11,crawl_time=%12 WHERE id='%13';")
ret = query.exec(QString("UPDATE entries SET title='%1',author='%2',content='%3',link='%4',image='%5',fresh_or=%6,liked=%7,read=%8,saved=%9,broadcast=%10,timestamp=%11,last_update=%12,crawl_time=%13 WHERE id='%14';")
.arg(QString(item.title.toUtf8().toBase64()))
.arg(QString(item.author.toUtf8().toBase64()))
.arg(QString(item.content.toUtf8().toBase64()))
@ -902,6 +949,7 @@ void DatabaseManager::writeEntry(const Entry &item)
.arg(item.liked)
.arg(item.read)
.arg(item.saved)
.arg(item.broadcast)
.arg(item.timestamp)
.arg(QDateTime::currentDateTimeUtc().toTime_t())
.arg(item.crawlTime)
@ -950,6 +998,22 @@ void DatabaseManager::updateEntriesCachedFlagByEntry(const QString &id, int cach
}
}
void DatabaseManager::updateEntriesBroadcastFlagByEntry(const QString &id, int flag)
{
if (db.isOpen()) {
QSqlQuery query(db);
bool ret = query.exec(QString("UPDATE entries SET broadcast=%1 WHERE id='%2';")
.arg(flag)
.arg(id));
if (!ret) {
checkError(query.lastError());
}
} else {
qWarning() << "DB is not opened!";
}
}
void DatabaseManager::updateEntriesReadFlagByEntry(const QString &id, int flag)
{
if (db.isOpen()) {
@ -1898,7 +1962,7 @@ QList<DatabaseManager::StreamModuleTab> DatabaseManager::readStreamModuleTabList
smt.tabId = query.value(2).toString();
smt.date = query.value(3).toInt();
list.append(smt);
//qDebug() << smt.streamId;
//qDebug() << smt.streamId << smt.moduleId << smt.tabId << smt.date;
}
} else {
@ -2398,7 +2462,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByStream(const QString
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s "
"WHERE e.stream_id='%1' AND e.stream_id=s.id "
"ORDER BY e.published_at DESC LIMIT %2 OFFSET %3;")
@ -2425,10 +2489,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByStream(const QString
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2446,7 +2511,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByDashboard(const QStr
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m, tabs as t "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id AND m.tab_id=t.id "
"AND t.dashboard_id='%1' "
@ -2474,10 +2539,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByDashboard(const QStr
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2495,7 +2561,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByDashboard(cons
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m, tabs as t "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id AND m.tab_id=t.id "
"AND t.dashboard_id='%1' "
@ -2523,10 +2589,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByDashboard(cons
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2544,7 +2611,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSlowUnreadByDashboard(
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m, tabs as t "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id AND m.tab_id=t.id "
"AND t.dashboard_id='%1' "
@ -2572,10 +2639,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSlowUnreadByDashboard(
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2593,7 +2661,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByTab(const QString &i
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id "
"AND m.tab_id='%1' "
@ -2621,10 +2689,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesByTab(const QString &i
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2642,7 +2711,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByTab(const QStr
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id "
"AND m.tab_id='%1' "
@ -2670,10 +2739,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByTab(const QStr
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2691,7 +2761,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSavedByDashboard(const
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m, tabs as t "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id AND m.tab_id=t.id "
"AND t.dashboard_id='%1' "
@ -2719,10 +2789,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSavedByDashboard(const
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2740,7 +2811,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSlowByDashboard(const
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s, module_stream as ms, modules as m, tabs as t "
"WHERE e.stream_id=ms.stream_id AND e.stream_id=s.id AND ms.module_id=m.id AND m.tab_id=t.id "
"AND t.dashboard_id='%1' "
@ -2768,10 +2839,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesSlowByDashboard(const
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2789,7 +2861,7 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByStream(const Q
QSqlQuery query(db);
bool ret = query.exec(QString("SELECT e.id, e.stream_id, e.title, e.author, e.content, e.link, e.image, s.icon, s.title, "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"e.fresh, e.fresh_or, e.read, e.saved, e.liked, e.cached, e.broadcast, e.created_at, e.published_at, e.timestamp, e.crawl_time, e.last_update "
"FROM entries as e, streams as s "
"WHERE e.stream_id='%1' AND e.stream_id=s.id AND e.read=0 "
"ORDER BY e.published_at DESC LIMIT %2 OFFSET %3;")
@ -2816,10 +2888,11 @@ QList<DatabaseManager::Entry> DatabaseManager::readEntriesUnreadByStream(const Q
item.saved = query.value(12).toInt();
item.liked = query.value(13).toInt();
item.cached = query.value(14).toInt();
item.createdAt = query.value(15).toInt();
item.publishedAt = query.value(16).toInt();
item.timestamp = query.value(17).toInt();
item.crawlTime = query.value(18).toInt();
item.broadcast = query.value(15).toInt();
item.createdAt = query.value(16).toInt();
item.publishedAt = query.value(17).toInt();
item.timestamp = query.value(18).toInt();
item.crawlTime = query.value(19).toInt();
list.append(item);
}
} else {
@ -2836,7 +2909,7 @@ QList<DatabaseManager::Action> DatabaseManager::readActions()
if (db.isOpen()) {
QSqlQuery query(db);
bool ret = query.exec("SELECT type, id1, id2, id3, date1, date2, date3 FROM actions ORDER BY date2;");
bool ret = query.exec("SELECT type, id1, id2, id3, text, date1, date2, date3 FROM actions ORDER BY date2;");
if (!ret) {
checkError(query.lastError());
@ -2848,9 +2921,10 @@ QList<DatabaseManager::Action> DatabaseManager::readActions()
item.id1 = query.value(1).toString();
item.id2 = query.value(2).toString();
item.id3 = query.value(3).toString();
item.date1 = query.value(4).toInt();
item.date2 = query.value(5).toInt();
item.date3 = query.value(6).toInt();
decodeBase64(query.value(4),item.text);
item.date1 = query.value(5).toInt();
item.date2 = query.value(6).toInt();
item.date3 = query.value(7).toInt();
list.append(item);
}

View file

@ -110,6 +110,7 @@ public:
int saved;
int liked;
int cached;
int broadcast;
int publishedAt;
int createdAt;
int crawlTime;
@ -141,7 +142,9 @@ public:
SetAllRead = 51,
UnSetAllRead = 50,
SetSlowRead = 61,
UnSetSlowRead = 60
UnSetSlowRead = 60,
SetBroadcast = 71,
UnSetBroadcast = 70
};
struct Action {
@ -149,6 +152,7 @@ public:
QString id1;
QString id2;
QString id3;
QString text;
int date1;
int date2;
int date3;
@ -182,6 +186,7 @@ public:
void updateEntriesReadFlagByEntry(const QString &id, int flag);
void updateEntriesSavedFlagByEntry(const QString &id, int flag);
void updateEntriesCachedFlagByEntry(const QString &id, int cacheDate, int flag);
void updateEntriesBroadcastFlagByEntry(const QString &id, int flag);
void updateEntriesFreshFlag(int flag);
void updateEntriesSavedFlagByFlagAndDashboard(const QString &id, int flagOld, int flagNew);
@ -300,7 +305,8 @@ private:
bool openDB();
bool createDB();
bool alterDB_19to20();
bool alterDB_19to21();
bool alterDB_20to21();
bool deleteDB();
bool createStructure();

View file

@ -192,29 +192,30 @@ int EntryModel::createItems(int offset, int limit)
if (dateRow>prevDateRow) {
switch (dateRow) {
case 1:
appendRow(new EntryItem("daterow",tr("Today"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Today"),"","","","","","",false,false,false,0,0,0,0));
break;
case 2:
appendRow(new EntryItem("daterow",tr("Yesterday"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Yesterday"),"","","","","","",false,false,false,0,0,0,0));
break;
case 3:
appendRow(new EntryItem("daterow",tr("Current week"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Current week"),"","","","","","",false,false,false,0,0,0,0));
break;
case 4:
appendRow(new EntryItem("daterow",tr("Current month"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Current month"),"","","","","","",false,false,false,0,0,0,0));
break;
case 5:
appendRow(new EntryItem("daterow",tr("Previous month"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Previous month"),"","","","","","",false,false,false,0,0,0,0));
break;
case 6:
appendRow(new EntryItem("daterow",tr("Current year"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Current year"),"","","","","","",false,false,false,0,0,0,0));
break;
default:
appendRow(new EntryItem("daterow",tr("Previous year & older"),"","","","","","",false,0,0,0,0));
appendRow(new EntryItem("daterow",tr("Previous year & older"),"","","","","","",false,false,false,0,0,0,0));
break;
}
}
prevDateRow = dateRow;
//qDebug() << "(*i).broadcast" << (*i).broadcast;
appendRow(new EntryItem((*i).id,
title.remove(re),
(*i).author,
@ -224,6 +225,8 @@ int EntryModel::createItems(int offset, int limit)
(*i).feedIcon,
(*i).feedTitle.remove(re),
_db->isCacheExistsByEntryId((*i).id),
(*i).broadcast==1,
(*i).liked==1,
(*i).fresh,
(*i).read,
(*i).saved,
@ -234,7 +237,7 @@ int EntryModel::createItems(int offset, int limit)
// Dummy row as workaround!
if (list.count()>0)
appendRow(new EntryItem("last","","","","","","","",false,0,0,0,0));
appendRow(new EntryItem("last","","","","","","","",false,false,false,0,0,0,0));
return list.count();
}
@ -455,11 +458,11 @@ int EntryModel::count()
void EntryModel::setData(int row, const QString &fieldName, QVariant newValue)
{
EntryItem* item = static_cast<EntryItem*>(readRow(row));
Settings *s = Settings::instance();
if (fieldName=="readlater") {
item->setReadlater(newValue.toInt());
DatabaseManager::Action action;
Settings *s = Settings::instance();
action.id2 = s->db->readStreamIdByEntry(item->id());
if (newValue==1) {
action.type = DatabaseManager::SetSaved;
@ -477,7 +480,6 @@ void EntryModel::setData(int row, const QString &fieldName, QVariant newValue)
if (fieldName=="read") {
item->setRead(newValue.toInt());
DatabaseManager::Action action;
Settings *s = Settings::instance();
action.id2 = s->db->readStreamIdByEntry(item->id());
if (newValue==1) {
action.type = DatabaseManager::SetRead;
@ -492,6 +494,27 @@ void EntryModel::setData(int row, const QString &fieldName, QVariant newValue)
_db->updateEntriesReadFlagByEntry(item->id(),newValue.toInt());
}
if (fieldName=="broadcast") {
if (s->getSigninType() < 10) {
// Broadcast not supported in API
qWarning() << "Broadcast is not supported!";
return;
}
item->setBroadcast(newValue.toBool());
DatabaseManager::Action action;
if (newValue.toBool()) {
action.type = DatabaseManager::SetBroadcast;
action.id1 = item->id();
action.date1 = item->date();
} else {
action.type = DatabaseManager::UnSetBroadcast;
action.id1 = item->id();
action.date1 = item->date();
}
_db->writeAction(action);
_db->updateEntriesReadFlagByEntry(item->id(),newValue.toInt());
}
if (fieldName=="cached") {
item->setCached(newValue.toInt());
}
@ -508,6 +531,8 @@ EntryItem::EntryItem(const QString &uid,
const QString &feedIcon,
const QString &feedTitle,
const bool cached,
const bool broadcast,
const bool liked,
const bool fresh,
const int read,
const int readlater,
@ -523,6 +548,8 @@ EntryItem::EntryItem(const QString &uid,
m_feedIcon(feedIcon),
m_feedTitle(feedTitle),
m_cached(cached),
m_broadcast(broadcast),
m_liked(liked),
m_fresh(fresh),
m_read(read),
m_readlater(readlater),
@ -541,6 +568,8 @@ QHash<int, QByteArray> EntryItem::roleNames() const
names[FeedIconRole] = "feedIcon";
names[FeedTitleRole] = "feedTitle";
names[CachedRole] = "cached";
names[BroadcastRole] = "broadcast";
names[LikedRole] = "liked";
names[FreshRole] = "fresh";
names[ReadRole] = "read";
names[ReadLaterRole] = "readlater";
@ -569,6 +598,10 @@ QVariant EntryItem::data(int role) const
return feedTitle();
case CachedRole:
return cached();
case BroadcastRole:
return broadcast();
case LikedRole:
return liked();
case FreshRole:
return fresh();
case ReadRole:
@ -598,6 +631,14 @@ void EntryItem::setRead(int value)
}
}
void EntryItem::setBroadcast(bool value)
{
if(m_broadcast!=value) {
m_broadcast = value;
emit dataChanged();
}
}
void EntryItem::setCached(int value)
{
if(m_cached!=value) {

View file

@ -45,6 +45,8 @@ public:
FeedIconRole,
FeedTitleRole,
CachedRole,
BroadcastRole,
LikedRole,
FreshRole,
ReadRole,
ReadLaterRole,
@ -62,6 +64,8 @@ public:
const QString &feedIcon,
const QString &feedTitle,
const bool cached,
const bool broadcast,
const bool liked,
const bool fresh,
const int read,
const int readlater,
@ -79,6 +83,8 @@ public:
inline QString feedIcon() const { return m_feedIcon; }
inline QString feedTitle() const { return m_feedTitle; }
inline bool cached() const { return m_cached; }
inline bool broadcast() const { return m_broadcast; }
inline bool liked() const { return m_liked; }
inline bool fresh() const { return m_fresh; }
inline int read() const { return m_read; }
inline int readlater() const { return m_readlater; }
@ -86,6 +92,7 @@ public:
void setReadlater(int value);
void setRead(int value);
void setBroadcast(bool value);
void setCached(int value);
private:
@ -98,6 +105,8 @@ private:
QString m_feedIcon;
QString m_feedTitle;
bool m_cached;
bool m_broadcast;
bool m_liked;
bool m_fresh;
int m_read;
int m_readlater;

View file

@ -27,12 +27,12 @@
#include "nviconprovider.h"
const QString NvIconProvider::availableColors[5] = {"green", "blue", "orange", "pink", "grey"};
const QString NvIconProvider::spriteMap[5][8] = {
{"plus", "home", "label-2", "star", "label", "pin", "sheet", "power"},
{"enveloppe", "happy-face", "rss", "calc", "clock", "pen", "bug"},
{"cloud", "cog", "vbar", "pie", "table", "line", "magnifier"},
{"lightbulb", "movie", "note", "camera", "mobile", "computer", "heart"},
{"alert", "bill", "funnel", "eye", "bubble", "calendar", "check"}
const QString NvIconProvider::spriteMap[5][10] = {
{"plus","home","label-2","star","label","pin","sheet","power","diamond","folder"},
{"enveloppe","happy-face","rss","calc","clock","pen","bug","label-box","yen","snail"},
{"cloud","cog","vbar","pie","table","line","magnifier","potion","pound","euro"},
{"lightbulb","movie","note","camera","mobile","computer","heart","bubbles","dollars"},
{"alert","bill","funnel","eye","bubble","calendar","check","crown","plane"}
};
NvIconProvider::NvIconProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap)
@ -56,9 +56,10 @@ QPixmap NvIconProvider::requestPixmap(const QString &id, QSize *size, const QSiz
QRect NvIconProvider::getPosition(const QString &icon, const QString &color)
{
//qDebug() << icon << color;
int n = 16, s = 20, a = 16;
for (int i = 0; i < 5; ++i) {
for (int j = 0; j < 8; ++j) {
for (int j = 0; j < 10; ++j) {
if (spriteMap[i][j] == icon) {
n += 100 * i;
a += j * s;

View file

@ -32,7 +32,7 @@ public:
private:
const static QString availableColors[5];
const static QString spriteMap[5][8];
const static QString spriteMap[5][10];
int getOffsetByColor(const QString &color);
QRect getPosition(const QString &icon, const QString &color);

View file

@ -174,6 +174,14 @@ void OldReaderFetcher::setAction()
QString::number(s->db->readLastLastUpdateByDashboard(s->getDashboardInUse()))+"000000"
);
break;
case DatabaseManager::SetBroadcast:
url.setUrl("https://theoldreader.com/reader/api/0/edit-tag");
body = QString("a=user/-/state/com.google/broadcast&i=%1").arg(action.id1);
break;
case DatabaseManager::UnSetBroadcast:
url.setUrl("https://theoldreader.com/reader/api/0/edit-tag");
body = QString("r=user/-/state/com.google/broadcast&i=%1").arg(action.id1);
break;
default:
// Unknown action -> skiping
qWarning("Unknown action!");
@ -196,6 +204,32 @@ void OldReaderFetcher::setAction()
connect(currentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError)));
}
void OldReaderFetcher::fetchFriends()
{
data.clear();
Settings *s = Settings::instance();
if (currentReply != NULL) {
currentReply->disconnect();
currentReply->deleteLater();
currentReply = NULL;
}
QUrl url("https://theoldreader.com/reader/api/0/friend/list?output=json");
QNetworkRequest request(url);
// Authorization header
request.setRawHeader("Authorization",QString("GoogleLogin auth=%1").arg(s->getCookie()).toLatin1());
currentReply = nam.get(request);
connect(currentReply, SIGNAL(finished()), this, SLOT(finishedFriends()));
connect(currentReply, SIGNAL(readyRead()), this, SLOT(readyRead()));
connect(currentReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError)));
}
void OldReaderFetcher::fetchTabs()
{
//qDebug() << "fetchTabs";
@ -475,14 +509,6 @@ void OldReaderFetcher::finishedTabs2()
lastContinuation = "";
continuationCount = 0;
if (busyType == Fetcher::Updating) {
s->db->updateEntriesFreshFlag(0); // Set current entries as not fresh
storedFeedList = s->db->readStreamModuleTabList();
}
s->db->cleanStreams();
s->db->cleanModules();
if (tabList.isEmpty()) {
qWarning() << "No Tabs to download!";
if (busyType == Fetcher::Initiating)
@ -500,6 +526,23 @@ void OldReaderFetcher::finishedTabs2()
fetchFeeds();
}
void OldReaderFetcher::finishedFriends()
{
//qDebug() << data;
if (currentReply->error()) {
emit error(500);
setBusy(false);
return;
}
startJob(StoreFriends);
}
void OldReaderFetcher::finishedFriends2()
{
fetchTabs();
}
void OldReaderFetcher::finishedFeeds()
{
//qDebug() << data;
@ -712,7 +755,18 @@ void OldReaderFetcher::startFetching()
{
Settings *s = Settings::instance();
// Create DB structure
s->db->cleanDashboards();
s->db->cleanTabs();
if(busyType == Fetcher::Initiating) {
s->db->cleanCache();
}
if (busyType == Fetcher::Updating) {
s->db->updateEntriesFreshFlag(0); // Set current entries as not fresh
storedFeedList = s->db->readStreamModuleTabList();
}
s->db->cleanStreams();
s->db->cleanModules();
// Old Reader API doesnt have Dashboards
// Manually adding dummy Dashboard
@ -724,17 +778,7 @@ void OldReaderFetcher::startFetching()
s->db->writeDashboard(d);
s->setDashboardInUse(d.id);
s->db->cleanTabs();
//s->db->cleanModules();
// Create Modules and Cache structure
if(busyType == Fetcher::Initiating) {
s->db->cleanCache();
s->db->cleanModules();
}
//qDebug() << "Fetching tabs...";
fetchTabs();
fetchFriends();
}
void OldReaderFetcher::startJob(Job job)
@ -772,6 +816,9 @@ void OldReaderFetcher::startJob(Job job)
case StoreTabs:
connect(this, SIGNAL(finished()), this, SLOT(finishedTabs2()));
break;
case StoreFriends:
connect(this, SIGNAL(finished()), this, SLOT(finishedFriends2()));
break;
case StoreFeeds:
connect(this, SIGNAL(finished()), this, SLOT(finishedFeeds2()));
break;
@ -803,6 +850,9 @@ void OldReaderFetcher::run()
case StoreTabs:
storeTabs();
break;
case StoreFriends:
storeFriends();
break;
case StoreFeeds:
storeFeeds();
break;
@ -826,7 +876,6 @@ void OldReaderFetcher::storeTabs()
{
Settings *s = Settings::instance();
QString dashboardId = "oldreader";
tabList.clear();
// Adding Subscriptions folder
DatabaseManager::Tab t;
@ -921,9 +970,10 @@ void OldReaderFetcher::getFolderFromCategories(const QVariantList &categories, Q
bool starred = false;
bool fresh = false;
bool liked = false;
bool broadcast = false;
while (i != end) {
QStringList id = (*i).toString().split('/');
//qDebug() << id;
//qDebug() << (*i).toString();
if (id.at(2)=="label") {
result.insert("tabId",QVariant((*i).toString()));
result.insert("tabName",QVariant(id.at(3)));
@ -935,6 +985,8 @@ void OldReaderFetcher::getFolderFromCategories(const QVariantList &categories, Q
liked = true;
} else if ((*i).toString() == "user/-/state/com.google/fresh") {
fresh = true;
} else if ((*i).toString() == "user/-/state/com.google/broadcast") {
broadcast = true;
}
++i;
@ -956,12 +1008,96 @@ void OldReaderFetcher::getFolderFromCategories(const QVariantList &categories, Q
result.insert("fresh",QVariant(1));
else
result.insert("fresh",QVariant(0));
if (broadcast)
result.insert("broadcast",QVariant(1));
else
result.insert("broadcast",QVariant(0));
}
void OldReaderFetcher::storeFriends()
{
tabList.clear();
feedUpdateList.clear();
Settings *s = Settings::instance();
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
if (jsonObj["friends"].isArray()) {
QJsonArray::const_iterator i = jsonObj["friends"].toArray().constBegin();
QJsonArray::const_iterator end = jsonObj["friends"].toArray().constEnd();
#else
if (jsonObj["friends"].type()==QVariant::List) {
QVariantList::const_iterator i = jsonObj["friends"].toList().constBegin();
QVariantList::const_iterator end = jsonObj["friends"].toList().constEnd();
#endif
bool addTab = false;
while (i != end) {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QJsonObject obj = (*i).toObject();
#else
QVariantMap obj = (*i).toMap();
#endif
addTab = true;
// Stream
DatabaseManager::Stream st;
st.id = obj["stream"].toString();
st.title = obj["displayName"].toString().remove(QRegExp("<[^>]*>"));
st.content = "";
st.type = "";
st.unread = 0;
st.read = 0;
st.slow = 0;
st.lastUpdate = QDateTime::currentDateTimeUtc().toTime_t();
if (obj["iconUrl"].toString() != "") {
st.icon = "http:"+obj["iconUrl"].toString();
// Downloading fav icon file
DatabaseManager::CacheItem item;
item.origUrl = st.icon;
item.finalUrl = st.icon;
item.type = "icon";
emit addDownload(item);
}
s->db->writeStream(st);
// Module
DatabaseManager::Module m;
m.id = st.id;
m.name = st.title;
m.title = st.title;
m.tabId = "friends";
m.streamList.append(st.id);
s->db->writeModule(m);
DatabaseManager::StreamModuleTab smt;
smt.streamId = st.id;
smt.moduleId = st.id;
smt.tabId = m.tabId;
feedList.append(smt);
feedUpdateList.append(smt);
++i;
}
if (addTab) {
// Adding Friends folder
DatabaseManager::Tab t;
t.id = "friends";
t.dashboardId = "oldreader";
t.title = "Following";
s->db->writeTab(t);
tabList.append(t.id);
}
} else {
qWarning() << "No \"friends\" element found!";
}
}
void OldReaderFetcher::storeFeeds()
{
//feedList.clear();
feedUpdateList.clear();
//feedUpdateList.clear();
Settings *s = Settings::instance();
bool subscriptionsFolderFeed = false;
@ -983,6 +1119,7 @@ void OldReaderFetcher::storeFeeds()
QJsonObject obj = (*i).toObject();
if (obj["categories"].isArray()) {
getFolderFromCategories(obj["categories"].toArray(), tabId, tabName);
}
#else
QVariantMap obj = (*i).toMap();
@ -1126,6 +1263,7 @@ void OldReaderFetcher::storeStream()
e.liked = categories.value("liked").toInt();
e.freshOR = categories.value("fresh").toInt();
e.cached = 0;
e.broadcast = categories.value("broadcast").toInt();
e.publishedAt = obj["published"].toDouble();
e.createdAt = obj["updated"].toDouble();
e.fresh = 1;
@ -1223,7 +1361,7 @@ void OldReaderFetcher::removeDeletedFeeds()
}
if (newFeed) {
//qDebug() << "Removing feed:" << (*si).streamId;
qDebug() << "Removing feed:" << (*si).streamId;
Settings *s = Settings::instance();
s->db->removeStreamsByStream((*si).streamId);
}

View file

@ -48,6 +48,8 @@ private Q_SLOTS:
void finishedSignInOnlyCheck();
void finishedTabs();
void finishedTabs2();
void finishedFriends();
void finishedFriends2();
void finishedFeeds();
void finishedFeeds2();
void finishedStreamUpdate();
@ -60,7 +62,7 @@ private Q_SLOTS:
void finishedMarkSlow();
private:
enum Job { Idle, StoreTabs, StoreFeeds, StoreStreamUpdate, StoreStream, StoreStarredStream, MarkSlow };
enum Job { Idle, StoreTabs, StoreFriends, StoreFeeds, StoreStreamUpdate, StoreStream, StoreStarredStream, MarkSlow };
static const int limitAtOnce = 100;
static const int limitAtOnceForUpdate = 100;
@ -86,6 +88,7 @@ private:
void removeDeletedFeeds();
void fetchTabs();
void fetchFriends();
void fetchFeeds();
void fetchStreamUpdate();
void fetchStream();
@ -95,6 +98,7 @@ private:
void startJob(Job job);
void storeTabs();
void storeFriends();
void storeFeeds();
void storeStream();
void storeStarredStream();