91a7003 · unity8 · git.iko.soy

debian/control+3−3

compare with xenial

unifiedsplit

@@ -52,7 +52,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk

52Package: indicators-client

53Architecture: amd64 armhf i386

54Depends: qmenumodel-qml (>= 0.2.7),

55− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),

55+ qtdeclarative5-ubuntu-ui-toolkit-plugin,

56 unity8 (= ${binary:Version}),

57 ${misc:Depends},

58 ${shlibs:Depends},

@@ -72,11 +72,10 @@ Package: unity8

72Architecture: any

73Provides: indicator-renderer,

74Depends: gsettings-desktop-schemas,

75− libunity-mir1 (>= 0.2),

76 qmenumodel-qml (>= 0.2.7),

75 qmenumodel-qml (>= 0.2.7),

77 qtdeclarative5-dee-plugin,

76 qtdeclarative5-dee-plugin,

78 qtdeclarative5-gsettings1.0,

77 qtdeclarative5-gsettings1.0,

79− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),

78+ qtdeclarative5-ubuntu-ui-toolkit-plugin,

80 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

79 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

81 qtdeclarative5-xmllistmodel-plugin,

80 qtdeclarative5-xmllistmodel-plugin,

82 unity-launcher-impl-3,

81 unity-launcher-impl-3,

@@ -104,6 +103,7 @@ Depends: gir1.2-glib-2.0,

104 libqt5widgets5,

103 libqt5widgets5,

105 python-evdev,

104 python-evdev,

106 python-gi,

105 python-gi,

106+ python-mock,

107 unity8 (>= ${source:Version}),

108 unity8-fake-env (>= ${source:Version}),

109 ${misc:Depends},

plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+8

@@ -60,6 +60,7 @@ Indicators.BaseMenuItem {

60

61 Loader {

62 id: contents

63+ objectName: "loader"

63 anchors.fill: parent

64 anchors.fill: parent

64

65

65 sourceComponent: loadMessage(actionsDescription);

66 sourceComponent: loadMessage(actionsDescription);

@@ -67,6 +68,7 @@ Indicators.BaseMenuItem {

67 Component {

68 Component {

68 id: simpleTextMessage

69 id: simpleTextMessage

69 SimpleTextMessage {

70 SimpleTextMessage {

71+ objectName: "simpleTextMessage"

70 // text

72 // text

71 title: menuData && menuData.label || ""

73 title: menuData && menuData.label || ""

72 time: getExtendedProperty(extendedData, "xCanonicalTime", 0)

74 time: getExtendedProperty(extendedData, "xCanonicalTime", 0)

@@ -74,6 +76,8 @@ Indicators.BaseMenuItem {

74 // icons

76 // icons

75 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")

77 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")

76 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

78 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

79+ // actions

80+ enabled: menuData && menuData.sensitive || false

77

81

78 onActivateApp: {

82 onActivateApp: {

79 menuModel.activate(menuIndex, true);

83 menuModel.activate(menuIndex, true);

@@ -91,6 +95,7 @@ Indicators.BaseMenuItem {

91 Component {

95 Component {

92 id: textMessage

96 id: textMessage

93 TextMessage {

97 TextMessage {

98+ objectName: "textMessage"

94 property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined

99 property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined

95

100

96 property var replyAction: QMenuModel.UnityMenuAction {

101 property var replyAction: QMenuModel.UnityMenuAction {

@@ -109,6 +114,7 @@ Indicators.BaseMenuItem {

109 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

114 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

110 // actions

115 // actions

111 replyEnabled: replyAction.valid && replyAction.enabled

116 replyEnabled: replyAction.valid && replyAction.enabled

117+ enabled: menuData && menuData.sensitive || false

112

118

113 onActivateApp: {

119 onActivateApp: {

114 menuModel.activate(menuIndex, true);

120 menuModel.activate(menuIndex, true);

@@ -129,6 +135,7 @@ Indicators.BaseMenuItem {

129 Component {

135 Component {

130 id: snapDecision

136 id: snapDecision

131 SnapDecision {

137 SnapDecision {

138+ objectName: "snapDecision"

132 property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined

139 property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined

133 property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined

140 property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined

134

141

@@ -156,6 +163,7 @@ Indicators.BaseMenuItem {

156 // actions

163 // actions

157 activateEnabled: activateAction.valid && activateAction.enabled

164 activateEnabled: activateAction.valid && activateAction.enabled

158 replyEnabled: replyAction.valid && replyAction.enabled

165 replyEnabled: replyAction.valid && replyAction.enabled

166+ enabled: menuData && menuData.sensitive || false

159

167

160 onActivateApp: {

168 onActivateApp: {

161 menuModel.activate(menuIndex, true);

169 menuModel.activate(menuIndex, true);

plugins/Unity/Indicators/Network/qml/AccessPoint.qml+2−2

@@ -30,7 +30,7 @@ Indicators.BaseMenuItem {

30 property bool secure: false

31 property bool adHoc: false

32 property int signalStrength: 0

33− property alias text: label.text

33+ property alias label: _label.text

34

35 signal activate()

36

@@ -89,7 +89,7 @@ Indicators.BaseMenuItem {

89 }

90

91 Label {

92− id: label

92+ id: _label

93 anchors {

94 left: iconSignal.right

95 leftMargin: units.gu(1)

plugins/Unity/Indicators/qml/ButtonMenuItem.qml+1−1

@@ -26,7 +26,7 @@ BaseMenuItem {

26 id: menuItem

27 implicitHeight: units.gu(7)

28

29− property alias text: button.text

29+ property alias buttonText: button.text

30

31 signal activate()

32

plugins/Unity/Indicators/qml/IndicatorPage.qmldeleted−219

@@ -1,219 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Renato Araujo Oliveira Filho <renato@canonical.com>

18− * Nick Dedekind <nick.dedekind@canonical.com>

19− */

20−

21−import QtQuick 2.0

22−import Ubuntu.Components 0.1 as Components

23−import Unity.Indicators 0.1 as Indicators

24−

25−IndicatorBase {

26− id: main

27−

28− //const

29− property bool contentActive: false

30− property string title: rootActionState.title

31− property alias emptyText: emptyLabel.text

32− property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem

33−

34− Indicators.UnityMenuModelStack {

35− id: menuStack

36− head: contentActive ? main.menuModel : null

37−

38− property var rootMenu: null

39−

40− onTailChanged: {

41− if (!tail) {

42− rootMenu = null;

43− } else if (rootMenu != tail) {

44− if (tail.get(0, "type") === rootMenuType) {

45− rootMenu = menuStack.tail.submenu(0);

46− push(rootMenu, 0);

47− } else {

48− rootMenu = null;

49− }

50− }

51− }

52− }

53−

54− Connections {

55− target: menuStack.tail

56− onRowsInserted: {

57− if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {

58− menuStack.rootMenu = menuStack.tail.submenu(0);

59− menuStack.push(menuStack.rootMenu, 0);

60− }

61− }

62− }

63−

64− ListView {

65− id: mainMenu

66− model: menuStack.rootMenu

67−

68− anchors {

69− fill: parent

70− bottomMargin: Qt.inputMethod.visible ? (Qt.inputMethod.keyboardRectangle.height - main.anchors.bottomMargin) : 0

71−

72− Behavior on bottomMargin {

73− NumberAnimation {

74− duration: 175

75− easing.type: Easing.OutQuad

76− }

77− }

78− // TODO - does ever frame.

79− onBottomMarginChanged: {

80− mainMenu.positionViewAtIndex(mainMenu.currentIndex, ListView.End)

81− }

82− }

83−

84− // Ensure all delegates are cached in order to improve smoothness of scrolling

85− cacheBuffer: 10000

86−

87− // Only allow flicking if the content doesn't fit on the page

88− interactive: contentHeight > height

89−

90− property int selectedIndex: -1

91− property bool blockCurrentIndexChange: false

92− // for count = 0

93− onCountChanged: {

94− if (count == 0 && selectedIndex != -1) {

95− selectedIndex = -1;

96− }

97− }

98− // for highlight following

99− onSelectedIndexChanged: {

100− if (currentIndex != selectedIndex) {

101− var blocked = blockCurrentIndexChange;

102− blockCurrentIndexChange = true;

103−

104− currentIndex = selectedIndex;

105−

106− blockCurrentIndexChange = blocked;

107− }

108− }

109− // for item addition/removal

110− onCurrentIndexChanged: {

111− if (!blockCurrentIndexChange) {

112− if (selectedIndex != -1 && selectedIndex != currentIndex) {

113− selectedIndex = currentIndex;

114− }

115− }

116− }

117−

118− delegate: Item {

119− id: menuDelegate

120−

121− anchors {

122− left: parent.left

123− right: parent.right

124− }

125− height: loader.height

126− visible: height > 0

127−

128− Loader {

129− id: loader

130− asynchronous: false

131−

132− property int modelIndex: index

133−

134− anchors {

135− left: parent.left

136− right: parent.right

137− }

138−

139− sourceComponent: factory.load(model)

140−

141− onLoaded: {

142− if (item.hasOwnProperty("menuSelected")) {

143− item.menuSelected = mainMenu.selectedIndex == index;

144− item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });

145− item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });

146− }

147− if (item.hasOwnProperty("menuData")) {

148− item.menuData = Qt.binding(function() { return model; });

149− }

150− if (item.hasOwnProperty("menuIndex")) {

151− item.menuIndex = Qt.binding(function() { return modelIndex; });

152− }

153− }

154−

155− Binding {

156− target: item ? item : null

157− property: "objectName"

158− value: model.action

159− }

160−

161− // TODO: Fixes lp#1243146

162− // This is a workaround for a Qt bug. https://bugreports.qt-project.org/browse/QTBUG-34351

163− Connections {

164− target: mainMenu

165− onSelectedIndexChanged: {

166− if (loader.item && loader.item.hasOwnProperty("menuSelected")) {

167− loader.item.menuSelected = mainMenu.selectedIndex == index;

168− }

169− }

170− }

171− }

172− }

173− }

174−

175− MenuItemFactory {

176− id: factory

177− menuModel: mainMenu.model ? mainMenu.model : null

178− }

179−

180− Components.Label {

181− id: emptyLabel

182− visible: mainMenu.count == 0

183− anchors {

184− top: parent.top

185− left: parent.left

186− right: parent.right

187− topMargin: units.gu(2)

188− }

189− wrapMode: Text.WordWrap

190− horizontalAlignment: Text.AlignHCenter

191−

192− //style

193− color: "#e8e1d0"

194− fontSize: "medium"

195−

196− text: "Empty!"

197− }

198−

199− function start()

200− {

201− reset()

202− if (!contentActive) {

203− contentActive = true;

204− }

205− }

206−

207− function stop()

208− {

209− if (contentActive) {

210− contentActive = false;

211− }

212− }

213−

214− function reset()

215− {

216− mainMenu.selectedIndex = -1;

217− mainMenu.positionViewAtBeginning();

218− }

219−}

plugins/Unity/Indicators/qml/MenuItemFactory.qml+18−3

@@ -57,11 +57,17 @@ Item {

57 return defaultValue;

58 }

59

60+ Component {

61+ id: divMenu;

60− Component { id: divMenu; Indicators.DivMenuItem {} }

62+ Indicators.DivMenuItem {

63+ objectName: "divMenu"

64+ }

65+ }

61

66

62 Component {

67 Component {

63 id: sliderMenu;

68 id: sliderMenu;

64 Indicators.SliderMenuItem {

69 Indicators.SliderMenuItem {

70+ objectName: "sliderMenu"

65 property QtObject menuData: null

71 property QtObject menuData: null

66 property var menuModel: menuFactory.menuModel

72 property var menuModel: menuFactory.menuModel

67 property int menuIndex: -1

73 property int menuIndex: -1

@@ -106,11 +112,12 @@ Item {

106 Component {

112 Component {

107 id: buttonMenu;

113 id: buttonMenu;

108 Indicators.ButtonMenuItem {

114 Indicators.ButtonMenuItem {

115+ objectName: "buttonMenu"

109 property QtObject menuData: null

116 property QtObject menuData: null

110 property var menuModel: menuFactory.menuModel

117 property var menuModel: menuFactory.menuModel

111 property int menuIndex: -1

118 property int menuIndex: -1

112

119

113− text: menuData && menuData.label || ""

120+ buttonText: menuData && menuData.label || ""

114 enabled: menuData && menuData.sensitive || false

121 enabled: menuData && menuData.sensitive || false

115

122

116 onActivate: {

123 onActivate: {

@@ -122,6 +129,7 @@ Item {

122 Component {

129 Component {

123 id: sectionMenu;

130 id: sectionMenu;

124 Indicators.SectionMenuItem {

131 Indicators.SectionMenuItem {

132+ objectName: "sectionMenu"

125 property QtObject menuData: null

133 property QtObject menuData: null

126 property var menuIndex: undefined

134 property var menuIndex: undefined

127

135

@@ -132,6 +140,7 @@ Item {

132 Component {

140 Component {

133 id: progressMenu;

141 id: progressMenu;

134 Indicators.ProgressMenuItem {

142 Indicators.ProgressMenuItem {

143+ objectName: "progressMenu"

135 property QtObject menuData: null

144 property QtObject menuData: null

136 property int menuIndex: -1

145 property int menuIndex: -1

137

146

@@ -145,6 +154,7 @@ Item {

145 Component {

154 Component {

146 id: standardMenu;

155 id: standardMenu;

147 Indicators.StandardMenuItem {

156 Indicators.StandardMenuItem {

157+ objectName: "standardMenu"

148 property QtObject menuData: null

158 property QtObject menuData: null

149 property int menuIndex: -1

159 property int menuIndex: -1

150

160

@@ -164,6 +174,7 @@ Item {

164 Component {

174 Component {

165 id: switchMenu;

175 id: switchMenu;

166 Indicators.SwitchMenuItem {

176 Indicators.SwitchMenuItem {

177+ objectName: "switchMenu"

167 property QtObject menuData: null

178 property QtObject menuData: null

168 property int menuIndex: -1

179 property int menuIndex: -1

169

180

@@ -182,6 +193,7 @@ Item {

182 Component {

193 Component {

183 id: wifiSection;

194 id: wifiSection;

184 Indicators.SectionMenuItem {

195 Indicators.SectionMenuItem {

196+ objectName: "wifiSection"

185 property QtObject menuData: null

197 property QtObject menuData: null

186 property var menuModel: menuFactory.menuModel

198 property var menuModel: menuFactory.menuModel

187 property int menuIndex: -1

199 property int menuIndex: -1

@@ -207,6 +219,7 @@ Item {

207 Component {

219 Component {

208 id: accessPoint;

220 id: accessPoint;

209 ICNetwork.AccessPoint {

221 ICNetwork.AccessPoint {

222+ objectName: "accessPoint"

210 property QtObject menuData: null

223 property QtObject menuData: null

211 property var menuModel: menuFactory.menuModel

224 property var menuModel: menuFactory.menuModel

212 property int menuIndex: -1

225 property int menuIndex: -1

@@ -218,7 +231,7 @@ Item {

218 name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")

231 name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")

219 }

232 }

220

233

221− text: menuData && menuData.label || ""

234+ label: menuData && menuData.label || ""

222 enabled: menuData && menuData.sensitive || false

235 enabled: menuData && menuData.sensitive || false

223 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)

236 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)

224 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)

237 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)

@@ -248,6 +261,7 @@ Item {

248 Component {

261 Component {

249 id: messageItem

262 id: messageItem

250 ICMessaging.MessageMenuItemFactory {

263 ICMessaging.MessageMenuItemFactory {

264+ objectName: "messageItem"

251 menuModel: menuFactory.menuModel

265 menuModel: menuFactory.menuModel

252 }

266 }

253 }

267 }

@@ -255,6 +269,7 @@ Item {

255 Component {

269 Component {

256 id: groupedMessage

270 id: groupedMessage

257 ICMessaging.GroupedMessage {

271 ICMessaging.GroupedMessage {

272+ objectName: "groupedMessage"

258 property QtObject menuData: null

273 property QtObject menuData: null

259 property var menuModel: menuFactory.menuModel

274 property var menuModel: menuFactory.menuModel

260 property int menuIndex: -1

275 property int menuIndex: -1

plugins/Unity/Indicators/qml/qmldir−2

@@ -9,8 +9,6 @@ DivMenuItem 0.1 DivMenuItem.qml

9FramedMenuItem 0.1 FramedMenuItem.qml

10HLine 0.1 HLine.qml

11IndicatorBase 0.1 IndicatorBase.qml

12−IndicatorPage 0.1 IndicatorPage.qml

13−IndicatorWidget 0.1 IndicatorWidget.qml

14MenuActionBinding 0.1 MenuActionBinding.qml

12MenuActionBinding 0.1 MenuActionBinding.qml

15MenuItemFactory 0.1 MenuItemFactory.qml

13MenuItemFactory 0.1 MenuItemFactory.qml

16ProgressMenuItem 0.1 ProgressMenuItem.qml

14ProgressMenuItem 0.1 ProgressMenuItem.qml

po/az.po+34−31

@@ -8,61 +8,64 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-06-26 23:48+0000\n"

11+"PO-Revision-Date: 2014-01-15 09:50+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"

13"Language-Team: Azerbaijani <az@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr ""

23+msgstr "Intro -nu keç"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "Sağ Künc"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

31−msgstr ""

31+msgstr "Kilidi açmaq üçün sağ küncdən çəkin"

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Yuxarı künc"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

39−msgstr ""

39+msgstr "Göstəricilərə keçid üçün yuxarı küncdən çəkin"

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "Bağla"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

47−msgstr ""

47+msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı çəkin"

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "Sol künc"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

55msgstr ""

56+"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"

56

57

57#: Components/EdgeDemo.qml:226

58#: Components/EdgeDemo.qml:226

58msgid "Well done"

59msgid "Well done"

59−msgstr ""

60+msgstr "Təbriklər"

60

61

61#: Components/EdgeDemo.qml:227

62#: Components/EdgeDemo.qml:227

62msgid ""

63msgid ""

63"You have now mastered the edge gestures and can start using the "

64"You have now mastered the edge gestures and can start using the "

64"phone Tap anywhere to start"

65"phone Tap anywhere to start"

65msgstr ""

66msgstr ""

67+"Siz indi künc hərəkətlərini mənimsəmisiniz və telefonu işlətməyə başlaya "

68+"bilərsiniz Başlamaq üçün toxunun"

66

69

67#: Components/PageHeader.qml:364

70#: Components/PageHeader.qml:364

68msgid "Recent searches"

71msgid "Recent searches"

@@ -70,50 +73,50 @@ msgstr "Son axtarışlar"

70

73

71#: Dash/Apps/AppPreview.qml:135

74#: Dash/Apps/AppPreview.qml:135

72msgid "Rate this"

75msgid "Rate this"

73−msgstr ""

76+msgstr "Qiymət ver"

74

77

75#. TRANSLATORS: Number of persons who rated this app/video/whatever

78#. TRANSLATORS: Number of persons who rated this app/video/whatever

76#: Dash/Previews/Header.qml:93

79#: Dash/Previews/Header.qml:93

77#, qt-format

80#, qt-format

78msgid "(%1)"

81msgid "(%1)"

79−msgstr ""

82+msgstr "(%1)"

80

83

81#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

84#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82#: Dash/Previews/Header.qml:105

85#: Dash/Previews/Header.qml:105

83#, qt-format

86#, qt-format

84msgid "%1 review"

87msgid "%1 review"

85msgid_plural "%1 reviews"

88msgid_plural "%1 reviews"

86−msgstr[0] ""

89+msgstr[0] "%1 rəy"

87−msgstr[1] ""

90+msgstr[1] "%1 rəy"

88

91

89#: Dash/Previews/Reviews.qml:74

92#: Dash/Previews/Reviews.qml:74

90msgid "Add a review"

93msgid "Add a review"

91−msgstr ""

94+msgstr "Rəy yaz"

92

95

93#: Dash/Previews/Reviews.qml:86

96#: Dash/Previews/Reviews.qml:86

94msgid "Review"

97msgid "Review"

95−msgstr ""

98+msgstr "Rəy"

96

99

97#: Dash/Previews/Reviews.qml:121

100#: Dash/Previews/Reviews.qml:121

98msgid "Send"

101msgid "Send"

99−msgstr ""

102+msgstr "Göndər"

100

103

101#: Dash/Previews/Reviews.qml:139

104#: Dash/Previews/Reviews.qml:139

102msgid "Comments:"

105msgid "Comments:"

103−msgstr ""

106+msgstr "Şərhlər:"

104

107

105#: Greeter/Lockscreen.qml:149

108#: Greeter/Lockscreen.qml:149

106msgid "Emergency Call"

109msgid "Emergency Call"

107−msgstr ""

110+msgstr "Zərurət zəngi"

108

111

109#: Greeter/PassphraseLockscreen.qml:59

112#: Greeter/PassphraseLockscreen.qml:59

110#, qt-format

113#, qt-format

111msgid "Hello %1"

114msgid "Hello %1"

112−msgstr ""

115+msgstr "Xoş gördük %1"

113

116

114#: Greeter/PassphraseLockscreen.qml:59

117#: Greeter/PassphraseLockscreen.qml:59

115msgid "Hello"

118msgid "Hello"

116−msgstr ""

119+msgstr "Xoş gördük"

117

120

118#: Hud/HudParametrizedActionsPage.qml:132

121#: Hud/HudParametrizedActionsPage.qml:132

119msgid "Confirm"

122msgid "Confirm"

@@ -125,19 +128,19 @@ msgstr "Əmri söyləyin və ya yazın"

125

128

126#: Hud/Hud.qml:84

129#: Hud/Hud.qml:84

127msgid "Loading. Please Wait..."

130msgid "Loading. Please Wait..."

128−msgstr "Yüklənir. Zəhmət olmasa, Gözləyin..."

131+msgstr "Yüklənir. Zəhmət olmasa, gözləyin..."

129

132

130#: Hud/Hud.qml:89

133#: Hud/Hud.qml:89

131msgid "Speak Now..."

134msgid "Speak Now..."

132−msgstr "Söyləyin..."

135+msgstr "Danışın..."

133

136

134#: Hud/Hud.qml:94

137#: Hud/Hud.qml:94

135msgid "Speaking..."

138msgid "Speaking..."

136−msgstr "Söylənilir..."

139+msgstr "Danışır..."

137

140

138#: Notifications/NotificationMenuItemFactory.qml:89

141#: Notifications/NotificationMenuItemFactory.qml:89

139msgid "Show password"

142msgid "Show password"

140−msgstr ""

143+msgstr "Parolu göstər"

141

144

142#: Panel/SearchIndicator.qml:27

145#: Panel/SearchIndicator.qml:27

143msgid "Search"

146msgid "Search"

@@ -146,13 +149,13 @@ msgstr "Axtar"

146#: plugins/Unity/Launcher/launcheritem.cpp:43

149#: plugins/Unity/Launcher/launcheritem.cpp:43

147#: plugins/Unity/Launcher/launcheritem.cpp:73

150#: plugins/Unity/Launcher/launcheritem.cpp:73

148msgid "Lock to Launcher"

151msgid "Lock to Launcher"

149−msgstr ""

152+msgstr "Panelə Bərkit"

150

153

151#: plugins/Unity/Launcher/launcheritem.cpp:73

154#: plugins/Unity/Launcher/launcheritem.cpp:73

152msgid "Unlock from Launcher"

155msgid "Unlock from Launcher"

153−msgstr ""

156+msgstr "Paneldən Qaldır"

154

157

155#: Shell.qml:439

158#: Shell.qml:439

156#, qt-format

159#, qt-format

157msgid "Please enter %1"

160msgid "Please enter %1"

158−msgstr ""

161+msgstr "Xahiş edirik daxil edin: %1"

po/ca.po+7−7

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-09-28 07:38+0000\n"

11+"PO-Revision-Date: 2014-01-10 07:45+0000\n"

12−"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -143,7 +143,7 @@ msgstr "S'està parlant..."

143

144#: Notifications/NotificationMenuItemFactory.qml:89

145msgid "Show password"

146−msgstr ""

146+msgstr "Mostra la contrasenya"

147

148#: Panel/SearchIndicator.qml:27

149msgid "Search"

@@ -152,11 +152,11 @@ msgstr "Cerca"

152#: plugins/Unity/Launcher/launcheritem.cpp:43

153#: plugins/Unity/Launcher/launcheritem.cpp:73

154msgid "Lock to Launcher"

155−msgstr ""

155+msgstr "Mantén-la al llançador"

156

157#: plugins/Unity/Launcher/launcheritem.cpp:73

158msgid "Unlock from Launcher"

159−msgstr ""

159+msgstr "No la mantinguis al llançador"

160

161#: Shell.qml:439

162#, qt-format

po/ckb.ponew file+158

@@ -0,0 +1,158 @@

1+# Kurdish (Sorani) translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-14 20:05+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19+"X-Generator: Launchpad (build 16890)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr ""

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr ""

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr ""

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr ""

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr ""

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr ""

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr ""

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/da.ponew file+158

@@ -0,0 +1,158 @@

1+# Danish translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-14 20:16+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Danish <da@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19+"X-Generator: Launchpad (build 16890)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr ""

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr ""

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr ""

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr ""

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr ""

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr ""

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr ""

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/de.po+8−8

@@ -8,19 +8,19 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-10-18 12:26+0000\n"

11+"PO-Revision-Date: 2014-01-15 11:01+0000\n"

12−"Last-Translator: Phillip Sz <Unknown>\n"

12+"Last-Translator: Dennis Baudys <Unknown>\n"

13"Language-Team: German <de@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr "Überspringe Einführung"

23+msgstr "Einführung überspringen"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

@@ -125,7 +125,7 @@ msgstr "Bestätigen"

125

126#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

127msgid "Type or say a command"

128−msgstr "Geben Sie einen Befehl ein oder sprechen Sie ihn"

128+msgstr "Befehl eingeben oder sprechen"

129

130#: Hud/Hud.qml:84

131msgid "Loading. Please Wait..."

@@ -137,11 +137,11 @@ msgstr "Sprechen Sie jetzt …"

137

138#: Hud/Hud.qml:94

139msgid "Speaking..."

140−msgstr "Sie sprechen …"

140+msgstr "Sprechen Sie …"

141

142#: Notifications/NotificationMenuItemFactory.qml:89

143msgid "Show password"

144−msgstr ""

144+msgstr "Passwort anzeigen"

145

146#: Panel/SearchIndicator.qml:27

147msgid "Search"

po/el.po+32−28

@@ -8,61 +8,65 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-06-27 00:53+0000\n"

11+"PO-Revision-Date: 2014-01-15 16:34+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Filippos Kolyvas <Unknown>\n"

13"Language-Team: Greek <el@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr ""

23+msgstr "Παράλειψη εισαγωγής"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "Δεξί άκρο"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

31−msgstr ""

31+msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Πάνω άκρο"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

39−msgstr ""

39+msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "Κλείσιμο"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

47−msgstr ""

47+msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "Αριστερό άκρο"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

55msgstr ""

56+"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "

57+"στις εφαρμογές"

56

58

57#: Components/EdgeDemo.qml:226

59#: Components/EdgeDemo.qml:226

58msgid "Well done"

60msgid "Well done"

59−msgstr ""

61+msgstr "Συγχαρητήρια"

60

62

61#: Components/EdgeDemo.qml:227

63#: Components/EdgeDemo.qml:227

62msgid ""

64msgid ""

63"You have now mastered the edge gestures and can start using the "

65"You have now mastered the edge gestures and can start using the "

64"phone Tap anywhere to start"

66"phone Tap anywhere to start"

65msgstr ""

67msgstr ""

68+"Τώρα γνωρίζετε τις χειρονομίες άκρων και μπορείτε να αρχίσετε να "

69+"χρησιμοποιείτε το τηλέφωνο Πατήστε οπουδήποτε για να ξεκινήσετε"

66

70

67#: Components/PageHeader.qml:364

71#: Components/PageHeader.qml:364

68msgid "Recent searches"

72msgid "Recent searches"

@@ -70,50 +74,50 @@ msgstr "Πρόσφατες αναζητήσεις"

70

74

71#: Dash/Apps/AppPreview.qml:135

75#: Dash/Apps/AppPreview.qml:135

72msgid "Rate this"

76msgid "Rate this"

73−msgstr ""

77+msgstr "Βαθμολογήστε το"

74

78

75#. TRANSLATORS: Number of persons who rated this app/video/whatever

79#. TRANSLATORS: Number of persons who rated this app/video/whatever

76#: Dash/Previews/Header.qml:93

80#: Dash/Previews/Header.qml:93

77#, qt-format

81#, qt-format

78msgid "(%1)"

82msgid "(%1)"

79−msgstr ""

83+msgstr "(%1)"

80

84

81#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

85#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82#: Dash/Previews/Header.qml:105

86#: Dash/Previews/Header.qml:105

83#, qt-format

87#, qt-format

84msgid "%1 review"

88msgid "%1 review"

85msgid_plural "%1 reviews"

89msgid_plural "%1 reviews"

86−msgstr[0] ""

90+msgstr[0] "%1 αξιολόγηση"

87−msgstr[1] ""

91+msgstr[1] "%1 αξιολογήσεις"

88

92

89#: Dash/Previews/Reviews.qml:74

93#: Dash/Previews/Reviews.qml:74

90msgid "Add a review"

94msgid "Add a review"

91−msgstr ""

95+msgstr "Προσθέστε την αξιολόγησή σας"

92

96

93#: Dash/Previews/Reviews.qml:86

97#: Dash/Previews/Reviews.qml:86

94msgid "Review"

98msgid "Review"

95−msgstr ""

99+msgstr "Αξιολόγηση"

96

100

97#: Dash/Previews/Reviews.qml:121

101#: Dash/Previews/Reviews.qml:121

98msgid "Send"

102msgid "Send"

99−msgstr ""

103+msgstr "Αποστολή"

100

104

101#: Dash/Previews/Reviews.qml:139

105#: Dash/Previews/Reviews.qml:139

102msgid "Comments:"

106msgid "Comments:"

103−msgstr ""

107+msgstr "Σχόλια:"

104

108

105#: Greeter/Lockscreen.qml:149

109#: Greeter/Lockscreen.qml:149

106msgid "Emergency Call"

110msgid "Emergency Call"

107−msgstr ""

111+msgstr "Κλήση έκτακτης ανάγκης"

108

112

109#: Greeter/PassphraseLockscreen.qml:59

113#: Greeter/PassphraseLockscreen.qml:59

110#, qt-format

114#, qt-format

111msgid "Hello %1"

115msgid "Hello %1"

112−msgstr ""

116+msgstr "Γεια σας %1"

113

117

114#: Greeter/PassphraseLockscreen.qml:59

118#: Greeter/PassphraseLockscreen.qml:59

115msgid "Hello"

119msgid "Hello"

116−msgstr ""

120+msgstr "Γεια σας"

117

121

118#: Hud/HudParametrizedActionsPage.qml:132

122#: Hud/HudParametrizedActionsPage.qml:132

119msgid "Confirm"

123msgid "Confirm"

@@ -137,7 +141,7 @@ msgstr "Ομιλία..."

137

141

138#: Notifications/NotificationMenuItemFactory.qml:89

142#: Notifications/NotificationMenuItemFactory.qml:89

139msgid "Show password"

143msgid "Show password"

140−msgstr ""

144+msgstr "Εμφάνιση κωδικού"

141

145

142#: Panel/SearchIndicator.qml:27

146#: Panel/SearchIndicator.qml:27

143msgid "Search"

147msgid "Search"

@@ -146,13 +150,13 @@ msgstr "Αναζήτηση"

146#: plugins/Unity/Launcher/launcheritem.cpp:43

150#: plugins/Unity/Launcher/launcheritem.cpp:43

147#: plugins/Unity/Launcher/launcheritem.cpp:73

151#: plugins/Unity/Launcher/launcheritem.cpp:73

148msgid "Lock to Launcher"

152msgid "Lock to Launcher"

149−msgstr ""

153+msgstr "Διατήρηση στον εκκινητή"

150

154

151#: plugins/Unity/Launcher/launcheritem.cpp:73

155#: plugins/Unity/Launcher/launcheritem.cpp:73

152msgid "Unlock from Launcher"

156msgid "Unlock from Launcher"

153−msgstr ""

157+msgstr "Απομάκρυνση από τον εκκινητή"

154

158

155#: Shell.qml:439

159#: Shell.qml:439

156#, qt-format

160#, qt-format

157msgid "Please enter %1"

161msgid "Please enter %1"

158−msgstr ""

162+msgstr "Πληκτρολογήστε %1"

po/en_GB.po+28−26

@@ -8,61 +8,63 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-06-27 08:53+0000\n"

11+"PO-Revision-Date: 2014-01-14 20:46+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Dan Bishop <dan@danbishop.org>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr ""

23+msgstr "Skip intro"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "Right edge"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

31−msgstr ""

31+msgstr "Try swiping from the right edge to unlock the phone"

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Top edge"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

39−msgstr ""

39+msgstr "Try swiping from the top edge to access the indicators"

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "Close"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

47−msgstr ""

47+msgstr "Swipe up again to close the settings screen"

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "Left edge"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

55−msgstr ""

55+msgstr "Swipe from the left to reveal the launcher for quick access to apps"

56

57#: Components/EdgeDemo.qml:226

58msgid "Well done"

59−msgstr ""

59+msgstr "Well done"

60

61#: Components/EdgeDemo.qml:227

62msgid ""

63"You have now mastered the edge gestures and can start using the "

64"phone Tap anywhere to start"

65msgstr ""

66+"You have now mastered the edge gestures and can start using the "

67+"phone Tap anywhere to start"

66

68

67#: Components/PageHeader.qml:364

69#: Components/PageHeader.qml:364

68msgid "Recent searches"

70msgid "Recent searches"

@@ -70,41 +72,41 @@ msgstr "Recent searches"

70

72

71#: Dash/Apps/AppPreview.qml:135

73#: Dash/Apps/AppPreview.qml:135

72msgid "Rate this"

74msgid "Rate this"

73−msgstr ""

75+msgstr "Rate this"

74

76

75#. TRANSLATORS: Number of persons who rated this app/video/whatever

77#. TRANSLATORS: Number of persons who rated this app/video/whatever

76#: Dash/Previews/Header.qml:93

78#: Dash/Previews/Header.qml:93

77#, qt-format

79#, qt-format

78msgid "(%1)"

80msgid "(%1)"

79−msgstr ""

81+msgstr "(%1)"

80

82

81#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

83#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82#: Dash/Previews/Header.qml:105

84#: Dash/Previews/Header.qml:105

83#, qt-format

85#, qt-format

84msgid "%1 review"

86msgid "%1 review"

85msgid_plural "%1 reviews"

87msgid_plural "%1 reviews"

86−msgstr[0] ""

88+msgstr[0] "%1 review"

87−msgstr[1] ""

89+msgstr[1] "%1 reviews"

88

90

89#: Dash/Previews/Reviews.qml:74

91#: Dash/Previews/Reviews.qml:74

90msgid "Add a review"

92msgid "Add a review"

91−msgstr ""

93+msgstr "Add a review"

92

94

93#: Dash/Previews/Reviews.qml:86

95#: Dash/Previews/Reviews.qml:86

94msgid "Review"

96msgid "Review"

95−msgstr ""

97+msgstr "Review"

96

98

97#: Dash/Previews/Reviews.qml:121

99#: Dash/Previews/Reviews.qml:121

98msgid "Send"

100msgid "Send"

99−msgstr ""

101+msgstr "Send"

100

102

101#: Dash/Previews/Reviews.qml:139

103#: Dash/Previews/Reviews.qml:139

102msgid "Comments:"

104msgid "Comments:"

103−msgstr ""

105+msgstr "Comments:"

104

106

105#: Greeter/Lockscreen.qml:149

107#: Greeter/Lockscreen.qml:149

106msgid "Emergency Call"

108msgid "Emergency Call"

107−msgstr ""

109+msgstr "Emergency Call"

108

110

109#: Greeter/PassphraseLockscreen.qml:59

111#: Greeter/PassphraseLockscreen.qml:59

110#, qt-format

112#, qt-format

@@ -137,7 +139,7 @@ msgstr "Speaking..."

137

139

138#: Notifications/NotificationMenuItemFactory.qml:89

140#: Notifications/NotificationMenuItemFactory.qml:89

139msgid "Show password"

141msgid "Show password"

140−msgstr ""

142+msgstr "Show password"

141

143

142#: Panel/SearchIndicator.qml:27

144#: Panel/SearchIndicator.qml:27

143msgid "Search"

145msgid "Search"

@@ -146,11 +148,11 @@ msgstr "Search"

146#: plugins/Unity/Launcher/launcheritem.cpp:43

148#: plugins/Unity/Launcher/launcheritem.cpp:43

147#: plugins/Unity/Launcher/launcheritem.cpp:73

149#: plugins/Unity/Launcher/launcheritem.cpp:73

148msgid "Lock to Launcher"

150msgid "Lock to Launcher"

149−msgstr ""

151+msgstr "Lock to Launcher"

150

152

151#: plugins/Unity/Launcher/launcheritem.cpp:73

153#: plugins/Unity/Launcher/launcheritem.cpp:73

152msgid "Unlock from Launcher"

154msgid "Unlock from Launcher"

153−msgstr ""

155+msgstr "Unlock from Launcher"

154

156

155#: Shell.qml:439

157#: Shell.qml:439

156#, qt-format

158#, qt-format

po/es.po+7−6

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-11-20 08:46+0000\n"

11+"PO-Revision-Date: 2014-01-15 18:49+0000\n"

12−"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -36,7 +36,8 @@ msgstr "Borde superior"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

39−msgstr "Deslice el dedo desde el borde superior para acceder a los menús"

40+"Deslice el dedo desde el borde superior para acceder a los indicadores"

40

41

41#: Components/EdgeDemo.qml:170

42#: Components/EdgeDemo.qml:170

42msgid "Close"

43msgid "Close"

@@ -113,7 +114,7 @@ msgstr "Llamada de emergencia"

113#: Greeter/PassphraseLockscreen.qml:59

114#: Greeter/PassphraseLockscreen.qml:59

114#, qt-format

115#, qt-format

115msgid "Hello %1"

116msgid "Hello %1"

116−msgstr "Hola %1"

117+msgstr "Hola, %1"

117

118

118#: Greeter/PassphraseLockscreen.qml:59

119#: Greeter/PassphraseLockscreen.qml:59

119msgid "Hello"

120msgid "Hello"

po/fo.po+5−5

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-10-01 15:13+0000\n"

11+"PO-Revision-Date: 2014-01-14 20:08+0000\n"

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -24,7 +24,7 @@ msgstr ""

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "Høgra kant"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

@@ -32,7 +32,7 @@ msgstr ""

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Topp kantur"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

po/hi.ponew file+158

@@ -0,0 +1,158 @@

1+# Hindi translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12+"Last-Translator: Siddhanathan S. <Unknown>\n"

13+"Language-Team: Hindi <hi@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19+"X-Generator: Launchpad (build 16901)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr "परिचय छोड़"

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr "दायाँ किनारा"

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr "ऊपर किनारे"

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr "बंद करें"

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr "बायाँ किनारा"

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr "शाबाश"

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr "पिछले खोजों"

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr "समीक्षा दे"

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr "समीक्षा"

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr "भेजें"

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr "आपातकालीन कॉल"

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr "नमस्ते"

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr "काम कर रहा है | कृपया प्रतीक्षा करे |"

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr "अब बात करें"

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr "अब बोल रहे हैं"

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr "खोजें"

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/hu.po+5−5

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2014-01-07 18:02+0000\n"

11+"PO-Revision-Date: 2014-01-14 23:02+0000\n"

12−"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"

12+"Last-Translator: Kristóf Kiszel <Unknown>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-01-08 05:43+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -133,7 +133,7 @@ msgstr "Betöltés, kis türelmet…"

133

134#: Hud/Hud.qml:89

135msgid "Speak Now..."

136−msgstr "Beszéljen most…"

136+msgstr "Most beszéljen…"

137

138#: Hud/Hud.qml:94

139msgid "Speaking..."

po/lt.ponew file+165

@@ -0,0 +1,165 @@

1+# Lithuanian translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-15 12:42+0000\n"

12+"Last-Translator: Gediminas Paulauskas <menesis@pov.lt>\n"

13+"Language-Team: Lithuanian <lt@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

20+"X-Generator: Launchpad (build 16901)\n"

21+

22+#: Components/EdgeDemoOverlay.qml:151

23+msgid "Skip intro"

24+msgstr "Praleisti įžangą"

25+

26+#: Components/EdgeDemo.qml:112

27+msgid "Right edge"

28+msgstr "Dešinysis kraštas"

29+

30+#: Components/EdgeDemo.qml:113

31+msgid "Try swiping from the right edge to unlock the phone"

32+msgstr "Pabandykite braukti nuo dešiniojo krašto, kad atrakintumėte telefoną"

33+

34+#: Components/EdgeDemo.qml:144

35+msgid "Top edge"

36+msgstr "Viršutinis kraštas"

37+

38+#: Components/EdgeDemo.qml:145

39+msgid "Try swiping from the top edge to access the indicators"

40+msgstr ""

41+"Pabandykite braukti nuo dešiniojo krašto, kad pasiektumėte indikatorius"

42+

43+#: Components/EdgeDemo.qml:170

44+msgid "Close"

45+msgstr "Užverti"

46+

47+#: Components/EdgeDemo.qml:171

48+msgid "Swipe up again to close the settings screen"

49+msgstr "Braukite aukštyn, kad užvertumėte nustatymų langą"

50+

51+#: Components/EdgeDemo.qml:198

52+msgid "Left edge"

53+msgstr "Kairysis kraštas"

54+

55+#: Components/EdgeDemo.qml:199

56+msgid "Swipe from the left to reveal the launcher for quick access to apps"

57+msgstr ""

58+"Braukite nuo kairiojo krašto, kad pamatytumėte skydelį greitam programų "

59+"paleidimui"

60+

61+#: Components/EdgeDemo.qml:226

62+msgid "Well done"

63+msgstr "Šaunu"

64+

65+#: Components/EdgeDemo.qml:227

66+msgid ""

67+"You have now mastered the edge gestures and can start using the "

68+"phone Tap anywhere to start"

69+msgstr ""

70+"Jūs išmokote kraštų gestus, ir galite pradėti naudotis "

71+"telefonu. Palieskite bet kur ir pradėkite"

72+

73+#: Components/PageHeader.qml:364

74+msgid "Recent searches"

75+msgstr "Paskiausios paieškos"

76+

77+#: Dash/Apps/AppPreview.qml:135

78+msgid "Rate this"

79+msgstr "Įvertinkite tai"

80+

81+#. TRANSLATORS: Number of persons who rated this app/video/whatever

82+#: Dash/Previews/Header.qml:93

83+#, qt-format

84+msgid "(%1)"

85+msgstr "(%1)"

86+

87+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

88+#: Dash/Previews/Header.qml:105

89+#, qt-format

90+msgid "%1 review"

91+msgid_plural "%1 reviews"

92+msgstr[0] "%1 apžvalga"

93+msgstr[1] "%1 apžvalgos"

94+msgstr[2] "%1 apžvalgų"

95+

96+#: Dash/Previews/Reviews.qml:74

97+msgid "Add a review"

98+msgstr "Pridėkite apžvalgą"

99+

100+#: Dash/Previews/Reviews.qml:86

101+msgid "Review"

102+msgstr "Apžvalga"

103+

104+#: Dash/Previews/Reviews.qml:121

105+msgid "Send"

106+msgstr "Siųsti"

107+

108+#: Dash/Previews/Reviews.qml:139

109+msgid "Comments:"

110+msgstr "Komentarai:"

111+

112+#: Greeter/Lockscreen.qml:149

113+msgid "Emergency Call"

114+msgstr "Pagalbos skambutis"

115+

116+#: Greeter/PassphraseLockscreen.qml:59

117+#, qt-format

118+msgid "Hello %1"

119+msgstr "Laba diena, %1"

120+

121+#: Greeter/PassphraseLockscreen.qml:59

122+msgid "Hello"

123+msgstr "Sveiki"

124+

125+#: Hud/HudParametrizedActionsPage.qml:132

126+msgid "Confirm"

127+msgstr "Patvirtinti"

128+

129+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

130+msgid "Type or say a command"

131+msgstr "Rašykite arba sakykite komandą"

132+

133+#: Hud/Hud.qml:84

134+msgid "Loading. Please Wait..."

135+msgstr "Įkeliama. Prašom palaukti..."

136+

137+#: Hud/Hud.qml:89

138+msgid "Speak Now..."

139+msgstr "Kalbėkite..."

140+

141+#: Hud/Hud.qml:94

142+msgid "Speaking..."

143+msgstr "Kalbama..."

144+

145+#: Notifications/NotificationMenuItemFactory.qml:89

146+msgid "Show password"

147+msgstr "Rodyti slaptažodį"

148+

149+#: Panel/SearchIndicator.qml:27

150+msgid "Search"

151+msgstr "Paieška"

152+

153+#: plugins/Unity/Launcher/launcheritem.cpp:43

154+#: plugins/Unity/Launcher/launcheritem.cpp:73

155+msgid "Lock to Launcher"

156+msgstr "Palikti mygtukų juostoje"

157+

158+#: plugins/Unity/Launcher/launcheritem.cpp:73

159+msgid "Unlock from Launcher"

160+msgstr "Nelaikyti mygtukų juostoje"

161+

162+#: Shell.qml:439

163+#, qt-format

164+msgid "Please enter %1"

165+msgstr "Prašom įvesti %1"

po/lv.po+6−6

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-09-28 16:29+0000\n"

11+"PO-Revision-Date: 2014-01-11 16:48+0000\n"

12"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"

13"Language-Team: Latvian <lv@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-12 05:52+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -32,7 +32,7 @@ msgstr ""

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Augšējā mala"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

@@ -40,7 +40,7 @@ msgstr ""

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "Aizvērt"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

@@ -48,7 +48,7 @@ msgstr ""

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "Kreisā mala"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

po/mr.ponew file+158

@@ -0,0 +1,158 @@

1+# Marathi translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-14 19:54+0000\n"

12+"Last-Translator: Rohan Deshmukh <Unknown>\n"

13+"Language-Team: Marathi <mr@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19+"X-Generator: Launchpad (build 16890)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr "परिचय वगळा"

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr "उजवा काठ"

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr "फोन अनलॉक करण्यासाठी उजव्या काठावरुन स्वाइप करण्याचा प्रयत्न करा"

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr "वरचा काठ"

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr "इंडिकेटर वापरण्याकरिता वरचा काठावरून स्वाइप करण्याचा प्रयत्न करा"

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr "बंद करा"

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr "सेटिंग्ज स्क्रीन बंद करण्यासाठी पुन्हा एकदा स्वाइप करा"

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr "डावा काठ"

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr "लाँचर वरील अॕप्प्स त्वरित वापरण्याकरिता डाव्या बाजूने स्वाइप करा"

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr "कौशल्यपूर्वक केले"

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr ""

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr ""

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/nl.po+29−27

@@ -8,23 +8,23 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-06-27 07:19+0000\n"

11+"PO-Revision-Date: 2014-01-15 16:42+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Hannie Dumoleyn <Unknown>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr ""

23+msgstr "Intro overslaan"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "Rechterrand"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

@@ -32,7 +32,7 @@ msgstr ""

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "Bovenrand"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

@@ -40,29 +40,31 @@ msgstr ""

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "Sluiten"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

47−msgstr ""

47+msgstr "Veeg nogmaals omhoog om het instellingenscherm te sluiten"

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "Linkerrand"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

55−msgstr ""

55+msgstr "Veeg vanaf links om de Starter te tonen voor snelle toegang tot apps"

56

57#: Components/EdgeDemo.qml:226

58msgid "Well done"

59−msgstr ""

59+msgstr "Goed gedaan"

60

61#: Components/EdgeDemo.qml:227

62msgid ""

63"You have now mastered the edge gestures and can start using the "

64"phone Tap anywhere to start"

65msgstr ""

66+"Nu je het vegen onder de knie hebt, kun je de telefoon gebruiken Tik "

67+"ergens om te beginnen"

66

68

67#: Components/PageHeader.qml:364

69#: Components/PageHeader.qml:364

68msgid "Recent searches"

70msgid "Recent searches"

@@ -70,50 +72,50 @@ msgstr "Recente zoekopdrachten"

70

72

71#: Dash/Apps/AppPreview.qml:135

73#: Dash/Apps/AppPreview.qml:135

72msgid "Rate this"

74msgid "Rate this"

73−msgstr ""

75+msgstr "Beoordeel dit"

74

76

75#. TRANSLATORS: Number of persons who rated this app/video/whatever

77#. TRANSLATORS: Number of persons who rated this app/video/whatever

76#: Dash/Previews/Header.qml:93

78#: Dash/Previews/Header.qml:93

77#, qt-format

79#, qt-format

78msgid "(%1)"

80msgid "(%1)"

79−msgstr ""

81+msgstr "(%1)"

80

82

81#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

83#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82#: Dash/Previews/Header.qml:105

84#: Dash/Previews/Header.qml:105

83#, qt-format

85#, qt-format

84msgid "%1 review"

86msgid "%1 review"

85msgid_plural "%1 reviews"

87msgid_plural "%1 reviews"

86−msgstr[0] ""

88+msgstr[0] "%1 recensie"

87−msgstr[1] ""

89+msgstr[1] "%1 recensies"

88

90

89#: Dash/Previews/Reviews.qml:74

91#: Dash/Previews/Reviews.qml:74

90msgid "Add a review"

92msgid "Add a review"

91−msgstr ""

93+msgstr "Voeg recensie toe"

92

94

93#: Dash/Previews/Reviews.qml:86

95#: Dash/Previews/Reviews.qml:86

94msgid "Review"

96msgid "Review"

95−msgstr ""

97+msgstr "Recensie"

96

98

97#: Dash/Previews/Reviews.qml:121

99#: Dash/Previews/Reviews.qml:121

98msgid "Send"

100msgid "Send"

99−msgstr ""

101+msgstr "Versturen"

100

102

101#: Dash/Previews/Reviews.qml:139

103#: Dash/Previews/Reviews.qml:139

102msgid "Comments:"

104msgid "Comments:"

103−msgstr ""

105+msgstr "Reacties:"

104

106

105#: Greeter/Lockscreen.qml:149

107#: Greeter/Lockscreen.qml:149

106msgid "Emergency Call"

108msgid "Emergency Call"

107−msgstr ""

109+msgstr "Noodoproep"

108

110

109#: Greeter/PassphraseLockscreen.qml:59

111#: Greeter/PassphraseLockscreen.qml:59

110#, qt-format

112#, qt-format

111msgid "Hello %1"

113msgid "Hello %1"

112−msgstr ""

114+msgstr "Hallo %1"

113

115

114#: Greeter/PassphraseLockscreen.qml:59

116#: Greeter/PassphraseLockscreen.qml:59

115msgid "Hello"

117msgid "Hello"

116−msgstr ""

118+msgstr "Hallo"

117

119

118#: Hud/HudParametrizedActionsPage.qml:132

120#: Hud/HudParametrizedActionsPage.qml:132

119msgid "Confirm"

121msgid "Confirm"

@@ -137,7 +139,7 @@ msgstr "Inspreken…"

137

139

138#: Notifications/NotificationMenuItemFactory.qml:89

140#: Notifications/NotificationMenuItemFactory.qml:89

139msgid "Show password"

141msgid "Show password"

140−msgstr ""

142+msgstr "Wachtwoord tonen"

141

143

142#: Panel/SearchIndicator.qml:27

144#: Panel/SearchIndicator.qml:27

143msgid "Search"

145msgid "Search"

@@ -146,13 +148,13 @@ msgstr "Zoeken"

146#: plugins/Unity/Launcher/launcheritem.cpp:43

148#: plugins/Unity/Launcher/launcheritem.cpp:43

147#: plugins/Unity/Launcher/launcheritem.cpp:73

149#: plugins/Unity/Launcher/launcheritem.cpp:73

148msgid "Lock to Launcher"

150msgid "Lock to Launcher"

149−msgstr ""

151+msgstr "In Starter vastzetten"

150

152

151#: plugins/Unity/Launcher/launcheritem.cpp:73

153#: plugins/Unity/Launcher/launcheritem.cpp:73

152msgid "Unlock from Launcher"

154msgid "Unlock from Launcher"

153−msgstr ""

155+msgstr "Uit Starter verwijderen"

154

156

155#: Shell.qml:439

157#: Shell.qml:439

156#, qt-format

158#, qt-format

157msgid "Please enter %1"

159msgid "Please enter %1"

158−msgstr ""

160+msgstr "Voer %1 in"

po/pl.po+7−7

@@ -8,16 +8,16 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-10-13 13:44+0000\n"

11+"PO-Revision-Date: 2014-01-10 11:38+0000\n"

12−"Last-Translator: GTriderXC <gtriderxc@yahoo.com>\n"

12+"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Polish <pl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

18"|| n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

19+"X-Launchpad-Export-Date: 2014-01-11 06:38+0000\n"

20−"X-Generator: Launchpad (build 16877)\n"

20+"X-Generator: Launchpad (build 16890)\n"

21

22#: Components/EdgeDemoOverlay.qml:151

23msgid "Skip intro"

@@ -143,7 +143,7 @@ msgstr "Rozpoznanie..."

143

144#: Notifications/NotificationMenuItemFactory.qml:89

145msgid "Show password"

146−msgstr ""

146+msgstr "Wyświetl hasło"

147

148#: Panel/SearchIndicator.qml:27

149msgid "Search"

@@ -152,11 +152,11 @@ msgstr "Szukaj"

152#: plugins/Unity/Launcher/launcheritem.cpp:43

153#: plugins/Unity/Launcher/launcheritem.cpp:73

154msgid "Lock to Launcher"

155−msgstr ""

155+msgstr "Dodaj do panelu uruchamiania"

156

157#: plugins/Unity/Launcher/launcheritem.cpp:73

158msgid "Unlock from Launcher"

159−msgstr ""

159+msgstr "Usuń z panelu uruchamiania"

160

161#: Shell.qml:439

162#, qt-format

po/pt.ponew file+158

@@ -0,0 +1,158 @@

1+# Portuguese translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-14 19:18+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Portuguese <pt@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19+"X-Generator: Launchpad (build 16890)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr ""

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr ""

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr ""

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr ""

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr ""

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr ""

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr ""

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/ru.po+6−4

@@ -8,16 +8,16 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2014-01-07 05:21+0000\n"

11+"PO-Revision-Date: 2014-01-14 19:17+0000\n"

12−"Last-Translator: Ivlev Denis <Unknown>\n"

12+"Last-Translator: alex <sos987@gmail.com>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2014-01-08 05:43+0000\n"

19+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

20−"X-Generator: Launchpad (build 16877)\n"

20+"X-Generator: Launchpad (build 16890)\n"

21

22#: Components/EdgeDemoOverlay.qml:151

23msgid "Skip intro"

@@ -69,6 +69,8 @@ msgid ""

69"You have now mastered the edge gestures and can start using the "

70"phone Tap anywhere to start"

71msgstr ""

72+"Теперь, когда вы изучили основные движения, вы можете начать использовать "

73+"телефон. Нажмите, чтобы начать"

72

74

73#: Components/PageHeader.qml:364

75#: Components/PageHeader.qml:364

74msgid "Recent searches"

76msgid "Recent searches"

po/sq.ponew file+159

@@ -0,0 +1,159 @@

1+# Albanian translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-15 13:51+0000\n"

12+"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"

13+"Language-Team: Albanian <sq@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19+"X-Generator: Launchpad (build 16901)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr "Cepi djathtas"

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr "Cepi i sipërm"

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+"Përpiqu te fërkosh gishtin prej cepit të sipërm për te zhblokuar telefonin"

41+

42+#: Components/EdgeDemo.qml:170

43+msgid "Close"

44+msgstr "Mbylle"

45+

46+#: Components/EdgeDemo.qml:171

47+msgid "Swipe up again to close the settings screen"

48+msgstr ""

49+

50+#: Components/EdgeDemo.qml:198

51+msgid "Left edge"

52+msgstr "Cepi majtas"

53+

54+#: Components/EdgeDemo.qml:199

55+msgid "Swipe from the left to reveal the launcher for quick access to apps"

56+msgstr ""

57+

58+#: Components/EdgeDemo.qml:226

59+msgid "Well done"

60+msgstr "Shumë mirë"

61+

62+#: Components/EdgeDemo.qml:227

63+msgid ""

64+"You have now mastered the edge gestures and can start using the "

65+"phone Tap anywhere to start"

66+msgstr ""

67+

68+#: Components/PageHeader.qml:364

69+msgid "Recent searches"

70+msgstr ""

71+

72+#: Dash/Apps/AppPreview.qml:135

73+msgid "Rate this"

74+msgstr "Vlerësoje këtë"

75+

76+#. TRANSLATORS: Number of persons who rated this app/video/whatever

77+#: Dash/Previews/Header.qml:93

78+#, qt-format

79+msgid "(%1)"

80+msgstr "(%1)"

81+

82+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

83+#: Dash/Previews/Header.qml:105

84+#, qt-format

85+msgid "%1 review"

86+msgid_plural "%1 reviews"

87+msgstr[0] "%1 rishikim"

88+msgstr[1] "%1 rishikime"

89+

90+#: Dash/Previews/Reviews.qml:74

91+msgid "Add a review"

92+msgstr "Shto një rishikim"

93+

94+#: Dash/Previews/Reviews.qml:86

95+msgid "Review"

96+msgstr ""

97+

98+#: Dash/Previews/Reviews.qml:121

99+msgid "Send"

100+msgstr ""

101+

102+#: Dash/Previews/Reviews.qml:139

103+msgid "Comments:"

104+msgstr ""

105+

106+#: Greeter/Lockscreen.qml:149

107+msgid "Emergency Call"

108+msgstr ""

109+

110+#: Greeter/PassphraseLockscreen.qml:59

111+#, qt-format

112+msgid "Hello %1"

113+msgstr ""

114+

115+#: Greeter/PassphraseLockscreen.qml:59

116+msgid "Hello"

117+msgstr ""

118+

119+#: Hud/HudParametrizedActionsPage.qml:132

120+msgid "Confirm"

121+msgstr ""

122+

123+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

124+msgid "Type or say a command"

125+msgstr ""

126+

127+#: Hud/Hud.qml:84

128+msgid "Loading. Please Wait..."

129+msgstr ""

130+

131+#: Hud/Hud.qml:89

132+msgid "Speak Now..."

133+msgstr ""

134+

135+#: Hud/Hud.qml:94

136+msgid "Speaking..."

137+msgstr ""

138+

139+#: Notifications/NotificationMenuItemFactory.qml:89

140+msgid "Show password"

141+msgstr ""

142+

143+#: Panel/SearchIndicator.qml:27

144+msgid "Search"

145+msgstr ""

146+

147+#: plugins/Unity/Launcher/launcheritem.cpp:43

148+#: plugins/Unity/Launcher/launcheritem.cpp:73

149+msgid "Lock to Launcher"

150+msgstr ""

151+

152+#: plugins/Unity/Launcher/launcheritem.cpp:73

153+msgid "Unlock from Launcher"

154+msgstr ""

155+

156+#: Shell.qml:439

157+#, qt-format

158+msgid "Please enter %1"

159+msgstr ""

po/sw.ponew file+158

@@ -0,0 +1,158 @@

1+# Swahili translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-14 19:28+0000\n"

12+"Last-Translator: Damas Mlabwa <Unknown>\n"

13+"Language-Team: Swahili <sw@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19+"X-Generator: Launchpad (build 16890)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr ""

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr ""

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr "Funga"

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr ""

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr ""

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr "Tuma"

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr "Maoni:"

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr "Thibitisha"

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr "Tafuta"

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/tr.po+6−4

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-12-12 16:06+0000\n"

11+"PO-Revision-Date: 2014-01-14 19:05+0000\n"

12−"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"

12+"Last-Translator: Osman Coşkun <Unknown>\n"

13"Language-Team: Turkish <tr@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-15 06:35+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16890)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

@@ -64,6 +64,8 @@ msgid ""

64"You have now mastered the edge gestures and can start using the "

65"phone Tap anywhere to start"

66msgstr ""

67+"Kenar hareketlerini öğrendiniz ve herhangi bir yere dokunarak telefonunuzu "

68+" kullanmaya başlayabilirsiniz"

67

69

68#: Components/PageHeader.qml:364

70#: Components/PageHeader.qml:364

69msgid "Recent searches"

71msgid "Recent searches"

po/vi.ponew file+158

@@ -0,0 +1,158 @@

1+# Vietnamese translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11+"PO-Revision-Date: 2014-01-15 01:19+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Vietnamese <vi@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19+"X-Generator: Launchpad (build 16901)\n"

20+

21+#: Components/EdgeDemoOverlay.qml:151

22+msgid "Skip intro"

23+msgstr ""

24+

25+#: Components/EdgeDemo.qml:112

26+msgid "Right edge"

27+msgstr ""

28+

29+#: Components/EdgeDemo.qml:113

30+msgid "Try swiping from the right edge to unlock the phone"

31+msgstr ""

32+

33+#: Components/EdgeDemo.qml:144

34+msgid "Top edge"

35+msgstr ""

36+

37+#: Components/EdgeDemo.qml:145

38+msgid "Try swiping from the top edge to access the indicators"

39+msgstr ""

40+

41+#: Components/EdgeDemo.qml:170

42+msgid "Close"

43+msgstr ""

44+

45+#: Components/EdgeDemo.qml:171

46+msgid "Swipe up again to close the settings screen"

47+msgstr ""

48+

49+#: Components/EdgeDemo.qml:198

50+msgid "Left edge"

51+msgstr ""

52+

53+#: Components/EdgeDemo.qml:199

54+msgid "Swipe from the left to reveal the launcher for quick access to apps"

55+msgstr ""

56+

57+#: Components/EdgeDemo.qml:226

58+msgid "Well done"

59+msgstr ""

60+

61+#: Components/EdgeDemo.qml:227

62+msgid ""

63+"You have now mastered the edge gestures and can start using the "

64+"phone Tap anywhere to start"

65+msgstr ""

66+

67+#: Components/PageHeader.qml:364

68+msgid "Recent searches"

69+msgstr ""

70+

71+#: Dash/Apps/AppPreview.qml:135

72+msgid "Rate this"

73+msgstr ""

74+

75+#. TRANSLATORS: Number of persons who rated this app/video/whatever

76+#: Dash/Previews/Header.qml:93

77+#, qt-format

78+msgid "(%1)"

79+msgstr ""

80+

81+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82+#: Dash/Previews/Header.qml:105

83+#, qt-format

84+msgid "%1 review"

85+msgid_plural "%1 reviews"

86+msgstr[0] ""

87+msgstr[1] ""

88+

89+#: Dash/Previews/Reviews.qml:74

90+msgid "Add a review"

91+msgstr ""

92+

93+#: Dash/Previews/Reviews.qml:86

94+msgid "Review"

95+msgstr ""

96+

97+#: Dash/Previews/Reviews.qml:121

98+msgid "Send"

99+msgstr ""

100+

101+#: Dash/Previews/Reviews.qml:139

102+msgid "Comments:"

103+msgstr ""

104+

105+#: Greeter/Lockscreen.qml:149

106+msgid "Emergency Call"

107+msgstr ""

108+

109+#: Greeter/PassphraseLockscreen.qml:59

110+#, qt-format

111+msgid "Hello %1"

112+msgstr ""

113+

114+#: Greeter/PassphraseLockscreen.qml:59

115+msgid "Hello"

116+msgstr ""

117+

118+#: Hud/HudParametrizedActionsPage.qml:132

119+msgid "Confirm"

120+msgstr ""

121+

122+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

123+msgid "Type or say a command"

124+msgstr ""

125+

126+#: Hud/Hud.qml:84

127+msgid "Loading. Please Wait..."

128+msgstr ""

129+

130+#: Hud/Hud.qml:89

131+msgid "Speak Now..."

132+msgstr ""

133+

134+#: Hud/Hud.qml:94

135+msgid "Speaking..."

136+msgstr ""

137+

138+#: Notifications/NotificationMenuItemFactory.qml:89

139+msgid "Show password"

140+msgstr ""

141+

142+#: Panel/SearchIndicator.qml:27

143+msgid "Search"

144+msgstr ""

145+

146+#: plugins/Unity/Launcher/launcheritem.cpp:43

147+#: plugins/Unity/Launcher/launcheritem.cpp:73

148+msgid "Lock to Launcher"

149+msgstr ""

150+

151+#: plugins/Unity/Launcher/launcheritem.cpp:73

152+msgid "Unlock from Launcher"

153+msgstr ""

154+

155+#: Shell.qml:439

156+#, qt-format

157+msgid "Please enter %1"

158+msgstr ""

po/zh_TW.po+24−25

@@ -8,47 +8,47 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-11-29 09:21+0100\n"

11−"PO-Revision-Date: 2013-06-27 10:24+0000\n"

11+"PO-Revision-Date: 2014-01-16 06:04+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: Henry Yang <henry9846@hotmail.com>\n"

13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"

18+"X-Launchpad-Export-Date: 2014-01-16 06:09+0000\n"

19−"X-Generator: Launchpad (build 16877)\n"

19+"X-Generator: Launchpad (build 16901)\n"

20

21#: Components/EdgeDemoOverlay.qml:151

22msgid "Skip intro"

23−msgstr ""

23+msgstr "略過導覽"

24

25#: Components/EdgeDemo.qml:112

26msgid "Right edge"

27−msgstr ""

27+msgstr "右方邊界"

28

29#: Components/EdgeDemo.qml:113

30msgid "Try swiping from the right edge to unlock the phone"

31−msgstr ""

31+msgstr "向左滑動以解鎖手機"

32

33#: Components/EdgeDemo.qml:144

34msgid "Top edge"

35−msgstr ""

35+msgstr "頂部邊界"

36

37#: Components/EdgeDemo.qml:145

38msgid "Try swiping from the top edge to access the indicators"

39−msgstr ""

39+msgstr "向下滑動以開啟指引"

40

41#: Components/EdgeDemo.qml:170

42msgid "Close"

43−msgstr ""

43+msgstr "關閉"

44

45#: Components/EdgeDemo.qml:171

46msgid "Swipe up again to close the settings screen"

47−msgstr ""

47+msgstr "再次向上滑動以關財設定頁面"

48

49#: Components/EdgeDemo.qml:198

50msgid "Left edge"

51−msgstr ""

51+msgstr "左方邊界"

52

53#: Components/EdgeDemo.qml:199

54msgid "Swipe from the left to reveal the launcher for quick access to apps"

@@ -70,50 +70,49 @@ msgstr "最近搜尋"

70

71#: Dash/Apps/AppPreview.qml:135

72msgid "Rate this"

73−msgstr ""

73+msgstr "對此評比"

74

75#. TRANSLATORS: Number of persons who rated this app/video/whatever

76#: Dash/Previews/Header.qml:93

77#, qt-format

78msgid "(%1)"

79−msgstr ""

79+msgstr "(%1)"

80

81#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

82#: Dash/Previews/Header.qml:105

83#, qt-format

84msgid "%1 review"

85msgid_plural "%1 reviews"

86−msgstr[0] ""

86+msgstr[0] "%1 回覆"

87−msgstr[1] ""

88

87

89#: Dash/Previews/Reviews.qml:74

88#: Dash/Previews/Reviews.qml:74

90msgid "Add a review"

89msgid "Add a review"

91−msgstr ""

90+msgstr "新增回覆"

92

91

93#: Dash/Previews/Reviews.qml:86

92#: Dash/Previews/Reviews.qml:86

94msgid "Review"

93msgid "Review"

95−msgstr ""

94+msgstr "回覆"

96

95

97#: Dash/Previews/Reviews.qml:121

96#: Dash/Previews/Reviews.qml:121

98msgid "Send"

97msgid "Send"

99−msgstr ""

98+msgstr "發送"

100

99

101#: Dash/Previews/Reviews.qml:139

100#: Dash/Previews/Reviews.qml:139

102msgid "Comments:"

101msgid "Comments:"

103−msgstr ""

102+msgstr "備註："

104

103

105#: Greeter/Lockscreen.qml:149

104#: Greeter/Lockscreen.qml:149

106msgid "Emergency Call"

105msgid "Emergency Call"

107−msgstr ""

106+msgstr "緊急連絡"

108

107

109#: Greeter/PassphraseLockscreen.qml:59

108#: Greeter/PassphraseLockscreen.qml:59

110#, qt-format

109#, qt-format

111msgid "Hello %1"

110msgid "Hello %1"

112−msgstr ""

111+msgstr "%1 您好"

113

112

114#: Greeter/PassphraseLockscreen.qml:59

113#: Greeter/PassphraseLockscreen.qml:59

115msgid "Hello"

114msgid "Hello"

116−msgstr ""

115+msgstr "您好"

117

116

118#: Hud/HudParametrizedActionsPage.qml:132

117#: Hud/HudParametrizedActionsPage.qml:132

119msgid "Confirm"

118msgid "Confirm"

@@ -137,7 +136,7 @@ msgstr "說話中..."

137

136

138#: Notifications/NotificationMenuItemFactory.qml:89

137#: Notifications/NotificationMenuItemFactory.qml:89

139msgid "Show password"

138msgid "Show password"

140−msgstr ""

139+msgstr "顯示密碼"

141

140

142#: Panel/SearchIndicator.qml:27

141#: Panel/SearchIndicator.qml:27

143msgid "Search"

142msgid "Search"

@@ -146,7 +145,7 @@ msgstr "搜尋"

146#: plugins/Unity/Launcher/launcheritem.cpp:43

145#: plugins/Unity/Launcher/launcheritem.cpp:43

147#: plugins/Unity/Launcher/launcheritem.cpp:73

146#: plugins/Unity/Launcher/launcheritem.cpp:73

148msgid "Lock to Launcher"

147msgid "Lock to Launcher"

149−msgstr ""

148+msgstr "鎖定至啟動欄"

150

149

151#: plugins/Unity/Launcher/launcheritem.cpp:73

150#: plugins/Unity/Launcher/launcheritem.cpp:73

152msgid "Unlock from Launcher"

151msgid "Unlock from Launcher"

qml/Panel/IndicatorRow.qml+51−29

@@ -26,7 +26,7 @@ Item {

26 readonly property int currentItemIndex: currentItem ? currentItem.ownIndex : -1

27 property alias row: row

28 property QtObject indicatorsModel: null

29− property var visibleIndicators: defined

29+ property var visibleIndicators: undefined

30 property int overFlowWidth: width

31 property bool showAll: false

32 property real currentItemOffset: 0.0

@@ -94,34 +94,56 @@ Item {

94 property real opacityMultiplier: highlighted ? 1 : (1 - indicatorRow.unitProgress)

95

96 IndicatorItem {

97− id: indicatorItem

97+ id: indicatorItem

98− identifier: model.identifier

98+ identifier: model.identifier

99− height: parent.height

99+ height: parent.height

100−

100+

101− dimmed: itemWrapper.dimmed

101+ dimmed: itemWrapper.dimmed

102−

102+

103− widgetSource: model.widgetSource

103+ widgetSource: model.widgetSource

104− indicatorProperties : model.indicatorProperties

104+ indicatorProperties : model.indicatorProperties

105−

105+

106− Component.onCompleted: {

106+ Component.onCompleted: {

107− if (visibleIndicators == undefined) {

107+ updateVisiblility();

108− visibleIndicators = {}

109− }

110− indicatorRow.visibleIndicators[model.identifier] = indicatorVisible;

111− indicatorRow.visibleIndicatorsChanged();

112− }

108+ }

113− onIndicatorVisibleChanged: {

109+ onIndicatorVisibleChanged: {

114− if (visibleIndicators == undefined) {

110+ updateVisiblility();

115− visibleIndicators = {}

111+

116− }

117− indicatorRow.visibleIndicators[model.identifier] = indicatorVisible;

118− indicatorRow.visibleIndicatorsChanged();

119−

120− if (indicatorVisible) {

112+ if (indicatorVisible) {

121− showAll = true;

113+ showAll = true;

122− allVisible.start();

114+ allVisible.start();

115+ }

116+ }

117+

118+ function updateVisiblility() {

119+ if (visibleIndicators == undefined) {

120+ visibleIndicators = {}

121+ }

122+ indicatorRow.visibleIndicators[model.identifier] = indicatorVisible;

123+

124+ // removed current index?

125+ if (indicatorRow.currentItemIndex === index && !indicatorVisible) {

126+ // find the next closest visible indicator (after current, else before)

127+ var newIndex = -1;

128+ for (var i = index+1; i < rowRepeater.count; i++) {

129+ if (indicatorRow.visibleIndicators[i] === undefined || indicatorRow.visibleIndicators[model.identifier]) {

130+ newIndex = i;

131+ break;

123− }

132+ }

133+ }

134+ if (newIndex === -1) {

135+ for (i = index - 1; i >= 0; i--) {

136+ if (indicatorRow.visibleIndicators[i] === undefined || indicatorRow.visibleIndicators[model.identifier]) {

137+ newIndex = i;

138+ break;

139+ }

140+ }

141+ }

142+ indicatorRow.setCurrentItem(newIndex);

143+ }

144+

145+ indicatorRow.visibleIndicatorsChanged();

124− }

146+ }

125 }

147 }

126

148

127 states: [

149 states: [

qml/Panel/Indicators.qml+46−34

@@ -193,21 +193,6 @@ Showable {

193 clip: !indicators.fullyOpened

194 activeHeader: indicators.state == "hint" || indicators.state == "reveal"

195 enabled: contentEnabled

196− visibleIndicators: indicatorRow.visibleIndicators

197−

198− Connections {

199− property bool enableIndexChangeSignal: true

200−

201− target: enableIndexChangeSignal ? indicatorRow : null

202− onCurrentItemIndexChanged: {

203− var oldActive = enableIndexChangeSignal;

204− enableIndexChangeSignal = false;

205−

206− menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);

207−

208− enableIndexChangeSignal = oldActive;

209− }

210− }

211

196

212 //small shadow gradient at bottom of menu

197 //small shadow gradient at bottom of menu

213 Rectangle {

198 Rectangle {

@@ -263,8 +248,6 @@ Showable {

263

248

264 Indicators.IndicatorsModel {

249 Indicators.IndicatorsModel {

265 id: indicatorsModel

250 id: indicatorsModel

266−

267− Component.onCompleted: load()

268 }

251 }

269

252

270 IndicatorRow {

253 IndicatorRow {

@@ -279,17 +262,11 @@ Showable {

279 state: indicators.state

262 state: indicators.state

280 unitProgress: indicators.unitProgress

263 unitProgress: indicators.unitProgress

281

264

282− Connections {

265+ onVisibleIndicatorsChanged: {

283− property bool enableIndexChangeSignal: true

266+ // need to do it here so we can control sequence

284−

267+ if (visibleIndicators !== undefined) {

285− target: enableIndexChangeSignal ? menuContent : null

268+ menuContent.visibleIndicators = visibleIndicators;

286− onCurrentMenuIndexChanged: {

269+ menuContent.setCurrentMenuIndex(currentItemIndex);

287− var oldActive = enableIndexChangeSignal;

288− enableIndexChangeSignal = false;

289−

290− indicatorRow.setCurrentItem(menuContent.currentMenuIndex);

291−

292− enableIndexChangeSignal = oldActive;

293 }

270 }

294 }

271 }

295

272

@@ -341,15 +318,45 @@ Showable {

341 }

318 }

342 }

319 }

343

320

321+ QtObject {

322+ id: d

323+ property bool enableIndexChangeSignal: true

344− property var activeDragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle.dragging ? hideDragHandle : null

324+ property var activeDragHandle: showDragHandle.dragging ? showDragHandle : hideDragHandle.dragging ? hideDragHandle : null

325+ }

326+

327+ Connections {

328+ target: menuContent

329+ onCurrentMenuIndexChanged: {

330+ var oldActive = d.enableIndexChangeSignal;

331+ if (!oldActive) return;

332+ d.enableIndexChangeSignal = false;

333+

334+ indicatorRow.setCurrentItem(menuContent.currentMenuIndex);

335+

336+ d.enableIndexChangeSignal = oldActive;

337+ }

338+ }

339+

340+ Connections {

341+ target: indicatorRow

342+ onCurrentItemIndexChanged: {

343+ var oldActive = d.enableIndexChangeSignal;

344+ if (!oldActive) return;

345+ d.enableIndexChangeSignal = false;

346+

347+ menuContent.setCurrentMenuIndex(indicatorRow.currentItemIndex);

348+

349+ d.enableIndexChangeSignal = oldActive;

350+ }

351+ }

345 // connections to the active drag handle

352 // connections to the active drag handle

346 Connections {

353 Connections {

347− target: activeDragHandle

354+ target: d.activeDragHandle

348 onTouchXChanged: {

355 onTouchXChanged: {

349− indicators.calculateCurrentItem(activeDragHandle.touchX, true);

356+ indicators.calculateCurrentItem(d.activeDragHandle.touchX, true);

350 }

357 }

351 onTouchSceneYChanged: {

358 onTouchSceneYChanged: {

352− yVelocityCalculator.trackedPosition = activeDragHandle.touchSceneY;

359+ yVelocityCalculator.trackedPosition = d.activeDragHandle.touchSceneY;

353 }

360 }

354 }

361 }

355

362

@@ -403,8 +410,8 @@ Showable {

403 }

410 }

404 StateChangeScript {

411 StateChangeScript {

405 script: {

412 script: {

406− if (activeDragHandle) {

413+ if (d.activeDragHandle) {

407− calculateCurrentItem(activeDragHandle.touchX, false);

414+ calculateCurrentItem(d.activeDragHandle.touchX, false);

408 }

415 }

409 }

416 }

410 }

417 }

@@ -429,4 +436,9 @@ Showable {

429 NumberAnimation {targets: [indicatorRow, menuContent]; property: "y"; duration: 300; easing.type: Easing.OutCubic}

436 NumberAnimation {targets: [indicatorRow, menuContent]; property: "y"; duration: 300; easing.type: Easing.OutCubic}

430 }

437 }

431 ]

438 ]

439+

440+ Component.onCompleted: initialise();

441+ function initialise() {

442+ indicatorsModel.load();

443+ }

432}

444}

qml/Panel/Indicators/DefaultIndicatorPage.qml+195−2

@@ -14,12 +14,205 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 *

16 * Authors:

17+ * Renato Araujo Oliveira Filho <renato@canonical.com>

17 * Nick Dedekind <nick.dedekind@canonical.com>

18 * Nick Dedekind <nick.dedekind@canonical.com>

18 */

19 */

19

20

20import QtQuick 2.0

21import QtQuick 2.0

22+import Ubuntu.Components 0.1 as Components

21import Unity.Indicators 0.1 as Indicators

23import Unity.Indicators 0.1 as Indicators

22

24

23−Indicators.IndicatorPage {

25+Indicators.IndicatorBase {

26+ id: main

27+

28+ //const

29+ property bool contentActive: false

30+ property string title: rootActionState.title

31+ property alias emptyText: emptyLabel.text

32+ property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem

33+

34+ Indicators.UnityMenuModelStack {

35+ id: menuStack

36+ head: contentActive ? main.menuModel : null

37+

38+ property var rootMenu: null

39+

40+ onTailChanged: {

41+ if (!tail) {

42+ rootMenu = null;

43+ } else if (rootMenu != tail) {

44+ if (tail.get(0, "type") === rootMenuType) {

45+ rootMenu = menuStack.tail.submenu(0);

46+ push(rootMenu, 0);

47+ } else {

48+ rootMenu = null;

49+ }

50+ }

51+ }

52+ }

53+

54+ Connections {

55+ target: menuStack.tail

56+ onRowsInserted: {

57+ if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {

58+ menuStack.rootMenu = menuStack.tail.submenu(0);

59+ menuStack.push(menuStack.rootMenu, 0);

60+ }

61+ }

62+ onModelReset: {

63+ if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {

64+ menuStack.rootMenu = menuStack.tail.submenu(0);

65+ menuStack.push(menuStack.rootMenu, 0);

66+ }

67+ }

68+ }

69+

70+ ListView {

71+ id: mainMenu

72+ objectName: "mainMenu"

73+ model: menuStack.rootMenu

74+

75+ anchors {

24− anchors.fill: parent

76+ fill: parent

77+ bottomMargin: Qt.inputMethod.visible ? (Qt.inputMethod.keyboardRectangle.height - main.anchors.bottomMargin) : 0

78+

79+ Behavior on bottomMargin {

80+ NumberAnimation {

81+ duration: 175

82+ easing.type: Easing.OutQuad

83+ }

84+ }

85+ // TODO - does ever frame.

86+ onBottomMarginChanged: {

87+ mainMenu.positionViewAtIndex(mainMenu.currentIndex, ListView.End)

88+ }

89+ }

90+

91+ // Ensure all delegates are cached in order to improve smoothness of scrolling

92+ cacheBuffer: 10000

93+

94+ // Only allow flicking if the content doesn't fit on the page

95+ interactive: contentHeight > height

96+

97+ property int selectedIndex: -1

98+ property bool blockCurrentIndexChange: false

99+ // for count = 0

100+ onCountChanged: {

101+ if (count == 0 && selectedIndex != -1) {

102+ selectedIndex = -1;

103+ }

104+ }

105+ // for highlight following

106+ onSelectedIndexChanged: {

107+ if (currentIndex != selectedIndex) {

108+ var blocked = blockCurrentIndexChange;

109+ blockCurrentIndexChange = true;

110+

111+ currentIndex = selectedIndex;

112+

113+ blockCurrentIndexChange = blocked;

114+ }

115+ }

116+ // for item addition/removal

117+ onCurrentIndexChanged: {

118+ if (!blockCurrentIndexChange) {

119+ if (selectedIndex != -1 && selectedIndex != currentIndex) {

120+ selectedIndex = currentIndex;

121+ }

122+ }

123+ }

124+

125+ delegate: Loader {

126+ id: loader

127+ objectName: "menuItem" + index

128+ asynchronous: false

129+ visible: height > 0

130+

131+ property int modelIndex: index

132+

133+ anchors {

134+ left: parent.left

135+ right: parent.right

136+ }

137+

138+ sourceComponent: factory.load(model)

139+

140+ onLoaded: {

141+ if (item.hasOwnProperty("menuSelected")) {

142+ item.menuSelected = mainMenu.selectedIndex == index;

143+ item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });

144+ item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });

145+ }

146+ if (item.hasOwnProperty("menuData")) {

147+ item.menuData = Qt.binding(function() { return model; });

148+ }

149+ if (item.hasOwnProperty("menuIndex")) {

150+ item.menuIndex = Qt.binding(function() { return modelIndex; });

151+ }

152+ }

153+

154+ Binding {

155+ target: item ? item : null

156+ property: "objectName"

157+ value: model.action

158+ }

159+

160+ // TODO: Fixes lp#1243146

161+ // This is a workaround for a Qt bug. https://bugreports.qt-project.org/browse/QTBUG-34351

162+ Connections {

163+ target: mainMenu

164+ onSelectedIndexChanged: {

165+ if (loader.item && loader.item.hasOwnProperty("menuSelected")) {

166+ loader.item.menuSelected = mainMenu.selectedIndex == index;

167+ }

168+ }

169+ }

170+ }

171+ }

172+

173+ Indicators.MenuItemFactory {

174+ id: factory

175+ menuModel: mainMenu.model ? mainMenu.model : null

176+ }

177+

178+ Components.Label {

179+ id: emptyLabel

180+ objectName: "emptyLabel"

181+ visible: mainMenu.count == 0

182+ anchors {

183+ top: parent.top

184+ left: parent.left

185+ right: parent.right

186+ topMargin: units.gu(2)

187+ }

188+ wrapMode: Text.WordWrap

189+ horizontalAlignment: Text.AlignHCenter

190+

191+ //style

192+ color: "#e8e1d0"

193+ fontSize: "medium"

194+

195+ text: "Empty!"

196+ }

197+

198+ function start()

199+ {

200+ reset()

201+ if (!contentActive) {

202+ contentActive = true;

203+ }

204+ }

205+

206+ function stop()

207+ {

208+ if (contentActive) {

209+ contentActive = false;

210+ }

211+ }

212+

213+ function reset()

214+ {

215+ mainMenu.selectedIndex = -1;

216+ mainMenu.positionViewAtBeginning();

217+ }

25}

218}

qml/Panel/Indicators/DefaultIndicatorWidget.qml+5−3

@@ -21,15 +21,17 @@ import QtQuick 2.0

21import Ubuntu.Components 0.1

22import Unity.Indicators 0.1 as Indicators

23

24−Indicators.IndicatorWidget {

24+Indicators.IndicatorBase {

25 id: indicatorWidget

26

27− width: itemRow.width

27+ property int iconSize: height

28−

29 property alias leftLabel: itemLeftLabel.text

28 property alias leftLabel: itemLeftLabel.text

30 property alias rightLabel: itemRightLabel.text

29 property alias rightLabel: itemRightLabel.text

31 property var icons: undefined

30 property var icons: undefined

32

31

32+ width: itemRow.width

33+ enabled: false

34+

33 Row {

35 Row {

34 id: itemRow

36 id: itemRow

35 width: childrenRect.width

37 width: childrenRect.width

qml/Panel/MenuContent.qml+2−2

@@ -39,10 +39,10 @@ MainView {

39 height: units.gu(42)

40

41 function setCurrentMenuIndex(index) {

42− var filteredIndex = filteredIndicators.mapFromSource(index)

42+ var filteredIndex = filteredIndicators.mapFromSource(index);

43

44 if (tabs.selectedTabIndex !== filteredIndex) {

45− if (tabs.selectedTabIndex == -1 || !animateNextMenuChange) {

45+ if (tabs.selectedTabIndex === -1 || !animateNextMenuChange) {

46 tabs.tabBar.animate = false;

47 }

48 tabs.selectedTabIndex = filteredIndex;

tests/autopilot/unity8/shell/emulators/__init__.py+11−4

@@ -1,7 +1,7 @@

1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2#

3# Unity Autopilot Test Suite

5#

6# This program is free software: you can redistribute it and/or modify

7# it under the terms of the GNU General Public License as published by

@@ -17,9 +17,16 @@

17# along with this program. If not, see <http://www.gnu.org/licenses/>.

18#

19

20+from autopilot import input, introspection

20

21

21−from autopilot.introspection import CustomEmulatorBase

22

23−

24−class UnityEmulatorBase(CustomEmulatorBase):

23+class UnityEmulatorBase(introspection.CustomEmulatorBase):

25 """A base class for all unity emulators."""

24 """A base class for all unity emulators."""

25+

26+ def __init__(self, *args):

27+ super(UnityEmulatorBase, self).__init__(*args)

28+ self.pointing_device = input.Touch.create()

29+

30+

31+class UnityEmulatorException(Exception):

32+ """Exception raised when there is an error with the Unity emulators."""

tests/autopilot/unity8/shell/emulators/create_interactive_notification.py+1−1

@@ -87,7 +87,7 @@ if __name__ == '__main__':

87 action_id,

88 action_label,

89 action_callback,

90− None,

90+ (None, ),

91 None

92 )

93

tests/autopilot/unity8/shell/emulators/dash.py+102−8

@@ -1,7 +1,7 @@

1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2#

3# Unity Autopilot Test Suite

5#

6# This program is free software: you can redistribute it and/or modify

7# it under the terms of the GNU General Public License as published by

@@ -17,13 +17,25 @@

17# along with this program. If not, see <http://www.gnu.org/licenses/>.

18#

19

20−from unity8.shell.emulators import UnityEmulatorBase

20+import logging

21

22+from unity8.shell import emulators

22

23

23−class Dash(UnityEmulatorBase):

24+from autopilot import logging as autopilot_logging

25+from autopilot.introspection import dbus

24

26

27+

28+logger = logging.getLogger(__name__)

29+

30+

31+class Dash(emulators.UnityEmulatorBase):

25 """An emulator that understands the Dash."""

32 """An emulator that understands the Dash."""

26

33

34+ def __init__(self, *args):

35+ super(Dash, self).__init__(*args)

36+ self.dash_content_list = self.wait_select_single(

37+ 'QQuickListView', objectName='dashContentList')

38+

27 def get_home_applications_grid(self):

39 def get_home_applications_grid(self):

28 get_grid = self.get_scope('home').wait_select_single(

40 get_grid = self.get_scope('home').wait_select_single(

29 "GenericFilterGrid",

41 "GenericFilterGrid",

@@ -43,9 +55,91 @@ class Dash(UnityEmulatorBase):

43 return resp_grid.select_single('Tile', text=text)

55 return resp_grid.select_single('Tile', text=text)

44

56

45 def get_scope(self, scope_name='home'):

57 def get_scope(self, scope_name='home'):

46− dash_content = self.wait_select_single(

47− 'QQuickListView',

48− objectName='dashContentList'

49− )

50 scope_id = "%s.scope" % scope_name

58 scope_id = "%s.scope" % scope_name

59+ return self.dash_content_list.select_single(

51− return dash_content.select_single('QQuickLoader', scopeId=scope_id)

60+ 'QQuickLoader', scopeId=scope_id)

61+

62+ @autopilot_logging.log_action(logger.info)

63+ def open_scope(self, scope_name):

64+ """Open a dash scope.

65+

66+ :parameter scope_name: The name of the scope.

67+ :return: The scope.

68+

69+ """

70+ scope_id = "%s.scope" % scope_name

71+ scope_loader = self._get_scope_loader(scope_id)

72+ if scope_loader.isCurrent:

73+ logger.info('The scope is already open.')

74+ return self._get_scope_from_loader(scope_loader)

75+ else:

76+ return self._open_scope_scrolling(scope_loader)

77+

78+ def _get_scope_loader(self, scope_id):

79+ try:

80+ return self.dash_content_list.select_single(

81+ 'QQuickLoader', scopeId=scope_id)

82+ except dbus.StateNotFoundError:

83+ raise emulators.UnityEmulatorException(

84+ 'No scope found with id {0}'.format(scope_id))

85+

86+ def _get_scope_from_loader(self, loader):

87+ if loader.scopeId == 'applications.scope':

88+ return loader.select_single(DashApps)

89+ else:

90+ return loader.select_single(GenericScopeView)

91+

92+ def _open_scope_scrolling(self, scope_loader):

93+ scroll = self._get_scroll_direction(scope_loader)

94+

95+ while not scope_loader.isCurrent:

96+ scroll()

97+

98+ scope = self._get_scope_from_loader(scope_loader)

99+ scope.moving.wait_for(False)

100+ scope.isCurrent.wait_for(True)

101+ return scope

102+

103+ def _get_scroll_direction(self, scope_loader):

104+ current_scope_loader = self.dash_content_list.select_single(

105+ 'QQuickLoader', isCurrent=True)

106+ if scope_loader.globalRect.x < current_scope_loader.globalRect.x:

107+ return self._scroll_to_left_scope

108+ elif scope_loader.globalRect.x > current_scope_loader.globalRect.x:

109+ return self._scroll_to_right_scope

110+ else:

111+ raise emulators.UnityEmulatorException('The scope is already open')

112+

113+ @autopilot_logging.log_action(logger.info)

114+ def _scroll_to_left_scope(self):

115+ original_index = self.dash_content_list.currentIndex

116+ # Scroll on the border of the page header, because some scopes have

117+ # contents that can be scrolled horizontally.

118+ page_header = self.select_single('PageHeader')

119+ border = page_header.select_single('QQuickBorderImage')

120+ start_x = border.width / 3

121+ stop_x = border.width / 3 * 2

122+ start_y = stop_y = border.globalRect.y + border.height / 2

123+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

124+ self.dash_content_list.currentIndex.wait_for(original_index - 1)

125+

126+ @autopilot_logging.log_action(logger.info)

127+ def _scroll_to_right_scope(self):

128+ original_index = self.dash_content_list.currentIndex

129+ # Scroll on the border of the page header, because some scopes have

130+ # contents that can be scrolled horizontally.

131+ page_header = self.select_single('PageHeader')

132+ border = page_header.select_single('QQuickBorderImage')

133+ start_x = border.width / 3 * 2

134+ stop_x = border.width / 3

135+ start_y = stop_y = border.globalRect.y + border.height / 2

136+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

137+ self.dash_content_list.currentIndex.wait_for(original_index + 1)

138+

139+

140+class GenericScopeView(emulators.UnityEmulatorBase):

141+ """Autopilot emulators for generic scopes."""

142+

143+

144+class DashApps(emulators.UnityEmulatorBase):

145+ """Autopilot emulators for the applications scope."""

tests/autopilot/unity8/shell/emulators/greeter.py+2−5

@@ -1,7 +1,7 @@

1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2#

3# Unity Autopilot Test Suite

5#

6# This program is free software: you can redistribute it and/or modify

7# it under the terms of the GNU General Public License as published by

@@ -18,24 +18,21 @@

18#

19

20from unity8.shell.emulators import UnityEmulatorBase

21−from autopilot.input import Touch

22

21

23

22

24class Greeter(UnityEmulatorBase):

23class Greeter(UnityEmulatorBase):

25−

26 """An emulator that understands the greeter screen."""

24 """An emulator that understands the greeter screen."""

27

25

28 def swipe(self):

26 def swipe(self):

29 """Swipe the greeter screen away."""

27 """Swipe the greeter screen away."""

30 self.created.wait_for(True)

28 self.created.wait_for(True)

31− touch = Touch.create()

32

29

33 rect = self.globalRect

30 rect = self.globalRect

34 start_x = rect[0] + rect[2] - 3

31 start_x = rect[0] + rect[2] - 3

35 start_y = int(rect[1] + rect[3] / 2)

32 start_y = int(rect[1] + rect[3] / 2)

36 stop_x = int(rect[0] + rect[2] * 0.2)

33 stop_x = int(rect[0] + rect[2] * 0.2)

37 stop_y = start_y

34 stop_y = start_y

38− touch.drag(start_x, start_y, stop_x, stop_y)

35+ self.pointing_device.drag(start_x, start_y, stop_x, stop_y)

39

36

40 self.created.wait_for(False)

37 self.created.wait_for(False)

41

38

tests/autopilot/unity8/shell/tests/test_emulators.pynew file+120

@@ -0,0 +1,120 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

11+# This program is distributed in the hope that it will be useful,

12+# but WITHOUT ANY WARRANTY; without even the implied warranty of

13+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+# GNU General Public License for more details.

15+#

16+# You should have received a copy of the GNU General Public License

17+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18+#

19+

20+import mock

21+

22+from unity8 import process_helpers

23+from unity8.shell import emulators, tests

24+from unity8.shell.emulators import dash as dash_emulators

25+

26+

27+class DashEmulatorTestCase(tests.UnityTestCase):

28+

29+ scenarios = tests._get_device_emulation_scenarios()

30+

31+ def setUp(self):

32+ super(DashEmulatorTestCase, self).setUp()

33+ unity_proxy = self.launch_unity()

34+ process_helpers.unlock_unity(unity_proxy)

35+ self.dash = self.main_window.get_dash()

36+

37+ def test_open_unexisting_scope(self):

38+ scope_name = 'unexisting'

39+ with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:

40+ exception = self.assertRaises(

41+ emulators.UnityEmulatorException,

42+ self.dash.open_scope, scope_name)

43+

44+ self.assertEqual(

45+ 'No scope found with id unexisting.scope', str(exception))

46+ self.assertFalse(mock_pointer.called)

47+

48+ def test_open_already_opened_scope(self):

49+ scope_id = self._get_current_scope_id()

50+ with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:

51+ scope = self.dash.open_scope(self._get_scope_name_from_id(

52+ scope_id))

53+

54+ self.assertFalse(mock_pointer.called)

55+ self._assert_scope_is_opened(scope, scope_id)

56+

57+ def _assert_scope_is_opened(self, scope, scope_id):

58+ self.assertTrue(scope.isCurrent)

59+ scope_loader = scope.get_parent()

60+ self.assertEqual(scope_loader.scopeId, scope_id)

61+

62+ def _get_current_scope_id(self):

63+ scope = self.dash.dash_content_list.select_single(

64+ 'QQuickLoader', isCurrent=True)

65+ return scope.scopeId

66+

67+ def test_open_scope_to_the_right(self):

68+ leftmost_scope = self._get_scope_name_from_id(

69+ self._get_leftmost_scope_id())

70+ self.dash.open_scope(leftmost_scope)

71+

72+ scope_id = self._get_rightmost_scope_id()

73+ scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))

74+ self._assert_scope_is_opened(scope, scope_id)

75+

76+ def _get_leftmost_scope_id(self):

77+ scope_loaders = self._get_scope_loaders()

78+ leftmost_scope_loader = scope_loaders[0]

79+ for loader in scope_loaders[1:]:

80+ if loader.globalRect.x < leftmost_scope_loader.globalRect.x:

81+ leftmost_scope_loader = loader

82+ return leftmost_scope_loader.scopeId

83+

84+ def _get_scope_loaders(self):

85+ item = self.dash.dash_content_list.get_children_by_type(

86+ 'QQuickItem')[0]

87+ return item.get_children_by_type('QQuickLoader')

88+

89+ def _get_scope_name_from_id(self, scope_id):

90+ if scope_id.endswith('.scope'):

91+ return scope_id[:-6]

92+

93+ def _get_rightmost_scope_id(self):

94+ scope_loaders = self._get_scope_loaders()

95+ rightmost_scope_loader = scope_loaders[0]

96+ for loader in scope_loaders[1:]:

97+ if loader.globalRect.x > rightmost_scope_loader.globalRect.x:

98+ rightmost_scope_loader = loader

99+ return rightmost_scope_loader.scopeId

100+

101+ def test_open_scope_to_the_left(self):

102+ rightmost_scope = self._get_scope_name_from_id(

103+ self._get_rightmost_scope_id())

104+ self.dash.open_scope(rightmost_scope)

105+

106+ scope_id = self._get_leftmost_scope_id()

107+ scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))

108+ self._assert_scope_is_opened(scope, scope_id)

109+

110+ def test_open_generic_scope(self):

111+ scope_id = 'home.scope'

112+ scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))

113+ self._assert_scope_is_opened(scope, scope_id)

114+ self.assertIsInstance(scope, dash_emulators.GenericScopeView)

115+

116+ def test_open_applications_scope(self):

117+ scope_id = 'applications.scope'

118+ scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))

119+ self._assert_scope_is_opened(scope, scope_id)

120+ self.assertIsInstance(scope, dash_emulators.DashApps)

tests/mocks/LightDM/CMakeLists.txt+1−1

@@ -33,7 +33,7 @@ add_library(MockLightDM-qml MODULE

33# installed on the system. So we make sure we link to our full fake version

34# At run time, we can point to whichever version we happen to be using via

35# LD_LIBRARY_PATH.

36−add_dependencies(MockLightDM-qml MockLightDM-full)

36+add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)

37target_link_libraries(MockLightDM-qml

38 -L${CMAKE_CURRENT_BINARY_DIR}/full

39 -llightdm-qt5-2

tests/mocks/QMenuModel/unitymenumodel.cpp+3

@@ -143,6 +143,9 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const

143

144QVariantMap UnityMenuModel::rowData(int row) const

145{

146+ if (m_modelData.count() <= row) {

147+ return QVariantMap();

148+ }

146 return m_modelData[row].toMap()["rowData"].toMap();

149 return m_modelData[row].toMap()["rowData"].toMap();

147}

150}

148

151

tests/mocks/Unity/Indicators/CMakeLists.txt+2

@@ -7,12 +7,14 @@ include_directories(

7 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_CURRENT_BINARY_DIR}

9 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators

10+ ${CMAKE_SOURCE_DIR}/tests/mocks/QMenuModel

10)

11)

11

12

12set(IndicatorsFakeQml_SOURCES

13set(IndicatorsFakeQml_SOURCES

13 fakeplugin.cpp

14 fakeplugin.cpp

14 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h

15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h

15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

17)

19)

18

20

tests/mocks/Unity/Indicators/IndicatorBase.qml+2−1

@@ -26,8 +26,9 @@ Item {

26 //const

27 property string busName

28 property string actionsObjectPath

29+ property string menuObjectPath

29 property string rootMenuType: "com.canonical.indicator.root"

30 property string rootMenuType: "com.canonical.indicator.root"

30− property string deviceMenuObjectPath

31+ property string deviceMenuObjectPath: menuObjectPath

31

32

32 property var menuModel: UnityMenuModel {}

33 property var menuModel: UnityMenuModel {}

33

34

tests/mocks/Unity/Indicators/IndicatorWidget.qmldeleted−28

@@ -1,28 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Nick Dedekind <nick.dedekind@canonical.com>

18− */

19−

20−import QtQuick 2.0

21−import Unity.Indicators 0.1 as Indicators

22−

23−IndicatorBase {

24− id: indicatorWidget

25−

26− enabled: false

27− property int iconSize: height

28−}

tests/mocks/Unity/Indicators/IndicatorsModel.qml+2−5

@@ -21,12 +21,9 @@ ListModel {

21

22 property var indicatorData : undefined

23

24− function load() {}

24+ function load() {

25+ clear();

25

26

26− // Need to do this dynamically.

27− // Apparently ListModels dont order roles visually when using ListElement

28− // which throws off the filter for non-visible indicators.

29− Component.onCompleted: {

30 append({ "identifier": "indicator-fake1",

27 append({ "identifier": "indicator-fake1",

31 "position": 0,

28 "position": 0,

32 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",

29 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",

plugins/Unity/Indicators/qml/IndicatorWidget.qml → tests/mocks/Unity/Indicators/MenuItemFactory.qmlrenamed+15−5

@@ -18,11 +18,21 @@

18 */

19

20import QtQuick 2.0

21−import Unity.Indicators 0.1 as Indicators

21+import Ubuntu.Components.ListItems 0.1 as ListItem

22

23−IndicatorBase {

23+Item {

24− id: indicatorWidget

24+ id: menuFactory

25

26− enabled: false

26+ property var menuModel: null

27− property int iconSize: height

27+

28+ Component {

29+ id: standardMenu;

30+ ListItem.Standard {

31+ objectName: "standardMenu"

32+ }

33+ }

34+

35+ function load(modelData) {

36+ return standardMenu;

37+ }

28}

38}

tests/mocks/Unity/Indicators/fakeplugin.cpp+2

@@ -25,6 +25,7 @@

25// local

26#include "indicators.h"

27#include "menucontentactivator.h"

28+#include "unitymenumodelstack.h"

28#include "visibleindicatorsmodel.h"

29#include "visibleindicatorsmodel.h"

29

30

30void IndicatorsFakePlugin::registerTypes(const char * uri)

31void IndicatorsFakePlugin::registerTypes(const char * uri)

@@ -32,6 +33,7 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

32 Q_INIT_RESOURCE(indicators_fake);

33 Q_INIT_RESOURCE(indicators_fake);

33

34

34 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

35 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

36+ qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

35 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

37 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

36

38

37 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

39 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

tests/mocks/Unity/Indicators/qml/fake_menu_widget2.qml+1−3

@@ -19,7 +19,5 @@ import QtQuick 2.0

19Rectangle {

20 width: 40

21 height: 40

22− color : "yellow"

22+ color : "blue"

23−

24− enabled: false

25}

23}

tests/mocks/Unity/Indicators/qml/fake_menu_widget3.qml+1−1

@@ -19,5 +19,5 @@ import QtQuick 2.0

19Rectangle {

20 width: 40

21 height: 40

22− color : "blue"

22+ color : "yellow"

23}

tests/mocks/Unity/Indicators/qmldir+1−1

@@ -3,7 +3,7 @@ plugin IndicatorsFakeQml

3

4CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml

5IndicatorBase 0.1 IndicatorBase.qml

6−IndicatorWidget 0.1 IndicatorWidget.qml

7IndicatorsModel 0.1 IndicatorsModel.qml

6IndicatorsModel 0.1 IndicatorsModel.qml

8FakeMenuPage 0.1 FakeMenuPage.qml

7FakeMenuPage 0.1 FakeMenuPage.qml

8+MenuItemFactory 0.1 MenuItemFactory.qml

9RootActionState 0.1 RootActionState.qml

tests/plugins/DashViews/CMakeLists.txt+3−5

@@ -55,7 +55,7 @@ macro(add_journal_try_test FILENAME)

55 target_link_libraries(${FILENAME}testExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

56 add_custom_target(test${CUSTOM_TARGET_NAME}

57 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}testExec

58− -o ${CMAKE_BINARY_DIR}/testVerticalJournal.xml,xunitxml

58+ -o ${CMAKE_BINARY_DIR}/test${CUSTOM_TARGET_NAME}.xml,xunitxml

59 -o -,txt

60 DEPENDS ${FILENAME}testExec DashViews-qml

61 )

@@ -69,8 +69,6 @@ macro(add_journal_try_test FILENAME)

69 target_link_libraries(${FILENAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

70 add_custom_target(try${CUSTOM_TARGET_NAME}

71 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}tryExec

72− -o ${CMAKE_BINARY_DIR}/testVerticalJournal.xml,xunitxml

73− -o -,txt

74 DEPENDS ${FILENAME}tryExec DashViews-qml

72 DEPENDS ${FILENAME}tryExec DashViews-qml

75 )

73 )

76endmacro()

74endmacro()

@@ -85,5 +83,5 @@ add_dependencies(qmluitests testlistviewwithpageheader)

85add_dependencies(qmluitests testlistviewwithpageheadersection)

83add_dependencies(qmluitests testlistviewwithpageheadersection)

86add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)

84add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)

87add_dependencies(qmluitests testlistviewwithpageheaderqml)

85add_dependencies(qmluitests testlistviewwithpageheaderqml)

88−add_dependencies(qmluitests testVerticalJournal)

86+add_dependencies(qmluitests testVerticaljournal)

89−add_dependencies(qmluitests testHorizontalJournal)

87+add_dependencies(qmluitests testHorizontaljournal)

tests/plugins/LightDM/CMakeLists.txt+1

@@ -11,6 +11,7 @@ include_directories(

11 ${LIBLIGHTDM_INCLUDE_DIRS}

12 )

13

14+add_dependencies(test-lightdm-dbus MockLightDM-full)

14target_link_libraries(test-lightdm-dbus

15target_link_libraries(test-lightdm-dbus

15 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full

16 -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full

16 -llightdm-qt5-2

17 -llightdm-qt5-2

tests/qmltests/CMakeLists.txt+4

@@ -74,6 +74,10 @@ add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFA

74add_qml_test(Panel SearchIndicator)

75add_qml_test(Panel/Indicators DefaultIndicatorWidget IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

76 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

77+add_qml_test(Panel/Indicators DefaultIndicatorPage IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

78+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")

79+add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

80+add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)

77add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}

81add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}

78 ${CMAKE_BINARY_DIR}/tests/mocks

82 ${CMAKE_BINARY_DIR}/tests/mocks

79 ${CMAKE_BINARY_DIR}/plugins)

83 ${CMAKE_BINARY_DIR}/plugins)

tests/qmltests/Greeter/tst_Lockscreen.qml+1−1

@@ -134,7 +134,7 @@ Rectangle {

134 if (data.pinPadAvailable) {

135 compare(findChild(lockscreen, "pinPadButton8").text, "8", "Could not find number 8 on PinPad")

136 } else {

137− compare(findChild(lockscreen, "pinPadButton8"), undefined, "Could find number 8 on PinPad even though it should be only OSK")

137+ compare(findChild(lockscreen, "pinPadButton8"), null, "Could find number 8 on PinPad even though it should be only OSK")

138 }

139 }

140

tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qmlnew file+179

@@ -0,0 +1,179 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import Unity.Test 0.1 as UT

20+import QMenuModel 0.1

21+import "../../../../qml/Panel/Indicators"

22+

23+Item {

24+ id: testView

25+ width: units.gu(40)

26+ height: units.gu(70)

27+

28+ DefaultIndicatorPage {

29+ id: page

30+

31+ anchors.fill: parent

32+ contentActive: true

33+

34+ busName: "test"

35+ actionsObjectPath: "test"

36+ menuObjectPath: "test"

37+

38+ rootMenuType: ""

39+ }

40+

41+ property var fullMenuData: [{

42+ "rowData": { // 1

43+ "label": "root",

44+ "sensitive": true,

45+ "isSeparator": false,

46+ "icon": "",

47+ "type": "com.canonical.indicator.root",

48+ "ext": {},

49+ "action": "",

50+ "actionState": {},

51+ "isCheck": false,

52+ "isRadio": false,

53+ "isToggled": false,

54+ },

55+ "submenu": [{

56+ "rowData": { // 1.1

57+ "label": "menu1",

58+ "sensitive": true,

59+ "isSeparator": false,

60+ "icon": "",

61+ "type": "",

62+ "ext": {},

63+ "action": "",

64+ "actionState": {},

65+ "isCheck": false,

66+ "isRadio": false,

67+ "isToggled": false,

68+ }}, {

69+ "rowData": { // 1.2

70+ "label": "menu2",

71+ "sensitive": true,

72+ "isSeparator": false,

73+ "icon": "",

74+ "type": "",

75+ "ext": {},

76+ "action": "",

77+ "actionState": {},

78+ "isCheck": false,

79+ "isRadio": false,

80+ "isToggled": false,

81+ }}, {

82+ "rowData": { // row 1.2

83+ "label": "menu3",

84+ "sensitive": true,

85+ "isSeparator": false,

86+ "icon": "",

87+ "type": "",

88+ "ext": {},

89+ "action": "",

90+ "actionState": {},

91+ "isCheck": false,

92+ "isRadio": false,

93+ "isToggled": false,

94+ }}

95+ ]

96+ }]; // end row 1

97+

98+ property var emptySubMenuData: [{

99+ "rowData": { // 1

100+ "label": "root",

101+ "sensitive": true,

102+ "isSeparator": false,

103+ "icon": "",

104+ "type": "com.canonical.indicator.root",

105+ "ext": {},

106+ "action": "",

107+ "actionState": {},

108+ "isCheck": false,

109+ "isRadio": false,

110+ "isToggled": false,

111+ },

112+ "submenu": []

113+ }]; // end row 1

114+

115+ UT.UnityTestCase {

116+ name: "DefaultIndicatorPage"

117+

118+ function init() {

119+ page.stop();

120+ var mainMenu = findChild(page, "mainMenu");

121+ verify(mainMenu.model === undefined);

122+

123+ page.rootMenuType = "com.canonical.indicator.root";

124+ page.start();

125+

126+ verify(mainMenu.model !== null);

127+ }

128+

129+ function test_reloadData() {

130+ var mainMenu = findChild(page, "mainMenu");

131+

132+ console.log("setting empty data");

133+ page.menuModel.modelData = [];

134+ tryCompare(mainMenu, "count", 0);

135+ console.log("set empty data");

136+

137+ console.log("setting full data");

138+ page.menuModel.modelData = fullMenuData;

139+ console.log("set full data");

140+ tryCompare(mainMenu, "count", 3);

141+

142+ page.menuModel.modelData = [];

143+ tryCompare(mainMenu, "count", 0);

144+

145+ page.menuModel.modelData = fullMenuData;

146+ tryCompare(mainMenu, "count", 3);

147+ }

148+

149+ function test_traverse_rootMenuType_data() {

150+ return [

151+ { tag: "Incorrect", rootMenuType: "com.canonical.indicator", expectedCount: 0},

152+ { tag: "Correct", rootMenuType: "com.canonical.indicator.root", expectedCount: 3},

153+ ]

154+ }

155+

156+ function test_traverse_rootMenuType(data) {

157+ page.rootMenuType = data.rootMenuType;

158+ page.menuModel.modelData = fullMenuData;

159+

160+ var mainMenu = findChild(page, "mainMenu");

161+ tryCompare(mainMenu, "count", data.expectedCount);

162+ }

163+

164+ function test_empty_data() {

165+ return [

166+ { tag: "EmptyNoData", modelData: [], visible: true},

167+ { tag: "EmptySubmenu", modelData: emptySubMenuData, visible: true},

168+ { tag: "NotEmpty", modelData: fullMenuData, visible: false},

169+ ]

170+ }

171+

172+ function test_empty(data) {

173+ page.menuModel.modelData = data.modelData;

174+

175+ var emptyLabel = findChild(page, "emptyLabel");

176+ tryCompare(emptyLabel, "visible", data.visible);

177+ }

178+ }

179+}

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qmlnew file+369

@@ -0,0 +1,369 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import Unity.Test 0.1 as UT

20+import QMenuModel 0.1

21+import Unity.Indicators 0.1 as Indicators

22+

23+Item {

24+ id: testView

25+ width: units.gu(40)

26+ height: units.gu(70)

27+

28+ Indicators.MenuItemFactory {

29+ id: factory

30+ menuModel: UnityMenuModel {}

31+ }

32+

33+ Loader {

34+ id: loader

35+ property int modelIndex: 0

36+ property var data

37+

38+ onLoaded: {

39+ if (item.hasOwnProperty("menuData")) {

40+ item.menuData = data;

41+ }

42+ }

43+ }

44+

45+ UT.UnityTestCase {

46+ name: "MenuItemFactory"

47+

48+ property QtObject menuData: QtObject {

49+ property string label: "root"

50+ property bool sensitive: true

51+ property bool isSeparator: false

52+ property string icon: ""

53+ property string type: ""

54+ property var ext: undefined

55+ property string action: ""

56+ property var actionState: undefined

57+ property bool isCheck: false

58+ property bool isRadio: false

59+ property bool isToggled: false

60+ }

61+

62+ function init() {

63+ menuData.label = "";

64+ menuData.sensitive = true;

65+ menuData.isSeparator = false;

66+ menuData.icon = "";

67+ menuData.type = "";

68+ menuData.ext = undefined;

69+ menuData.action = "";

70+ menuData.actionState = undefined;

71+ menuData.isCheck = false;

72+ menuData.isRadio = false;

73+ menuData.isToggled = false;

74+

75+ loader.sourceComponent = null;

76+ loader.data = undefined;

77+

78+ verify(loader.item == null);

79+ }

80+

81+ function test_createTypes_data() {

82+ return [

83+ { tag: 'volume', type: "unity.widgets.systemsettings.tablet.volumecontrol", objectName: "sliderMenu" },

84+ { tag: 'switch1', type: "unity.widgets.systemsettings.tablet.switch", objectName: "switchMenu" },

85+

86+ { tag: 'button', type: "com.canonical.indicator.button", objectName: "buttonMenu" },

87+ { tag: 'separator', type: "com.canonical.indicator.div", objectName: "divMenu" },

88+ { tag: 'section', type: "com.canonical.indicator.section", objectName: "sectionMenu" },

89+ { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },

90+ { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },

91+ { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },

92+

93+ { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },

94+ { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },

95+

96+ { tag: 'slider2', type: "com.canonical.unity.slider", objectName: "sliderMenu" },

97+ { tag: 'switch3', type: "com.canonical.unity.switch", objectName: "switchMenu" },

98+

99+ { tag: 'mediaplayer', type: "com.canonical.unity.media-player", objectName: "standardMenu" },

100+ { tag: 'playbackitem', type: "com.canonical.unity.playback-item", objectName: "standardMenu" },

101+

102+ { tag: 'wifisection', type: "unity.widgets.systemsettings.tablet.wifisection", objectName: "wifiSection" },

103+ { tag: 'accesspoint', type: "unity.widgets.systemsettings.tablet.accesspoint", objectName: "accessPoint" },

104+

105+ { tag: 'unknown', type: "", objectName: "standardMenu"}

106+ ];

107+ }

108+

109+ function test_createTypes(data) {

110+ menuData.type = data.type;

111+

112+ loader.data = menuData;

113+ loader.sourceComponent = factory.load(menuData);

114+ tryCompareFunction(function() { return loader.item != undefined; }, true);

115+ compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");

116+ }

117+

118+ function test_create_radio() {

119+ skip("No radio component");

120+ menuData.isRadio = true;

121+

122+ loader.data = menuData;

123+ loader.sourceComponent = factory.load(menuData);

124+ tryCompareFunction(function() { return loader.item != undefined; }, true);

125+ compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");

126+ }

127+

128+ function test_create_separator() {

129+ menuData.isSeparator = true;

130+

131+ loader.data = menuData;

132+ loader.sourceComponent = factory.load(menuData);

133+ tryCompareFunction(function() { return loader.item != undefined; }, true);

134+ compare(loader.item.objectName, "divMenu", "Should have created a separator menu");

135+ }

136+

137+ function test_create_sliderMenu_data() {

138+ return [

139+ {label: "testLabel1", enabled: false, minValue: 0, maxValue: 100, value: 10.5 },

140+ {label: "testLabel2", enabled: true, minValue: 0, maxValue: 100, value: 100 },

141+ ];

142+ }

143+

144+ function test_create_sliderMenu(data) {

145+ menuData.type = "com.canonical.indicator.slider"

146+ menuData.label = data.label;

147+ menuData.sensitive = data.enabled;

148+ menuData.actionState = data.value;

149+ menuData.ext = {

150+ 'minIcon': "file:///testMinIcon",

151+ 'maxIcon': "file:///testMaxIcon",

152+ 'minValue': data.minValue,

153+ 'maxValue': data.maxValue

154+ };

155+

156+ loader.data = menuData;

157+ loader.sourceComponent = factory.load(menuData);

158+ tryCompareFunction(function() { return loader.item != undefined; }, true);

159+ compare(loader.item.objectName, "sliderMenu", "Should have created a slider menu");

160+

161+ compare(loader.item.text, data.label, "Label does not match data");

162+ compare(loader.item.minIcon, "file:///testMinIcon", "MinIcon does not match data");

163+ compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");

164+ compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");

165+ compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");

166+ compare(loader.item.value, data.value, "Calue does not match data");

167+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

168+ }

169+

170+ function test_create_buttonMenu_data() {

171+ return [

172+ {label: "testLabel1", enabled: false },

173+ {label: "testLabel2", enabled: true },

174+ ];

175+ }

176+

177+ function test_create_buttonMenu(data) {

178+ menuData.type = "com.canonical.indicator.button"

179+ menuData.label = data.label;

180+ menuData.sensitive = data.enabled;

181+

182+ loader.data = menuData;

183+ loader.sourceComponent = factory.load(menuData);

184+ tryCompareFunction(function() { return loader.item != undefined; }, true);

185+ compare(loader.item.objectName, "buttonMenu", "Should have created a button menu");

186+

187+ compare(loader.item.buttonText, data.label, "Label does not match data");

188+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

189+ }

190+

191+ function test_create_sectionMenu_data() {

192+ return [

193+ {label: "testLabel1" },

194+ {label: "testLabel2" },

195+ ];

196+ }

197+

198+ function test_create_sectionMenu(data) {

199+ menuData.type = "com.canonical.indicator.section"

200+ menuData.label = data.label;

201+

202+ loader.data = menuData;

203+ loader.sourceComponent = factory.load(menuData);

204+ tryCompareFunction(function() { return loader.item != undefined; }, true);

205+ compare(loader.item.objectName, "sectionMenu", "Should have created a section menu");

206+

207+ compare(loader.item.text, data.label, "Label does not match data");

208+ }

209+

210+ function test_create_progressMenu_data() {

211+ return [

212+ {label: "testLabel1", enabled: true, value: 10 },

213+ {label: "testLabel2", enabled: false, value: 55 },

214+ ];

215+ }

216+

217+ function test_create_progressMenu(data) {

218+ menuData.type = "com.canonical.indicator.progress"

219+ menuData.label = data.label;

220+ menuData.sensitive = data.enabled;

221+ menuData.actionState = data.value;

222+

223+ loader.data = menuData;

224+ loader.sourceComponent = factory.load(menuData);

225+ tryCompareFunction(function() { return loader.item != undefined; }, true);

226+ compare(loader.item.objectName, "progressMenu", "Should have created a progress menu");

227+

228+ compare(loader.item.text, data.label, "Label does not match data");

229+ compare(loader.item.value, data.value, "Value does not match data");

230+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

231+ }

232+

233+ function test_create_standardMenu_data() {

234+ return [

235+ {label: "testLabel1", enabled: true, icon: "file:///testIcon" },

236+ {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},

237+ ];

238+ }

239+

240+ function test_create_standardMenu(data) {

241+ menuData.type = ""

242+ menuData.label = data.label;

243+ menuData.sensitive = data.enabled;

244+ menuData.icon = data.icon;

245+

246+ loader.data = menuData;

247+ loader.sourceComponent = factory.load(menuData);

248+ tryCompareFunction(function() { return loader.item != undefined; }, true);

249+ compare(loader.item.objectName, "standardMenu", "Should have created a standard menu");

250+

251+ compare(loader.item.text, data.label, "Label does not match data");

252+ compare(loader.item.iconSource, data.icon, "MaxIcon does not match data");

253+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

254+ }

255+

256+ function test_create_switchMenu_data() {

257+ return [

258+ {label: "testLabel1", enabled: true, checked: false },

259+ {label: "testLabel2", enabled: false, checked: true },

260+ ];

261+ }

262+

263+ function test_create_switchMenu(data) {

264+ menuData.type = "com.canonical.indicator.switch";

265+ menuData.label = data.label;

266+ menuData.sensitive = data.enabled;

267+ menuData.icon = "file:///testIcon";

268+ menuData.isToggled = data.checked;

269+

270+ loader.data = menuData;

271+ loader.sourceComponent = factory.load(menuData);

272+ tryCompareFunction(function() { return loader.item != undefined; }, true);

273+ compare(loader.item.objectName, "switchMenu", "Should have created a standard menu");

274+

275+ compare(loader.item.text, data.label, "Label does not match data");

276+ compare(loader.item.icon, "file:///testIcon", "MaxIcon does not match data");

277+ compare(loader.item.checked, data.checked, "Checked does not match data");

278+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

279+ }

280+

281+ function test_create_wifiSection_data() {

282+ return [

283+ {label: "testLabel1", busy: false },

284+ {label: "testLabel2", busy: true },

285+ ];

286+ }

287+

288+ function test_create_wifiSection(data) {

289+ menuData.type = "unity.widgets.systemsettings.tablet.wifisection";

290+ menuData.label = data.label;

291+ menuData.ext = { 'xCanonicalBusyAction': data.busy }

292+

293+ loader.data = menuData;

294+ loader.sourceComponent = factory.load(menuData);

295+ tryCompareFunction(function() { return loader.item != undefined; }, true);

296+ compare(loader.item.objectName, "wifiSection", "Should have created a wifi section menu");

297+

298+ compare(loader.item.text, data.label, "Label does not match data");

299+ compare(loader.item.busy, data.busy, "Busy does not match data");

300+ }

301+

302+ function test_create_accessPoint_data() {

303+ return [

304+ {label: "testLabel1", enabled: true, checked: false, secure: true, adHoc: false },

305+ {label: "testLabel2", enabled: false, checked: true, secure: false, adHoc: true },

306+ ];

307+ }

308+

309+ function test_create_accessPoint(data) {

310+ menuData.type = "unity.widgets.systemsettings.tablet.accesspoint";

311+ menuData.label = data.label;

312+ menuData.sensitive = data.enabled;

313+ menuData.isToggled = data.checked;

314+ menuData.ext = {

315+ 'xCanonicalWifiApStrengthAction': "action::strength",

316+ 'xCanonicalWifiApIsSecure': data.secure,

317+ 'xCanonicalWifiApIsAdhoc': data.adHoc,

318+ };

319+

320+ loader.data = menuData;

321+ loader.sourceComponent = factory.load(menuData);

322+ tryCompareFunction(function() { return loader.item != undefined; }, true);

323+ compare(loader.item.objectName, "accessPoint", "Should have created a access point menu");

324+

325+ compare(loader.item.label, data.label, "Label does not match data");

326+ compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");

327+ compare(loader.item.secure, data.secure, "Secure does not match data");

328+ compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");

329+ compare(loader.item.checked, data.checked, "Checked does not match data");

330+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

331+ }

332+

333+ function test_create_messageItem() {

334+ menuData.type = "com.canonical.indicator.messages.messageitem";

335+

336+ loader.data = menuData;

337+ loader.sourceComponent = factory.load(menuData);

338+ tryCompareFunction(function() { return loader.item != undefined; }, true);

339+ compare(loader.item.objectName, "messageItem", "Should have created a message menu");

340+ }

341+

342+ function test_create_groupedMessage_data() {

343+ return [

344+ {label: "testLabel1", enabled: true, count: "5", appIcon: "file:///testIcon" },

345+ {label: "testLabel2", enabled: false, count: "10", appIcon: "file:///testIcon2" },

346+ ];

347+ }

348+

349+ function test_create_groupedMessage(data) {

350+ menuData.type = "com.canonical.indicator.messages.sourceitem";

351+ menuData.label = data.label;

352+ menuData.sensitive = data.enabled;

353+ menuData.icon = data.appIcon;

354+ menuData.ext = { 'icon': data.appIcon };

355+ menuData.actionState = [data.count];

356+ menuData.isToggled = true;

357+

358+ loader.data = menuData;

359+ loader.sourceComponent = factory.load(menuData);

360+ tryCompareFunction(function() { return loader.item != undefined; }, true);

361+ compare(loader.item.objectName, "groupedMessage", "Should have created a group message menu");

362+

363+ compare(loader.item.title, data.label, "Label does not match data");

364+ compare(loader.item.count, data.count, "Count does not match data");

365+ compare(loader.item.appIcon, data.appIcon, "App Icon does not match data");

366+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

367+ }

368+ }

369+}

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qmlnew file+177

@@ -0,0 +1,177 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.0

18+import QtTest 1.0

19+import Unity.Test 0.1 as UT

20+import QMenuModel 0.1

21+import Unity.Indicators.Messaging 0.1 as Indicators

22+

23+Item {

24+ id: testView

25+ width: units.gu(40)

26+ height: units.gu(70)

27+

28+ Indicators.MessageMenuItemFactory {

29+ id: factory

30+ menuModel: UnityMenuModel {}

31+ menuIndex: 0

32+ }

33+

34+ UT.UnityTestCase {

35+ name: "MessageMenuItemFactory"

36+

37+ property QtObject menuData: QtObject {

38+ property string label: "root"

39+ property bool sensitive: true

40+ property bool isSeparator: false

41+ property string icon: ""

42+ property string type: ""

43+ property var ext: undefined

44+ property string action: ""

45+ property var actionState: undefined

46+ property bool isCheck: false

47+ property bool isRadio: false

48+ property bool isToggled: false

49+ }

50+

51+ function init() {

52+ menuData.label = "";

53+ menuData.sensitive = true;

54+ menuData.isSeparator = false;

55+ menuData.icon = "";

56+ menuData.type = "";

57+ menuData.ext = undefined;

58+ menuData.action = "";

59+ menuData.actionState = undefined;

60+ menuData.isCheck = false;

61+ menuData.isRadio = false;

62+ menuData.isToggled = false;

63+

64+ factory.menuData = null;

65+ }

66+

67+ function test_create_simpleTextmessage_data() {

68+ return [

69+ { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},

70+ { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},

71+ ];

72+ }

73+

74+ function test_create_simpleTextmessage(data) {

75+ menuData.type = "com.canonical.indicator.messages.messageitem";

76+ menuData.label = data.title;

77+ menuData.sensitive = data.enabled;

78+ menuData.ext = {

79+ 'xCanonicalTime': data.time,

80+ 'xCanonicalText': data.message,

81+ 'icon': data.avatar,

82+ 'xCanonicalAppIcon': data.appIcon,

83+ };

84+ factory.menuData = menuData;

85+

86+ var loader = findChild(factory, "loader");

87+ verify(loader !== undefined);

88+

89+ tryCompare(loader.item, "objectName", "simpleTextMessage");

90+ compare(loader.item.title, data.title, "Title does not match data");

91+ compare(loader.item.time, data.time, "Time does not match data");

92+ compare(loader.item.message, data.message, "Message does not match data");

93+ compare(loader.item.avatar, data.avatar, "Avatar does not match data");

94+ compare(loader.item.appIcon, data.appIcon, "App icon does not match data");

95+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

96+ }

97+

98+ function test_create_textmessage_data() {

99+ return [

100+ { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},

101+ { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},

102+ ];

103+ }

104+

105+ function test_create_textmessage(data) {

106+ menuData.type = "com.canonical.indicator.messages.messageitem";

107+ menuData.label = data.title;

108+ menuData.sensitive = data.enabled;

109+ menuData.ext = {

110+ 'xCanonicalTime': data.time,

111+ 'xCanonicalText': data.message,

112+ 'icon': data.avatar,

113+ 'xCanonicalAppIcon': data.appIcon,

114+ 'xCanonicalMessageActions': [{

115+ 'parameter-type': "s",

116+ 'name': "action::reply",

117+ 'label': "Reply1"

118+ }

119+ ]

120+ };

121+ factory.menuData = menuData;

122+

123+ var loader = findChild(factory, "loader");

124+ verify(loader !== undefined);

125+

126+ tryCompare(loader.item, "objectName", "textMessage");

127+ compare(loader.item.title, data.title, "Title does not match data");

128+ compare(loader.item.time, data.time, "Time does not match data");

129+ compare(loader.item.message, data.message, "Message does not match data");

130+ compare(loader.item.avatar, data.avatar, "Avatar does not match data");

131+ compare(loader.item.appIcon, data.appIcon, "App icon does not match data");

132+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

133+ }

134+

135+

136+ function test_create_snapDecision_data() {

137+ return [

138+ { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},

139+ { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},

140+ ];

141+ }

142+

143+ function test_create_snapDecision(data) {

144+ menuData.type = "com.canonical.indicator.messages.messageitem";

145+ menuData.label = data.title;

146+ menuData.sensitive = data.enabled;

147+ menuData.ext = {

148+ 'xCanonicalTime': data.time,

149+ 'xCanonicalText': data.message,

150+ 'icon': data.avatar,

151+ 'xCanonicalAppIcon': data.appIcon,

152+ 'xCanonicalMessageActions': [{

153+ 'name': "action::callback",

154+ 'label': "Callback1"

155+ },{

156+ 'parameter-type': "s",

157+ 'name': "action::reply",

158+ 'label': "Reply1"

159+ }

160+ ]

161+ };

162+ factory.menuData = menuData;

163+

164+ var loader = findChild(factory, "loader");

165+ verify(loader !== undefined);

166+

167+ tryCompare(loader.item, "objectName", "snapDecision");

168+ compare(loader.item.title, data.title, "Title does not match data");

169+ compare(loader.item.time, data.time, "Time does not match data");

170+ compare(loader.item.message, data.message, "Message does not match data");

171+ compare(loader.item.avatar, data.avatar, "Avatar does not match data");

172+ compare(loader.item.appIcon, data.appIcon, "App icon does not match data");

173+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");

174+ }

175+

176+ }

177+}

tests/qmltests/Panel/tst_IndicatorRow.qml+2−1

@@ -32,6 +32,8 @@ Item {

32

33 function init_test()

34 {

35+ indicatorModel.load();

36+

35 indicatorRow.state = "initial";

37 indicatorRow.state = "initial";

36 indicatorRow.currentItem = null;

38 indicatorRow.currentItem = null;

37 indicatorRow.unitProgress = 0.0;

39 indicatorRow.unitProgress = 0.0;

@@ -53,7 +55,6 @@ Item {

53

55

54 Indicators.IndicatorsModel {

56 Indicators.IndicatorsModel {

55 id: indicatorModel

57 id: indicatorModel

56− Component.onCompleted: load()

57 }

58 }

58

59

59 UT.UnityTestCase {

60 UT.UnityTestCase {

tests/qmltests/Panel/tst_Indicators.qml+59−8

@@ -83,6 +83,8 @@ Item {

83 when: windowShown

84

85 function init() {

86+ indicators.initialise();

87+

86 indicators.hide();

88 indicators.hide();

87 tryCompare(indicators.hideAnimation, "running", false);

89 tryCompare(indicators.hideAnimation, "running", false);

88 tryCompare(indicators, "state", "initial");

90 tryCompare(indicators, "state", "initial");

@@ -161,21 +163,70 @@ Item {

161 compare(indicators.fullyOpened, true);

163 compare(indicators.fullyOpened, true);

162 }

164 }

163

165

166+ function init_invisible_indicator(identifier) {

167+ tryCompareFunction(function() { return findChild(indicators, identifier+"-widget") !== null }, true);

168+ var item = findChild(indicators, identifier+"-widget");

169+

170+ item.enabled = false;

171+ }

172+

164 function test_row_visible_menuContent_visible_data() { return [

173 function test_row_visible_menuContent_visible_data() { return [

165− {tag: "visible", index: 0, name: "indicator-fake1", visible: true },

174+ {tag: "first", visible: [false, true, true, true, true] },

166− {tag: "invisible", index: 1, name: "indicator-fake2", visible: false }]

175+ {tag: "adjacent", visible: [true, false, false, true, true] },

176+ {tag: "bounds", visible: [false, true, true, true, false] },

177+ {tag: "disjoint", visible: [true, false, true, false, true] },

178+ {tag: "last", visible: [true, true, true, true, false] }];

167 }

179 }

168

180

169 function test_row_visible_menuContent_visible(data) {

181 function test_row_visible_menuContent_visible(data) {

182+

183+ indicators.show();

184+

170 var indicatorTabs = findChild(indicators, "tabs");

185 var indicatorTabs = findChild(indicators, "tabs");

171− var rowRepeater = findChild(indicators, "rowRepeater");

186+ var rowRepeater = findChild(indicators, "rowRepeater")

187+

188+

189+ for (var i = 0; i< data.visible.length; i++) {

190+ if (data.visible[i] === false)

191+ init_invisible_indicator("indicator-fake" + (i + 1));

192+ }

193+

194+ for (i = 0; i < data.visible.length; i++) {

195+ var shouldBeVisible = data.visible[i];

172

196

197+ // check item visibility

173− var indicatorItem = rowRepeater.itemAt(data.index);

198+ var indicatorItem = rowRepeater.itemAt(i);

199+ tryCompare(indicatorItem, "visible", shouldBeVisible);

200+ // check tab visibility

174− tryCompareFunction(function() { return indicatorItem.width > 0}, true);

201+ tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (i + 1)) !== null }, shouldBeVisible);

175− tryCompare(indicatorItem, "visible", data.visible);

202+ }

203+ }

204+

205+ function test_indicator_visible_correct_tabs_data() { return [

206+ {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expected: 1 },

207+ {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expected: 3 },

208+ {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expected: 0 },

209+ {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expected: 1 }];

210+ }

211+

212+ function test_indicator_visible_correct_tabs(data) {

213+

214+ var indicatorTabs = findChild(indicators, "tabs");

215+ var indicatorRow = findChild(indicators, "indicatorRow");

216+

217+ indicators.show();

218+ indicatorRow.setCurrentItem(data.currentIndex);

219+ tryCompare(indicators, "fullyOpened", true);

220+

221+ for (var i = 0; i< data.visible.length; i++) {

222+ if (data.visible[i] === false)

223+ init_invisible_indicator("indicator-fake" + (i + 1));

224+ }

176

225

177− var indicatorTab = findChild(indicatorTabs, data.name)

226+ // check for current selected item

178− tryCompareFunction(function() { return indicatorTab !== undefined }, data.visible);

227+ tryCompare(indicatorRow, "currentItemIndex", data.expected);

228+ // check for current selected tab

229+ tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (data.expected + 1)) === indicatorTabs.selectedTab }, true);

179 }

230 }

180 }

231 }

181}

232}

tests/qmltests/Panel/tst_MenuContent.qml+2−2

@@ -103,13 +103,13 @@ Item {

103

104 function selected_tab_equals_test_tab() {

105 var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab

106− if (currentTab == undefined) {

106+ if (currentTab === null) {

107 console.log("selected tab undefined");

108 return false;

109 }

110

111 var testTab = menu_content_test.findChild(menuContent, testTabObjectName);

112− if (testTab == undefined) {

112+ if (testTab === null) {

113 console.log("test_tab " + testTabObjectName + " undefined");

114 return false;

115 }

tests/qmltests/Panel/tst_Panel.qml+14−12

@@ -56,6 +56,8 @@ Item {

56 }

57

58 function init() {

59+ panel.indicators.initialise();

60+

59 searchClicked = false;

61 searchClicked = false;

60 panel.indicators.hide();

62 panel.indicators.hide();

61 tryCompare(panel.indicators.hideAnimation, "running", false);

63 tryCompare(panel.indicators.hideAnimation, "running", false);

@@ -64,16 +66,16 @@ Item {

64

66

65 function get_indicator_item(index) {

67 function get_indicator_item(index) {

66 var rowRepeater = findChild(panel.indicators, "rowRepeater");

68 var rowRepeater = findChild(panel.indicators, "rowRepeater");

67− verify(rowRepeater != undefined);

69+ verify(rowRepeater !== null);

68 return rowRepeater.itemAt(index);

70 return rowRepeater.itemAt(index);

69 }

71 }

70

72

71 function get_indicator_item_position(index) {

73 function get_indicator_item_position(index) {

72 var indicatorRow = findChild(panel.indicators, "indicatorRow");

74 var indicatorRow = findChild(panel.indicators, "indicatorRow");

73− verify(indicatorRow != undefined);

75+ verify(indicatorRow !== null);

74

76

75 var indicatorItem = get_indicator_item(index);

77 var indicatorItem = get_indicator_item(index);

76− verify(indicatorItem != undefined);

78+ verify(indicatorItem !== null);

77

79

78 return panel.mapFromItem(indicatorItem, indicatorItem.width/2, indicatorItem.height/2);

80 return panel.mapFromItem(indicatorItem, indicatorItem.width/2, indicatorItem.height/2);

79 }

81 }

@@ -118,7 +120,7 @@ Item {

118 // no hint animation when fullscreen

120 // no hint animation when fullscreen

119 compare(panel.indicators.y, -panel.panelHeight);

121 compare(panel.indicators.y, -panel.panelHeight);

120 var indicatorRow = findChild(panel.indicators, "indicatorRow");

122 var indicatorRow = findChild(panel.indicators, "indicatorRow");

121− verify(indicatorRow != undefined);

123+ verify(indicatorRow !== null);

122 compare(indicatorRow.y, 0);

124 compare(indicatorRow.y, 0);

123 compare(panel.indicators.height, panel.indicators.panelHeight);

125 compare(panel.indicators.height, panel.indicators.panelHeight);

124 compare(panel.indicators.partiallyOpened, false,

126 compare(panel.indicators.partiallyOpened, false,

@@ -143,13 +145,13 @@ Item {

143 }

145 }

144

146

145 var indicatorRow = findChild(panel.indicators, "indicatorRow");

147 var indicatorRow = findChild(panel.indicators, "indicatorRow");

146− verify(indicatorRow != undefined);

148+ verify(indicatorRow !== null);

147

149

148 var rowRepeater = findChild(panel.indicators, "rowRepeater");

150 var rowRepeater = findChild(panel.indicators, "rowRepeater");

149− verify(indicatorRow != undefined);

151+ verify(indicatorRow !== null);

150

152

151 var menuContent = findChild(panel.indicators, "menuContent");

153 var menuContent = findChild(panel.indicators, "menuContent");

152− verify(indicatorRow != undefined);

154+ verify(indicatorRow !== null);

153

155

154 // Wait for the indicators to get into position.

156 // Wait for the indicators to get into position.

155 // (switches between normal and fullscreen modes are animated)

157 // (switches between normal and fullscreen modes are animated)

@@ -203,7 +205,7 @@ Item {

203 panel.searchVisible = true;

205 panel.searchVisible = true;

204

206

205 var searchIndicator = findChild(panel, "search");

207 var searchIndicator = findChild(panel, "search");

206− verify(searchIndicator != undefined);

208+ verify(searchIndicator !== null);

207

209

208 tap(searchIndicator, 1, 1);

210 tap(searchIndicator, 1, 1);

209

211

@@ -216,7 +218,7 @@ Item {

216 panel.searchVisible = false;

218 panel.searchVisible = false;

217

219

218 var searchIndicator = findChild(panel, "search");

220 var searchIndicator = findChild(panel, "search");

219− verify(searchIndicator != undefined);

221+ verify(searchIndicator !== null);

220

222

221 tap(searchIndicator, 1, 1);

223 tap(searchIndicator, 1, 1);

222

224

@@ -232,14 +234,14 @@ Item {

232 panel.searchVisible = false;

234 panel.searchVisible = false;

233

235

234 var indicatorRow = findChild(panel.indicators, "indicatorRow");

236 var indicatorRow = findChild(panel.indicators, "indicatorRow");

235− verify(indicatorRow != undefined);

237+ verify(indicatorRow !== null);

236

238

237 var rowRepeater = findChild(panel.indicators, "rowRepeater");

239 var rowRepeater = findChild(panel.indicators, "rowRepeater");

238− verify(indicatorRow != undefined);

240+ verify(indicatorRow !== null);

239

241

240 // Get the first indicator

242 // Get the first indicator

241 var indicatorItemFirst = get_indicator_item(0);

243 var indicatorItemFirst = get_indicator_item(0);

242− verify(indicatorItemFirst != undefined);

244+ verify(indicatorItemFirst !== undefined);

243

245

244 var indicatorItemCoordFirst = get_indicator_item_position(0);

246 var indicatorItemCoordFirst = get_indicator_item_position(0);

245 var indicatorItemCoordNext = get_indicator_item_position(indicatorRow.count - 1);

247 var indicatorItemCoordNext = get_indicator_item_position(indicatorRow.count - 1);

tests/utils/modules/Unity/Test/UnityTestCase.qml+2−2

@@ -83,7 +83,7 @@ TestCase {

83 }

84 childs.splice(0, 1);

85 }

86− return undefined;

86+ return null;

87 }

88

89 // Find an object with the given name in the children tree of "obj"

@@ -103,7 +103,7 @@ TestCase {

103 }

104 childs.splice(0, 1);

105 }

106− return undefined;

106+ return null;

107 }

108

109 // Type a full string instead of keyClick letter by letter