Merge lp:~paulliu/unity/i18n into lp:unity/phablet

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 715
Merged at revision: 716
Proposed branch: lp:~paulliu/unity/i18n
Merge into: lp:unity/phablet
Diff against target: 91 lines (+21/-5)
4 files modified
Panel/MenuContent.qml (+1/-1)
Panel/Menus/Overview/FlightModeWidget.qml (+1/-1)
po/unity8.pot (+9/-1)
po/zh_TW.po (+10/-2)
To merge this branch: bzr merge lp:~paulliu/unity/i18n
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+166765@code.launchpad.net

Commit message

Add strings in Panel for translation.

Description of the change

Add strings in Panel for translation.

To post a comment you must log in.
lp:~paulliu/unity/i18n updated
715. By Ying-Chun Liu on 2013-05-31

Add strings for translation in Panel.

Albert Astals Cid (aacid) wrote :

Good :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Panel/MenuContent.qml'
2--- Panel/MenuContent.qml 2013-04-12 10:28:33 +0000
3+++ Panel/MenuContent.qml 2013-05-31 11:39:27 +0000
4@@ -189,7 +189,7 @@
5 left: parent.left
6 right: parent.right
7 }
8- text: content.overviewActive ? "Device" : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ? indicatorsModel.get(menus.currentIndex).title : ""
9+ text: content.overviewActive ? i18n.tr("Device") : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ? indicatorsModel.get(menus.currentIndex).title : ""
10 opacity: __shown ? 1 : 0
11 Behavior on opacity {NumberAnimation{duration: 100}}
12 }
13
14=== modified file 'Panel/Menus/Overview/FlightModeWidget.qml'
15--- Panel/Menus/Overview/FlightModeWidget.qml 2013-02-15 12:32:30 +0000
16+++ Panel/Menus/Overview/FlightModeWidget.qml 2013-05-31 11:39:27 +0000
17@@ -39,7 +39,7 @@
18 margins: units.gu(2)
19 verticalCenter: parent.verticalCenter
20 }
21- text: "Flight mode"
22+ text: i18n.tr("Flight mode")
23 color: "#f3f3e7"
24 style: Text.Raised
25 styleColor: "black"
26
27=== modified file 'po/unity8.pot'
28--- po/unity8.pot 2013-05-29 15:30:21 +0000
29+++ po/unity8.pot 2013-05-31 11:39:27 +0000
30@@ -8,7 +8,7 @@
31 msgstr ""
32 "Project-Id-Version: unity8\n"
33 "Report-Msgid-Bugs-To: \n"
34-"POT-Creation-Date: 2013-05-29 23:27+0800\n"
35+"POT-Creation-Date: 2013-05-30 21:08+0800\n"
36 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
37 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38 "Language-Team: LANGUAGE <LL@li.org>\n"
39@@ -97,6 +97,14 @@
40 msgid "Speaking..."
41 msgstr ""
42
43+#: Panel/MenuContent.qml:192
44+msgid "Device"
45+msgstr ""
46+
47+#: Panel/Menus/Overview/FlightModeWidget.qml:42
48+msgid "Flight mode"
49+msgstr ""
50+
51 #: plugins/Unity/lens.cpp:333
52 msgid "Sorry, there is nothing that matches your search."
53 msgstr ""
54
55=== modified file 'po/zh_TW.po'
56--- po/zh_TW.po 2013-05-30 06:57:44 +0000
57+++ po/zh_TW.po 2013-05-31 11:39:27 +0000
58@@ -7,16 +7,16 @@
59 msgstr ""
60 "Project-Id-Version: unity\n"
61 "Report-Msgid-Bugs-To: \n"
62-"POT-Creation-Date: 2013-05-29 23:27+0800\n"
63+"POT-Creation-Date: 2013-05-30 21:08+0800\n"
64 "PO-Revision-Date: 2013-05-25 17:21+0000\n"
65 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
66 "Language-Team: Ubuntu Touch Team <ubuntu-phone@lists.ubuntu.com>\n"
67+"Language: \n"
68 "MIME-Version: 1.0\n"
69 "Content-Type: text/plain; charset=UTF-8\n"
70 "Content-Transfer-Encoding: 8bit\n"
71 "X-Launchpad-Export-Date: 2013-05-30 06:57+0000\n"
72 "X-Generator: Launchpad (build 16652)\n"
73-"Language: \n"
74
75 #: Components/PageHeader.qml:300
76 msgid "Recent searches"
77@@ -98,6 +98,14 @@
78 msgid "Speaking..."
79 msgstr "說話中..."
80
81+#: Panel/MenuContent.qml:192
82+msgid "Device"
83+msgstr "設備"
84+
85+#: Panel/Menus/Overview/FlightModeWidget.qml:42
86+msgid "Flight mode"
87+msgstr "飛航模式"
88+
89 #: plugins/Unity/lens.cpp:333
90 msgid "Sorry, there is nothing that matches your search."
91 msgstr "很抱歉,找不到符合您想搜尋的結果。"

Subscribers

People subscribed via source and target branches