Merge branch 'v0.4.x'

This commit is contained in:
Hauke Schade 2014-11-10 22:09:07 +01:00
commit 5b1c8b5e0e
4 changed files with 12 additions and 12 deletions

View file

@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see
# http://www.gnu.org/licenses/.
VERSION = 0.4.5
VERSION = 0.4.6
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
DEFINES += Q_OS_SAILFISH

View file

@ -63,7 +63,7 @@
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="44"/>
<source>Full License</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="99"/>
@ -73,12 +73,12 @@
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="118"/>
<source>Contributors</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="134"/>
<source>Feature Requests &amp; Bugs</source>
<translation type="unfinished"/>
<translation>bug反馈</translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="141"/>
@ -88,12 +88,12 @@
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="160"/>
<source>Legal Notice</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/AboutPage.qml" line="176"/>
<source>The source code is available at %1.</source>
<translation type="unfinished"/>
<translation> %1 </translation>
</message>
</context>
<context>
@ -239,12 +239,12 @@
<message>
<location filename="../qml/ttrss/sailfish/pages/FeedDelegate.qml" line="114"/>
<source>Marking all read</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/FeedDelegate.qml" line="122"/>
<source>Unsubcribing</source>
<translation type="unfinished"/>
<translation>退</translation>
</message>
</context>
<context>
@ -397,7 +397,7 @@
<message>
<location filename="../qml/ttrss/sailfish/pages/FeedItems.qml" line="143"/>
<source>Marking all read</source>
<translation type="unfinished"/>
<translation></translation>
</message>
</context>
<context>
@ -702,7 +702,7 @@
<location filename="../qml/ttrss/harmattan/Settings.qml" line="106"/>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="115"/>
<source>Display Labels in Item List</source>
<translation type="unfinished"/>
<translation></translation>
</message>
<message>
<location filename="../qml/ttrss/sailfish/pages/Settings.qml" line="161"/>

View file

@ -13,7 +13,7 @@ Name: harbour-ttrss-cnlpete
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tiny Tiny RSS Reader
Version: 0.4.5
Version: 0.4.6
Release: 1
Group: Applications/Internet
License: GPLv2+

View file

@ -1,6 +1,6 @@
Name: harbour-ttrss-cnlpete
Summary: Tiny Tiny RSS Reader
Version: 0.4.5
Version: 0.4.6
Release: 1
Group: Applications/Internet
URL: http://ttrss.cnlpete.de/