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

Merge branch 'master' of github.com:cnlpete/ttrss

Browse source
This commit is contained in:
Hauke Schade 2013-01-16 22:36:15 +01:00
commit 90311082b4
8 changed files with 366 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
harmattan.qrc
View file

@ -3,5 +3,6 @@
<file>i18n/qml-translation.de.qm</file>
<file>i18n/qml-translation.en.qm</file>
<file>i18n/qml-translation.es.qm</file>
<file>i18n/qml-translation.fr.qm</file>
</qresource>
</RCC>

24
i18n/qml-translation.de.ts
View file

@ -10,29 +10,39 @@
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="110"/>
<source>Copyright: %1</source>
<translation>Copyright: %1</translation>
<source>Author: %1</source>
<translation>Autor: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="117"/>
<location filename="../qml/ttrss/About.qml" line="111"/>
<source>Thanks to:</source>
<translation>Danke an:</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="119"/>
<source>Homepage</source>
<translation>Webseite</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="124"/>
<location filename="../qml/ttrss/About.qml" line="126"/>
<source>If you encounter bugs or have feature requests, please visit the Issue Tracker</source>
<translation>Wenn dir Fehler auffallen, oder du Verbesserungsvorschläge hast, benutze bitte den </translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="128"/>
<location filename="../qml/ttrss/About.qml" line="130"/>
<source>Issue Tracker</source>
<translation>Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="135"/>
<location filename="../qml/ttrss/About.qml" line="166"/>
<source>License</source>
<translation>Lizenz</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="172"/>
<source>Privacy Policy</source>
<translation>Datenschutzerklärung</translation>
</message>
</context>
<context>
<name>AboutItem</name>
@ -237,7 +247,7 @@
<context>
<name>SimplePopup</name>
<message>
<location filename="../qml/ttrss/SimplePopup.qml" line="47"/>
<location filename="../qml/ttrss/SimplePopup.qml" line="45"/>
<source>OK</source>
<translation>OK</translation>
</message>

24
i18n/qml-translation.en.ts
View file

@ -10,29 +10,39 @@
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="110"/>
<source>Copyright: %1</source>
<translation>Copyright: %1</translation>
<source>Author: %1</source>
<translation>Author: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="117"/>
<location filename="../qml/ttrss/About.qml" line="111"/>
<source>Thanks to:</source>
<translation>Thanks to:</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="119"/>
<source>Homepage</source>
<translation>Homepage</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="124"/>
<location filename="../qml/ttrss/About.qml" line="126"/>
<source>If you encounter bugs or have feature requests, please visit the Issue Tracker</source>
<translation>If you encounter bugs or have feature requests, please visit the Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="128"/>
<location filename="../qml/ttrss/About.qml" line="130"/>
<source>Issue Tracker</source>
<translation>Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="135"/>
<location filename="../qml/ttrss/About.qml" line="166"/>
<source>License</source>
<translation>License</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="172"/>
<source>Privacy Policy</source>
<translation>Privacy Policy</translation>
</message>
</context>
<context>
<name>AboutItem</name>
@ -237,7 +247,7 @@
<context>
<name>SimplePopup</name>
<message>
<location filename="../qml/ttrss/SimplePopup.qml" line="47"/>
<location filename="../qml/ttrss/SimplePopup.qml" line="45"/>
<source>OK</source>
<translation>OK</translation>
</message>

24
i18n/qml-translation.es.ts
View file

@ -10,29 +10,39 @@
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="110"/>
<source>Copyright: %1</source>
<translation>Copyright: %1</translation>
<source>Author: %1</source>
<translation>Autor: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="117"/>
<location filename="../qml/ttrss/About.qml" line="111"/>
<source>Thanks to:</source>
<translation>Gracias a:</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="119"/>
<source>Homepage</source>
<translation>Página web</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="124"/>
<location filename="../qml/ttrss/About.qml" line="126"/>
<source>If you encounter bugs or have feature requests, please visit the Issue Tracker</source>
<translation>Si observa errores, o tienes alguna sugerencia, por favor visite el Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="128"/>
<location filename="../qml/ttrss/About.qml" line="130"/>
<source>Issue Tracker</source>
<translation>Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="135"/>
<location filename="../qml/ttrss/About.qml" line="166"/>
<source>License</source>
<translation>Licencia</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="172"/>
<source>Privacy Policy</source>
<translation>Declaración de privacidad</translation>
</message>
</context>
<context>
<name>AboutItem</name>
@ -237,7 +247,7 @@
<context>
<name>SimplePopup</name>
<message>
<location filename="../qml/ttrss/SimplePopup.qml" line="47"/>
<location filename="../qml/ttrss/SimplePopup.qml" line="45"/>
<source>OK</source>
<translation>Aceptar</translation>
</message>

268
i18n/qml-translation.fr.ts Normal file
View file

@ -0,0 +1,268 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="fr_FR">
<context>
<name>About</name>
<message>
<location filename="../qml/ttrss/About.qml" line="109"/>
<source>Version: %1</source>
<translation>Version: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="110"/>
<source>Author: %1</source>
<translation>Auteur: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="111"/>
<source>Thanks to:</source>
<translation>Merci à:</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="119"/>
<source>Homepage</source>
<translation>Site web</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="126"/>
<source>If you encounter bugs or have feature requests, please visit the Issue Tracker</source>
<translation>Si vous trouvez des bugs ou désirez de nouvelles fonctionnalités, visitez l&apos;Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="130"/>
<source>Issue Tracker</source>
<translation>Issue Tracker</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="166"/>
<source>License</source>
<translation>Licence</translation>
</message>
<message>
<location filename="../qml/ttrss/About.qml" line="172"/>
<source>Privacy Policy</source>
<translation>Déclaration de confidentialité</translation>
</message>
</context>
<context>
<name>AboutItem</name>
<message>
<location filename="../qml/ttrss/AboutItem.qml" line="16"/>
<source>About</source>
<translation>A propos</translation>
</message>
</context>
<context>
<name>Categories</name>
<message>
<location filename="../qml/ttrss/Categories.qml" line="146"/>
<location filename="../qml/ttrss/Categories.qml" line="156"/>
<source>Unread: %1</source>
<translation>%1 non lu(s)</translation>
</message>
<message>
<location filename="../qml/ttrss/Categories.qml" line="164"/>
<source>No categories have unread items</source>
<translation>Aucune catégorie sans article non-lu</translation>
</message>
<message>
<location filename="../qml/ttrss/Categories.qml" line="164"/>
<source>No categories to display</source>
<translation>Aucune catégorie</translation>
</message>
<message>
<location filename="../qml/ttrss/Categories.qml" line="196"/>
<source>Tiny Tiny RSS Reader</source>
<translation>Tiny Tiny RSS Reader</translation>
</message>
</context>
<context>
<name>Constants</name>
<message>
<location filename="../qml/ttrss/Constants.qml" line="39"/>
<source>Archived articles</source>
<translation>Articles archivés</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="40"/>
<source>Starred articles</source>
<translation>Articles étoilés</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="41"/>
<source>Published articles</source>
<translation>Articles publiés</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="42"/>
<source>Fresh articles</source>
<translation>Articles récents</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="43"/>
<source>All articles</source>
<translation>Tous les articles</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="44"/>
<source>Recently read</source>
<translation>Récemment lu</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="46"/>
<source>Labels</source>
<translation>Etiquettes</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="47"/>
<source>Special</source>
<translation>Spécial</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="48"/>
<source>All Feeds</source>
<translation>Tous les flux</translation>
</message>
<message>
<location filename="../qml/ttrss/Constants.qml" line="49"/>
<source>Uncategorized</source>
<translation>Sans catégorie</translation>
</message>
</context>
<context>
<name>ErrorDialog</name>
<message>
<location filename="../qml/ttrss/ErrorDialog.qml" line="44"/>
<source>OK</source>
<translation>OK</translation>
</message>
</context>
<context>
<name>FeedItem</name>
<message>
<location filename="../qml/ttrss/FeedItem.qml" line="187"/>
<source>Open in Web Browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItem.qml" line="194"/>
<source>Mark read</source>
<translation>Marquer comme lu</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItem.qml" line="194"/>
<source>Mark Unread</source>
<translation>Marquer comme non-lu</translation>
</message>
</context>
<context>
<name>FeedItems</name>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="160"/>
<source>No items in feed</source>
<translation>Pas d&apos;article dans le flux</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="160"/>
<source>No unread items in feed</source>
<translation>Pas d&apos;article non-lu dans le flux</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="248"/>
<source>Unstar</source>
<translation>Enlever l&apos;étoile</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="248"/>
<source>Star</source>
<translation>Etoiler</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="257"/>
<source>Unpublish</source>
<translation>Dépublier</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="257"/>
<source>Publish</source>
<translation>Publier</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="266"/>
<source>Mark read</source>
<translation>Marquer comme lu</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="266"/>
<source>Mark Unread</source>
<translation>Marquer comme non-lu</translation>
</message>
<message>
<location filename="../qml/ttrss/FeedItems.qml" line="275"/>
<source>Open in Web Browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
</context>
<context>
<name>Feeds</name>
<message>
<location filename="../qml/ttrss/Feeds.qml" line="135"/>
<source>Unread: %1</source>
<translation>Non-lu: %1</translation>
</message>
<message>
<location filename="../qml/ttrss/Feeds.qml" line="142"/>
<source>No feeds in category</source>
<translation>Pas de flux dans la catégorie</translation>
</message>
<message>
<location filename="../qml/ttrss/Feeds.qml" line="142"/>
<source>Category has no unread items</source>
<translation>La catégorie n&apos;a pas d&apos;article non-lu</translation>
</message>
</context>
<context>
<name>MainPage</name>
<message>
<location filename="../qml/ttrss/MainPage.qml" line="103"/>
<source>Server:</source>
<translation>Serveur:</translation>
</message>
<message>
<location filename="../qml/ttrss/MainPage.qml" line="113"/>
<source>Username:</source>
<translation>Nom d&apos;utilisateur:</translation>
</message>
<message>
<location filename="../qml/ttrss/MainPage.qml" line="123"/>
<source>Password:</source>
<translation>Mot de passe:</translation>
</message>
<message>
<location filename="../qml/ttrss/MainPage.qml" line="148"/>
<source>Login</source>
<translation>Login</translation>
</message>
</context>
<context>
<name>SimplePopup</name>
<message>
<location filename="../qml/ttrss/SimplePopup.qml" line="45"/>
<source>OK</source>
<translation>OK</translation>
</message>
</context>
<context>
<name>ToggleShowAllItem</name>
<message>
<location filename="../qml/ttrss/ToggleShowAllItem.qml" line="21"/>
<source>Show Unread Only</source>
<translation>Montrer les non-lus seulement</translation>
</message>
<message>
<location filename="../qml/ttrss/ToggleShowAllItem.qml" line="21"/>
<source>Show All</source>
<translation>Montrer tout</translation>
</message>
</context>
</TS>

49
qml/ttrss/About.qml
View file

@ -106,8 +106,10 @@ Page {
Label {
width: parent.width
text: qsTr("Version: %1").arg("0.1.1") + "<br/>"
+qsTr("Copyright: %1").arg("Hauke Schade 2012") + "<br/>"
text: qsTr("Version: %1").arg("0.1.2") + "<br/>"
+qsTr("Author: %1").arg("Hauke Schade 2012") + "<br/>"
+qsTr("Thanks to:") + " "
+ "Francois Cattin"
onLinkActivated: {
Qt.openUrlExternally(link)
}
@ -130,17 +132,10 @@ Page {
Qt.openUrlExternally(constant.issueTrackerUrl)
}
}
Button {
width: parent.width
text: qsTr("License")
onClicked: {
popup.open();
}
}
}
SimplePopup {
id: popup
id: license
text: "This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@ -155,6 +150,17 @@ Page {
along with this program. If not, see <a href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a>."
}
SimplePopup {
id: privacypolicy
text: "ttrss will collect the login information you give at startup and nothing more.
Your login data is stored in a configuration file on your device and nowhere else.
ttrss will only use it to establish connections to the available services and/or servers.
The login data is not given to any third party and is not used for any other purpose than the functions of ttrss.
<br><br>
If you have any questions, concerns, or comments about our privacy policy you may contact us via:<br>
<a href='mailto:cnlpete@cnlpete.de'>cnlpete@cnlpete.de</a>"
}
ToolBarLayout {
id: aboutTools
@ -163,6 +169,29 @@ Page {
iconId: "toolbar-back";
onClicked: { pageStack.pop(); }
}
ToolIcon {
iconId: "toolbar-view-menu" ;
onClicked: (menu.status === DialogStatus.Closed) ? menu.open() : menu.close()
}
}
Menu {
id: menu
visualParent: pageStack
MenuLayout {
MenuItem {
text: qsTr("License")
onClicked: {
license.open();
}
}
MenuItem {
text: qsTr("Privacy Policy")
onClicked: {
privacypolicy.open();
}
}
}
}
}

6
qtc_packaging/debian_harmattan/changelog
View file

@ -1,3 +1,9 @@
ttrss (0.1.2) unstable; urgency=low
* Added french translations
* Added privacy policy
-- Hauke Schade <cnlpete@cnlpete.de> Wed, 16 Jan 2013 18:29:33 +0100
ttrss (0.1.1) unstable; urgency=low
* A better AboutView
* Improved Spanish Translation

2
qtc_packaging/debian_harmattan/control
View file

@ -1,5 +1,5 @@
Source: ttrss
Section: user/other
Section: user/internet
Priority: optional
Maintainer: Hauke Schade <cnlpete@cnlpete.de>
Build-Depends: debhelper (>= 5), libqt4-dev