git.iko.soy/unity8
on xenial help sign in
1.Minor change on property binding in expandable widget

2.Resolve the issue in merging *.po files

commit3055bc9caedd5116a06e64a5c8c290ce15cb7807 authorGary.Wzl <Gary.Wang@canonical.com> dateTue 8 Sep 2015, 13:15 (11 years ago) parented6dcf8
6 files changed+73−67
compare with xenial
unifiedsplit
po/br.po+25−20 po/hu.po+21−18 po/ia.po+23−20 qml/Dash/Previews/PreviewExpandable.qml−5 qml/Dash/Previews/PreviewWidgetFactory.qml+2−4 tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+2
po/br.po+25−20
@@ -6,12 +6,11 @@
66msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
9−"Report-Msgid-Bugs-To: \n"
10−"POT-Creation-Date: 2015-07-17 10:10+0200\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-08-25 14:53+0200\n"
1111"PO-Revision-Date: 2015-05-14 09:20+0000\n"
1212"Last-Translator: Rouxel <vincent.rouxel@mailoo.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
14−"Language: br\n"
1514"MIME-Version: 1.0\n"
1615"Content-Type: text/plain; charset=UTF-8\n"
1716"Content-Transfer-Encoding: 8bit\n"
@@ -23,12 +22,16 @@ msgstr ""
2322msgid "Password: "
2423msgstr "Ger-tremen : "
2524
26−#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:100
25+#: plugins/Unity/Launcher/launcheritem.cpp:47
26+#: plugins/Unity/Launcher/launcheritem.cpp:106
2827msgid "Pin shortcut"
2928msgstr "Spilhennañ ar verradenn"
3029
31−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:52
31+msgid "Quit"
32+msgstr ""
33+
34+#: plugins/Unity/Launcher/launcheritem.cpp:106
3235msgid "Unpin shortcut"
3336msgstr "Dispilhennañ ar verradenn"
3437
@@ -230,15 +233,15 @@ msgstr "Pellgomzadenn vallus"
230233msgid "OK"
231234msgstr "Mat eo"
232235
233−#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
236+#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
234237msgid "See less"
235238msgstr "Gwelet nebeutoc'h"
236239
237−#: qml/Dash/GenericScopeView.qml:539
240+#: qml/Dash/GenericScopeView.qml:569
238241msgid "See all"
239242msgstr "Gwelet pep tra"
240243
241−#: qml/Dash/GenericScopeView.qml:601
244+#: qml/Dash/GenericScopeView.qml:631
242245msgctxt "Label: Hint for dash search line edit"
243246msgid "Search"
244247msgstr "Klask"
@@ -274,6 +277,11 @@ msgstr "Muioc'h..."
274277msgid "Less..."
275278msgstr "Nebeutoc'h..."
276279
280+#: qml/Dash/Previews/PreviewCommentInput.qml:61
281+#: qml/Dash/Previews/PreviewRatingInput.qml:169
282+msgid "Send"
283+msgstr "Kas"
284+
277285#: qml/Dash/Previews/PreviewRatingInput.qml:84
278286msgid "Rate this"
279287msgstr "Priziit an dra-mañ"
@@ -282,10 +290,6 @@ msgstr "Priziit an dra-mañ"
282290msgid "Add a review"
283291msgstr "Ouzhpennañ un ali"
284292
285−#: qml/Dash/Previews/PreviewRatingInput.qml:169
286−msgid "Send"
287−msgstr "Kas"
288−
289293#: qml/Dash/PullToRefreshScopeStyle.qml:55
290294msgid "Pull to refresh…"
291295msgstr "Tennañ evit freskaat..."
@@ -481,15 +485,11 @@ msgstr "Digeriñ al lañserioù ispisial"
481485msgid "Swipe up from the bottom edge."
482486msgstr "Riklit war-du an nec'h adalek an traoñ"
483487
484−#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25
488+#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
485489#: qml/Tutorial/TutorialRight.qml:144
486490msgid "Tap here to continue."
487491msgstr "Pouzañ amañ evit kenderc'hel"
488492
489−#: qml/Tutorial/TutorialContent.qml:81
490−msgid "Click here to finish."
491−msgstr "Klikit amañ evit echuiñ."
492−
493493#: qml/Tutorial/TutorialLeftFinish.qml:24
494494msgid "These are the shortcuts to favorite apps"
495495msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
@@ -564,7 +564,8 @@ msgstr "Surentez ar prennañ"
564564
565565#: qml/Wizard/Pages/30-passwd-type.qml:74
566566msgid "Please select how you’d like to unlock your phone."
567−msgstr "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
567+msgstr ""
568+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
568569
569570#: qml/Wizard/Pages/30-passwd-type.qml:97
570571msgctxt "Label: Type of security method"
@@ -622,7 +623,8 @@ msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
622623
623624#: qml/Wizard/Pages/50-location.qml:86
624625msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
625−msgstr "Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
626+msgstr ""
627+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
626628
627629#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
628630#: qml/Wizard/Pages/50-location.qml:103
@@ -716,3 +718,6 @@ msgstr "%1 〉"
716718
717719#~ msgid "Please re-enter"
718720#~ msgstr "Adverkañ, mar plij"
721+
722+#~ msgid "Click here to finish."
723+#~ msgstr "Klikit amañ evit echuiñ."
po/hu.po+21−18
@@ -6,12 +6,11 @@
66msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
9−"Report-Msgid-Bugs-To: \n"
10−"POT-Creation-Date: 2015-07-17 10:10+0200\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-08-25 14:53+0200\n"
1111"PO-Revision-Date: 2015-05-14 09:20+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
14−"Language: hu\n"
1514"MIME-Version: 1.0\n"
1615"Content-Type: text/plain; charset=UTF-8\n"
1716"Content-Transfer-Encoding: 8bit\n"
@@ -23,12 +22,16 @@ msgstr ""
2322msgid "Password: "
2423msgstr "Jelszó: "
2524
26−#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:100
25+#: plugins/Unity/Launcher/launcheritem.cpp:47
26+#: plugins/Unity/Launcher/launcheritem.cpp:106
2827msgid "Pin shortcut"
2928msgstr "Indító rögzítése"
3029
31−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:52
31+msgid "Quit"
32+msgstr ""
33+
34+#: plugins/Unity/Launcher/launcheritem.cpp:106
3235msgid "Unpin shortcut"
3336msgstr "Indító feloldása"
3437
@@ -226,15 +229,15 @@ msgstr "Segélyhívás"
226229msgid "OK"
227230msgstr "OK"
228231
229−#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
232+#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
230233msgid "See less"
231234msgstr "Kevesebb"
232235
233−#: qml/Dash/GenericScopeView.qml:539
236+#: qml/Dash/GenericScopeView.qml:569
234237msgid "See all"
235238msgstr "Összes megtekintése"
236239
237−#: qml/Dash/GenericScopeView.qml:601
240+#: qml/Dash/GenericScopeView.qml:631
238241msgctxt "Label: Hint for dash search line edit"
239242msgid "Search"
240243msgstr "Keresés"
@@ -270,6 +273,11 @@ msgstr "Több…"
270273msgid "Less..."
271274msgstr "Kevesebb…"
272275
276+#: qml/Dash/Previews/PreviewCommentInput.qml:61
277+#: qml/Dash/Previews/PreviewRatingInput.qml:169
278+msgid "Send"
279+msgstr "Küldés"
280+
273281#: qml/Dash/Previews/PreviewRatingInput.qml:84
274282msgid "Rate this"
275283msgstr "Értékelje"
@@ -278,10 +286,6 @@ msgstr "Értékelje"
278286msgid "Add a review"
279287msgstr "Értékelés hozzáadása"
280288
281−#: qml/Dash/Previews/PreviewRatingInput.qml:169
282−msgid "Send"
283−msgstr "Küldés"
284−
285289#: qml/Dash/PullToRefreshScopeStyle.qml:55
286290msgid "Pull to refresh…"
287291msgstr "Húzza a frissítéshez…"
@@ -477,15 +481,11 @@ msgstr "Speciális menük elérése"
477481msgid "Swipe up from the bottom edge."
478482msgstr "Húzza az ujját a kijelző aljától indulva felfelé."
479483
480−#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25
484+#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
481485#: qml/Tutorial/TutorialRight.qml:144
482486msgid "Tap here to continue."
483487msgstr "Koppintson ide a folytatáshoz."
484488
485−#: qml/Tutorial/TutorialContent.qml:81
486−msgid "Click here to finish."
487−msgstr "Kattintson ide a befejezéshez."
488−
489489#: qml/Tutorial/TutorialLeftFinish.qml:24
490490msgid "These are the shortcuts to favorite apps"
491491msgstr "Ezek a kedvenc alkalmazások gyorsindítói"
@@ -714,3 +714,6 @@ msgstr "%1 〉"
714714
715715#~ msgid "Please re-enter"
716716#~ msgstr "Próbálja újra"
717+
718+#~ msgid "Click here to finish."
719+#~ msgstr "Kattintson ide a befejezéshez."
po/ia.po+23−20
@@ -6,12 +6,11 @@
66msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
9−"Report-Msgid-Bugs-To: \n"
10−"POT-Creation-Date: 2015-07-17 10:10+0200\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-08-25 14:53+0200\n"
1111"PO-Revision-Date: 2015-05-14 09:20+0000\n"
1212"Last-Translator: karm <melo@carmu.com>\n"
1313"Language-Team: Interlingua <ia@li.org>\n"
14−"Language: ia\n"
1514"MIME-Version: 1.0\n"
1615"Content-Type: text/plain; charset=UTF-8\n"
1716"Content-Transfer-Encoding: 8bit\n"
@@ -23,12 +22,16 @@ msgstr ""
2322msgid "Password: "
2423msgstr "Contrasigno: "
2524
26−#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:100
25+#: plugins/Unity/Launcher/launcheritem.cpp:47
26+#: plugins/Unity/Launcher/launcheritem.cpp:106
2827msgid "Pin shortcut"
2928msgstr "Via-breve a pin"
3029
31−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:52
31+msgid "Quit"
32+msgstr ""
33+
34+#: plugins/Unity/Launcher/launcheritem.cpp:106
3235msgid "Unpin shortcut"
3336msgstr "Via-breve a levar pin"
3437
@@ -228,15 +231,15 @@ msgstr "Appello de emergentia"
228231msgid "OK"
229232msgstr "OK"
230233
231−#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234+#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
232235msgid "See less"
233236msgstr "Vider minus"
234237
235−#: qml/Dash/GenericScopeView.qml:539
238+#: qml/Dash/GenericScopeView.qml:569
236239msgid "See all"
237240msgstr "Vider toto"
238241
239−#: qml/Dash/GenericScopeView.qml:601
242+#: qml/Dash/GenericScopeView.qml:631
240243msgctxt "Label: Hint for dash search line edit"
241244msgid "Search"
242245msgstr "Cerca"
@@ -272,6 +275,11 @@ msgstr "Plus..."
272275msgid "Less..."
273276msgstr "Minus..."
274277
278+#: qml/Dash/Previews/PreviewCommentInput.qml:61
279+#: qml/Dash/Previews/PreviewRatingInput.qml:169
280+msgid "Send"
281+msgstr "Mandar"
282+
275283#: qml/Dash/Previews/PreviewRatingInput.qml:84
276284msgid "Rate this"
277285msgstr "Evalutar isto"
@@ -280,10 +288,6 @@ msgstr "Evalutar isto"
280288msgid "Add a review"
281289msgstr "Adder un revision"
282290
283−#: qml/Dash/Previews/PreviewRatingInput.qml:169
284−msgid "Send"
285−msgstr "Mandar"
286−
287291#: qml/Dash/PullToRefreshScopeStyle.qml:55
288292msgid "Pull to refresh…"
289293msgstr "Tirar pro renovar…"
@@ -479,15 +483,11 @@ msgstr "Aperi le menus special"
479483msgid "Swipe up from the bottom edge."
480484msgstr "Stria in alto ex le bordo basse."
481485
482−#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25
486+#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
483487#: qml/Tutorial/TutorialRight.qml:144
484488msgid "Tap here to continue."
485489msgstr "Pulsa ci pro continuar"
486490
487−#: qml/Tutorial/TutorialContent.qml:81
488−msgid "Click here to finish."
489−msgstr "Clicca ci pro finir"
490−
491491#: qml/Tutorial/TutorialLeftFinish.qml:24
492492msgid "These are the shortcuts to favorite apps"
493493msgstr "Iste es le vias breve al applicationes favorite"
@@ -641,8 +641,8 @@ msgstr "No, del toto"
641641#: qml/Wizard/Pages/50-location.qml:124
642642msgid "You can change your mind later in <b>System Settings</b>."
643643msgstr ""
644−"Tu pote cambiar tu desiderata plus tarde in <b>Configurationes del systema</"
645−"b>."
644+"Tu pote cambiar tu desiderata plus tarde in <b>Configurationes del "
645+"systema</b>."
646646
647647#: qml/Wizard/Pages/60-reporting.qml:24
648648msgid "Improving your experience"
@@ -719,3 +719,6 @@ msgstr "%1 〉"
719719
720720#~ msgid "Please re-enter"
721721#~ msgstr "Per favor re-inserer"
722+
723+#~ msgid "Click here to finish."
724+#~ msgstr "Clicca ci pro finir"
qml/Dash/Previews/PreviewExpandable.qml−5
@@ -33,11 +33,6 @@ PreviewWidget {
3333 id: root
3434 implicitHeight: childrenRect.height
3535
36− property var initialExpanded:widgetData["expanded"]
37− onInitialExpandedChanged: {
38− expanded = initialExpanded === undefined? false : initialExpanded;
39− }
40−
4136 Label {
4237 id: titleLabel
4338 objectName: "titleLabel"
qml/Dash/Previews/PreviewWidgetFactory.qml+2−4
@@ -35,7 +35,7 @@ Loader {
3535 property var scopeStyle: null
3636
3737 //! Should the widget show in expanded mode (For those that support it)
38− property bool expanded: widgetType !== "expandable"
38+ property bool expanded: widgetType !== "expandable" || widgetData["expanded"] === true
3939
4040 //! Set to true if the parent preview is displayed.
4141 property bool isCurrentPreview: false
@@ -74,10 +74,8 @@ Loader {
7474 item.widgetId = Qt.binding(function() { return root.widgetId } )
7575 item.widgetData = Qt.binding(function() { return root.widgetData } )
7676 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
77+ item.expanded = Qt.binding(function() { return root.expanded } )
7778 item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
78−
79− if (widgetType !== "expandable")
80− item.expanded = Qt.binding(function() { return root.expanded } )
8179 }
8280
8381 Connections {
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+2
@@ -212,6 +212,8 @@ Rectangle {
212212 }
213213
214214 function init() {
215+ previewExpandable.widgetType = "";
216+ previewExpandable.widgetType = "expandable";
215217 previewExpandable.widgetData = widgetData;
216218 checkInitialState();
217219 }