|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/tidings.git</param>
<param name="branch">master</param>
- <param name="revision">0.9.4</param>
+ <param name="revision">1.0.0</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/harbour-tidings.qml
^
|
| @@ -84,12 +84,24 @@
}
ConfigValue {
+ id: configAllFeedsSorter
+ key: "all-feeds-sort-by"
+ value: "latestFirst"
+ }
+
+ ConfigValue {
id: configFeedSorter
key: "feed-sort-by"
value: "feedOnlyLatestFirst"
}
ConfigValue {
+ id: configShowOnlyUnread
+ key: "filter-only-unread"
+ value: "0"
+ }
+
+ ConfigValue {
id: configShowPreviewImages
key: "feed-preview-images"
value: "1"
@@ -141,10 +153,10 @@
{
// add example feeds
sourcesModel.addSource("Engadget",
- "http://www.engadget.com/rss.xml",
+ "https://www.engadget.com/rss.xml",
"#ff0000");
sourcesModel.addSource("JollaUsers.com",
- "http://jollausers.com/feed/",
+ "https://jollausers.com/feed/",
"#ffa000");
}
newsBlendModel.tidyCache();
@@ -225,13 +237,9 @@
Page {
allowedOrientations: Orientation.All
-
- Label {
- anchors.centerIn: parent
- horizontalAlignment: Text.AlignHCenter
- font.pixelSize: Theme.fontSizeExtraLarge
- color: Theme.highlightColor
+ BusyLabel {
text: qsTr("Loading from cache")
+ running: true
}
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/FeedsPage.qml
^
|
| @@ -5,17 +5,23 @@
id: page
objectName: "FeedsPage"
- function positionAtFirst(feedUrl)
- {
- var idx = newsBlendModel.firstOfFeed(feedUrl);
- if (idx !== -1)
- {
- listview.positionViewAtIndex(idx,
- ListView.Beginning);
+ allowedOrientations: Orientation.All
+
+ onStatusChanged: {
+ if (status == PageStatus.Inactive && pageStack.currentPage.objectName == 'SourcesPage') {
+ // Show all feeds again if we returned to the root page, i.e. the
+ // feed sources overview page.
+ // WARNING: This inevitably breaks if it becomes possible to reach the
+ // combined news page from somewhere other than "SourcesPage".
+ newsBlendModel.isBlendModeEnabled = true;
+ listview.currentIndex = -1
}
- }
- allowedOrientations: Orientation.All
+ // Uncomment to debug page changes.
+ // if (status == PageStatus.Inactive) {
+ // console.log("FeedsPage inactive: status =", status, "depth =", pageStack.depth, "current = ", pageStack.currentPage.objectName)
+ // }
+ }
Connections {
target: navigationState
@@ -103,6 +109,11 @@
}
MenuItem {
+ text: newsBlendModel.unreadOnly ? qsTr("Show all entries") : qsTr("Only show unread")
+ onClicked: configShowOnlyUnread.value = (newsBlendModel.unreadOnly ? '0' : '1')
+ }
+
+ MenuItem {
text: qsTr("All read")
onClicked: {
@@ -149,12 +160,13 @@
color: feedColor[model.source]
}
- Image {
+ IconButton {
id: shelveIcon
anchors.left: parent.left
anchors.leftMargin: Theme.paddingSmall
- visible: model.shelved
- source: "image://theme/icon-s-favorite"
+ anchors.verticalCenter: parent.verticalCenter
+ icon.source: model.shelved ? "image://theme/icon-m-favorite-selected" : "image://theme/icon-m-favorite"
+ onClicked: newsBlendModel.setShelved(model.index, !model.shelved)
}
Label {
@@ -223,17 +235,24 @@
onClicked: {
listview.currentIndex = index;
- var props = {
- "index": index,
- "listview": listview
- };
- pageStack.push("ViewPage.qml", props);
+ pageStack.push("ViewPageProxy.qml", { "listview": listview });
}
}
ViewPlaceholder {
- enabled: sourcesModel.count === 0
- text: qsTr("Pull down to add feeds.")
+ enabled: sourcesModel.count === 0 || newsBlendModel.count === 0
+ text: {
+ if (sourcesModel.count === 0) return qsTr("No entries")
+ else if (newsBlendModel.count === 0) {
+ if (newsBlendModel.unreadOnly) return qsTr("No unread entries")
+ else return qsTr("No entries")
+ }
+ else return ''
+ }
+ hintText: {
+ if (sourcesModel.count === 0) return qsTr("Pull down to add feeds.")
+ else return qsTr("Pull down to refresh.")
+ }
}
ScrollDecorator { color: palette.primaryColor }
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/NewsBlendModel.qml
^
|
| @@ -9,9 +9,16 @@
id: listModel
sortMode: feedSorter.sortMode
+ unreadOnly: configShowOnlyUnread.booleanValue
+
+
+ // whether to blend models or show a single feed
+ // Must be set to "true" initially so the attached feeds page shows all
+ // feeds on startup.
+ property bool isBlendModeEnabled: true
// the sorter for this model
- property FeedSorter feedSorter: _getFeedSorter(configFeedSorter.value)
+ property FeedSorter feedSorter: _getFeedSorter(isBlendModeEnabled ? configAllFeedsSorter.value : configFeedSorter.value)
// the list of all feed sources to load.
property variant sources: []
@@ -75,6 +82,18 @@
feedOnlyOldestFirstSorter
]
+ property variant feedSortersSingle: [
+ feedOnlyLatestFirstSorter,
+ feedOnlyOldestFirstSorter
+ ]
+
+ property variant feedSortersCombined: [
+ latestFirstSorter,
+ oldestFirstSorter,
+ feedSourceLatestFirstSorter,
+ feedSourceOldestFirstSorter
+ ]
+
property FeedLoader _feedLoader: FeedLoader {
property string feedName
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/SortSelectorPage.qml
^
|
| @@ -18,7 +18,7 @@
id: listview
anchors.fill: parent
- model: newsBlendModel.feedSorters
+ model: newsBlendModel.isBlendModeEnabled ? newsBlendModel.feedSortersCombined : newsBlendModel.feedSortersSingle
header: PageHeader {
title: qsTr("Sort by")
@@ -41,15 +41,15 @@
}
onClicked: {
- function closure(sorter)
+ function closure(sorter, targetConfig)
{
return function()
{
- configFeedSorter.value = sorter.key;
+ targetConfig.value = sorter.key
}
}
- _callback = closure(modelData);
+ _callback = closure(modelData, newsBlendModel.isBlendModeEnabled ? configAllFeedsSorter : configFeedSorter);
pageStack.pop();
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/SourcesPage.qml
^
|
| @@ -170,7 +170,7 @@
onClicked: {
var props = {
- "url": "http://"
+ "url": "https://"
};
var dlg = pageStack.push("SourceEditDialog.qml", props);
}
@@ -413,8 +413,8 @@
onClicked: {
if (page.editMode === 0 && totalCount !== 0)
{
+ newsBlendModel.isBlendModeEnabled = false; // show a single feed
newsBlendModel.selectedFeed = item.url;
- feedsPage.positionAtFirst(item.url);
pageStack.navigateForward();
}
else if (page.editMode === 1)
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/ViewPage.qml
^
|
| @@ -2,10 +2,12 @@
import Sailfish.Silica 1.0
import harbour.tidings 1.0
-Page {
+Item {
id: page
objectName: "ViewPage"
+ property int status: PageStatus.Active
+
property GridView listview
property variant itemData: listview.currentItem !== null
? listview.currentItem.data
@@ -15,7 +17,7 @@
property int _previousOfFeed: -1
property int _nextOfFeed: -1
- property bool _activated
+ property bool _activated: true
property real _pageMargin: (width > height) ? Theme.paddingLarge * 2
: Theme.paddingLarge
@@ -80,7 +82,7 @@
}
}
- allowedOrientations: Orientation.All
+ // allowedOrientations: Orientation.All
Component.onCompleted: {
navigationState.openedItem(listview.currentIndex);
@@ -89,23 +91,6 @@
}
}
- onStatusChanged: {
- if (status === PageStatus.Active)
- {
- if (itemData.link !== "")
- {
- var props = {
- "resources": resources
- };
-
- pageStack.pushAttached(Qt.resolvedUrl("ResourcesPage.qml"),
- props);
- }
-
- page._activated = true;
- }
- }
-
onItemDataChanged: {
if (itemData)
{
@@ -203,6 +188,13 @@
column.opacity = 0;
}
}
+
+ MenuItem {
+ visible: itemData.link !== ""
+ text: qsTr("Resources")
+ onClicked: pageStack.push(Qt.resolvedUrl("ResourcesPage.qml"), { "resources": resources })
+ }
+
MenuItem {
enabled: listview.currentIndex > 0
text: enabled ? qsTr("Previous")
@@ -277,16 +269,6 @@
NumberAnimation { duration: 300; easing.type: Easing.InOutQuad }
}
- LoadImagesButton {
- visible: htmlFilter.imageProxy !== "" &&
- htmlFilter.images.length > 0
- width: parent.width
-
- onClicked: {
- htmlFilter.imageProxy = "";
- }
- }
-
PageHeader {
id: pageHeader
title: feedName[itemData.source]
@@ -396,6 +378,17 @@
height: Theme.paddingMedium
}
+ Button {
+ id: loadImagesButton
+ visible: htmlFilter.imageProxy !== "" &&
+ htmlFilter.images.length > 0
+ text: qsTr("Load images")
+ anchors.horizontalCenter: parent.horizontalCenter
+ onClicked: htmlFilter.imageProxy = ""
+ }
+
+ Item { width: 1; height: Theme.paddingMedium; visible: loadImagesButton.visible }
+
RescalingRichText {
id: body
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/qml/pages/ViewPageProxy.qml
^
|
| @@ -0,0 +1,60 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import harbour.tidings 1.0
+
+Dialog {
+ id: page
+ objectName: "ViewPageProxy"
+ allowedOrientations: Orientation.All
+
+ property var listview
+ property int currentIndex: -1
+ property var _fakePreviousPage: null
+
+ canAccept: listview.currentIndex < (listview.count - 1)
+ acceptDestinationAction: PageStackAction.Replace
+ acceptDestination: Qt.resolvedUrl('ViewPageProxy.qml')
+ acceptDestinationProperties: { "listview": page.listview }
+ onAccepted: {
+ // This is called when the dialog is "accepted", i.e. when the user swiped
+ // right or tapped the "next page" indicator. We then grab a tiny screenshot
+ // and show this, while we hide the current page and update currentIndex.
+ // This is necessary to avoid a bunch of segmentation faults that happened
+ // when the current page updates itself while getting deactivated. It is
+ // not possible to prevent ViewPage from updating itself when currentIndex
+ // is changed. Showing the screenshot is necessary to avoid too much flickering
+ // when the old page is being hidden.
+
+ var fakeSuccess = viewLoader.item.grabToImage(function(result){
+ _fakePreviousPage = result
+ viewLoader.sourceComponent = fakePreviousPageComponent
+ listview.currentIndex += 1
+ }, Qt.size(Screen.width/20, Screen.height/20))
+
+ if (!fakeSuccess) {
+ console.log("faking previous page failed")
+ viewLoader.sourceComponent = undefined
+ listview.currentIndex += 1
+ }
+ }
+
+ Component {
+ id: fakePreviousPageComponent
+ Image {
+ source: _fakePreviousPage !== null ? _fakePreviousPage.url : ''
+ opacity: 0.7
+ }
+ }
+
+ Loader {
+ id: viewLoader
+ anchors.fill: parent
+ asynchronous: true
+ sourceComponent: Component {
+ ViewPage {
+ listview: page.listview
+ status: page.status
+ }
+ }
+ }
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/src/newsblendmodel.cpp
^
|
| @@ -135,6 +135,18 @@
}
}
+void NewsBlendModel::setUnreadOnly(bool newUnreadOnly)
+{
+ if (newUnreadOnly != myUnreadOnly)
+ {
+ qDebug() << Q_FUNC_INFO << newUnreadOnly;
+ myUnreadOnly = newUnreadOnly;
+ reinsertItems();
+ emit unreadOnlyChanged();
+ emit countChanged();
+ }
+}
+
void NewsBlendModel::setSelectedFeed(const QString& selectedFeed)
{
if (selectedFeed != mySelectedFeed)
@@ -155,7 +167,8 @@
if (mySortMode == FeedOnlyLatestFirst ||
mySortMode == FeedOnlyOldestFirst)
{
- return myTotalCounts.value(mySelectedFeed, 0);
+ if (myUnreadOnly) return myItems.size();
+ else return myTotalCounts.value(mySelectedFeed, 0);
}
else
{
@@ -214,9 +227,10 @@
{
int insertPos = -1;
- if ((mySortMode == FeedOnlyLatestFirst ||
- mySortMode == FeedOnlyOldestFirst) &&
- item->feedSource != mySelectedFeed)
+ if ((myUnreadOnly && item->isRead) ||
+ ((mySortMode == FeedOnlyLatestFirst ||
+ mySortMode == FeedOnlyOldestFirst) &&
+ item->feedSource != mySelectedFeed))
{
return insertPos;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/src/newsblendmodel.h
^
|
| @@ -21,6 +21,8 @@
Q_ENUMS(SortMode)
Q_PROPERTY(SortMode sortMode READ sortMode WRITE setSortMode
NOTIFY sortModeChanged)
+ Q_PROPERTY(bool unreadOnly READ unreadOnly WRITE setUnreadOnly
+ NOTIFY unreadOnlyChanged)
Q_PROPERTY(QString selectedFeed READ selectedFeed WRITE setSelectedFeed
NOTIFY selectedFeedChanged)
Q_PROPERTY(int count READ count NOTIFY countChanged)
@@ -125,6 +127,7 @@
signals:
void sortModeChanged();
+ void unreadOnlyChanged();
void selectedFeedChanged();
void countChanged();
void shelvedChanged(int index);
@@ -136,6 +139,9 @@
SortMode sortMode() const { return mySortMode; }
void setSortMode(SortMode mode);
+ bool unreadOnly() const { return myUnreadOnly; }
+ void setUnreadOnly(bool newUnreadOnly);
+
QString selectedFeed() const { return mySelectedFeed; }
void setSelectedFeed(const QString& selectedFeed);
@@ -163,6 +169,7 @@
SortMode mySortMode;
QString mySelectedFeed;
+ bool myUnreadOnly = {false};
};
#endif // NEWSBLENDMODEL_H
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings-es.ts
^
|
| @@ -64,31 +64,57 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translation>%1 artículos</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation>Ordenar por: %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="121"/>
<source>All read</source>
<translation>Leer todo</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation>Detener el audio</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translation>Halar hacia abajo para la lista de opciones, y añadir alimentos.</translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -143,39 +169,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation>Últimos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation>Antiguos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation>Alimento, en los últimos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation>Alimento, en los antiguos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation>Solo alimentación actual, los últimos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation>Solo alimentación actual, los antiguos primero</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation>Error con %1:
@@ -403,67 +429,77 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation>Audio</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation>Imagen</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation>Vídeo</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation>Documentos PDF</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished">Recursos</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation>Anterior</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation>Ya al principio</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation>siguiente</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation>Ya al final</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translation>(%1 segundos)</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished">Cargar imagen</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation>Corto</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation>Fuente</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
<translation>Completo</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="534"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings-fr_FR.ts
^
|
| @@ -64,31 +64,57 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translation>%1 éléments</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation>Trier par : %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="121"/>
<source>All read</source>
<translation>Marquer comme lus</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation>Arrêter l'audio</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translation>Tirer vers le bas pour ajouter un flux</translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -143,39 +169,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation>Plus récents d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation>Plus anciens d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation>Flux, puis les plus récents d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation>Flux, puis les plus anciens d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation>Seulement le flux choisi, les plus récents d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation>Seulement le flux choisi, les plus anciens d'abord</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation>Erreur - %1 :
@@ -403,67 +429,77 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation>Audio</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation>Images</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation>Vidéo</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation>Document PDF</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished">Ressources</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation>Précédent</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation>Premier article</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation>Suivant</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation>Dernier article</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translation>(%1 secondes)</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished">Charger les images</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation>Articlé réduit</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation>Site internet</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
<translation>Article complet</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="534"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings-pt_BR.ts
^
|
| @@ -65,34 +65,60 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translatorcomment>This is the plural form</translatorcomment>
<translation>%1 itens</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation>Visualizar: %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="121"/>
<source>All read</source>
<translatorcomment>Added more context to this as "mark all as read"</translatorcomment>
<translation>Marcar todos como lidos</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation>Interromper áudio</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translatorcomment>Could not find this message to understand the context</translatorcomment>
<translation>Adicione feeds deslizando para baixo</translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -147,39 +173,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation>Artigos, recentes antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation>Artigos, antigos antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation>Feeds, artigos recentes antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation>Feeds, artigos antigos antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation>Só feed atual, artigos recentes antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation>Só feed atual, artigos antigos antes</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation>Erro - %1:
@@ -408,68 +434,78 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation>Áudio</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation>Imagem</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation>Vídeo</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation>Documento PDF</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished">Mídia</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation>Item anterior</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation>Primeiro item</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation>Item seguinte</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation>Último item</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translatorcomment>translation is as original: only in plural form</translatorcomment>
<translation>(%1 segundos)</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished">Carregar imagens</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation>Artigo resumido</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation>Site</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings-ru_RU.ts
^
|
| @@ -64,31 +64,57 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translation>Статьи: %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation>Тип сортировки: %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="121"/>
<source>All read</source>
<translation>Все прочитано</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation>Заглушить звук</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translation>Потяните вниз, чтобы добавить ленту.</translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -143,39 +169,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation>Вначале новые статьи</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation>Вначале старые статьи</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation>Вначале новые, группировка по лентам</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation>Вначале старые, группировка по лентам</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation>Вначале новые, только текущая лента</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation>Вначале старые, только текущая лента</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation>Ошибка с %1:
@@ -403,67 +429,77 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation>Аудио</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation>Изображение</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation>Видео</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation>Документ PDF</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished">Ресурсы</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation>Назад</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation>Уже в начале</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation>Далее</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation>Уже в конце</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translation>(%1 секунд)</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished">Загрузка изображений</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation>Статья вкратце</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation>Вебсайт</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
<translation>Статья целиком</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="534"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings-sv.ts
^
|
| @@ -64,31 +64,57 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translation>%1 objekt</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation>Sortera efter: %1</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="121"/>
<source>All read</source>
<translation>Alla lästa</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation>Stoppa ljud</translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translation>Dra neråt för att lägga till flöden.</translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -143,39 +169,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation>Senaste först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation>Äldsta först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation>Flöde, sedan senast först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation>Flöde, sedan äldst först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation>Endast aktuellt flöde, senast först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation>Endast aktuellt flöde, äldst först</translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation>Fel med %1:
@@ -403,67 +429,77 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation>Ljud</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation>Bild</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation>Film</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation>PDF-dokument</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished">Resurser</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation>Föregående</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation>Redan vid början</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation>Nästa</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation>Redan vid slutet</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translation>(%1 sekunder)</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished">Läs in bilder</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation>Kort artikel</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation>Webbsida</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
<translation>Hel artikel</translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="534"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings-1.0.0.tar.bz2/translations/harbour-tidings.ts
^
|
| @@ -64,31 +64,57 @@
<context>
<name>FeedsPage</name>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="73"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="79"/>
<source>%1 items</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="97"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="103"/>
<source>Sort by: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="106"/>
- <location filename="../qml/pages/FeedsPage.qml" line="110"/>
- <source>All read</source>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Show all entries</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../qml/pages/FeedsPage.qml" line="112"/>
+ <source>Only show unread</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="117"/>
<location filename="../qml/pages/FeedsPage.qml" line="121"/>
+ <source>All read</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="132"/>
<source>Stop Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/FeedsPage.qml" line="236"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="245"/>
+ <location filename="../qml/pages/FeedsPage.qml" line="248"/>
+ <source>No entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="247"/>
+ <source>No unread entries</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="253"/>
<source>Pull down to add feeds.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../qml/pages/FeedsPage.qml" line="254"/>
+ <source>Pull down to refresh.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HintLoader</name>
@@ -143,39 +169,39 @@
<context>
<name>NewsBlendModel</name>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="35"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="42"/>
<source>Latest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="41"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="48"/>
<source>Oldest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="47"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="54"/>
<source>Feed, then latest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="53"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="60"/>
<source>Feed, then oldest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="59"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="66"/>
<source>Current feed only, latest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="65"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="72"/>
<source>Current feed only, oldest first</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/NewsBlendModel.qml" line="276"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="282"/>
- <location filename="../qml/pages/NewsBlendModel.qml" line="286"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="295"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="301"/>
+ <location filename="../qml/pages/NewsBlendModel.qml" line="305"/>
<source>Error with %1:
%2</source>
<translation type="unfinished"></translation>
@@ -402,67 +428,77 @@
<context>
<name>ViewPage</name>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="71"/>
+ <location filename="../qml/pages/ViewPage.qml" line="73"/>
<source>Audio</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="73"/>
+ <location filename="../qml/pages/ViewPage.qml" line="75"/>
<source>Image</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="75"/>
+ <location filename="../qml/pages/ViewPage.qml" line="77"/>
<source>Video</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="77"/>
+ <location filename="../qml/pages/ViewPage.qml" line="79"/>
<source>PDF document</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="208"/>
+ <location filename="../qml/pages/ViewPage.qml" line="194"/>
+ <source>Resources</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="200"/>
<source>Previous</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="209"/>
+ <location filename="../qml/pages/ViewPage.qml" line="201"/>
<source>Already at the beginning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="239"/>
+ <location filename="../qml/pages/ViewPage.qml" line="231"/>
<source>Next</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="240"/>
+ <location filename="../qml/pages/ViewPage.qml" line="232"/>
<source>Already at the end</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="380"/>
+ <location filename="../qml/pages/ViewPage.qml" line="362"/>
<source>(%1 seconds)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="456"/>
+ <location filename="../qml/pages/ViewPage.qml" line="385"/>
+ <source>Load images</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/ViewPage.qml" line="449"/>
<source>Short article</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="488"/>
+ <location filename="../qml/pages/ViewPage.qml" line="481"/>
<source>Website</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="457"/>
+ <location filename="../qml/pages/ViewPage.qml" line="450"/>
<source>Full article</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/pages/ViewPage.qml" line="534"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-tidings.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-tidings
Summary: RSS / Atom / Podcasts / Feed Reader
-Version: 0.9.4
+Version: 1.0.0
Release: 1
Group: Qt/Qt
License: GPLv2
|
