Merge lp:~aacid/ubuntu-rssreader-app/addi18ntr into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

Proposed by Albert Astals Cid
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 324
Merged at revision: 329
Proposed branch: lp:~aacid/ubuntu-rssreader-app/addi18ntr
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 49 lines (+11/-3)
2 files modified
ReadingOptions.qml (+2/-2)
po/com.ubuntu.shorts.pot (+9/-1)
To merge this branch: bzr merge lp:~aacid/ubuntu-rssreader-app/addi18ntr
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Joey Chan Approve
Review via email: mp+235927@code.launchpad.net

Commit message

Add i18n.tr

To post a comment you must log in.
Revision history for this message
Joey Chan (qqworini) wrote :

Oh Thx for fixing my careless

review: Approve
Revision history for this message
Roman Shchekin (mrqtros) wrote :

Mine careless, I think ;)

Revision history for this message
Albert Astals Cid (aacid) wrote :

Can anyone top approve?

Revision history for this message
Joey Chan (qqworini) wrote :

@Albert

U request Alan to review it, I can't top-approve without his review

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ReadingOptions.qml'
2--- ReadingOptions.qml 2014-09-20 10:51:29 +0000
3+++ ReadingOptions.qml 2014-09-25 09:46:35 +0000
4@@ -41,7 +41,7 @@
5 spacing: units.gu(2)
6 anchors.centerIn: parent
7 Button {
8- text: "Dark"
9+ text: i18n.tr("Dark")
10 width: units.gu(14)
11 gradient: buttonRow.useDark ? UbuntuColors.orangeGradient : UbuntuColors.greyGradient
12 onClicked: {
13@@ -51,7 +51,7 @@
14 }
15
16 Button {
17- text: "Light"
18+ text: i18n.tr("Light")
19 width: units.gu(14)
20 gradient: buttonRow.useDark ? UbuntuColors.greyGradient : UbuntuColors.orangeGradient
21 onClicked: {
22
23=== modified file 'po/com.ubuntu.shorts.pot'
24--- po/com.ubuntu.shorts.pot 2014-09-20 10:51:29 +0000
25+++ po/com.ubuntu.shorts.pot 2014-09-25 09:46:35 +0000
26@@ -8,7 +8,7 @@
27 msgstr ""
28 "Project-Id-Version: \n"
29 "Report-Msgid-Bugs-To: \n"
30-"POT-Creation-Date: 2014-09-20 02:37-0700\n"
31+"POT-Creation-Date: 2014-09-25 11:45+0200\n"
32 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
33 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
34 "Language-Team: LANGUAGE <LL@li.org>\n"
35@@ -43,6 +43,14 @@
36 msgid "Open site"
37 msgstr ""
38
39+#: ../ReadingOptions.qml:44
40+msgid "Dark"
41+msgstr ""
42+
43+#: ../ReadingOptions.qml:54
44+msgid "Light"
45+msgstr ""
46+
47 #: ../ReadingOptions.qml:111
48 msgid "Small"
49 msgstr ""

Subscribers

People subscribed via source and target branches