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

[Ying-Chun Liu]

Add more strings for translation.

Add more strings for translation.

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~paulliu/unity/i18n/+merge/166287/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Btw, I would have used the index for switching. That would allow you to remove the strings twice and reduce likelyhood of typos. Example:

ListModel {
 ListElement { component: "ApplicationsFilterGrid"; modelName: "InstalledApplicationsModel" }
 ListElement { component: "ApplicationsFilterGrid"; modelName: AppsAvailableForDownloadModel" }
}
 function category(index) {
   switch(index) {
     case 0:
       return i18n.tr("Running apps");
     case 1:
       return i18n.tr("Frequently used");
   }
 }

Another possiblity would be to completely generate the model at runtime:

ListModel {
  id: someModel
  Component.onCompleted: {
    someModel.append( {category: qsTr("Running apps"), modelName: "RunningAppsModel"} )
    someModel.append( {category: qsTr("Frequently used"), modelName: "FrequentAppsModel"} )
  }
}

Both solutions seem cleaner to me than the current approach of typing the same string 3 times.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:706
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1066/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/941
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/941/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1735

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:706
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1068/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1073/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/943
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/943/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1738

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Dash/DashApps.qml'
--- Dash/DashApps.qml	2013-05-24 13:16:26 +0000
+++ Dash/DashApps.qml	2013-05-29 15:32:28 +0000
@@ -60,6 +60,21 @@
         ListElement { category: "Frequently used";        component: "ApplicationsFilterGrid";  modelName: "FrequentlyUsedAppsModel" }
         ListElement { category: "Installed";              component: "ApplicationsFilterGrid";  modelName: "InstalledApplicationsModel" }
         ListElement { category: "Available for download"; component: "ApplicationsFilterGrid";  modelName: "AppsAvailableForDownloadModel" }
+        function getCategory(category1) {
+            if (category1 === "Running apps") {
+                return i18n.tr("Running apps");
+            }
+            if (category1 === "Frequently used") {
+                return i18n.tr("Frequently used");
+            }
+            if (category1 === "Installed") {
+                return i18n.tr("Installed");
+            }
+            if (category1 === "Available for download") {
+                return i18n.tr("Available for download");
+            }
+            return ""
+        }
     }
 
     FrequentlyUsedAppsModel { id: frequentlyUsedAppsModel }
@@ -155,7 +170,7 @@
         sectionProperty: "category"
         sectionDelegate: Header {
             width: categoryView.width
-            text: section
+            text: categoryListModel.getCategory(section)
         }
         pageHeader: PageHeader {
             id: pageHeader

=== modified file 'Dash/DashHome.qml'
--- Dash/DashHome.qml	2013-05-24 13:16:26 +0000
+++ Dash/DashHome.qml	2013-05-29 15:32:28 +0000
@@ -38,6 +38,24 @@
         ListElement { category: "People Recently in Touch"; component: "PeopleGrid";  modelName: "RecentModel" }
         ListElement { category: "Recent Music";          component: "MusicGrid";      modelName: "MusicModel" }
         ListElement { category: "Videos Popular Online"; component: "VideosGrid";     modelName: "VideosModel" }
+        function getCategory(category1) {
+            if (category1 === "Frequent Apps") {
+                return i18n.tr("Frequent Apps");
+            }
+            if (category1 === "Favourite People") {
+                return i18n.tr("Favourite People");
+            }
+            if (category1 === "People Recently in Touch") {
+                return i18n.tr("People Recently in Touch");
+            }
+            if (category1 === "Recent Music") {
+                return i18n.tr("Recent Music");
+            }
+            if (category1 === "Videos Popular Online") {
+                return i18n.tr("Videos Popular Online");
+            }
+            return ""
+        }
     }
 
     FrequentlyUsedAppsModel { id: appsModel }
@@ -172,7 +190,7 @@
         sectionProperty: "category"
         sectionDelegate: Header {
             width: listView.width
-            text: section
+            text: listView.model.getCategory(section)
         }
         pageHeader: PageHeader {
             width: listView.width

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2013-05-24 13:54:54 +0000
+++ po/unity8.pot	2013-05-29 15:32:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-24 21:36+0800\n"
+"POT-Creation-Date: 2013-05-29 23:27+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"
@@ -21,11 +21,47 @@
 msgid "Recent searches"
 msgstr ""
 
-#: Dash/DashApps.qml:163
+#: Dash/DashApps.qml:65
+msgid "Running apps"
+msgstr ""
+
+#: Dash/DashApps.qml:68
+msgid "Frequently used"
+msgstr ""
+
+#: Dash/DashApps.qml:71
+msgid "Installed"
+msgstr ""
+
+#: Dash/DashApps.qml:74
+msgid "Available for download"
+msgstr ""
+
+#: Dash/DashApps.qml:178
 msgid "Apps"
 msgstr ""
 
-#: Dash/DashHome.qml:179 plugins/Unity/lenses.cpp:38
+#: Dash/DashHome.qml:43
+msgid "Frequent Apps"
+msgstr ""
+
+#: Dash/DashHome.qml:46
+msgid "Favourite People"
+msgstr ""
+
+#: Dash/DashHome.qml:49
+msgid "People Recently in Touch"
+msgstr ""
+
+#: Dash/DashHome.qml:52
+msgid "Recent Music"
+msgstr ""
+
+#: Dash/DashHome.qml:55
+msgid "Videos Popular Online"
+msgstr ""
+
+#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
 msgid "Home"
 msgstr ""
 

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2013-05-26 05:40:19 +0000
+++ po/zh_TW.po	2013-05-29 15:32:28 +0000
@@ -7,26 +7,63 @@
 msgstr ""
 "Project-Id-Version: unity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-24 21:36+0800\n"
+"POT-Creation-Date: 2013-05-29 23:27+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-26 05:40+0000\n"
 "X-Generator: Launchpad (build 16640)\n"
-"Language: \n"
 
 #: Components/PageHeader.qml:300
 msgid "Recent searches"
 msgstr "最近搜尋"
 
-#: Dash/DashApps.qml:163
+#: Dash/DashApps.qml:65
+msgid "Running apps"
+msgstr "正在執行中的程式"
+
+#: Dash/DashApps.qml:68
+msgid "Frequently used"
+msgstr "最常使用"
+
+#: Dash/DashApps.qml:71
+msgid "Installed"
+msgstr "己安裝"
+
+#: Dash/DashApps.qml:74
+msgid "Available for download"
+msgstr "可被下載的"
+
+#: Dash/DashApps.qml:178
 msgid "Apps"
 msgstr "程式"
 
-#: Dash/DashHome.qml:179 plugins/Unity/lenses.cpp:38
+#: Dash/DashHome.qml:43
+msgid "Frequent Apps"
+msgstr "常用的程式"
+
+#: Dash/DashHome.qml:46
+msgid "Favourite People"
+msgstr "喜歡的朋友"
+
+#: Dash/DashHome.qml:49
+msgid "People Recently in Touch"
+msgstr "最近接觸的朋友"
+
+#: Dash/DashHome.qml:52
+#, fuzzy
+msgid "Recent Music"
+msgstr "最近搜尋"
+
+#: Dash/DashHome.qml:55
+msgid "Videos Popular Online"
+msgstr "線上最熱門的影片"
+
+#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
 msgid "Home"
 msgstr "家屋"