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

[Ying-Chun Liu]

Add strings in Panel for translation.

Add strings in Panel for translation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:715
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1096/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/971
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/971/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1779

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1096/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Good :-)

review: Approve

=== modified file 'Panel/MenuContent.qml'
--- Panel/MenuContent.qml	2013-04-12 10:28:33 +0000
+++ Panel/MenuContent.qml	2013-05-31 11:39:27 +0000
@@ -189,7 +189,7 @@
                 left: parent.left
                 right: parent.right
             }
-            text: content.overviewActive ? "Device" : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ?  indicatorsModel.get(menus.currentIndex).title : ""
+            text: content.overviewActive ? i18n.tr("Device") : (indicatorsModel && menus.currentIndex >= 0 && menus.currentIndex < indicatorsModel.count) ?  indicatorsModel.get(menus.currentIndex).title : ""
             opacity: __shown ? 1 : 0
             Behavior on opacity {NumberAnimation{duration: 100}}
         }
 
=== modified file 'Panel/Menus/Overview/FlightModeWidget.qml'
--- Panel/Menus/Overview/FlightModeWidget.qml	2013-02-15 12:32:30 +0000
+++ Panel/Menus/Overview/FlightModeWidget.qml	2013-05-31 11:39:27 +0000
@@ -39,7 +39,7 @@
             margins: units.gu(2)
             verticalCenter: parent.verticalCenter
         }
-        text: "Flight mode"
+        text: i18n.tr("Flight mode")
         color: "#f3f3e7"
         style: Text.Raised
         styleColor: "black"
 
=== modified file 'po/unity8.pot'
--- po/unity8.pot	2013-05-29 15:30:21 +0000
+++ po/unity8.pot	2013-05-31 11:39:27 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 23:27+0800\n"
+"POT-Creation-Date: 2013-05-30 21:08+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -97,6 +97,14 @@
 msgid "Speaking..."
 msgstr ""
 
+#: Panel/MenuContent.qml:192
+msgid "Device"
+msgstr ""
+
+#: Panel/Menus/Overview/FlightModeWidget.qml:42
+msgid "Flight mode"
+msgstr ""
+
 #: plugins/Unity/lens.cpp:333
 msgid "Sorry, there is nothing that matches your search."
 msgstr ""
 
=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2013-05-30 06:57:44 +0000
+++ po/zh_TW.po	2013-05-31 11:39:27 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: unity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-29 23:27+0800\n"
+"POT-Creation-Date: 2013-05-30 21:08+0800\n"
 "PO-Revision-Date: 2013-05-25 17:21+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Ubuntu Touch Team <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2013-05-30 06:57+0000\n"
 "X-Generator: Launchpad (build 16652)\n"
-"Language: \n"
 
 #: Components/PageHeader.qml:300
 msgid "Recent searches"
@@ -98,6 +98,14 @@
 msgid "Speaking..."
 msgstr "說話中..."
 
+#: Panel/MenuContent.qml:192
+msgid "Device"
+msgstr "設備"
+
+#: Panel/Menus/Overview/FlightModeWidget.qml:42
+msgid "Flight mode"
+msgstr "飛航模式"
+
 #: plugins/Unity/lens.cpp:333
 msgid "Sorry, there is nothing that matches your search."
 msgstr "很抱歉，找不到符合您想搜尋的結果。"