diff --git a/harmattan.qrc b/harmattan.qrc index e420d3c..6b57f11 100644 --- a/harmattan.qrc +++ b/harmattan.qrc @@ -3,5 +3,6 @@ i18n/qml-translation.de.qm i18n/qml-translation.en.qm i18n/qml-translation.es.qm + i18n/qml-translation.fr.qm diff --git a/i18n/qml-translation.de.ts b/i18n/qml-translation.de.ts index 077d5d7..522c05c 100644 --- a/i18n/qml-translation.de.ts +++ b/i18n/qml-translation.de.ts @@ -10,29 +10,39 @@ - Copyright: %1 - Copyright: %1 + Author: %1 + Autor: %1 - + + Thanks to: + Danke an: + + + Homepage Webseite - + If you encounter bugs or have feature requests, please visit the Issue Tracker Wenn dir Fehler auffallen, oder du Verbesserungsvorschläge hast, benutze bitte den - + Issue Tracker Issue Tracker - + License Lizenz + + + Privacy Policy + Datenschutzerklärung + AboutItem @@ -237,7 +247,7 @@ SimplePopup - + OK OK diff --git a/i18n/qml-translation.en.ts b/i18n/qml-translation.en.ts index 682aabb..9726293 100644 --- a/i18n/qml-translation.en.ts +++ b/i18n/qml-translation.en.ts @@ -10,29 +10,39 @@ - Copyright: %1 - Copyright: %1 + Author: %1 + Author: %1 - + + Thanks to: + Thanks to: + + + Homepage Homepage - + If you encounter bugs or have feature requests, please visit the Issue Tracker If you encounter bugs or have feature requests, please visit the Issue Tracker - + Issue Tracker Issue Tracker - + License License + + + Privacy Policy + Privacy Policy + AboutItem @@ -237,7 +247,7 @@ SimplePopup - + OK OK diff --git a/i18n/qml-translation.es.ts b/i18n/qml-translation.es.ts index fabff11..d0d39cf 100644 --- a/i18n/qml-translation.es.ts +++ b/i18n/qml-translation.es.ts @@ -10,29 +10,39 @@ - Copyright: %1 - Copyright: %1 + Author: %1 + Autor: %1 - + + Thanks to: + Gracias a: + + + Homepage Página web - + If you encounter bugs or have feature requests, please visit the Issue Tracker Si observa errores, o tienes alguna sugerencia, por favor visite el Issue Tracker - + Issue Tracker Issue Tracker - + License Licencia + + + Privacy Policy + Declaración de privacidad + AboutItem @@ -237,7 +247,7 @@ SimplePopup - + OK Aceptar diff --git a/i18n/qml-translation.fr.ts b/i18n/qml-translation.fr.ts new file mode 100644 index 0000000..5438d13 --- /dev/null +++ b/i18n/qml-translation.fr.ts @@ -0,0 +1,268 @@ + + + + + About + + + Version: %1 + Version: %1 + + + + Author: %1 + Auteur: %1 + + + + Thanks to: + Merci à: + + + + Homepage + Site web + + + + If you encounter bugs or have feature requests, please visit the Issue Tracker + Si vous trouvez des bugs ou désirez de nouvelles fonctionnalités, visitez l'Issue Tracker + + + + Issue Tracker + Issue Tracker + + + + License + Licence + + + + Privacy Policy + Déclaration de confidentialité + + + + AboutItem + + + About + A propos + + + + Categories + + + + Unread: %1 + %1 non lu(s) + + + + No categories have unread items + Aucune catégorie sans article non-lu + + + + No categories to display + Aucune catégorie + + + + Tiny Tiny RSS Reader + Tiny Tiny RSS Reader + + + + Constants + + + Archived articles + Articles archivés + + + + Starred articles + Articles étoilés + + + + Published articles + Articles publiés + + + + Fresh articles + Articles récents + + + + All articles + Tous les articles + + + + Recently read + Récemment lu + + + + Labels + Etiquettes + + + + Special + Spécial + + + + All Feeds + Tous les flux + + + + Uncategorized + Sans catégorie + + + + ErrorDialog + + + OK + OK + + + + FeedItem + + + Open in Web Browser + Ouvrir dans le navigateur + + + + Mark read + Marquer comme lu + + + + Mark Unread + Marquer comme non-lu + + + + FeedItems + + + No items in feed + Pas d'article dans le flux + + + + No unread items in feed + Pas d'article non-lu dans le flux + + + + Unstar + Enlever l'étoile + + + + Star + Etoiler + + + + Unpublish + Dépublier + + + + Publish + Publier + + + + Mark read + Marquer comme lu + + + + Mark Unread + Marquer comme non-lu + + + + Open in Web Browser + Ouvrir dans le navigateur + + + + Feeds + + + Unread: %1 + Non-lu: %1 + + + + No feeds in category + Pas de flux dans la catégorie + + + + Category has no unread items + La catégorie n'a pas d'article non-lu + + + + MainPage + + + Server: + Serveur: + + + + Username: + Nom d'utilisateur: + + + + Password: + Mot de passe: + + + + Login + Login + + + + SimplePopup + + + OK + OK + + + + ToggleShowAllItem + + + Show Unread Only + Montrer les non-lus seulement + + + + Show All + Montrer tout + + + diff --git a/qml/ttrss/About.qml b/qml/ttrss/About.qml index da93004..86df52e 100644 --- a/qml/ttrss/About.qml +++ b/qml/ttrss/About.qml @@ -106,8 +106,10 @@ Page { Label { width: parent.width - text: qsTr("Version: %1").arg("0.1.1") + "
" - +qsTr("Copyright: %1").arg("Hauke Schade 2012") + "
" + text: qsTr("Version: %1").arg("0.1.2") + "
" + +qsTr("Author: %1").arg("Hauke Schade 2012") + "
" + +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 http://www.gnu.org/licenses/." } + 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. +

+ If you have any questions, concerns, or comments about our privacy policy you may contact us via:
+ cnlpete@cnlpete.de" + } + 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(); + } + } + } } } diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index bb30832..8a1f078 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,9 @@ +ttrss (0.1.2) unstable; urgency=low + * Added french translations + * Added privacy policy + + -- Hauke Schade Wed, 16 Jan 2013 18:29:33 +0100 + ttrss (0.1.1) unstable; urgency=low * A better AboutView * Improved Spanish Translation diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control index 4c9101b..c4a71d6 100644 --- a/qtc_packaging/debian_harmattan/control +++ b/qtc_packaging/debian_harmattan/control @@ -1,5 +1,5 @@ Source: ttrss -Section: user/other +Section: user/internet Priority: optional Maintainer: Hauke Schade Build-Depends: debhelper (>= 5), libqt4-dev