on xenial help sign in
Merged trunk.
bc9f5cdPawel Stolowski
Components/DragHandle.qmlnew file+148
@@ -0,0 +1,148 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
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 Ubuntu.Components 0.1
19+import Ubuntu.Gestures 0.1
20+
21+/*
22+ Put a DragHandle inside a Showable to enable the user to drag it from that handle.
23+ Main use case is to drag fullscreen Showables into the screen or off the screen.
24+
25+ This example shows a DragHandle placed on the right corner of a Showable, used
26+ to slide it away, off the screen.
27+
28+ Showable {
29+ x: 0
30+ y: 0
31+ width: ... // screen width
32+ height: ... // screen height
33+ shown: true
34+ ...
35+ DragHandle {
36+ anchors.right: parent.right
37+ anchors.top: parent.top
38+ anchors.bottom: parent.bottom
39+ width: units.gu(2)
40+
41+ direction: DirectionalDragArea::Leftwards
42+ }
43+ }
44+
45+ */
46+DirectionalDragArea {
47+ id: dragArea
48+
49+ // Once we are satisfied with those values, make them the default
50+ // and remove them from here for the sake of consistency
51+ maxDeviation: units.gu(1)
52+ wideningAngle: 20
53+ distanceThreshold: units.gu(3)
54+ minSpeed: units.gu(5)
55+
56+ // How far you can drag
57+ property real maxTotalDragDistance: Direction.isHorizontal(direction) ? parent.width : parent.height
58+
59+ property var __previousStatus
60+ property real __totalDragDistance: 0
61+
62+ property alias edgeDragEvaluator: dragEvaluator
63+
64+ EdgeDragEvaluator {
65+ objectName: "edgeDragEvaluator"
66+ id: dragEvaluator
67+ trackedPosition: Direction.isHorizontal(direction) ? parent.x + touchX : parent.y + touchY
68+ maxDragDistance: maxTotalDragDistance
69+ direction: dragArea.direction
70+ }
71+
72+ onDistanceChanged: {
73+ if (status === DirectionalDragArea.Recognized) {
74+ // don't go the whole distance in order to smooth out the movement
75+ var step = distance * 0.3;
76+
77+ step = __limitMovement(step);
78+
79+ __totalDragDistance += step;
80+
81+ if (Direction.isHorizontal(direction)) {
82+ parent.x += step;
83+ } else {
84+ parent.y += step;
85+ }
86+ }
87+ }
88+
89+
90+ function __limitMovement(step) {
91+ if (Direction.isPositive(direction)) {
92+ if (__totalDragDistance + step > maxTotalDragDistance) {
93+ step = maxTotalDragDistance - __totalDragDistance;
94+ } else if (__totalDragDistance + step < 0) {
95+ step = 0 - __totalDragDistance;
96+ }
97+ } else {
98+ if (__totalDragDistance + step < -maxTotalDragDistance) {
99+ step = -maxTotalDragDistance - __totalDragDistance;
100+ } else if (__totalDragDistance + step > 0) {
101+ step = 0 - __totalDragDistance;
102+ }
103+ }
104+
105+ return step;
106+ }
107+
108+ onStatusChanged: {
109+ if (status === DirectionalDragArea.WaitingForTouch) {
110+ if (__previousStatus === DirectionalDragArea.Recognized) {
111+ __onFinishedRecognizedGesture();
112+ }
113+ __totalDragDistance = 0;
114+ }
115+ else if (status === DirectionalDragArea.Undecided) {
116+ dragEvaluator.reset();
117+ }
118+ else if (status === DirectionalDragArea.Recognized) {
119+ if (__previousStatus === DirectionalDragArea.WaitingForTouch)
120+ dragEvaluator.reset();
121+ }
122+ __previousStatus = status;
123+ }
124+
125+ function __onFinishedRecognizedGesture() {
126+ if (dragEvaluator.shouldAutoComplete()) {
127+ __completeDrag();
128+ } else {
129+ __rollbackDrag();
130+ }
131+ }
132+
133+ function __completeDrag() {
134+ if (parent.shown) {
135+ parent.hide();
136+ } else {
137+ parent.show();
138+ }
139+ }
140+
141+ function __rollbackDrag() {
142+ if (parent.shown) {
143+ parent.show();
144+ } else {
145+ parent.hide();
146+ }
147+ }
148+}
Components/EdgeDragEvaluator.qmlnew file+88
@@ -0,0 +1,88 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
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 Ubuntu.Components 0.1
19+import Ubuntu.Gestures 0.1
20+
21+/*
22+ Evaluates end velocity (velocity at the moment the gesture ends) and travelled
23+ distance (delta between finger down and finger up positions) to determine
24+ whether the drag should continue by itself towards completion (auto-complete)
25+ after the finger has left the touchscreen.
26+ */
27+AxisVelocityCalculator {
28+
29+ // How far the drag can go, or should go to achieve completion.
30+ property real maxDragDistance
31+
32+ // Ending a drag at any point before this threshold will need some positive velocity
33+ // (i.e., towards the set direction) to get auto-completion (e.g. to get show()
34+ // called for a hidden Showable) and ending a drag at any point after this
35+ // threshold will need some negative velocity to avoid auto-completion.
36+ property real dragThreshold: maxDragDistance / 2
37+
38+ property real minDragDistance: maxDragDistance * 0.1
39+
40+ // Speed needed to get auto-completion for an hypothetical flick of length zero.
41+ //
42+ // This requirement is gradually reduced as flicks gets longer until it reaches
43+ // a value of zero for flicks of dragThreshold lenght.
44+ //
45+ // in pixels per second
46+ property real speedThreshold: units.gu(70)
47+
48+ property int direction
49+
50+ property real velocity
51+ property real minVelocity
52+
53+ // Returns whether the drag should continue by itself until completed.
54+ function shouldAutoComplete() {
55+ var deltaPos = trackedPosition - __startPosition;
56+ if (Math.abs(deltaPos) < minDragDistance) {
57+ velocity = 0;
58+ minVelocity = 0;
59+ return false;
60+ }
61+
62+ minVelocity = __calculateMinimumVelocityForAutoCompletion(deltaPos);
63+ velocity = calculate();
64+
65+ if (Direction.isPositive(direction) && (velocity >= minVelocity)
66+ || !Direction.isPositive(direction) && (velocity <= minVelocity)) {
67+ return true;
68+ } else {
69+ return false;
70+ }
71+ }
72+
73+ property real __startPosition
74+
75+ // speedThreshold in pixels per millisecond
76+ property real __speedThresholdMs: speedThreshold / 1000.0
77+
78+ // Minimum velocity when a drag total distance is zero
79+ property real __v0: Direction.isPositive(direction) ? __speedThresholdMs : - __speedThresholdMs
80+
81+ function __calculateMinimumVelocityForAutoCompletion(distance) {
82+ return __v0 - ((__speedThresholdMs / dragThreshold) * distance);
83+ }
84+
85+ function reset() {
86+ __startPosition = trackedPosition;
87+ }
88+}
Components/IconUtil.js+5−5
@@ -26,17 +26,17 @@ function from_gicon(name) {
26 var base_icon_re = /'base-icon':.+?'(.+?)'/;
26 var base_icon_re = /'base-icon':.+?'(.+?)'/;
27 var base_icon = name.toString().match(base_icon_re);
27 var base_icon = name.toString().match(base_icon_re);
28 icon_name = base_icon[1];
28 icon_name = base_icon[1];
29− }
30− else {
29+ } else {
31 var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;
30 var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;
32 var themed = name.match(themed_re);
31 var themed = name.match(themed_re);
33 if (themed) {
32 if (themed) {
34 return "image://gicon/" + themed[1];
33 return "image://gicon/" + themed[1];
35 }
34 }
36 }
35 }
37− var remote_re = /^http/;
36+ var name_re = /^[a-z0-9\._-]+$/;
38− if (remote_re.test(icon_name)) {
37+ if (name_re.test(icon_name)) {
38+ return "image://gicon/" + icon_name;
39+ } else {
39 return icon_name;
40 return icon_name;
40 }
41 }
41− return "image://gicon/" + icon_name;
42}
42}
Components/Stage.qml+7−5
@@ -416,9 +416,11 @@ Showable {
416 }
416 }
417 }
417 }
418
418
419− AxisVelocityCalculator {
419+ EdgeDragEvaluator {
420− id: dragVelocityCalculator
420+ id: dragEvaluator
421− trackedPosition: rightEdgeDraggingArea.distance
421+ trackedPosition: rightEdgeDraggingArea.touchX
422+ direction: rightEdgeDraggingArea.direction
423+ maxDragDistance: stage.width
422 }
424 }
423
425
424 DirectionalDragArea {
426 DirectionalDragArea {
@@ -478,7 +480,7 @@ Showable {
478 }
480 }
479
481
480 function onUndecided() {
482 function onUndecided() {
481− dragVelocityCalculator.reset()
483+ dragEvaluator.reset();
482
484
483 var nextApplication = null;
485 var nextApplication = null;
484 if (stage.applications.count > 1) {
486 if (stage.applications.count > 1) {
@@ -491,7 +493,7 @@ Showable {
491 }
493 }
492
494
493 function onGestureEnded() {
495 function onGestureEnded() {
494− if (stage.applications.count > 1 && dragVelocityCalculator.calculate() < 0) {
496+ if (stage.applications.count > 1 && dragEvaluator.shouldAutoComplete()) {
495 switchToApplicationAnimationController.completeToEndWithSignal();
497 switchToApplicationAnimationController.completeToEndWithSignal();
496 } else {
498 } else {
497 switchToApplicationAnimationController.completeToBeginningWithSignal();
499 switchToApplicationAnimationController.completeToBeginningWithSignal();
Components/WrongPasswordAnimation.qml+3−3
@@ -26,14 +26,14 @@ SequentialAnimation {
26 property: "anchors.horizontalCenterOffset"
26 property: "anchors.horizontalCenterOffset"
27 duration: 50
27 duration: 50
28 easing.type: Easing.InQuad
28 easing.type: Easing.InQuad
29− to: units.gu(2)
29+ to: units.gu(1)
30 }
30 }
31 NumberAnimation {
31 NumberAnimation {
32 target: root.target
32 target: root.target
33 property: "anchors.horizontalCenterOffset"
33 property: "anchors.horizontalCenterOffset"
34 duration: 100
34 duration: 100
35 easing.type: Easing.InOutQuad
35 easing.type: Easing.InOutQuad
36− to: -units.gu(2)
36+ to: -units.gu(1)
37 }
37 }
38 NumberAnimation {
38 NumberAnimation {
39 target: root.target
39 target: root.target
@@ -41,6 +41,6 @@ SequentialAnimation {
41 properties: "anchors.horizontalCenterOffset"
41 properties: "anchors.horizontalCenterOffset"
42 to: 0
42 to: 0
43 duration: 400
43 duration: 400
44− easing.overshoot: units.gu(2)
44+ easing.overshoot: units.gu(1)
45 }
45 }
46}
46}
Dash/Apps/ApplicationsFilterGrid.qml+3−2
@@ -17,11 +17,12 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import "../../Components"
18import "../../Components"
19import "../../Applications"
19import "../../Applications"
20+import "../../Components/IconUtil.js" as IconUtil
20
21
21FilterGrid {
22FilterGrid {
22 id: filterGrid
23 id: filterGrid
23
24
24− filter: true
25+ filter: false
25 expandable: false
26 expandable: false
26 minimumHorizontalSpacing: units.gu(0.5)
27 minimumHorizontalSpacing: units.gu(0.5)
27 maximumNumberOfColumns: 6
28 maximumNumberOfColumns: 6
@@ -50,7 +51,7 @@ FilterGrid {
50 text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
51 text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
51 imageWidth: units.gu(8)
52 imageWidth: units.gu(8)
52 imageHeight: units.gu(7.5)
53 imageHeight: units.gu(7.5)
53− source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
54+ source: IconUtil.from_gicon(icon)
54 onClicked: filterGrid.clicked(index, application.desktopFile);
55 onClicked: filterGrid.clicked(index, application.desktopFile);
55 }
56 }
56}
57}
Greeter/Greeter.qml+26
@@ -16,14 +16,23 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import Ubuntu.Gestures 0.1
19import LightDM 0.1 as LightDM
20import LightDM 0.1 as LightDM
20import "../Components"
21import "../Components"
22+import "../Components/Math.js" as MathLocal
21
23
22Showable {
24Showable {
23 id: greeter
25 id: greeter
24 enabled: shown
26 enabled: shown
25 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
27 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
26
28
29+ // 1 when fully shown and 0 when fully hidden
30+ property real showProgress: MathLocal.clamp((width + x) / width, 0, 1)
31+
32+ showAnimation: StandardAnimation { property: "x"; to: 0 }
33+ hideAnimation: StandardAnimation { property: "x"; to: -width }
34+
35+ property alias dragHandleWidth: dragHandle.width
27 property alias model: greeterContentLoader.model
36 property alias model: greeterContentLoader.model
28 property bool locked: shown && multiUser && !greeterContentLoader.promptless
37 property bool locked: shown && multiUser && !greeterContentLoader.promptless
29
38
@@ -91,4 +100,21 @@ Showable {
91 }
100 }
92 }
101 }
93 ]
102 ]
103+
104+ DragHandle {
105+ id: dragHandle
106+
107+ anchors.top: parent.top
108+ anchors.bottom: parent.bottom
109+ anchors.right: parent.right
110+
111+ // no need for requiring a directional drag since we are covering the screen
112+ // anyway (i.e., no change user could be trying to interact with some other
113+ // UI element)
114+ distanceThreshold: 0
115+
116+ enabled: !greeter.locked
117+
118+ direction: Direction.Leftwards
119+ }
94}
120}
Greeter/GreeterContent.qml+3−1
@@ -80,7 +80,9 @@ MouseArea {
80 source: greeter.narrowMode ? "" : "LoginList.qml"
80 source: greeter.narrowMode ? "" : "LoginList.qml"
81
81
82 onLoaded: {
82 onLoaded: {
83− item.currentIndex = greeterContentLoader.currentIndex
83+ item.currentIndex = greeterContentLoader.currentIndex;
84+ selected(item.currentIndex);
85+ item.resetAuthentication();
84 }
86 }
85
87
86 Binding {
88 Binding {
Greeter/Lockscreen.qml+7−1
@@ -41,7 +41,14 @@ Showable {
41 signal cancel()
41 signal cancel()
42 signal emergencyCall()
42 signal emergencyCall()
43
43
44+ onRequiredChanged: {
45+ if (required && pinPadLoader.item) {
46+ pinPadLoader.item.clear(false);
47+ }
48+ }
49+
44 function reset() {
50 function reset() {
51+ // This causes the loader below to destry and recreate the source
45 pinPadLoader.resetting = true;
52 pinPadLoader.resetting = true;
46 pinPadLoader.resetting = false;
53 pinPadLoader.resetting = false;
47 }
54 }
@@ -140,7 +147,6 @@ Showable {
140 }
147 }
141 if (LightDM.Greeter.authenticated) {
148 if (LightDM.Greeter.authenticated) {
142 root.unlocked();
149 root.unlocked();
143− pinPadLoader.item.clear(false);
144 } else {
150 } else {
145 pinPadLoader.item.clear(true);
151 pinPadLoader.item.clear(true);
146 }
152 }
Greeter/LoginList.qml−8
@@ -66,14 +66,6 @@ Item {
66
66
67 readonly property bool movingInternally: moveTimer.running || userList.moving
67 readonly property bool movingInternally: moveTimer.running || userList.moving
68
68
69− onCountChanged: {
70− // Start authentication when we start up
71− if (!LightDM.Greeter.authenticationUser && userList.currentItem) {
72− root.selected(userList.currentIndex);
73− root.resetAuthentication();
74− }
75− }
76−
77 onCurrentIndexChanged: {
69 onCurrentIndexChanged: {
78 if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
70 if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
79 root.resetAuthentication();
71 root.resetAuthentication();
Launcher/Launcher.qml+5−5
@@ -50,7 +50,7 @@ Item {
50 }
50 }
51
51
52 function hide() {
52 function hide() {
53− state = ""
53+ switchToNextState("")
54 }
54 }
55
55
56 function switchToNextState(state) {
56 function switchToNextState(state) {
@@ -215,11 +215,11 @@ Item {
215
215
216 onDraggingChanged: {
216 onDraggingChanged: {
217 if (!dragging) {
217 if (!dragging) {
218− if (distance > root.width / 2) {
218+ if (distance > panel.width / 2) {
219− root.dash()
220− root.switchToNextState("")
221− } else if (distance > panel.width/2) {
222 root.switchToNextState("visible")
219 root.switchToNextState("visible")
220+ if (distance > panel.width * 2) {
221+ root.dash()
222+ }
223 } else {
223 } else {
224 root.switchToNextState("")
224 root.switchToNextState("")
225 }
225 }
Launcher/LauncherDelegate.qml+202−39
@@ -25,6 +25,8 @@ Item {
25 property real angle: 0
25 property real angle: 0
26 property bool highlighted: false
26 property bool highlighted: false
27 property real offset: 0
27 property real offset: 0
28+ property alias brightness: transformEffect.brightness
29+ property real itemOpacity: 1
28
30
29 property real maxAngle: 0
31 property real maxAngle: 0
30 property bool inverted: false
32 property bool inverted: false
@@ -32,74 +34,237 @@ Item {
32 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
34 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
33 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
35 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
34
36
35− property int itemsBeforeThis: 0
36− property int itemsAfterThis: 0
37−
38 property bool dragging:false
37 property bool dragging:false
39
38
40 signal clicked()
39 signal clicked()
41 signal longtap()
40 signal longtap()
42 signal released()
41 signal released()
43
42
44− UbuntuShape {
43+ Item {
45 id: iconItem
44 id: iconItem
46− color: Qt.rgba(0, 0, 1, 0.5)
47 width: parent.width
45 width: parent.width
48 height: parent.height
46 height: parent.height
49 anchors.centerIn: parent
47 anchors.centerIn: parent
50− anchors.verticalCenterOffset: root.offset + (height - root.effectiveHeight)/2 * (angle < 0 ? -1 : 1)
51− rotation: root.inverted ? 180 : 0
52− radius: "medium"
53−
54− transform: Rotation {
55− axis { x: 1; y: 0; z: 0 }
56− origin { x: iconItem.width / 2; y: iconItem.height / 2; z: 0 }
57− angle: root.angle
58− }
59−
60− image: Image {
61− source: "../graphics/applicationIcons/" + root.iconName + ".png"
62− }
63
48
64− MouseArea {
49+ UbuntuShape {
65− id: mouseArea
50+ id: iconShape
66 anchors.fill: parent
51 anchors.fill: parent
67− onClicked: root.clicked()
52+ anchors.margins: units.gu(0.5)
68− onCanceled: root.released()
53+ radius: "medium"
69− preventStealing: false
70
54
71− onPressAndHold: {
55+ image: Image {
72− root.state = "moving"
56+ id: iconImage
57+ sourceSize.width: iconShape.width
58+ sourceSize.height: iconShape.height
59+ source: "../graphics/applicationIcons/" + root.iconName + ".png"
73 }
60 }
61+
62+ MouseArea {
63+ id: mouseArea
64+ anchors.fill: parent
65+ onClicked: root.clicked()
66+ onCanceled: root.released()
67+ preventStealing: false
68+ enabled: root.angle < 5
69+
70+ onPressAndHold: {
71+ root.state = "moving"
72+ }
74− onReleased: {
73+ onReleased: {
75− root.state = "docked"
74+ root.state = "docked"
75+ }
76 }
76 }
77 }
77 }
78−
79 BorderImage {
78 BorderImage {
80 id: overlayHighlight
79 id: overlayHighlight
81 anchors.centerIn: iconItem
80 anchors.centerIn: iconItem
82 rotation: inverted ? 180 : 0
81 rotation: inverted ? 180 : 0
83− source: root.highlighted || mouseArea.pressed ? "graphics/selected.sci" : "graphics/non-selected.sci"
82+ source: isSelected ? "graphics/selected.sci" : "graphics/non-selected.sci"
84− width: iconItem.width + units.gu(1.5)
83+ width: root.width + units.gu(0.5)
85 height: width
84 height: width
85+ property bool isSelected: root.highlighted || mouseArea.pressed
86+ onIsSelectedChanged: shaderEffectSource.scheduleUpdate();
86 }
87 }
87 }
88 }
88
89
90+ ShaderEffect {
91+ id: transformEffect
92+ anchors.centerIn: parent
93+ anchors.verticalCenterOffset: root.offset
94+ width: parent.width
95+ height: parent.height
96+ property real itemOpacity: root.itemOpacity
97+ property real brightness: 0
98+ property real angle: root.angle
99+ rotation: root.inverted ? 180 : 0
100+
101+
102+ property variant source: ShaderEffectSource {
103+ id: shaderEffectSource
104+ sourceItem: iconItem
105+ hideSource: true
106+ live: false
107+ }
108+
109+ transform: [
110+ // Rotating 3 times at top/bottom because that increases the perspective.
111+ // This is a hack, but as QML does not support real 3D coordinates
112+ // getting a higher perspective can only be done by a hack. This is the most
113+ // readable/understandable one I could come up with.
114+ Rotation {
115+ axis { x: 1; y: 0; z: 0 }
116+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
117+ angle: root.angle * 0.7
118+ },
119+ Rotation {
120+ axis { x: 1; y: 0; z: 0 }
121+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
122+ angle: root.angle * 0.7
123+ },
124+ Rotation {
125+ axis { x: 1; y: 0; z: 0 }
126+ origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
127+ angle: root.angle * 0.7
128+ },
129+ // Because rotating it 3 times moves it more to the front/back, i.e. it gets
130+ // bigger/smaller and we need a scale to compensate that again.
131+ Scale {
132+ xScale: 1 - (Math.abs(angle) / 500)
133+ yScale: 1 - (Math.abs(angle) / 500)
134+ origin { x: iconItem.width / 2; y: iconItem.height / 2}
135+ }
136+ ]
137+
138+ // Using a fragment shader instead of QML's opacity and BrightnessContrast
139+ // to be able to do both in one step which gives quite some better performance
140+ fragmentShader: "
141+ varying highp vec2 qt_TexCoord0;
142+ uniform sampler2D source;
143+ uniform lowp float brightness;
144+ uniform lowp float itemOpacity;
145+ void main(void)
146+ {
147+ highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
148+ sourceColor.rgb = mix(sourceColor.rgb, vec3(step(0.0, brightness)), abs(brightness));
149+ sourceColor *= itemOpacity;
150+ gl_FragColor = sourceColor;
151+ }"
152+ }
153+
154+ QtObject {
155+ id: priv
156+
157+ property ListView listView: root.ListView.view
158+ property real totalUnfoldedHeight: listView.itemSize + listView.spacing
159+ property real totalEffectiveHeight: effectiveHeight + listView.spacing
160+ property real effectiveContentY: listView.contentY - listView.originY
161+ property real effectiveY: y - listView.originY
162+ property real distanceFromTopEdge: -(effectiveContentY + listView.topMargin - index*totalUnfoldedHeight)
163+ property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (effectiveY+height) + effectiveContentY
164+
165+ property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
166+ property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1
167+
168+ property real overlapWithFoldingArea: listView.foldingAreaHeight - distanceFromEdge
169+ }
170+
89 states: [
171 states: [
90 State {
172 State {
91 name: "docked"
173 name: "docked"
92 PropertyChanges {
174 PropertyChanges {
93 target: root
175 target: root
94− offset: if (launcherFlickable.contentY > itemsBeforeThis * (foldedHeight + launcherColumn.spacing*2)) {
176+
95− return launcherFlickable.contentY - (index * (foldedHeight + launcherColumn.spacing*2));
177+ // This is the offset that keeps the items inside the panel
96− } else if (y + height - launcherFlickable.contentY > launcherFlickable.height - (itemsAfterThis*(foldedHeight - launcherColumn.spacing))) {
178+ offset: {
97− return launcherFlickable.height - (y+height) + launcherFlickable.contentY - (itemsAfterThis*(foldedHeight - launcherColumn.spacing));
179+ // First/last items are special
98− } else {
180+ if (index == 0 || index == priv.listView.count-1) {
99− return 0;
181+ // Just keep them bound to the edges in case they're outside of the visible area
182+ if (priv.distanceFromEdge < 0) {
183+ return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;
184+ }
185+ return 0;
186+ }
187+
188+ // Are we already completely outside the flickable? Stop the icon here.
189+ if (priv.distanceFromEdge < -priv.totalUnfoldedHeight) {
190+ return (-priv.distanceFromEdge - (root.height - effectiveHeight)) * priv.orientationFlag;
191+ }
192+
193+ // We're touching the edge, move slower than the actual flicking speed.
194+ if (priv.distanceFromEdge < 0) {
195+ return (Math.abs(priv.distanceFromEdge) * priv.totalEffectiveHeight / priv.totalUnfoldedHeight) * priv.orientationFlag
196+ }
197+ return 0;
198+ }
199+
200+ // The angle used for rotating
201+ angle: {
202+ // First/last items are special
203+ if (index == 0 || index == priv.listView.count-1) {
204+ if (priv.distanceFromEdge < 0) {
205+ // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
206+ return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingAreaHeight)) * priv.orientationFlag
100 }
207 }
101− angle: -Math.min(Math.max(offset * maxAngle / foldedHeight, -maxAngle), maxAngle)
208+ return 0; // Don't fold first/last item as long as inside the view
209+ }
102
210
211+ // Are we in the already completely outside the flickable? Fold for the last 5 degrees
212+ if (priv.distanceFromEdge < 0) {
213+ // proportion equation: -distanceFromTopEdge : angle = totalUnfoldedHeight : 5
214+ return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.listView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag
215+ }
216+
217+ // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees
218+ if (priv.overlapWithFoldingArea > 0) {
219+ // proportion equation: overlap: totalHeight = angle : (maxAngle - 5)
220+ return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.listView.foldingAreaHeight * priv.orientationFlag;
221+ }
222+ return 0;
223+ }
224+
225+ itemOpacity: {
226+ // First/last items are special
227+ if (index == 0 || index == priv.listView.count-1) {
228+ if (priv.distanceFromEdge < 0) {
229+ // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)
230+ return 1.0 - (-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
231+ }
232+ return 1; // Don't make first/last item transparent as long as inside the view
233+ }
234+
235+ // Are we already completely outside the flickable? Fade from 0.75 to 0 in 2 items height
236+ if (priv.distanceFromEdge < 0) {
237+ // proportion equation: -distanceFromEdge : 1-opacity = totalUnfoldedHeight : 0.75
238+ return 0.75 - (-priv.distanceFromEdge * 0.75 / (priv.totalUnfoldedHeight*2))
239+ }
240+
241+ // We are overlapping with the folding area, fade out to 0.75
242+ if (priv.overlapWithFoldingArea > 0) {
243+ // proportion equation: overlap : totalHeight = 1-opacity : 0.25
244+ return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.listView.foldingAreaHeight)
245+ }
246+ return 1;
247+ }
248+
249+ brightness: {
250+ // First/last items are special
251+ if (index == 0 || index == priv.listView.count-1) {
252+ if (priv.distanceFromEdge < 0) {
253+ return -(-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
254+ }
255+ return 0;
256+ }
257+ // Are we already completely outside the flickable? Fade from 0.7 to 0 in 2 items height
258+ if (priv.distanceFromEdge < 0) {
259+ return -0.3 - (-priv.distanceFromEdge * 0.1 / (priv.totalUnfoldedHeight*2))
260+ }
261+
262+ // We are overlapping with the folding area, fade out to 0.7
263+ if (priv.overlapWithFoldingArea > 0) {
264+ return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingAreaHeight)
265+ }
266+ return 0;
267+ }
103 }
268 }
104 },
269 },
105
270
@@ -121,7 +286,5 @@ Item {
121 drag.target: root
286 drag.target: root
122 }
287 }
123 }
288 }
124−
125 ]
289 ]
126−
127}
290}
Launcher/LauncherPanel.qml+106−52
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity 0.1
19import Unity 0.1
20+import "../Components/ListItems"
20
21
21Item {
22Item {
22 id: root
23 id: root
@@ -26,7 +27,7 @@ Item {
26 property var model
27 property var model
27 property bool inverted: true
28 property bool inverted: true
28 property bool dragging: false
29 property bool dragging: false
29− property bool moving: launcherFlickable.moving
30+ property bool moving: launcherListView.moving || launcherListView.flicking
30 property int dragPosition: 0
31 property int dragPosition: 0
31 property int highlightIndex: -1
32 property int highlightIndex: -1
32
33
@@ -34,23 +35,23 @@ Item {
34 signal dashItemSelected(int index)
35 signal dashItemSelected(int index)
35
36
36 onDragPositionChanged: {
37 onDragPositionChanged: {
37− var effectiveDragPosition = root.inverted ? launcherFlickable.height - dragPosition : dragPosition - mainColumn.anchors.margins
38+ var effectiveDragPosition = root.inverted ? launcherListView.height - dragPosition : dragPosition - mainColumn.anchors.margins
38
39
39− var hiddenContentHeight = launcherFlickable.contentHeight - launcherFlickable.height
40+ var hiddenContentHeight = launcherListView.contentHeight - launcherListView.height
40 // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
41 // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
41− var scrollableHeight = launcherFlickable.height - (launcherFlickable.itemSize + launcherColumn.spacing) *2
42+ var scrollableHeight = launcherListView.height - (launcherListView.itemSize + launcherColumn.spacing) *2
42 // As we shortened the scrollableHeight, lets move everything down by the itemSize
43 // As we shortened the scrollableHeight, lets move everything down by the itemSize
43− var shortenedEffectiveDragPosition = effectiveDragPosition - launcherFlickable.itemSize - launcherColumn.spacing
44+ var shortenedEffectiveDragPosition = effectiveDragPosition - launcherListView.itemSize - launcherColumn.spacing
44 var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
45 var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
45
46
46 // limit top/bottom to prevent overshooting
47 // limit top/bottom to prevent overshooting
47− launcherFlickable.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
48+ launcherListView.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
48
49
49 // Now calculate the current index:
50 // Now calculate the current index:
50 // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
51 // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
51 // > adjust that removing all the margins
52 // > adjust that removing all the margins
52 // > divide by itemSize to get index
53 // > divide by itemSize to get index
53− highlightIndex = (effectiveDragPosition + launcherFlickable.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherFlickable.itemSize + launcherColumn.spacing)
54+ highlightIndex = (effectiveDragPosition + launcherListView.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherListView.itemSize + launcherColumn.spacing)
54 }
55 }
55
56
56 BorderImage {
57 BorderImage {
@@ -61,58 +62,111 @@ Item {
61
62
62 Column {
63 Column {
63 id: mainColumn
64 id: mainColumn
65+ anchors {
64− anchors.fill: parent
66+ fill: parent
65− anchors.margins: units.gu(1)
67+ topMargin: units.gu(0.5)
68+ bottomMargin: units.gu(1)
69+ leftMargin: units.gu(0.5)
70+ rightMargin: units.gu(0.5)
71+ }
66− spacing: units.gu(1)
72+ spacing: units.gu(0.5)
67
73
68− LauncherDelegate {
74+ MouseArea {
69 id: dashItem
75 id: dashItem
70− objectName: "dashItem"
76+ width: parent.width
71− width: launcherFlickable.itemSize
77+ height: units.gu(6.5)
72− height: launcherFlickable.itemSize
73− anchors.horizontalCenter: parent.horizontalCenter
74− iconName: "dash"
75 onClicked: root.dashItemSelected(0)
78 onClicked: root.dashItemSelected(0)
79+ z: 1
80+ Image {
81+ objectName: "dashItem"
82+ width: units.gu(5.5)
83+ height: width
84+ anchors.centerIn: parent
85+ source: "graphics/home.png"
86+ }
76 }
87 }
77− Flickable {
88+ ThinDivider {
78− id: launcherFlickable
89+ anchors {
90+ left: parent.left
91+ right: parent.right
92+ margins: -mainColumn.anchors.leftMargin
93+ }
94+ rotation: root.rotation
95+ }
96+
97+ Item {
79 anchors.left: parent.left
98 anchors.left: parent.left
80 anchors.right: parent.right
99 anchors.right: parent.right
81− height: parent.height - dashItem.height - parent.spacing
100+ height: parent.height - dashItem.height - parent.spacing*2
82− contentHeight: launcherColumn.height
101+ ListView {
83−
102+ id: launcherListView
84− property int itemSize: width
103+ anchors.fill: parent
85−
104+ anchors.topMargin: -itemSize
86− Column {
105+ anchors.bottomMargin: -itemSize
87− id: launcherColumn
106+ topMargin: itemSize
88− width: parent.width
107+ bottomMargin: itemSize
89− spacing: units.gu(1)
108+ height: parent.height - dashItem.height - parent.spacing*2
90− anchors.horizontalCenter: parent.horizontalCenter
109+ model: root.model
91−
110+ cacheBuffer: itemSize * 3
92− Repeater {
111+ snapMode: ListView.SnapToItem
93− id: iconRepeater
112+ highlightRangeMode: ListView.ApplyRange
94− model: root.model
113+ preferredHighlightBegin: (height - itemSize) / 2
95−
114+ preferredHighlightEnd: (height + itemSize) / 2
115+
116+ // The height of the area where icons start getting folded
117+ property int foldingAreaHeight: itemSize * 0.75
118+ property int itemSize: width
119+
120+ Component.onCompleted: {
121+ // This is needed because snapping would partially fold
122+ // the first item on initialisation. This can only be
123+ // overridden by mouse interactions - which is what flick()
124+ // simulates. Setting contentY to 0 would not work because
125+ // of this.
126+ flick(0, units.gu(20))
127+ }
128+
96− LauncherDelegate {
129+ delegate: LauncherDelegate {
97− id: launcherDelegate
130+ id: launcherDelegate
98− objectName: "launcherDelegate" + index
131+ objectName: "launcherDelegate" + index
99− width: launcherFlickable.itemSize
132+ width: launcherListView.itemSize
100− height: launcherFlickable.itemSize
133+ height: launcherListView.itemSize
101− iconName: model.icon
134+ iconName: model.icon
102− inverted: root.inverted
135+ inverted: root.inverted
103− highlighted: root.dragging && index === root.highlightIndex
136+ highlighted: root.dragging && index === root.highlightIndex
104− z: -Math.abs(offset)
137+ z: -Math.abs(offset)
105− state: "docked"
138+ state: "docked"
106−
107− maxAngle: 60
139+ maxAngle: 60
108−
140+
109− itemsBeforeThis: index
110− itemsAfterThis: iconRepeater.count - (index+1)
111−
112− onClicked: {
141+ onClicked: {
113− root.applicationSelected(launcherModel.get(index).desktopFile);
142+ root.applicationSelected(launcherModel.get(index).desktopFile);
143+ }
144+ }
145+
146+ MouseArea {
147+ id: topFoldingArea
148+ anchors {
149+ left: parent.left
150+ right: parent.right
151+ top: parent.top
152+ topMargin: launcherListView.topMargin
114− }
153+ }
154+ height: launcherListView.itemSize
155+ enabled: launcherListView.contentY > -launcherListView.topMargin
156+ onClicked: launcherListView.flick(0, units.gu(40))
157+ }
158+
159+ MouseArea {
160+ id: bottomFoldingArea
161+ anchors {
162+ left: parent.left
163+ right: parent.right
164+ bottom: parent.bottom
165+ bottomMargin: launcherListView.bottomMargin
115 }
166 }
167+ height: launcherListView.itemSize
168+ enabled: launcherListView.contentHeight - launcherListView.height - launcherListView.contentY > -launcherListView.bottomMargin
169+ onClicked: launcherListView.flick(0, -units.gu(40))
116 }
170 }
117 }
171 }
118 }
172 }
Launcher/graphics/home@18.pngnew file

Binary file not shown.

Shell.qml+37−40
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Application 0.1
18import Ubuntu.Application 0.1
19import Ubuntu.Components 0.1
19import Ubuntu.Components 0.1
20+import Ubuntu.Gestures 0.1
20import LightDM 0.1 as LightDM
21import LightDM 0.1 as LightDM
21import "Dash"
22import "Dash"
22import "Greeter"
23import "Greeter"
@@ -167,7 +168,14 @@ FocusScope {
167
168
168 contentScale: 1.0 - 0.2 * disappearingAnimationProgress
169 contentScale: 1.0 - 0.2 * disappearingAnimationProgress
169 opacity: 1.0 - disappearingAnimationProgress
170 opacity: 1.0 - disappearingAnimationProgress
170− property real disappearingAnimationProgress: ((greeter.shown) ? greeterRevealer.animatedProgress : stagesRevealer.animatedProgress)
171+ property real disappearingAnimationProgress: {
172+ if (greeter.shown) {
173+ return greeter.showProgress;
174+ } else {
175+ return stagesOuterContainer.showProgress;
176+ }
177+ }
178+
171 // FIXME: only necessary because stagesRevealer.animatedProgress and
179 // FIXME: only necessary because stagesRevealer.animatedProgress and
172 // greeterRevealer.animatedProgress are not animated
180 // greeterRevealer.animatedProgress are not animated
173 Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
181 Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
@@ -176,26 +184,29 @@ FocusScope {
176
184
177
185
178 Item {
186 Item {
187+ id: stagesOuterContainer
179
188
180 width: parent.width
189 width: parent.width
181 height: parent.height
190 height: parent.height
182 x: launcher.progress
191 x: launcher.progress
183 Behavior on x {SmoothedAnimation{velocity: 600}}
192 Behavior on x {SmoothedAnimation{velocity: 600}}
184
193
194+ property real showProgress:
195+ MathLocal.clamp(1 - (x + stages.x) / shell.width, 0, 1)
185
196
186 Showable {
197 Showable {
187 id: stages
198 id: stages
188
199
189− property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
200+ x: width
190− && parent.x == 0
191
201
192− property bool fullyHidden: !shown && stages[stagesRevealer.boundProperty] == stagesRevealer.closedValue
202+ property bool fullyShown: shown && x == 0 && parent.x == 0
203+ property bool fullyHidden: !shown && x == width
193 available: !greeter.shown
204 available: !greeter.shown
194 hides: [launcher, panel.indicators]
205 hides: [launcher, panel.indicators]
195 shown: false
206 shown: false
196 opacity: 1.0
207 opacity: 1.0
197− showAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.openedValue; easing.type: Easing.OutCubic }
208+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }
198− hideAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.closedValue; easing.type: Easing.OutCubic }
209+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: width; easing.type: Easing.OutCubic }
199
210
200 width: parent.width
211 width: parent.width
201 height: parent.height
212 height: parent.height
@@ -326,24 +337,19 @@ FocusScope {
326 height: sideStage.height
337 height: sideStage.height
327 orientation: Qt.Horizontal
338 orientation: Qt.Horizontal
328 }
339 }
329− }
330− }
331
340
341+ DragHandle {
342+ id: stagesRevealer
332
343
333− Revealer {
344+ anchors.top: parent.top
334− id: stagesRevealer
345+ anchors.bottom: parent.bottom
335−
346+ anchors.right: parent.left
336− property real animatedProgress: MathLocal.clamp((-dragPosition - launcher.progress) / closedValue, 0, 1)
347+
348+ width: shell.edgeSize
349+ direction: Direction.Leftwards
337− enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
350+ enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
338− direction: Qt.RightToLeft
351+ }
339− openedValue: 0
352+ }
340− hintDisplacement: units.gu(3)
341− handleSize: shell.edgeSize
342− closedValue: width
343− target: stages
344− width: stages.width
345− height: stages.height
346− orientation: Qt.Horizontal
347 }
353 }
348
354
349 Lockscreen {
355 Lockscreen {
@@ -380,7 +386,7 @@ FocusScope {
380 } else {
386 } else {
381 lockscreen.alphaNumeric = true
387 lockscreen.alphaNumeric = true
382 }
388 }
383− lockscreen.placeholderText = i18n.tr("Please enter %1:").arg(text);
389+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
384 lockscreen.show();
390 lockscreen.show();
385 }
391 }
386 }
392 }
@@ -392,12 +398,13 @@ FocusScope {
392 available: true
398 available: true
393 hides: [launcher, panel.indicators, hud]
399 hides: [launcher, panel.indicators, hud]
394 shown: true
400 shown: true
395− showAnimation: StandardAnimation { property: "x"; to: greeterRevealer.openedValue }
401+
396− hideAnimation: StandardAnimation { property: "x"; to: greeterRevealer.closedValue }
397 y: panel.panelHeight
402 y: panel.panelHeight
398 width: parent.width
403 width: parent.width
399 height: parent.height - panel.panelHeight
404 height: parent.height - panel.panelHeight
400
405
406+ dragHandleWidth: shell.edgeSize
407+
401 property var previousMainApp: null
408 property var previousMainApp: null
402 property var previousSideApp: null
409 property var previousSideApp: null
403
410
@@ -439,19 +446,6 @@ FocusScope {
439 blockInput: greeter.shown || lockscreen.shown
446 blockInput: greeter.shown || lockscreen.shown
440 }
447 }
441
448
442− Revealer {
443− id: greeterRevealer
444−
445− property real animatedProgress: MathLocal.clamp(-dragPosition / closedValue, 0, 1)
446− target: greeter
447− width: greeter.width
448− height: greeter.height
449− handleSize: shell.edgeSize
450− orientation: Qt.Horizontal
451− visible: greeter.shown
452− enabled: !greeter.locked
453− }
454−
455 Item {
449 Item {
456 id: overlay
450 id: overlay
457
451
@@ -550,8 +544,11 @@ FocusScope {
550 stages.hide();
544 stages.hide();
551 }
545 }
552 onDash: {
546 onDash: {
547+ if (stages.shown) {
553− dash.setCurrentScope("applications.scope", true, false)
548+ dash.setCurrentScope("applications.scope", true, false)
554− stages.hide();
549+ stages.hide();
550+ launcher.hide();
551+ }
555 }
552 }
556 onLauncherApplicationSelected:{
553 onLauncherApplicationSelected:{
557 greeter.hide()
554 greeter.hide()
debian/changelog+32
@@ -1,3 +1,35 @@
1+unity8 (7.81.2) saucy; urgency=low
2+
3+ * Translation updates.
4+
5+ [ Michał Sawicz ]
6+ * Fix icons in ApplicationsFilterGrid.qml.
7+ * Support flipped image in run_on_device.
8+
9+ [ Michael Zanetti ]
10+ * Don't clear lockscreen when it's fading out.
11+ * Reworked Launcher folding.
12+ * Tweak Launcher revealing.
13+
14+ [ Michal Hruby ]
15+ * Add content_type property to category models.
16+
17+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 26 Jun 2013 18:10:39 +0200
18+
19+unity8 (7.81.1) saucy; urgency=low
20+
21+ * Translation updates.
22+
23+ [ Michał Sawicz ]
24+ * Don't limit installed apps.
25+ * Pre-optimize PNGs to speed-up builds.
26+ * Clean up build scripts.
27+
28+ [ Daniel d'Andrada ]
29+ * Use DirectionalDragArea in BottomBar.
30+
31+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 21 Jun 2013 17:37:02 +0200
32+
1unity8 (7.81.0) saucy; urgency=low
33unity8 (7.81.0) saucy; urgency=low
2
34
3 * Translation updates.
35 * Translation updates.
main.cpp+26−6
@@ -31,13 +31,33 @@
31#include "MouseTouchAdaptor.h"
31#include "MouseTouchAdaptor.h"
32
32
33namespace {
33namespace {
34+
35+void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
36+{
37+ QStringList importPathList = engine->importPathList();
38+ for (int i = paths.count() -1; i >= 0; i--) {
39+ // don't duplicate
40+ const QString& path = paths[i];
41+ QStringList::iterator iter = qFind(importPathList.begin(), importPathList.end(), path);
42+ if (iter == importPathList.end())
43+ importPathList.prepend(path);
44+ }
45+ engine->setImportPathList(importPathList);
46+}
47+
34/* When you append and import path to the list of import paths it will be the *last*
48/* When you append and import path to the list of import paths it will be the *last*
35 place where Qt will search for QML modules.
49 place where Qt will search for QML modules.
36 The usual QQmlEngine::addImportPath() actually prepends the given path.*/
50 The usual QQmlEngine::addImportPath() actually prepends the given path.*/
37−void appendImportPath(QQmlEngine *engine, const QString &path)
51+void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
38{
52{
39 QStringList importPathList = engine->importPathList();
53 QStringList importPathList = engine->importPathList();
54+ Q_FOREACH(const QString& path, paths) {
55+ // don't duplicate
56+ QStringList::iterator iter = qFind(importPathList.begin(), importPathList.end(), path);
57+ if (iter == importPathList.end())
40− importPathList.append(path);
58+ importPathList.append(path);
59+ }
60+ importPathList.append(paths);
41 engine->setImportPathList(importPathList);
61 engine->setImportPathList(importPathList);
42}
62}
43
63
@@ -88,7 +108,7 @@ int main(int argc, char** argv)
88 QQuickView* view = new QQuickView();
108 QQuickView* view = new QQuickView();
89 view->setResizeMode(QQuickView::SizeRootObjectToView);
109 view->setResizeMode(QQuickView::SizeRootObjectToView);
90 view->setTitle("Qml Phone Shell");
110 view->setTitle("Qml Phone Shell");
91− view->engine()->setBaseUrl(QUrl::fromLocalFile(shellAppDirectory()));
111+ view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()));
92 if (args.contains(QLatin1String("-frameless"))) {
112 if (args.contains(QLatin1String("-frameless"))) {
93 view->setFlags(Qt::FramelessWindowHint);
113 view->setFlags(Qt::FramelessWindowHint);
94 }
114 }
@@ -114,9 +134,9 @@ int main(int argc, char** argv)
114 QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
134 QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
115
135
116 QUrl source("Shell.qml");
136 QUrl source("Shell.qml");
117− view->engine()->addImportPath(shellAppDirectory());
137+ prependImportPaths(view->engine(), QStringList() << ::shellAppDirectory());
118− view->engine()->addImportPath(shellImportPath());
138+ prependImportPaths(view->engine(), ::shellImportPaths());
119− appendImportPath(view->engine(), fakePluginsImportPath());
139+ appendImportPaths(view->engine(), QStringList() << ::fakePluginsImportPath());
120 view->setSource(source);
140 view->setSource(source);
121 view->setColor("transparent");
141 view->setColor("transparent");
122
142
paths.h.in+10−3
@@ -17,6 +17,9 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */
18 */
19
19
20+#ifndef PATHS_H
21+#define PATHS_H
22+
20// Qt
23// Qt
21#include <QtCore/QCoreApplication>
24#include <QtCore/QCoreApplication>
22#include <QtCore/QDir>
25#include <QtCore/QDir>
@@ -43,12 +46,14 @@ inline QString shellAppDirectory() {
43 }
46 }
44}
47}
45
48
46−inline QString shellImportPath() {
49+inline QStringList shellImportPaths() {
50+ QStringList paths;
47 if (isRunningInstalled()) {
51 if (isRunningInstalled()) {
48− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
52+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
49 } else {
53 } else {
50− return QString("@CMAKE_BINARY_DIR@/plugins/");
54+ paths << QString("@CMAKE_BINARY_DIR@/plugins");
51 }
55 }
56+ return paths;
52}
57}
53
58
54inline QString fakePluginsImportPath() {
59inline QString fakePluginsImportPath() {
@@ -62,3 +67,5 @@ inline QString fakePluginsImportPath() {
62inline QString sourceDirectory() {
67inline QString sourceDirectory() {
63 return QString("@CMAKE_SOURCE_DIR@/");
68 return QString("@CMAKE_SOURCE_DIR@/");
64}
69}
70+
71+#endif
plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+31−16
@@ -21,9 +21,10 @@
21#include "AxisVelocityCalculator.h"
21#include "AxisVelocityCalculator.h"
22#include <QtCore/QElapsedTimer>
22#include <QtCore/QElapsedTimer>
23
23
24−class RealTimeSource : public AxisVelocityCalculator::TimeSource {
24+class RealTimeSource : public UbuntuGestures::TimeSource {
25public:
25public:
26− RealTimeSource() {
26+ RealTimeSource()
27+ : UbuntuGestures::TimeSource() {
27 m_timer.start();
28 m_timer.start();
28 }
29 }
29 virtual qint64 msecsSinceReference() {
30 virtual qint64 msecsSinceReference() {
@@ -33,23 +34,17 @@ private:
33 QElapsedTimer m_timer;
34 QElapsedTimer m_timer;
34};
35};
35
36
36−
37AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
37AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
38− : AxisVelocityCalculator(new RealTimeSource, parent)
39−{
40−}
41−
42−AxisVelocityCalculator::AxisVelocityCalculator(TimeSource *timeSource, QObject *parent)
43 : QObject(parent)
38 : QObject(parent)
44− , m_timeSource(timeSource)
39+ , m_timeSource(new RealTimeSource)
45 , m_trackedPosition(0.0)
40 , m_trackedPosition(0.0)
46{
41{
42+ m_timeSource->setParent(this);
47 reset();
43 reset();
48}
44}
49
45
50AxisVelocityCalculator::~AxisVelocityCalculator()
46AxisVelocityCalculator::~AxisVelocityCalculator()
51{
47{
52− delete m_timeSource;
53}
48}
54
49
55qreal AxisVelocityCalculator::trackedPosition() const
50qreal AxisVelocityCalculator::trackedPosition() const
@@ -59,13 +54,17 @@ qreal AxisVelocityCalculator::trackedPosition() const
59
54
60void AxisVelocityCalculator::setTrackedPosition(qreal newPosition)
55void AxisVelocityCalculator::setTrackedPosition(qreal newPosition)
61{
56{
57+ processMovement(newPosition - m_trackedPosition);
58+
62− if (newPosition == m_trackedPosition) {
59+ if (newPosition != m_trackedPosition) {
63− return;
60+ m_trackedPosition = newPosition;
61+ Q_EMIT trackedPositionChanged(newPosition);
64 }
62 }
63+}
65
64
65+void AxisVelocityCalculator::updateIdleTime()
66+{
66− processMovement(newPosition - m_trackedPosition);
67+ processMovement(0);
67− m_trackedPosition = newPosition;
68− Q_EMIT trackedPositionChanged(newPosition);
69}
68}
70
69
71void AxisVelocityCalculator::processMovement(qreal movement)
70void AxisVelocityCalculator::processMovement(qreal movement)
@@ -83,11 +82,12 @@ void AxisVelocityCalculator::processMovement(qreal movement)
83 m_samplesWrite = (m_samplesWrite + 1) % MAX_SAMPLES;
82 m_samplesWrite = (m_samplesWrite + 1) % MAX_SAMPLES;
84}
83}
85
84
86−qreal AxisVelocityCalculator::calculate() const
85+qreal AxisVelocityCalculator::calculate()
87{
86{
88 if (numSamples() < MIN_SAMPLES_NEEDED) {
87 if (numSamples() < MIN_SAMPLES_NEEDED) {
89 return 0.0;
88 return 0.0;
90 }
89 }
90+ updateIdleTime(); // consider the time elapsed since the last update and now
91
91
92 int lastIndex;
92 int lastIndex;
93 if (m_samplesWrite == 0) {
93 if (m_samplesWrite == 0) {
@@ -141,3 +141,18 @@ int AxisVelocityCalculator::numSamples() const
141 }
141 }
142 }
142 }
143}
143}
144+
145+void AxisVelocityCalculator::setTimeSource(UbuntuGestures::TimeSource *timeSource)
146+{
147+ if (m_timeSource && m_timeSource->parent() == this)
148+ delete m_timeSource;
149+
150+ m_timeSource = timeSource;
151+
152+ if (numSamples() > 0) {
153+ qWarning("AxisVelocityCalculator: changing time source while there are samples present.");
154+ // Any existent samples are based on the old time source and are, therefore, incompatible
155+ // with this new one.
156+ reset();
157+ }
158+}
plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+31−20
@@ -25,6 +25,19 @@
25#include <stdint.h>
25#include <stdint.h>
26#include <QtCore/QObject>
26#include <QtCore/QObject>
27
27
28+namespace UbuntuGestures {
29+/*
30+ Interface for a time source.
31+ */
32+class UBUNTUGESTURES_EXPORT TimeSource : public QObject {
33+ Q_OBJECT
34+public:
35+ virtual ~TimeSource() {}
36+ /* Returns the current time in milliseconds since some reference time in the past. */
37+ virtual qint64 msecsSinceReference() = 0;
38+};
39+}
40+
28/*
41/*
29 Estimates the current velocity of a finger based on recent movement along an axis
42 Estimates the current velocity of a finger based on recent movement along an axis
30
43
@@ -59,27 +72,11 @@ class UBUNTUGESTURES_EXPORT AxisVelocityCalculator : public QObject
59 NOTIFY trackedPositionChanged)
72 NOTIFY trackedPositionChanged)
60public:
73public:
61
74
62− /*
63− Interface for a time source.
64− */
65− class TimeSource {
66− public:
67− virtual ~TimeSource() {}
68− /* Returns the current time in milliseconds since some reference time in the past. */
69− virtual qint64 msecsSinceReference() = 0;
70− };
71−
72 /*
75 /*
73 Regular constructor
76 Regular constructor
74 */
77 */
75 AxisVelocityCalculator(QObject *parent = 0);
78 AxisVelocityCalculator(QObject *parent = 0);
76
79
77− /*
78− Extended constructor useful for testing purposes where you can inject
79− a fake time source implementation.
80− */
81− AxisVelocityCalculator(TimeSource *timeSource, QObject *parent = 0);
82−
83 virtual ~AxisVelocityCalculator();
80 virtual ~AxisVelocityCalculator();
84
81
85 qreal trackedPosition() const;
82 qreal trackedPosition() const;
@@ -88,7 +85,7 @@ public:
88 /*
85 /*
89 Calculates the finger velocity, in axis units/millisecond
86 Calculates the finger velocity, in axis units/millisecond
90 */
87 */
91− Q_INVOKABLE qreal calculate() const;
88+ Q_INVOKABLE qreal calculate();
92
89
93 /*
90 /*
94 Removes all stored movements from previous calls to setTrackedPosition()
91 Removes all stored movements from previous calls to setTrackedPosition()
@@ -97,6 +94,11 @@ public:
97
94
98 int numSamples() const;
95 int numSamples() const;
99
96
97+ /*
98+ Replaces the TimeSource with the given one. Useful for testing purposes.
99+ */
100+ void setTimeSource(UbuntuGestures::TimeSource *timeSource);
101+
100 /*
102 /*
101 The minimum amount of samples needed for a velocity calculation.
103 The minimum amount of samples needed for a velocity calculation.
102 */
104 */
@@ -105,18 +107,27 @@ public:
105 /*
107 /*
106 Maximum number of movement samples stored
108 Maximum number of movement samples stored
107 */
109 */
108− static const int MAX_SAMPLES = 10;
110+ static const int MAX_SAMPLES = 50;
109
111
110 /*
112 /*
111 Age of the oldest sample considered in the velocity calculations, in
113 Age of the oldest sample considered in the velocity calculations, in
112 milliseconds, compared to the most recent one.
114 milliseconds, compared to the most recent one.
113 */
115 */
114− static const int AGE_OLDEST_SAMPLE = 200;
116+ static const int AGE_OLDEST_SAMPLE = 100;
115
117
116Q_SIGNALS:
118Q_SIGNALS:
117 void trackedPositionChanged(qreal value);
119 void trackedPositionChanged(qreal value);
118
120
119private:
121private:
122+
123+ /*
124+ Inform that trackedPosition remained motionless since the time it was
125+ last changed.
126+
127+ It's the same as calling setTrackedPosition(trackedPosition())
128+ */
129+ void updateIdleTime();
130+
120 /*
131 /*
121 How much the finger has moved since processMovement() was last called.
132 How much the finger has moved since processMovement() was last called.
122 */
133 */
@@ -134,7 +145,7 @@ private:
134 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
145 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
135 int m_samplesWrite; /* index where the next sample will be written */
146 int m_samplesWrite; /* index where the next sample will be written */
136
147
137− TimeSource *m_timeSource;
148+ UbuntuGestures::TimeSource *m_timeSource;
138
149
139 qreal m_trackedPosition;
150 qreal m_trackedPosition;
140};
151};
plugins/Ubuntu/Gestures/Direction.cpp+5
@@ -25,3 +25,8 @@ bool Direction::isVertical(Direction::Type type)
25{
25{
26 return type == Direction::Upwards || type == Direction::Downwards;
26 return type == Direction::Upwards || type == Direction::Downwards;
27}
27}
28+
29+bool Direction::isPositive(Direction::Type type)
30+{
31+ return type == Rightwards || type == Downwards;
32+}
plugins/Ubuntu/Gestures/Direction.h+1
@@ -38,6 +38,7 @@ public:
38
38
39 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
39 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
40 Q_INVOKABLE static bool isVertical(Direction::Type type);
40 Q_INVOKABLE static bool isVertical(Direction::Type type);
41+ Q_INVOKABLE static bool isPositive(Direction::Type type);
41};
42};
42
43
43#endif // DIRECTION_H
44#endif // DIRECTION_H
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+7−6
@@ -141,12 +141,9 @@ void DirectionalDragArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *tim
141 }
141 }
142}
142}
143
143
144−void DirectionalDragArea::setAxisVelocityCalculator(AxisVelocityCalculator *newVelCalc)
144+void DirectionalDragArea::setTimeSource(UbuntuGestures::TimeSource *timeSource)
145{
145{
146− if (m_velocityCalculator->parent() == this)
146+ m_velocityCalculator->setTimeSource(timeSource);
147− delete m_velocityCalculator;
148−
149− m_velocityCalculator = newVelCalc;
150}
147}
151
148
152qreal DirectionalDragArea::distance() const
149qreal DirectionalDragArea::distance() const
@@ -203,7 +200,11 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
203 m_numSamplesOnLastSpeedCheck = 0;
200 m_numSamplesOnLastSpeedCheck = 0;
204 m_silenceTime = 0;
201 m_silenceTime = 0;
205 setPreviousPos(m_startPos);
202 setPreviousPos(m_startPos);
203+
204+ if (m_distanceThreshold > 0)
206− setStatus(Undecided);
205+ setStatus(Undecided);
206+ else
207+ setStatus(Recognized);
207 }
208 }
208}
209}
209
210
plugins/Ubuntu/Gestures/DirectionalDragArea.h+2−2
@@ -172,8 +172,8 @@ public:
172 // Useful for providing a fake timer when testing.
172 // Useful for providing a fake timer when testing.
173 void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
173 void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
174
174
175− // Useful for testing, where a calculator with a fake time source can be supplied
175+ // Useful for testing, where a fake time source can be supplied
176− void setAxisVelocityCalculator(AxisVelocityCalculator *velCalc);
176+ void setTimeSource(UbuntuGestures::TimeSource *timeSource);
177
177
178Q_SIGNALS:
178Q_SIGNALS:
179 void directionChanged(Direction::Type direction);
179 void directionChanged(Direction::Type direction);
plugins/Unity/categories.cpp+26−17
@@ -30,6 +30,7 @@ Categories::Categories(QObject* parent)
30 m_roles[Categories::RoleName] = "name";
30 m_roles[Categories::RoleName] = "name";
31 m_roles[Categories::RoleIcon] = "icon";
31 m_roles[Categories::RoleIcon] = "icon";
32 m_roles[Categories::RoleRenderer] = "renderer";
32 m_roles[Categories::RoleRenderer] = "renderer";
33+ m_roles[Categories::RoleContentType] = "content_type";
33 m_roles[Categories::RoleHints] = "hints";
34 m_roles[Categories::RoleHints] = "hints";
34 m_roles[Categories::RoleResults] = "results";
35 m_roles[Categories::RoleResults] = "results";
35 m_roles[Categories::RoleCount] = "count";
36 m_roles[Categories::RoleCount] = "count";
@@ -111,22 +112,30 @@ Categories::data(const QModelIndex& index, int role) const
111 return QVariant();
112 return QVariant();
112 }
113 }
113
114
115+ switch (role) {
114− if (role == RoleId) {
116+ case RoleId:
115− return QVariant::fromValue(index.row());
117+ return QVariant::fromValue(index.row());
116− } else if (role == RoleName) {
118+ case RoleName:
117− return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
119+ return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
118− } else if (role == RoleIcon) {
120+ case RoleIcon:
119− return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
121+ return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
120− } else if (role == RoleRenderer) {
122+ case RoleRenderer:
121− return QVariant::fromValue(DeeListModel::data(index, 3)); //RENDERER_NAME
123+ return QVariant::fromValue(DeeListModel::data(index, 3)); //RENDERER_NAME
124+ case RoleContentType:
125+ {
126+ auto hints = QVariant::fromValue(DeeListModel::data(index, 4)).toHash();
127+ return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
128+ }
122− } else if (role == RoleHints) {
129+ case RoleHints:
123− return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
130+ return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
124− } else if (role == RoleResults) {
131+ case RoleResults:
125− return QVariant::fromValue(getFilter(index.row()));
132+ return QVariant::fromValue(getFilter(index.row()));
126− } else if (role == RoleCount) {
133+ case RoleCount:
134+ {
127− CategoryFilter* filter = getFilter(index.row());
135+ CategoryFilter* filter = getFilter(index.row());
128− return QVariant::fromValue(filter->rowCount());
136+ return QVariant::fromValue(filter->rowCount());
129− } else {
137+ }
138+ default:
130− return QVariant();
139+ return QVariant();
131 }
140 }
132}
141}
plugins/Unity/categories.h+1
@@ -46,6 +46,7 @@ public:
46 RoleName,
46 RoleName,
47 RoleIcon,
47 RoleIcon,
48 RoleRenderer,
48 RoleRenderer,
49+ RoleContentType,
49 RoleHints,
50 RoleHints,
50 RoleResults,
51 RoleResults,
51 RoleCount
52 RoleCount
po/ar.po+40−48
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-14 21:09+0000\n"
11+"PO-Revision-Date: 2013-06-22 16:15+0000\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "متوفرة للتنزيل"
109msgid "Apps"
109msgid "Apps"
110msgstr "تطبيقات"
110msgstr "تطبيقات"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "تطبيقات مألوفة"
114msgstr "تطبيقات مألوفة"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "الأشخاص المفضلون"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "أشخاص كانوا على اتصال مؤخرا"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "آخر الصوتيات المشغلة"
118msgstr "آخر الصوتيات المشغلة"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "فيديوهات رائجة على الإنترنت"
122msgstr "فيديوهات رائجة على الإنترنت"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "الرئيسية"
126msgstr "الرئيسية"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "موسيقى"
146msgstr "موسيقى"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "المفضلات"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "على اتصال موخرا"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "أشخاص جدد"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "أشخاص"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "الشائع على الإنترنت"
150msgstr "الشائع على الإنترنت"
@@ -193,18 +165,18 @@ msgstr "النجوم:"
193msgid "Author:"
165msgid "Author:"
194msgstr "المؤلف:"
166msgstr "المؤلف:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "مكالمة طوارئ"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "مرحبا %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "مرحبًا"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "الجهاز"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "نمط الطيران"
207msgstr "نمط الطيران"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "ابحث"
211msgstr "ابحث"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "عذراً، لا يوجد ما يطابق بحثك."
215msgstr "عذراً، لا يوجد ما يطابق بحثك."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "الشاشة الرئيسية"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "أشخاص"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "الشاشة الرئيسية"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "الأشخاص المفضلون"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "أشخاص كانوا على اتصال مؤخرا"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "على اتصال موخرا"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "أشخاص جدد"
242+
243+#~ msgid "Favourites"
244+#~ msgstr "المفضلات"
po/az.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Tətbiqlər"
110msgstr "Tətbiqlər"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Ev"
126msgstr "Ev"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Musiqi"
146msgstr "Musiqi"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "İnsanlar"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Axtar"
211msgstr "Axtar"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."
215msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Əsas Ekran"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "İnsanlar"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Əsas Ekran"
po/bg.po+24−44
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-19 15:47+0000\n"
11"PO-Revision-Date: 2013-06-19 15:47+0000\n"
12"Last-Translator: Miroslav E. Hadzhiev (Хаджиев) "
12"Last-Translator: Miroslav E. Hadzhiev (Хаджиев) "
13"<miroslav.hadzhiev@gmail.com>\n"
13"<miroslav.hadzhiev@gmail.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"MIME-Version: 1.0\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
19−"X-Generator: Launchpad (build 16673)\n"
19+"X-Generator: Launchpad (build 16681)\n"
20
20
21#: Applications/applications.js:23
21#: Applications/applications.js:23
22msgid "Phone"
22msgid "Phone"
@@ -110,27 +110,19 @@ msgstr ""
110msgid "Apps"
110msgid "Apps"
111msgstr "Приложения"
111msgstr "Приложения"
112
112
113−#: Dash/DashHome.qml:43
113+#: Dash/DashHome.qml:40
114msgid "Frequent Apps"
114msgid "Frequent Apps"
115msgstr ""
115msgstr ""
116
116
117−#: Dash/DashHome.qml:46
117+#: Dash/DashHome.qml:43
118−msgid "Favourite People"
119−msgstr ""
120−
121−#: Dash/DashHome.qml:49
122−msgid "People Recently in Touch"
123−msgstr ""
124−
125−#: Dash/DashHome.qml:52
126msgid "Recent Music"
118msgid "Recent Music"
127msgstr ""
119msgstr ""
128
120
129−#: Dash/DashHome.qml:55
121+#: Dash/DashHome.qml:46
130msgid "Videos Popular Online"
122msgid "Videos Popular Online"
131msgstr ""
123msgstr ""
132
124
133−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
125+#: Dash/DashHome.qml:175
134msgid "Home"
126msgid "Home"
135msgstr "Начало"
127msgstr "Начало"
136
128
@@ -154,26 +146,6 @@ msgstr ""
154msgid "Music"
146msgid "Music"
155msgstr "Музика"
147msgstr "Музика"
156
148
157−#: Dash/DashPeople.qml:31
158−msgid "Favourites"
159−msgstr "Любими"
160−
161−#: Dash/DashPeople.qml:32
162−msgid "Recently in touch"
163−msgstr ""
164−
165−#: Dash/DashPeople.qml:33
166−msgid "New Contacts"
167−msgstr ""
168−
169−#: Dash/DashPeople.qml:34
170−msgid "A-Z"
171−msgstr "А-Я"
172−
173−#: Dash/DashPeople.qml:123
174−msgid "People"
175−msgstr "Хора"
176−
177#: Dash/DashVideos.qml:31
149#: Dash/DashVideos.qml:31
178msgid "Popular Online"
150msgid "Popular Online"
179msgstr ""
151msgstr ""
@@ -194,7 +166,7 @@ msgstr ""
194msgid "Author:"
166msgid "Author:"
195msgstr "Автор:"
167msgstr "Автор:"
196
168
197−#: Greeter/Lockscreen.qml:126
169+#: Greeter/Lockscreen.qml:133
198msgid "Emergency call"
170msgid "Emergency call"
199msgstr ""
171msgstr ""
200
172
@@ -235,19 +207,27 @@ msgstr "Устройство"
235msgid "Flight mode"
207msgid "Flight mode"
236msgstr ""
208msgstr ""
237
209
238−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
210+#: Panel/SearchIndicator.qml:26
239msgid "Search"
211msgid "Search"
240msgstr "Търсене"
212msgstr "Търсене"
241
213
242−#: plugins/Unity/lens.cpp:333
214+#: plugins/Unity/scope.cpp:268
243msgid "Sorry, there is nothing that matches your search."
215msgid "Sorry, there is nothing that matches your search."
244msgstr "Съжаляваме, няма нищо, което да отговаря на вашето търсене."
216msgstr "Съжаляваме, няма нищо, което да отговаря на вашето търсене."
245
217
246−#: plugins/Unity/lenses.cpp:39
247−msgid "Home screen"
248−msgstr "Начален екран"
249−
250−#: Shell.qml:380
218+#: Shell.qml:383
251#, qt-format
219#, qt-format
252−msgid "Please enter %1:"
220+msgid "Please enter %1"
253msgstr ""
221msgstr ""
222+
223+#~ msgid "Favourites"
224+#~ msgstr "Любими"
225+
226+#~ msgid "People"
227+#~ msgstr "Хора"
228+
229+#~ msgid "A-Z"
230+#~ msgstr "А-Я"
231+
232+#~ msgid "Home screen"
233+#~ msgstr "Начален екран"
po/ca.po+24−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Disponibles per baixar"
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplicacions"
110msgstr "Aplicacions"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Aplicacions freqüents"
114msgstr "Aplicacions freqüents"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Gent preferida"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Gent amb qui heu parlat"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Música recent"
118msgstr "Música recent"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Vídeos populars en línia"
122msgstr "Vídeos populars en línia"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Inici"
126msgstr "Inici"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Música"
146msgstr "Música"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Gent"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,27 @@ msgstr "Dispositiu"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Mode d'avió"
207msgstr "Mode d'avió"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Cerca"
211msgstr "Cerca"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "No hi ha res que coincideixi amb la cerca"
215msgstr "No hi ha res que coincideixi amb la cerca"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla d'inici"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Gent"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Pantalla d'inici"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Gent preferida"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Gent amb qui heu parlat"
po/de.po+41−49
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-15 20:04+0000\n"
11+"PO-Revision-Date: 2013-06-23 18:17+0000\n"
12−"Last-Translator: Eduard Gotwig <eduardgotwig@gmail.com>\n"
12+"Last-Translator: Phillip Sz <Unknown>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Zum Herunterladen verfügbar"
109msgid "Apps"
109msgid "Apps"
110msgstr "Anwendungen"
110msgstr "Anwendungen"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Häufig genutzte Anwendungen"
114msgstr "Häufig genutzte Anwendungen"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Lieblingspersonen"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Zuletzt kontaktierte Personen"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Zuletzt gehörte Musik"
118msgstr "Zuletzt gehörte Musik"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Beliebte Online-Videos"
122msgstr "Beliebte Online-Videos"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Start"
126msgstr "Start"
135
127
@@ -153,26 +145,6 @@ msgstr "Top Tabellenplatz"
153msgid "Music"
145msgid "Music"
154msgstr "Musik"
146msgstr "Musik"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Favoriten"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Kürzlich im Gespräch"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "Neue Kontakte"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Personen"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Online Beliebt"
150msgstr "Online Beliebt"
@@ -193,18 +165,18 @@ msgstr "Darsteller:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Autor:"
166msgstr "Autor:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "Notruf"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "Hallo %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "Hallo"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "Gerät"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Flugmodus"
207msgstr "Flugmodus"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Suchen"
211msgstr "Suchen"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Entschuldigung, es wurden keine Treffer erzielt."
215msgstr "Entschuldigung, es wurden keine Treffer erzielt."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Startseite"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Personen"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Startseite"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Lieblingspersonen"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Zuletzt kontaktierte Personen"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "Kürzlich im Gespräch"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "Neue Kontakte"
242+
243+#~ msgid "Favourites"
244+#~ msgstr "Favoriten"
po/el.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Greek <el@li.org>\n"
13"Language-Team: Greek <el@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Εφαρμογές"
110msgstr "Εφαρμογές"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Αρχή"
126msgstr "Αρχή"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Μουσική"
146msgstr "Μουσική"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Πρόσωπα"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Αναζήτηση"
211msgstr "Αναζήτηση"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να ταιριάζει στην αναζήτησή σας."
215msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να ταιριάζει στην αναζήτησή σας."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Αρχική οθόνη"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Πρόσωπα"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Αρχική οθόνη"
po/en_AU.po+36−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-18 20:36+0000\n"
11"PO-Revision-Date: 2013-06-18 20:36+0000\n"
12"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"
12"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Available for download"
109msgid "Apps"
109msgid "Apps"
110msgstr "Apps"
110msgstr "Apps"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Frequent Apps"
114msgstr "Frequent Apps"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Favourite People"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "People Recently in Touch"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Recent Music"
118msgstr "Recent Music"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Videos Popular Online"
122msgstr "Videos Popular Online"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Home"
126msgstr "Home"
135
127
@@ -153,26 +145,6 @@ msgstr "Top Charting"
153msgid "Music"
145msgid "Music"
154msgstr "Music"
146msgstr "Music"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Favourites"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Recently in touch"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "New Contacts"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "People"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Popular Online"
150msgstr "Popular Online"
@@ -193,7 +165,7 @@ msgstr "Starring:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Author:"
166msgstr "Author:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,39 @@ msgstr "Device"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Flight mode"
207msgstr "Flight mode"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Search"
211msgstr "Search"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Sorry, there is nothing that matches your search."
215msgstr "Sorry, there is nothing that matches your search."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home screen"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "People"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Home screen"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Favourite People"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "People Recently in Touch"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "Recently in touch"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "New Contacts"
242+
243+#~ msgid "Favourites"
244+#~ msgstr "Favourites"
po/en_GB.po+41−49
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-14 12:43+0000\n"
11+"PO-Revision-Date: 2013-06-27 00:22+0000\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Available for download"
109msgid "Apps"
109msgid "Apps"
110msgstr "Apps"
110msgstr "Apps"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Frequent Apps"
114msgstr "Frequent Apps"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Favourite People"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "People Recently in Touch"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Recent Music"
118msgstr "Recent Music"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Videos Popular Online"
122msgstr "Videos Popular Online"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Home"
126msgstr "Home"
135
127
@@ -153,26 +145,6 @@ msgstr "Top Charting"
153msgid "Music"
145msgid "Music"
154msgstr "Music"
146msgstr "Music"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Favourites"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Recently in touch"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "New Contacts"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "People"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Popular Online"
150msgstr "Popular Online"
@@ -193,18 +165,18 @@ msgstr "Starring:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Author:"
166msgstr "Author:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "Emergency call"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "Hello %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "Hello"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "Device"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Flight mode"
207msgstr "Flight mode"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Search"
211msgstr "Search"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Sorry, there is nothing that matches your search."
215msgstr "Sorry, there is nothing that matches your search."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home screen"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252−msgstr ""
220+msgstr "Please enter %1"
221+
222+#~ msgid "Favourite People"
223+#~ msgstr "Favourite People"
224+
225+#~ msgid "People Recently in Touch"
226+#~ msgstr "People Recently in Touch"
227+
228+#~ msgid "People"
229+#~ msgstr "People"
230+
231+#~ msgid "A-Z"
232+#~ msgstr "A-Z"
233+
234+#~ msgid "Recently in touch"
235+#~ msgstr "Recently in touch"
236+
237+#~ msgid "New Contacts"
238+#~ msgstr "New Contacts"
239+
240+#~ msgid "Favourites"
241+#~ msgstr "Favourites"
242+
243+#~ msgid "Home screen"
244+#~ msgstr "Home screen"
po/eo.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr ""
146msgstr ""
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/es.po+36−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-16 23:44+0000\n"
11"PO-Revision-Date: 2013-06-16 23:44+0000\n"
12"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
12"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Disponibles para descargar"
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplicaciones"
110msgstr "Aplicaciones"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Aplicaciones frecuentes"
114msgstr "Aplicaciones frecuentes"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Gente favorita"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Gente contactada recientemente"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Música reciente"
118msgstr "Música reciente"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Vídeos populares en línea"
122msgstr "Vídeos populares en línea"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Inicio"
126msgstr "Inicio"
135
127
@@ -153,26 +145,6 @@ msgstr "Mejor posicionadas"
153msgid "Music"
145msgid "Music"
154msgstr "Música"
146msgstr "Música"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Favoritos"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Contactados recientemente"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "Contactos nuevos"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Gente"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Populares en línea"
150msgstr "Populares en línea"
@@ -193,7 +165,7 @@ msgstr "Protagonistas:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Autor:"
166msgstr "Autor:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,39 @@ msgstr "Dispositivo"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Modo de vuelo"
207msgstr "Modo de vuelo"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Buscar"
211msgstr "Buscar"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "No hay nada que coincida con su búsqueda."
215msgstr "No hay nada que coincida con su búsqueda."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla de inicio"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Gente"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Pantalla de inicio"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Gente favorita"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Gente contactada recientemente"
233+
234+#~ msgid "Recently in touch"
235+#~ msgstr "Contactados recientemente"
236+
237+#~ msgid "Favourites"
238+#~ msgstr "Favoritos"
239+
240+#~ msgid "A-Z"
241+#~ msgstr "A-Z"
242+
243+#~ msgid "New Contacts"
244+#~ msgstr "Contactos nuevos"
po/fi.po+33−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-10 16:19+0000\n"
11"PO-Revision-Date: 2013-06-10 16:19+0000\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
13"Language-Team: Finnish <fi@li.org>\n"
13"Language-Team: Finnish <fi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Ladattavissa"
109msgid "Apps"
109msgid "Apps"
110msgstr "Sovellukset"
110msgstr "Sovellukset"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Yleisimmät sovellukset"
114msgstr "Yleisimmät sovellukset"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Suosikkihenkilöt"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Viimeksi yhteydessä olleet henkilöt"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Viimeisin musiikki"
118msgstr "Viimeisin musiikki"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Suositut verkkovideot"
122msgstr "Suositut verkkovideot"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Kotinäyttö"
126msgstr "Kotinäyttö"
135
127
@@ -153,26 +145,6 @@ msgstr "Nousukiidossa"
153msgid "Music"
145msgid "Music"
154msgstr "Musiikki"
146msgstr "Musiikki"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Suosikit"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Viimeksi yhteydessä"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "Uudet yhteystiedot"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Ihmiset"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Suosittua verkossa"
150msgstr "Suosittua verkossa"
@@ -193,7 +165,7 @@ msgstr "Pääosissa:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Laatinut:"
166msgstr "Laatinut:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,36 @@ msgstr "Laite"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Lentokonetila"
207msgstr "Lentokonetila"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Hae"
211msgstr "Hae"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Hakuun täsmääviä tuloksia ei löydy."
215msgstr "Hakuun täsmääviä tuloksia ei löydy."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Kotinäyttö"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Ihmiset"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Kotinäyttö"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Suosikkihenkilöt"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Viimeksi yhteydessä olleet henkilöt"
233+
234+#~ msgid "Favourites"
235+#~ msgstr "Suosikit"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "Viimeksi yhteydessä"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "Uudet yhteystiedot"
po/fo.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Faroese <fo@li.org>\n"
13"Language-Team: Faroese <fo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Nýtsluskipanir"
110msgstr "Nýtsluskipanir"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Heim"
126msgstr "Heim"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Tónleikur"
146msgstr "Tónleikur"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Fólk"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Leita"
211msgstr "Leita"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Tíanverri er tað einki sum hóskar til tína leiting."
215msgstr "Tíanverri er tað einki sum hóskar til tína leiting."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Heimaskíggi"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Fólk"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Heimaskíggi"
po/fr.po+71−82
@@ -7,63 +7,63 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11+"PO-Revision-Date: 2013-06-26 15:11+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Anne <anneonyme017@gmail.com>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
22−msgstr ""
22+msgstr "Téléphone"
23
23
24#: Applications/applications.js:29
24#: Applications/applications.js:29
25msgid "Camera"
25msgid "Camera"
26−msgstr ""
26+msgstr "Appareil photo"
27
27
28#: Applications/applications.js:35
28#: Applications/applications.js:35
29msgid "Gallery"
29msgid "Gallery"
30−msgstr ""
30+msgstr "Galerie"
31
31
32#: Applications/applications.js:40
32#: Applications/applications.js:40
33msgid "Facebook"
33msgid "Facebook"
34−msgstr ""
34+msgstr "Facebook"
35
35
36#: Applications/applications.js:46
36#: Applications/applications.js:46
37msgid "Browser"
37msgid "Browser"
38−msgstr ""
38+msgstr "Navigateur"
39
39
40#: Applications/applications.js:51
40#: Applications/applications.js:51
41msgid "Twitter"
41msgid "Twitter"
42−msgstr ""
42+msgstr "Twitter"
43
43
44#: Applications/applications.js:57
44#: Applications/applications.js:57
45msgid "GMail"
45msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
47
47
48#: Applications/applications.js:62
48#: Applications/applications.js:62
49msgid "Weather"
49msgid "Weather"
50−msgstr ""
50+msgstr "Météo"
51
51
52#: Applications/applications.js:68
52#: Applications/applications.js:68
53msgid "Notepad"
53msgid "Notepad"
54−msgstr ""
54+msgstr "Bloc-notes"
55
55
56#: Applications/applications.js:74
56#: Applications/applications.js:74
57msgid "Calendar"
57msgid "Calendar"
58−msgstr ""
58+msgstr "Agenda"
59
59
60#: Applications/applications.js:80
60#: Applications/applications.js:80
61msgid "Media Player"
61msgid "Media Player"
62−msgstr ""
62+msgstr "Lecteur multimédia"
63
63
64#: Applications/applications.js:86
64#: Applications/applications.js:86
65msgid "Evernote"
65msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
67
67
68#: Applications/applications.js:91
68#: Applications/applications.js:91
69msgid "Map"
69msgid "Map"
@@ -71,27 +71,27 @@ msgstr ""
71
71
72#: Applications/applications.js:96
72#: Applications/applications.js:96
73msgid "Pinterest"
73msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
75
75
76#: Applications/applications.js:101
76#: Applications/applications.js:101
77msgid "SoundCloud"
77msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
79
79
80#: Applications/applications.js:106
80#: Applications/applications.js:106
81msgid "Wikipedia"
81msgid "Wikipedia"
82−msgstr ""
82+msgstr "Wikipédia"
83
83
84#: Applications/applications.js:111
84#: Applications/applications.js:111
85msgid "YouTube"
85msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
87
87
88#: Components/PageHeader.qml:300
88#: Components/PageHeader.qml:300
89msgid "Recent searches"
89msgid "Recent searches"
90−msgstr ""
90+msgstr "Recherches récentes"
91
91
92#: Dash/DashApps.qml:65
92#: Dash/DashApps.qml:65
93msgid "Running apps"
93msgid "Running apps"
94−msgstr ""
94+msgstr "Applications en cours d’exécution"
95
95
96#: Dash/DashApps.qml:68
96#: Dash/DashApps.qml:68
97msgid "Frequently used"
97msgid "Frequently used"
@@ -99,7 +99,7 @@ msgstr ""
99
99
100#: Dash/DashApps.qml:71
100#: Dash/DashApps.qml:71
101msgid "Installed"
101msgid "Installed"
102−msgstr ""
102+msgstr "Installées"
103
103
104#: Dash/DashApps.qml:74
104#: Dash/DashApps.qml:74
105msgid "Available for download"
105msgid "Available for download"
@@ -109,29 +109,21 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Applications"
110msgstr "Applications"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114−msgstr ""
114+msgstr "Applications fréquemment utilisées"
115−
116−#: Dash/DashHome.qml:46
117−msgid "Favourite People"
118−msgstr ""
119
115
120−#: Dash/DashHome.qml:49
116+#: Dash/DashHome.qml:43
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126−msgstr ""
118+msgstr "Musique récente"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130−msgstr ""
122+msgstr "Vidéos populaires en ligne"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134−msgstr ""
126+msgstr "Accueil"
135
127
136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
128#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137msgid "Featured"
129msgid "Featured"
@@ -143,7 +135,7 @@ msgstr ""
143
135
144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145msgid "New Releases"
137msgid "New Releases"
146−msgstr ""
138+msgstr "Nouveautés"
147
139
148#: Dash/DashMusic.qml:30
140#: Dash/DashMusic.qml:30
149msgid "Top Charting"
141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Musique"
146msgstr "Musique"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -183,44 +155,44 @@ msgstr "Vidéos"
183
155
184#: Dash/Video/VideoPreview.qml:98
156#: Dash/Video/VideoPreview.qml:98
185msgid "Directed by:"
157msgid "Directed by:"
186−msgstr ""
158+msgstr "Réalisé par :"
187
159
188#: Dash/Video/VideoPreview.qml:121
160#: Dash/Video/VideoPreview.qml:121
189msgid "Starring:"
161msgid "Starring:"
190−msgstr ""
162+msgstr "Acteurs :"
191
163
192#: Dash/Video/VideoPreview.qml:144
164#: Dash/Video/VideoPreview.qml:144
193msgid "Author:"
165msgid "Author:"
194−msgstr ""
166+msgstr "Auteur :"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "Bonjour %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "Bonjour"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
211−msgstr ""
183+msgstr "Confirmer"
212
184
213#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
185#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
214msgid "Type or say a command"
186msgid "Type or say a command"
215−msgstr ""
187+msgstr "Entrez ou dictez une commande"
216
188
217#: Hud/Hud.qml:84
189#: Hud/Hud.qml:84
218msgid "Loading. Please Wait..."
190msgid "Loading. Please Wait..."
219−msgstr ""
191+msgstr "Chargement. Veuillez patienter..."
220
192
221#: Hud/Hud.qml:89
193#: Hud/Hud.qml:89
222msgid "Speak Now..."
194msgid "Speak Now..."
223−msgstr ""
195+msgstr "Parlez maintenant..."
224
196
225#: Hud/Hud.qml:94
197#: Hud/Hud.qml:94
226msgid "Speaking..."
198msgid "Speaking..."
@@ -232,21 +204,38 @@ msgstr ""
232
204
233#: Panel/Menus/Overview/FlightModeWidget.qml:42
205#: Panel/Menus/Overview/FlightModeWidget.qml:42
234msgid "Flight mode"
206msgid "Flight mode"
235−msgstr ""
207+msgstr "Mode avion"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239−msgstr ""
211+msgstr "Rechercher"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243−msgstr ""
215+msgstr "Désolé, aucun résultat ne correspond à votre recherche."
244−
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248
216
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "Home screen"
223+#~ msgstr "Écran d’accueil"
224+
225+#~ msgid "People"
226+#~ msgstr "Contacts"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Contacts favoris"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Contacts récents"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "New Contacts"
238+#~ msgstr "Nouveaux contacts"
239+
240+#~ msgid "Favourites"
241+#~ msgstr "Favoris"
po/gl.po+24−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Dispoñíbel para descargar"
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplicativos"
110msgstr "Aplicativos"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Aplicativos frecuentes"
114msgstr "Aplicativos frecuentes"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Xente favorita"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Xente contactada recentemente"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Música recente"
118msgstr "Música recente"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Vídeos populares en liña"
122msgstr "Vídeos populares en liña"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Cartafol persoal"
126msgstr "Cartafol persoal"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Música"
146msgstr "Música"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Persoas"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,27 @@ msgstr "Dispositivo"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Modo de voo"
207msgstr "Modo de voo"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Buscar"
211msgstr "Buscar"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Sentímolo, non hai nada que coincida con esta busca."
215msgstr "Sentímolo, non hai nada que coincida con esta busca."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla de inicio"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Persoas"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Pantalla de inicio"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Xente favorita"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Xente contactada recentemente"
po/he.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Hebrew <he@li.org>\n"
13"Language-Team: Hebrew <he@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "יישומים"
110msgstr "יישומים"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "בית"
126msgstr "בית"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "מוזיקה"
146msgstr "מוזיקה"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "אנשים"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "חיפוש"
211msgstr "חיפוש"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה."
215msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "מסך הבית"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "אנשים"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "מסך הבית"
po/hr.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Croatian <hr@li.org>\n"
13"Language-Team: Croatian <hr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplikacije"
110msgstr "Aplikacije"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Početna"
126msgstr "Početna"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Glazba"
146msgstr "Glazba"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Osobe"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Pretraživanje"
211msgstr "Pretraživanje"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."
215msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Početni zaslon"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Osobe"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Početni zaslon"
po/hu.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Alkalmazások"
110msgstr "Alkalmazások"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Kezdőoldal"
126msgstr "Kezdőoldal"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Zene"
146msgstr "Zene"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Emberek"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr "Eszköz"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Keresés"
211msgstr "Keresés"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Elnézést, nincs találat a keresésre."
215msgstr "Elnézést, nincs találat a keresésre."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Kezdőképernyő"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Emberek"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Kezdőképernyő"
po/hy.po+24−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-07 12:42+0000\n"
11"PO-Revision-Date: 2013-06-07 12:42+0000\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Հասանելի ծրագրեր"
109msgid "Apps"
109msgid "Apps"
110msgstr "Ծրագրեր"
110msgstr "Ծրագրեր"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Հաճախակի ծրագրերը"
114msgstr "Հաճախակի ծրագրերը"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Ֆավորիտներ"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Վերջին մարդիկ"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Վերջին երգերը"
118msgstr "Վերջին երգերը"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Հայտնի օնլայն վիդեոներ"
122msgstr "Հայտնի օնլայն վիդեոներ"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Տուն"
126msgstr "Տուն"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Երգեր"
146msgstr "Երգեր"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Մարդիկ"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,27 @@ msgstr "Սարք"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Անկապ րեժիմ"
207msgstr "Անկապ րեժիմ"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Որոնում"
211msgstr "Որոնում"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"
215msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Տուն"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People Recently in Touch"
223+#~ msgstr "Վերջին մարդիկ"
224+
225+#~ msgid "Favourite People"
226+#~ msgstr "Ֆավորիտներ"
227+
228+#~ msgid "People"
229+#~ msgstr "Մարդիկ"
230+
231+#~ msgid "Home screen"
232+#~ msgstr "Տուն"
po/id.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Indonesian <id@li.org>\n"
13"Language-Team: Indonesian <id@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr ""
146msgstr ""
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/it.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Italian <it@li.org>\n"
13"Language-Team: Italian <it@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Applicazioni"
110msgstr "Applicazioni"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Home"
126msgstr "Home"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Musica"
146msgstr "Musica"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Contatti"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Cerca"
211msgstr "Cerca"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Nessun risultato corrispondente alla ricerca."
215msgstr "Nessun risultato corrispondente alla ricerca."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Contatti"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Home"
po/ja.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-15 14:12+0000\n"
11"PO-Revision-Date: 2013-06-15 14:12+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Japanese <ja@li.org>\n"
13"Language-Team: Japanese <ja@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr ""
146msgstr ""
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/kn.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Kannada <kn@li.org>\n"
13"Language-Team: Kannada <kn@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"
110msgstr "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "ಮನೆ (Home)"
126msgstr "ಮನೆ (Home)"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "ಸಂಗೀತ"
146msgstr "ಸಂಗೀತ"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "ಜನರು"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "ಹುಡುಕು"
211msgstr "ಹುಡುಕು"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯಾದ ಹೊಂದಾಣಿಕೆಗಳು ದೊರಕುತ್ತಿಲ್ಲ"
215msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯಾದ ಹೊಂದಾಣಿಕೆಗಳು ದೊರಕುತ್ತಿಲ್ಲ"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "ಹೋಮ್ ಸ್ಕ್ರೀನ್"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "ಜನರು"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "ಹೋಮ್ ಸ್ಕ್ರೀನ್"
po/ko.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Korean <ko@li.org>\n"
13"Language-Team: Korean <ko@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "내려받을 수 있음"
109msgid "Apps"
109msgid "Apps"
110msgstr "앱"
110msgstr "앱"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "자주 쓰는 앱"
114msgstr "자주 쓰는 앱"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "요즈음 찾는 음악"
118msgstr "요즈음 찾는 음악"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "음악"
146msgstr "음악"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "찾기"
211msgstr "찾기"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/ky.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Тиркемелер"
110msgstr "Тиркемелер"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Үй папкасы"
126msgstr "Үй папкасы"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Музыка"
146msgstr "Музыка"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Адамдар"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Издөө"
211msgstr "Издөө"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Тилекке каршы, сиздин издөөңүзгө эч нерсе дал келген жок."
215msgstr "Тилекке каршы, сиздин издөөңүзгө эч нерсе дал келген жок."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Башкы экран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Адамдар"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Башкы экран"
po/lv.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Latvian <lv@li.org>\n"
13"Language-Team: Latvian <lv@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Lietotnes"
110msgstr "Lietotnes"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Mājas"
126msgstr "Mājas"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Mūzika"
146msgstr "Mūzika"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Cilvēki"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Meklēt"
211msgstr "Meklēt"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Diemžēl nekas neatbilst jūsu meklētajam."
215msgstr "Diemžēl nekas neatbilst jūsu meklētajam."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Mājas ekrāns"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Cilvēki"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Mājas ekrāns"
po/my.po+15−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Burmese <my@li.org>\n"
13"Language-Team: Burmese <my@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Apps"
110msgstr "Apps"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "ပင်မ"
126msgstr "ပင်မ"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "တေးဂီတ"
146msgstr "တေးဂီတ"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "လူ"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,18 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "ရှာဖွေ"
211msgstr "ရှာဖွေ"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့်တူညီတာဘာမှမရှိပါ။"
215msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့်တူညီတာဘာမှမရှိပါ။"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "လူ"
po/nb.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-17 09:10+0000\n"
11"PO-Revision-Date: 2013-06-17 09:10+0000\n"
12"Last-Translator: Joakim Langvand <jlangvand@gmail.com>\n"
12"Last-Translator: Joakim Langvand <jlangvand@gmail.com>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Tilgjengelig for nedlasting"
109msgid "Apps"
109msgid "Apps"
110msgstr "Programmer"
110msgstr "Programmer"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Hjem"
126msgstr "Hjem"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Musikk"
146msgstr "Musikk"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Personer"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr "Enhet"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Flymodus"
207msgstr "Flymodus"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Søk"
211msgstr "Søk"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Søket ga ingen treff."
215msgstr "Søket ga ingen treff."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Hjemmeskjerm"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Personer"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Hjemmeskjerm"
po/nl.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Apps"
110msgstr "Apps"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Hoofdvenster"
126msgstr "Hoofdvenster"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Muziek"
146msgstr "Muziek"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Mensen"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Zoeken"
211msgstr "Zoeken"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."
215msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Startscherm"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Mensen"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Startscherm"
po/pl.po+36−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:43+0000\n"
11"PO-Revision-Date: 2013-06-05 22:43+0000\n"
12"Last-Translator: Piotr Merski <Unknown>\n"
12"Last-Translator: Piotr Merski <Unknown>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Dostępne do pobrania"
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplikacje"
110msgstr "Aplikacje"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Często używane aplikacje"
114msgstr "Często używane aplikacje"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Ulubione kontakty"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Osoby ostatnio w kontakcie"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Najnowsza muzyka"
118msgstr "Najnowsza muzyka"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Wideo popularne online"
122msgstr "Wideo popularne online"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Dom"
126msgstr "Dom"
135
127
@@ -153,26 +145,6 @@ msgstr "Przeboje"
153msgid "Music"
145msgid "Music"
154msgstr "Muzyka"
146msgstr "Muzyka"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Ulubione"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Ostatnio w kontakcie"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "Nowe kontakty"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Ludzie"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Popularne w sieci"
150msgstr "Popularne w sieci"
@@ -193,7 +165,7 @@ msgstr "Obsada:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Autor:"
166msgstr "Autor:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,39 @@ msgstr "Urządzenie"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Tryb samolotowy"
207msgstr "Tryb samolotowy"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Szukaj"
211msgstr "Szukaj"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Nie znaleziono pasujących wyników."
215msgstr "Nie znaleziono pasujących wyników."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Ekran domowy"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "Home screen"
223+#~ msgstr "Ekran domowy"
224+
225+#~ msgid "People"
226+#~ msgstr "Ludzie"
227+
228+#~ msgid "People Recently in Touch"
229+#~ msgstr "Osoby ostatnio w kontakcie"
230+
231+#~ msgid "Favourite People"
232+#~ msgstr "Ulubione kontakty"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "Ostatnio w kontakcie"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "Nowe kontakty"
242+
243+#~ msgid "Favourites"
244+#~ msgstr "Ulubione"
po/pt_BR.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplicativos"
110msgstr "Aplicativos"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Início"
126msgstr "Início"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Músicas"
146msgstr "Músicas"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Pessoas"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Pesquisar"
211msgstr "Pesquisar"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Desculpe, não há nada que corresponda à sua pesquisa."
215msgstr "Desculpe, não há nada que corresponda à sua pesquisa."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Tela inicial"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Pessoas"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Tela inicial"
po/ro.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Romanian <ro@li.org>\n"
13"Language-Team: Romanian <ro@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Aplicații"
110msgstr "Aplicații"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Acasă"
126msgstr "Acasă"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Muzică"
146msgstr "Muzică"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Persoane"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,20 +206,22 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Căutare"
211msgstr "Căutare"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244"Ne pare rău, nu este nimic care se potrivește căutării dumneavoastră."
216"Ne pare rău, nu este nimic care se potrivește căutării dumneavoastră."
245
217
246−#: plugins/Unity/lenses.cpp:39
247−msgid "Home screen"
248−msgstr "Ecran principal"
249−
250−#: Shell.qml:380
218+#: Shell.qml:383
251#, qt-format
219#, qt-format
252−msgid "Please enter %1:"
220+msgid "Please enter %1"
253msgstr ""
221msgstr ""
222+
223+#~ msgid "People"
224+#~ msgstr "Persoane"
225+
226+#~ msgid "Home screen"
227+#~ msgstr "Ecran principal"
po/ru.po+35−52
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11+"PO-Revision-Date: 2013-06-21 10:08+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Andrey Dedikov <iamawesome.ndr@gmail.com>\n"
13"Language-Team: Russian <ru@li.org>\n"
13"Language-Team: Russian <ru@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -63,7 +63,7 @@ msgstr ""
63
63
64#: Applications/applications.js:86
64#: Applications/applications.js:86
65msgid "Evernote"
65msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
67
67
68#: Applications/applications.js:91
68#: Applications/applications.js:91
69msgid "Map"
69msgid "Map"
@@ -71,11 +71,11 @@ msgstr ""
71
71
72#: Applications/applications.js:96
72#: Applications/applications.js:96
73msgid "Pinterest"
73msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
75
75
76#: Applications/applications.js:101
76#: Applications/applications.js:101
77msgid "SoundCloud"
77msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
79
79
80#: Applications/applications.js:106
80#: Applications/applications.js:106
81msgid "Wikipedia"
81msgid "Wikipedia"
@@ -109,27 +109,19 @@ msgstr "Доступно для загрузки"
109msgid "Apps"
109msgid "Apps"
110msgstr "Приложения"
110msgstr "Приложения"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Часто используемые приложения"
114msgstr "Часто используемые приложения"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Избранные контакты"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Недавние контакты"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Недавно прослушанная музыка"
118msgstr "Недавно прослушанная музыка"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Популярные видео из сети"
122msgstr "Популярные видео из сети"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Главная"
126msgstr "Главная"
135
127
@@ -143,7 +135,7 @@ msgstr ""
143
135
144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145msgid "New Releases"
137msgid "New Releases"
146−msgstr ""
138+msgstr "Новые релизы"
147
139
148#: Dash/DashMusic.qml:30
140#: Dash/DashMusic.qml:30
149msgid "Top Charting"
141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Музыка"
146msgstr "Музыка"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Люди"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -183,17 +155,17 @@ msgstr "Видео"
183
155
184#: Dash/Video/VideoPreview.qml:98
156#: Dash/Video/VideoPreview.qml:98
185msgid "Directed by:"
157msgid "Directed by:"
186−msgstr ""
158+msgstr "Режиссёр"
187
159
188#: Dash/Video/VideoPreview.qml:121
160#: Dash/Video/VideoPreview.qml:121
189msgid "Starring:"
161msgid "Starring:"
190−msgstr ""
162+msgstr "В главных ролях"
191
163
192#: Dash/Video/VideoPreview.qml:144
164#: Dash/Video/VideoPreview.qml:144
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,30 @@ msgstr "Устройство"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Режим полета"
207msgstr "Режим полета"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Поиск"
211msgstr "Поиск"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Извините, поиск не дал результатов."
215msgstr "Извините, поиск не дал результатов."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Главный экран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Люди"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Главный экран"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Избранные контакты"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Недавние контакты"
233+
234+#~ msgid "New Contacts"
235+#~ msgstr "Новые контакты"
po/si.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr ""
146msgstr ""
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/sl.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-09 10:23+0000\n"
11"PO-Revision-Date: 2013-06-09 10:23+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Na voljo za prejem"
109msgid "Apps"
109msgid "Apps"
110msgstr "Programi"
110msgstr "Programi"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Nedavna glasba"
118msgstr "Nedavna glasba"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Domov"
126msgstr "Domov"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Glasba"
146msgstr "Glasba"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Ljudje"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr "Naprava"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Način letenja"
207msgstr "Način letenja"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Iskanje"
211msgstr "Iskanje"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Nič se ne ujema z vašim iskalnim nizom."
215msgstr "Nič se ne ujema z vašim iskalnim nizom."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Domači zaslon"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Ljudje"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Domači zaslon"
po/sr.po+18−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Serbian <sr@li.org>\n"
13"Language-Team: Serbian <sr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr "Програми"
110msgstr "Програми"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Почетна"
126msgstr "Почетна"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Музика"
146msgstr "Музика"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Људи"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,21 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Претрага"
211msgstr "Претрага"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Нажалост, претрага није наишла на икакво подударање."
215msgstr "Нажалост, претрага није наишла на икакво подударање."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Почетни екран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Људи"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Почетни екран"
po/sv.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Swedish <sv@li.org>\n"
13"Language-Team: Swedish <sv@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr ""
126msgstr ""
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr ""
146msgstr ""
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/te.po+12−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Telugu <te@li.org>\n"
13"Language-Team: Telugu <te@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109msgid "Apps"
109msgid "Apps"
110msgstr ""
110msgstr ""
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr ""
114msgstr ""
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr ""
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr ""
118msgstr ""
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr ""
122msgstr ""
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "నివాసం"
126msgstr "నివాసం"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "సంగీతం"
146msgstr "సంగీతం"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr ""
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,15 @@ msgstr ""
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr ""
207msgstr ""
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr ""
211msgstr ""
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr ""
215msgstr ""
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
po/tr.po+59−70
@@ -7,59 +7,59 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11+"PO-Revision-Date: 2013-06-24 17:24+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Adar Cem EREN <adarcemeren34@gmail.com>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
22−msgstr ""
22+msgstr "Telefon"
23
23
24#: Applications/applications.js:29
24#: Applications/applications.js:29
25msgid "Camera"
25msgid "Camera"
26−msgstr ""
26+msgstr "Kamera"
27
27
28#: Applications/applications.js:35
28#: Applications/applications.js:35
29msgid "Gallery"
29msgid "Gallery"
30−msgstr ""
30+msgstr "Galeri"
31
31
32#: Applications/applications.js:40
32#: Applications/applications.js:40
33msgid "Facebook"
33msgid "Facebook"
34−msgstr ""
34+msgstr "Facebook"
35
35
36#: Applications/applications.js:46
36#: Applications/applications.js:46
37msgid "Browser"
37msgid "Browser"
38−msgstr ""
38+msgstr "Tarayıcı"
39
39
40#: Applications/applications.js:51
40#: Applications/applications.js:51
41msgid "Twitter"
41msgid "Twitter"
42−msgstr ""
42+msgstr "Twitter"
43
43
44#: Applications/applications.js:57
44#: Applications/applications.js:57
45msgid "GMail"
45msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
47
47
48#: Applications/applications.js:62
48#: Applications/applications.js:62
49msgid "Weather"
49msgid "Weather"
50−msgstr ""
50+msgstr "Hava Durumu"
51
51
52#: Applications/applications.js:68
52#: Applications/applications.js:68
53msgid "Notepad"
53msgid "Notepad"
54−msgstr ""
54+msgstr "Not Defteri"
55
55
56#: Applications/applications.js:74
56#: Applications/applications.js:74
57msgid "Calendar"
57msgid "Calendar"
58−msgstr ""
58+msgstr "Takvim"
59
59
60#: Applications/applications.js:80
60#: Applications/applications.js:80
61msgid "Media Player"
61msgid "Media Player"
62−msgstr ""
62+msgstr "Ortam Oynatıcı"
63
63
64#: Applications/applications.js:86
64#: Applications/applications.js:86
65msgid "Evernote"
65msgid "Evernote"
@@ -67,7 +67,7 @@ msgstr ""
67
67
68#: Applications/applications.js:91
68#: Applications/applications.js:91
69msgid "Map"
69msgid "Map"
70−msgstr ""
70+msgstr "Harita"
71
71
72#: Applications/applications.js:96
72#: Applications/applications.js:96
73msgid "Pinterest"
73msgid "Pinterest"
@@ -79,15 +79,15 @@ msgstr ""
79
79
80#: Applications/applications.js:106
80#: Applications/applications.js:106
81msgid "Wikipedia"
81msgid "Wikipedia"
82−msgstr ""
82+msgstr "Vikipedi"
83
83
84#: Applications/applications.js:111
84#: Applications/applications.js:111
85msgid "YouTube"
85msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
87
87
88#: Components/PageHeader.qml:300
88#: Components/PageHeader.qml:300
89msgid "Recent searches"
89msgid "Recent searches"
90−msgstr "Son aramalar"
90+msgstr "Son Arananlar"
91
91
92#: Dash/DashApps.qml:65
92#: Dash/DashApps.qml:65
93msgid "Running apps"
93msgid "Running apps"
@@ -109,37 +109,29 @@ msgstr "İndirilebilir durumda"
109msgid "Apps"
109msgid "Apps"
110msgstr "Uygulamalar"
110msgstr "Uygulamalar"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Sıkça Kullanılan Uygulamalar"
114msgstr "Sıkça Kullanılan Uygulamalar"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Favori Kişiler"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "En Son Konuşulan Kişiler"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "En Son Müzik"
118msgstr "En Son Müzik"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Çevrimiçi Yaygın Videolar"
122msgstr "Çevrimiçi Yaygın Videolar"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134−msgstr "Ev"
126+msgstr "Ana Sayfa"
135
127
136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
128#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137msgid "Featured"
129msgid "Featured"
138−msgstr ""
130+msgstr "Öne Çıkanlar"
139
131
140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
132#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141msgid "Recent"
133msgid "Recent"
142−msgstr ""
134+msgstr "En Son"
143
135
144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145msgid "New Releases"
137msgid "New Releases"
@@ -153,29 +145,9 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "Müzik"
146msgstr "Müzik"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Kişiler"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178−msgstr ""
150+msgstr "Genellikle Çevrimiçi"
179
151
180#: Dash/DashVideos.qml:155
152#: Dash/DashVideos.qml:155
181msgid "Videos"
153msgid "Videos"
@@ -183,7 +155,7 @@ msgstr "Videolar"
183
155
184#: Dash/Video/VideoPreview.qml:98
156#: Dash/Video/VideoPreview.qml:98
185msgid "Directed by:"
157msgid "Directed by:"
186−msgstr ""
158+msgstr "Yönetmen"
187
159
188#: Dash/Video/VideoPreview.qml:121
160#: Dash/Video/VideoPreview.qml:121
189msgid "Starring:"
161msgid "Starring:"
@@ -191,11 +163,11 @@ msgstr ""
191
163
192#: Dash/Video/VideoPreview.qml:144
164#: Dash/Video/VideoPreview.qml:144
193msgid "Author:"
165msgid "Author:"
194−msgstr ""
166+msgstr "Yazar:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "Acil Arama"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
@@ -204,7 +176,7 @@ msgstr ""
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "Merhaba"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -232,21 +204,38 @@ msgstr "Aygıt"
232
204
233#: Panel/Menus/Overview/FlightModeWidget.qml:42
205#: Panel/Menus/Overview/FlightModeWidget.qml:42
234msgid "Flight mode"
206msgid "Flight mode"
235−msgstr "Uçak kipi"
207+msgstr "Uçak Modu"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Ara"
211msgstr "Ara"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."
215msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Başlangıç ekranı"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Kişiler"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Başlangıç ekranı"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Favori Kişiler"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "En Son Konuşulan Kişiler"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "New Contacts"
238+#~ msgstr "Yeni Kişiler"
239+
240+#~ msgid "Favourites"
241+#~ msgstr "Favoriler"
po/ug.po+59−70
@@ -7,23 +7,23 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-06 07:40+0000\n"
11+"PO-Revision-Date: 2013-06-28 04:36+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur <ug@li.org>\n"
13"Language-Team: Uyghur <ug@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-28 06:54+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
22−msgstr ""
22+msgstr "تېلېفون"
23
23
24#: Applications/applications.js:29
24#: Applications/applications.js:29
25msgid "Camera"
25msgid "Camera"
26−msgstr ""
26+msgstr "كامېرا"
27
27
28#: Applications/applications.js:35
28#: Applications/applications.js:35
29msgid "Gallery"
29msgid "Gallery"
@@ -31,59 +31,59 @@ msgstr ""
31
31
32#: Applications/applications.js:40
32#: Applications/applications.js:40
33msgid "Facebook"
33msgid "Facebook"
34−msgstr ""
34+msgstr "فېيىسبۇك(Facebook)"
35
35
36#: Applications/applications.js:46
36#: Applications/applications.js:46
37msgid "Browser"
37msgid "Browser"
38−msgstr ""
38+msgstr "توركۆرگۈ"
39
39
40#: Applications/applications.js:51
40#: Applications/applications.js:51
41msgid "Twitter"
41msgid "Twitter"
42−msgstr ""
42+msgstr "تىۋىتتېر(Twitter)"
43
43
44#: Applications/applications.js:57
44#: Applications/applications.js:57
45msgid "GMail"
45msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
47
47
48#: Applications/applications.js:62
48#: Applications/applications.js:62
49msgid "Weather"
49msgid "Weather"
50−msgstr ""
50+msgstr "ھاۋا رايى"
51
51
52#: Applications/applications.js:68
52#: Applications/applications.js:68
53msgid "Notepad"
53msgid "Notepad"
54−msgstr ""
54+msgstr "خاتىرە دەپتەر(Notepad)"
55
55
56#: Applications/applications.js:74
56#: Applications/applications.js:74
57msgid "Calendar"
57msgid "Calendar"
58−msgstr ""
58+msgstr "يىلنامە"
59
59
60#: Applications/applications.js:80
60#: Applications/applications.js:80
61msgid "Media Player"
61msgid "Media Player"
62−msgstr ""
62+msgstr "ۋاسىتە قويغۇ"
63
63
64#: Applications/applications.js:86
64#: Applications/applications.js:86
65msgid "Evernote"
65msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
67
67
68#: Applications/applications.js:91
68#: Applications/applications.js:91
69msgid "Map"
69msgid "Map"
70−msgstr ""
70+msgstr "خەرىتە"
71
71
72#: Applications/applications.js:96
72#: Applications/applications.js:96
73msgid "Pinterest"
73msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
75
75
76#: Applications/applications.js:101
76#: Applications/applications.js:101
77msgid "SoundCloud"
77msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
79
79
80#: Applications/applications.js:106
80#: Applications/applications.js:106
81msgid "Wikipedia"
81msgid "Wikipedia"
82−msgstr ""
82+msgstr "ۋىكىپېدىيە"
83
83
84#: Applications/applications.js:111
84#: Applications/applications.js:111
85msgid "YouTube"
85msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
87
87
88#: Components/PageHeader.qml:300
88#: Components/PageHeader.qml:300
89msgid "Recent searches"
89msgid "Recent searches"
@@ -109,41 +109,33 @@ msgstr "چۈشۈرگىلى بولىدىغانلىرى"
109msgid "Apps"
109msgid "Apps"
110msgstr "ئەپلەر"
110msgstr "ئەپلەر"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "دائىم ئىشلىتىلىدىغان ئەپلەر"
114msgstr "دائىم ئىشلىتىلىدىغان ئەپلەر"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "ھەمىشە ئالاقە قىلىدىغان كىشىلەر"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "يېقىندا ئالاقە قىلغان كىشىلەر"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "يېقىندا ئاڭلىغان مۇزىكىلار"
118msgstr "يېقىندا ئاڭلىغان مۇزىكىلار"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "توردىكى ئالقىشقا ئېرىشكەن سىنلار"
122msgstr "توردىكى ئالقىشقا ئېرىشكەن سىنلار"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "ماكان"
126msgstr "ماكان"
135
127
136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
128#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137msgid "Featured"
129msgid "Featured"
138−msgstr ""
130+msgstr "داڭلىق"
139
131
140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
132#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141msgid "Recent"
133msgid "Recent"
142−msgstr ""
134+msgstr "يېقىنقى"
143
135
144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145msgid "New Releases"
137msgid "New Releases"
146−msgstr ""
138+msgstr "يېڭى ئېلان قىلىنغانلىرى"
147
139
148#: Dash/DashMusic.qml:30
140#: Dash/DashMusic.qml:30
149msgid "Top Charting"
141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "مۇزىكا"
146msgstr "مۇزىكا"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "كىشىلەر"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -191,20 +163,20 @@ msgstr ""
191
163
192#: Dash/Video/VideoPreview.qml:144
164#: Dash/Video/VideoPreview.qml:144
193msgid "Author:"
165msgid "Author:"
194−msgstr ""
166+msgstr "ئاپتور:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "جىددىي تېلېفون"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "سالام %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "سالام"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,36 @@ msgstr "ئۈسكۈنە"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "ئايروپىلاندا"
207msgstr "ئايروپىلاندا"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "ئىزدە"
211msgstr "ئىزدە"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپىلمىدى."
215msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپىلمىدى."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "ماكان ئېكران"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252−msgstr ""
220+msgstr "%1 نى كىرگۈزۈڭ"
221+
222+#~ msgid "Favourite People"
223+#~ msgstr "ھەمىشە ئالاقە قىلىدىغان كىشىلەر"
224+
225+#~ msgid "People Recently in Touch"
226+#~ msgstr "يېقىندا ئالاقە قىلغان كىشىلەر"
227+
228+#~ msgid "People"
229+#~ msgstr "كىشىلەر"
230+
231+#~ msgid "Home screen"
232+#~ msgstr "ماكان ئېكران"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "A-Z"
236+
237+#~ msgid "Recently in touch"
238+#~ msgstr "يېقىندا ئالاقە قىلغانلار"
239+
240+#~ msgid "New Contacts"
241+#~ msgstr "يېڭى ئالاقەداشلار"
po/uk.po+40−48
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-14 11:26+0000\n"
11+"PO-Revision-Date: 2013-06-25 08:08+0000\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Доступно до завантаження"
109msgid "Apps"
109msgid "Apps"
110msgstr "Програми"
110msgstr "Програми"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "Часто використовувані програми"
114msgstr "Часто використовувані програми"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "Вибрані контакти"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "Недавні контакти"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "Нещодавно прослухана музика"
118msgstr "Нещодавно прослухана музика"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "Популярні в мережі відео"
122msgstr "Популярні в мережі відео"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "Домівка"
126msgstr "Домівка"
135
127
@@ -153,26 +145,6 @@ msgstr "З високими оцінками"
153msgid "Music"
145msgid "Music"
154msgstr "Музика"
146msgstr "Музика"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Улюблене"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "Нещодавні контакти"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "Нові контакти"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "А-Я"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "Люди"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "Популярне у мережі"
150msgstr "Популярне у мережі"
@@ -193,18 +165,18 @@ msgstr "Актори:"
193msgid "Author:"
165msgid "Author:"
194msgstr "Автор:"
166msgstr "Автор:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "Екстрений виклик"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "Привіт, %1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "Привіт!"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "Пристрій"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "Автономний режим"
207msgstr "Автономний режим"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "Пошук"
211msgstr "Пошук"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "Вибачте, для вказаних вами ключових слів нічого не знайдено."
215msgstr "Вибачте, для вказаних вами ключових слів нічого не знайдено."
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Екран домівки"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Люди"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Екран домівки"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "Вибрані контакти"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "Недавні контакти"
233+
234+#~ msgid "A-Z"
235+#~ msgstr "А-Я"
236+
237+#~ msgid "New Contacts"
238+#~ msgstr "Нові контакти"
239+
240+#~ msgid "Favourites"
241+#~ msgstr "Улюблене"
242+
243+#~ msgid "Recently in touch"
244+#~ msgstr "Нещодавні контакти"
po/unity8.pot+4−9
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,7 +165,7 @@ msgstr ""
165msgid "Author:"
165msgid "Author:"
166msgstr ""
166msgstr ""
167
167
168−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
169msgid "Emergency call"
169msgid "Emergency call"
170msgstr ""
170msgstr ""
171
171
@@ -214,12 +214,7 @@ msgstr ""
214msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
215msgstr ""
215msgstr ""
216
216
217−#: Shell.qml:380
217+#: Shell.qml:383
218#, qt-format
218#, qt-format
219−msgid "Please enter %1:"
219+msgid "Please enter %1"
220−msgstr ""
221−
222−#: Shell.qml:380
223−#, qt-format
224−msgid "Please enter %1:"
225msgstr ""
220msgstr ""
po/zh_CN.po+41−49
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11−"PO-Revision-Date: 2013-06-13 11:35+0000\n"
11+"PO-Revision-Date: 2013-06-22 21:20+0000\n"
12−"Last-Translator: Wylmer Wang <Unknown>\n"
12+"Last-Translator: Anthony Wong <anthony.wong@canonical.com>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "可供下载"
109msgid "Apps"
109msgid "Apps"
110msgstr "应用程序"
110msgstr "应用程序"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "常用软件"
114msgstr "常用软件"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "常用联系人"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "近期联系人"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "近期听过的音乐"
118msgstr "近期听过的音乐"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "热门在线视频"
122msgstr "热门在线视频"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "主页"
126msgstr "主页"
135
127
@@ -153,26 +145,6 @@ msgstr "排行榜图"
153msgid "Music"
145msgid "Music"
154msgstr "音乐"
146msgstr "音乐"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "最爱"
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr "最近联系"
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr "新建联系人"
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr "A-Z"
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "联系人"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr "经常在线"
150msgstr "经常在线"
@@ -193,18 +165,18 @@ msgstr "主演:"
193msgid "Author:"
165msgid "Author:"
194msgstr "作者:"
166msgstr "作者:"
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198−msgstr ""
170+msgstr "紧急呼救"
199
171
200#: Greeter/PassphraseLockscreen.qml:59
172#: Greeter/PassphraseLockscreen.qml:59
201#, qt-format
173#, qt-format
202msgid "Hello %1"
174msgid "Hello %1"
203−msgstr ""
175+msgstr "你好,%1"
204
176
205#: Greeter/PassphraseLockscreen.qml:59
177#: Greeter/PassphraseLockscreen.qml:59
206msgid "Hello"
178msgid "Hello"
207−msgstr ""
179+msgstr "你好"
208
180
209#: Hud/HudParametrizedActionsPage.qml:132
181#: Hud/HudParametrizedActionsPage.qml:132
210msgid "Confirm"
182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "设备"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "飞行模式"
207msgstr "飞行模式"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "搜索"
211msgstr "搜索"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "对不起,没有找到您想要的结果。"
215msgstr "对不起,没有找到您想要的结果。"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "主页"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "Home screen"
223+#~ msgstr "主页"
224+
225+#~ msgid "Favourite People"
226+#~ msgstr "常用联系人"
227+
228+#~ msgid "People Recently in Touch"
229+#~ msgstr "近期联系人"
230+
231+#~ msgid "People"
232+#~ msgstr "联系人"
233+
234+#~ msgid "Recently in touch"
235+#~ msgstr "最近联系"
236+
237+#~ msgid "New Contacts"
238+#~ msgstr "新建联系人"
239+
240+#~ msgid "Favourites"
241+#~ msgstr "最爱"
242+
243+#~ msgid "A-Z"
244+#~ msgstr "A-Z"
po/zh_TW.po+24−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
11"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
18+"X-Generator: Launchpad (build 16681)\n"
19
19
20#: Applications/applications.js:23
20#: Applications/applications.js:23
21msgid "Phone"
21msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "可供下載"
109msgid "Apps"
109msgid "Apps"
110msgstr "程式"
110msgstr "程式"
111
111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113msgid "Frequent Apps"
113msgid "Frequent Apps"
114msgstr "常用的程式"
114msgstr "常用的程式"
115
115
116−#: Dash/DashHome.qml:46
116+#: Dash/DashHome.qml:43
117−msgid "Favourite People"
118−msgstr "喜歡的朋友"
119−
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr "最近接觸的朋友"
123−
124−#: Dash/DashHome.qml:52
125msgid "Recent Music"
117msgid "Recent Music"
126msgstr "最近聽過的音樂"
118msgstr "最近聽過的音樂"
127
119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129msgid "Videos Popular Online"
121msgid "Videos Popular Online"
130msgstr "線上熱門的影片"
122msgstr "線上熱門的影片"
131
123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133msgid "Home"
125msgid "Home"
134msgstr "家屋"
126msgstr "家屋"
135
127
@@ -153,26 +145,6 @@ msgstr ""
153msgid "Music"
145msgid "Music"
154msgstr "音樂"
146msgstr "音樂"
155
147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr ""
159−
160−#: Dash/DashPeople.qml:32
161−msgid "Recently in touch"
162−msgstr ""
163−
164−#: Dash/DashPeople.qml:33
165−msgid "New Contacts"
166−msgstr ""
167−
168−#: Dash/DashPeople.qml:34
169−msgid "A-Z"
170−msgstr ""
171−
172−#: Dash/DashPeople.qml:123
173−msgid "People"
174−msgstr "朋友"
175−
176#: Dash/DashVideos.qml:31
148#: Dash/DashVideos.qml:31
177msgid "Popular Online"
149msgid "Popular Online"
178msgstr ""
150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193msgid "Author:"
165msgid "Author:"
194msgstr ""
166msgstr ""
195
167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197msgid "Emergency call"
169msgid "Emergency call"
198msgstr ""
170msgstr ""
199
171
@@ -234,19 +206,27 @@ msgstr "裝置"
234msgid "Flight mode"
206msgid "Flight mode"
235msgstr "飛航模式"
207msgstr "飛航模式"
236
208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238msgid "Search"
210msgid "Search"
239msgstr "搜尋"
211msgstr "搜尋"
240
212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242msgid "Sorry, there is nothing that matches your search."
214msgid "Sorry, there is nothing that matches your search."
243msgstr "很抱歉,找不到符合您想搜尋的結果。"
215msgstr "很抱歉,找不到符合您想搜尋的結果。"
244
216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "家屋畫面"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250#, qt-format
218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252msgstr ""
220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "朋友"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "家屋畫面"
227+
228+#~ msgid "Favourite People"
229+#~ msgstr "喜歡的朋友"
230+
231+#~ msgid "People Recently in Touch"
232+#~ msgstr "最近接觸的朋友"
run_on_device+23−5
@@ -15,6 +15,8 @@ PINLOCK=false
15KEYLOCK=false
15KEYLOCK=false
16SUDO="echo $PASSWORD | sudo -S"
16SUDO="echo $PASSWORD | sudo -S"
17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
18+FLIPPED=false
19+CHROOT_PREFIX="/data/ubuntu"
18
20
19usage() {
21usage() {
20 echo "usage: run_on_device [OPTIONS]\n"
22 echo "usage: run_on_device [OPTIONS]\n"
@@ -35,7 +37,11 @@ exec_with_ssh() {
35}
37}
36
38
37exec_with_adb() {
39exec_with_adb() {
40+ if $FLIPPED; then
41+ adb shell $@
42+ else
38− adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
43+ adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
44+ fi
39}
45}
40
46
41adb_root() {
47adb_root() {
@@ -45,7 +51,7 @@ adb_root() {
45
51
46install_ssh_key() {
52install_ssh_key() {
47 ssh-keygen -R $TARGET_IP
53 ssh-keygen -R $TARGET_IP
48− HOME_DIR=/data/ubuntu/home/phablet
54+ HOME_DIR="${CHROOT_PREFIX}/home/phablet"
49 adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
55 adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
50 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
56 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
51 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
57 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
@@ -79,14 +85,15 @@ build() {
79}
85}
80
86
81run() {
87run() {
82− SERVICEFILE="/data/ubuntu/etc/device-services"
88+ SERVICEFILE="${CHROOT_PREFIX}/etc/device-services"
83 adb shell "egrep '$BINARY|qml-phone-shell' $SERVICEFILE"
89 adb shell "egrep '$BINARY|qml-phone-shell' $SERVICEFILE"
84 CONTAINS_SHELL=$?
90 CONTAINS_SHELL=$?
85 if [ $CONTAINS_SHELL -eq 0 ]; then
91 if [ $CONTAINS_SHELL -eq 0 ]; then
86 echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
92 echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
87 adb shell cp $SERVICEFILE $SERVICEFILE.backup
93 adb shell cp $SERVICEFILE $SERVICEFILE.backup
88 adb shell sed -i "/$BINARY\\\\\|qml-phone-shell/d" $SERVICEFILE
94 adb shell sed -i "/$BINARY\\\\\|qml-phone-shell/d" $SERVICEFILE
95+ if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
89− adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
96+ else exec_with_adb /usr/bin/service ubuntu-session restart; fi
90 fi
97 fi
91 adb shell pkill qml-phone-shell
98 adb shell pkill qml-phone-shell
92 adb shell pkill $BINARY
99 adb shell pkill $BINARY
@@ -106,7 +113,8 @@ run() {
106 if [ $CONTAINS_SHELL -eq 0 ]; then
113 if [ $CONTAINS_SHELL -eq 0 ]; then
107 echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
114 echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
108 adb shell cp $SERVICEFILE.backup $SERVICEFILE
115 adb shell cp $SERVICEFILE.backup $SERVICEFILE
116+ if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
109− adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
117+ else exec_with_adb /usr/bin/service ubuntu-session restart; fi
110 fi
118 fi
111}
119}
112
120
@@ -130,6 +138,16 @@ done
130adb_root
138adb_root
131[ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
139[ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
132
140
141+if [ "`adb shell 'grep -q Ubuntu /etc/lsb-release 2> /dev/null && echo -n FLIPPED'`" = "FLIPPED" ]; then
142+ FLIPPED=true
143+ CHROOT_PREFIX=""
144+ if [ "${TARGET_IP}" != "127.0.0.1" ]; then
145+ echo "ERROR: Flipped image detected, adb over TCP/IP isn't supported, yet :/"
146+ echo "Unset TARGET_IP and try again."
147+ exit 2
148+ fi
149+fi
150+
133if $SETUP; then
151if $SETUP; then
134 echo "Setting up environment for building shell.."
152 echo "Setting up environment for building shell.."
135 install_ssh_key
153 install_ssh_key
tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+40−28
@@ -20,7 +20,7 @@
20
20
21#include <AxisVelocityCalculator.h>
21#include <AxisVelocityCalculator.h>
22
22
23−class FakeTimeSource : public AxisVelocityCalculator::TimeSource {
23+class FakeTimeSource : public UbuntuGestures::TimeSource {
24public:
24public:
25 FakeTimeSource() : m_value(0) {}
25 FakeTimeSource() : m_value(0) {}
26
26
@@ -44,71 +44,85 @@ class tst_AxisVelocityCalculator : public QObject
44{
44{
45 Q_OBJECT
45 Q_OBJECT
46private Q_SLOTS:
46private Q_SLOTS:
47+ void init(); // called right before each and every test function is executed
48+ void cleanup(); // called right after each and every test function is executed
49+
47 void simpleSamples();
50 void simpleSamples();
48 void noSamples();
51 void noSamples();
49 void overflowSamples();
52 void overflowSamples();
50 void average();
53 void average();
54+
55+private:
56+ AxisVelocityCalculator *velCalc;
57+ FakeTimeSource *fakeTimeSource;
51};
58};
52
59
60+void tst_AxisVelocityCalculator::init()
61+{
62+ fakeTimeSource = new FakeTimeSource;
63+
64+ velCalc = new AxisVelocityCalculator;
65+ velCalc->setTimeSource(fakeTimeSource);
66+}
67+
68+void tst_AxisVelocityCalculator::cleanup()
69+{
70+ delete velCalc;
71+ delete fakeTimeSource;
72+}
73+
53void tst_AxisVelocityCalculator::simpleSamples()
74void tst_AxisVelocityCalculator::simpleSamples()
54{
75{
55− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
56− AxisVelocityCalculator velCalc(fakeTimeSource);
57 qreal pos = 0;
76 qreal pos = 0;
58
77
59− velCalc.setTrackedPosition(pos);
78+ velCalc->setTrackedPosition(pos);
60− velCalc.reset();
79+ velCalc->reset();
61
80
62 fakeTimeSource->setMsecsSinceReference(10);
81 fakeTimeSource->setMsecsSinceReference(10);
63 pos += 20;
82 pos += 20;
64− velCalc.setTrackedPosition(pos);
83+ velCalc->setTrackedPosition(pos);
65
84
66 fakeTimeSource->setMsecsSinceReference(20);
85 fakeTimeSource->setMsecsSinceReference(20);
67 pos += 20;
86 pos += 20;
68− velCalc.setTrackedPosition(pos);
87+ velCalc->setTrackedPosition(pos);
69
88
70 fakeTimeSource->setMsecsSinceReference(30);
89 fakeTimeSource->setMsecsSinceReference(30);
71 pos += 20;
90 pos += 20;
72− velCalc.setTrackedPosition(pos);
91+ velCalc->setTrackedPosition(pos);
73
92
74− qreal velocity = velCalc.calculate();
93+ qreal velocity = velCalc->calculate();
75
94
76 QCOMPARE(velocity, 2.0f);
95 QCOMPARE(velocity, 2.0f);
77}
96}
78
97
79void tst_AxisVelocityCalculator::noSamples()
98void tst_AxisVelocityCalculator::noSamples()
80{
99{
81− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
82− AxisVelocityCalculator velCalc(fakeTimeSource);
83−
84− float velocity = velCalc.calculate();
100+ float velocity = velCalc->calculate();
85
101
86 QCOMPARE(velocity, 0.0f);
102 QCOMPARE(velocity, 0.0f);
87}
103}
88
104
89void tst_AxisVelocityCalculator::overflowSamples()
105void tst_AxisVelocityCalculator::overflowSamples()
90{
106{
91− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
92− AxisVelocityCalculator velCalc(fakeTimeSource);
93 qreal pos = 0;
107 qreal pos = 0;
94
108
95− velCalc.setTrackedPosition(pos);
109+ velCalc->setTrackedPosition(pos);
96− velCalc.reset();
110+ velCalc->reset();
97
111
98 for (int i = 0; i < 1000; ++i) {
112 for (int i = 0; i < 1000; ++i) {
99 fakeTimeSource->increaseMsecsSinceReference(10);
113 fakeTimeSource->increaseMsecsSinceReference(10);
100 pos += 20;
114 pos += 20;
101− velCalc.setTrackedPosition(pos);
115+ velCalc->setTrackedPosition(pos);
102 }
116 }
103
117
104 /* overwrite all existing samples with faster ones */
118 /* overwrite all existing samples with faster ones */
105 for (int i = 0; i < AxisVelocityCalculator::MAX_SAMPLES; ++i) {
119 for (int i = 0; i < AxisVelocityCalculator::MAX_SAMPLES; ++i) {
106 fakeTimeSource->increaseMsecsSinceReference(10);
120 fakeTimeSource->increaseMsecsSinceReference(10);
107 pos += 40;
121 pos += 40;
108− velCalc.setTrackedPosition(pos);
122+ velCalc->setTrackedPosition(pos);
109 }
123 }
110
124
111− float velocity = velCalc.calculate();
125+ float velocity = velCalc->calculate();
112
126
113 /* check that the calculated velocity correspond to the latest, faster, samples */
127 /* check that the calculated velocity correspond to the latest, faster, samples */
114 QCOMPARE(velocity, 4.0f);
128 QCOMPARE(velocity, 4.0f);
@@ -116,28 +130,26 @@ void tst_AxisVelocityCalculator::overflowSamples()
116
130
117void tst_AxisVelocityCalculator::average()
131void tst_AxisVelocityCalculator::average()
118{
132{
119− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
120− AxisVelocityCalculator velCalc(fakeTimeSource);
121 qreal pos = 0;
133 qreal pos = 0;
122
134
123− velCalc.setTrackedPosition(pos);
135+ velCalc->setTrackedPosition(pos);
124− velCalc.reset();
136+ velCalc->reset();
125
137
126 fakeTimeSource->increaseMsecsSinceReference(10);
138 fakeTimeSource->increaseMsecsSinceReference(10);
127 pos += 20;
139 pos += 20;
128− velCalc.setTrackedPosition(pos);
140+ velCalc->setTrackedPosition(pos);
129
141
130 fakeTimeSource->increaseMsecsSinceReference(10);
142 fakeTimeSource->increaseMsecsSinceReference(10);
131 pos += 20;
143 pos += 20;
132− velCalc.setTrackedPosition(pos);
144+ velCalc->setTrackedPosition(pos);
133
145
134 /* the last sample is an erratic one and would yield a big velocity if
146 /* the last sample is an erratic one and would yield a big velocity if
135 considered isolatedly */
147 considered isolatedly */
136 fakeTimeSource->increaseMsecsSinceReference(10);
148 fakeTimeSource->increaseMsecsSinceReference(10);
137 pos += 100;
149 pos += 100;
138− velCalc.setTrackedPosition(pos);
150+ velCalc->setTrackedPosition(pos);
139
151
140− float velocity = velCalc.calculate();
152+ float velocity = velCalc->calculate();
141
153
142 /* calculated velocity is lower than the one from the last sample */
154 /* calculated velocity is lower than the one from the last sample */
143 QVERIFY(velocity < 9.0f);
155 QVERIFY(velocity < 9.0f);
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+7−11
@@ -38,7 +38,7 @@ private:
38 int m_duration;
38 int m_duration;
39};
39};
40
40
41−class FakeTimeSource : public AxisVelocityCalculator::TimeSource
41+class FakeTimeSource : public UbuntuGestures::TimeSource
42{
42{
43public:
43public:
44 FakeTimeSource() { m_msecsSinceReference = 0; }
44 FakeTimeSource() { m_msecsSinceReference = 0; }
@@ -72,7 +72,6 @@ private:
72 QTouchDevice *device;
72 QTouchDevice *device;
73 FakeTimer *fakeTimer;
73 FakeTimer *fakeTimer;
74 FakeTimeSource *fakeTimeSource;
74 FakeTimeSource *fakeTimeSource;
75− AxisVelocityCalculator *velCalcWithFakeTiming;
76};
75};
77
76
78void tst_DirectionalDragArea::initTestCase()
77void tst_DirectionalDragArea::initTestCase()
@@ -101,7 +100,6 @@ void tst_DirectionalDragArea::init()
101
100
102 fakeTimer = new FakeTimer;
101 fakeTimer = new FakeTimer;
103 fakeTimeSource = new FakeTimeSource;
102 fakeTimeSource = new FakeTimeSource;
104− velCalcWithFakeTiming = new AxisVelocityCalculator(fakeTimeSource);
105}
103}
106
104
107void tst_DirectionalDragArea::cleanup()
105void tst_DirectionalDragArea::cleanup()
@@ -112,10 +110,8 @@ void tst_DirectionalDragArea::cleanup()
112 delete fakeTimer;
110 delete fakeTimer;
113 fakeTimer = 0;
111 fakeTimer = 0;
114
112
115− // will bring fakeTimeSource down with it
113+ delete fakeTimeSource;
116− delete velCalcWithFakeTiming;
117 fakeTimeSource = 0;
114 fakeTimeSource = 0;
118− velCalcWithFakeTiming = 0;
119}
115}
120
116
121QQuickView *tst_DirectionalDragArea::createView()
117QQuickView *tst_DirectionalDragArea::createView()
@@ -187,7 +183,7 @@ void tst_DirectionalDragArea::edgeDrag()
187 view->rootObject()->findChild<DirectionalDragArea*>(dragAreaObjectName);
183 view->rootObject()->findChild<DirectionalDragArea*>(dragAreaObjectName);
188 QVERIFY(edgeDragArea != 0);
184 QVERIFY(edgeDragArea != 0);
189 edgeDragArea->setRecognitionTimer(fakeTimer);
185 edgeDragArea->setRecognitionTimer(fakeTimer);
190− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
186+ edgeDragArea->setTimeSource(fakeTimeSource);
191
187
192 QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
188 QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
193
189
@@ -292,7 +288,7 @@ void tst_DirectionalDragArea::dragWithShortDirectionChange()
292 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
288 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
293 QVERIFY(edgeDragArea != 0);
289 QVERIFY(edgeDragArea != 0);
294 edgeDragArea->setRecognitionTimer(fakeTimer);
290 edgeDragArea->setRecognitionTimer(fakeTimer);
295− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
291+ edgeDragArea->setTimeSource(fakeTimeSource);
296
292
297 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
293 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
298 QPointF touchPoint = initialTouchPos;
294 QPointF touchPoint = initialTouchPos;
@@ -337,7 +333,7 @@ void tst_DirectionalDragArea::minSpeed()
337 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
333 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
338 QVERIFY(edgeDragArea != 0);
334 QVERIFY(edgeDragArea != 0);
339 edgeDragArea->setRecognitionTimer(fakeTimer);
335 edgeDragArea->setRecognitionTimer(fakeTimer);
340− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
336+ edgeDragArea->setTimeSource(fakeTimeSource);
341
337
342 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
338 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
343 QPointF touchPoint = initialTouchPos;
339 QPointF touchPoint = initialTouchPos;
@@ -390,7 +386,7 @@ void tst_DirectionalDragArea::recognitionTimerUsage()
390 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
386 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
391 QVERIFY(edgeDragArea != 0);
387 QVERIFY(edgeDragArea != 0);
392 edgeDragArea->setRecognitionTimer(fakeTimer);
388 edgeDragArea->setRecognitionTimer(fakeTimer);
393− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
389+ edgeDragArea->setTimeSource(fakeTimeSource);
394
390
395 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
391 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
396 QPointF touchPoint = initialTouchPos;
392 QPointF touchPoint = initialTouchPos;
@@ -431,7 +427,7 @@ void tst_DirectionalDragArea::maxSilenceTime()
431 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
427 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
432 QVERIFY(edgeDragArea != 0);
428 QVERIFY(edgeDragArea != 0);
433 edgeDragArea->setRecognitionTimer(fakeTimer);
429 edgeDragArea->setRecognitionTimer(fakeTimer);
434− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
430+ edgeDragArea->setTimeSource(fakeTimeSource);
435
431
436 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
432 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
437 QPointF touchPoint = initialTouchPos;
433 QPointF touchPoint = initialTouchPos;
tests/qmltests/CMakeLists.txt+2
@@ -2,6 +2,7 @@
2include(QmlTest)
2include(QmlTest)
3
3
4add_subdirectory(plugins)
4add_subdirectory(plugins)
5+add_subdirectory(Components)
5
6
6set(qmltest_DEFAULT_IMPORT_PATHS
7set(qmltest_DEFAULT_IMPORT_PATHS
7 ${CMAKE_CURRENT_BINARY_DIR}/plugins
8 ${CMAKE_CURRENT_BINARY_DIR}/plugins
@@ -25,6 +26,7 @@ add_qml_test(utils/Unity/Test UnityTest)
25set(qmltest_DEFAULT_TARGETS qmluitests)
26set(qmltest_DEFAULT_TARGETS qmluitests)
26set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
27set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
27set(qmltest_DEFAULT_PROPERTIES "")
28set(qmltest_DEFAULT_PROPERTIES "")
29+add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
28add_qml_test(Components DraggingArea)
30add_qml_test(Components DraggingArea)
29add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
31add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
30add_qml_test(Components ListViewWithPageHeader)
32add_qml_test(Components ListViewWithPageHeader)
tests/qmltests/Components/CMakeLists.txtnew file+23
@@ -0,0 +1,23 @@
1+########## tst_DragHandle
2+
3+include_directories(
4+ ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
5+ ${CMAKE_CURRENT_BINARY_DIR}
6+ )
7+
8+set(testCommand
9+ LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
10+ ${CMAKE_CURRENT_BINARY_DIR}/DragHandleTestExec
11+ -o ${CMAKE_BINARY_DIR}/DragHandleTest.xml,xunitxml
12+ -o -,txt)
13+
14+add_custom_target(testDragHandle ${testCommand})
15+add_dependencies(qmluitests testDragHandle)
16+add_dependencies(testDragHandle DragHandleTestExec)
17+
18+add_executable(DragHandleTestExec tst_DragHandle.cpp)
19+qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
20+target_link_libraries(DragHandleTestExec UbuntuGestureQml)
21+
22+add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
23+add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")
tests/qmltests/Components/tst_DragHandle.cppnew file+295
@@ -0,0 +1,295 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
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+#include <functional>
18+#include <QtTest/QtTest>
19+#include <QtCore/QObject>
20+#include <qpa/qwindowsysteminterface.h>
21+#include <QtQuick/QQuickView>
22+#include <QtQml/QQmlEngine>
23+
24+#include <DirectionalDragArea.h>
25+
26+class FakeTimer : public UbuntuGestures::AbstractTimer
27+{
28+ Q_OBJECT
29+public:
30+ FakeTimer(QObject *parent = 0)
31+ : UbuntuGestures::AbstractTimer(parent)
32+ {}
33+
34+ virtual int interval() const { return m_duration; }
35+ virtual void setInterval(int msecs) { m_duration = msecs; }
36+private:
37+ int m_duration;
38+};
39+
40+class FakeTimeSource : public UbuntuGestures::TimeSource
41+{
42+public:
43+ FakeTimeSource() { m_msecsSinceReference = 0; }
44+ virtual qint64 msecsSinceReference() {return m_msecsSinceReference;}
45+ qint64 m_msecsSinceReference;
46+};
47+
48+class tst_DragHandle: public QObject
49+{
50+ Q_OBJECT
51+public:
52+ tst_DragHandle() : m_device(0) { }
53+private Q_SLOTS:
54+ void initTestCase(); // will be called before the first test function is executed
55+ void cleanupTestCase(); // will be called after the last test function was executed.
56+
57+ void init(); // called right before each and every test function is executed
58+ void cleanup(); // called right after each and every test function is executed
59+
60+ void dragThreshold_horizontal();
61+ void dragThreshold_vertical();
62+
63+private:
64+ void flickAndHold(DirectionalDragArea *dragHandle, qreal distance);
65+ DirectionalDragArea *fetchAndSetupDragHandle(const char *objectName);
66+ qreal fetchDragThreshold(DirectionalDragArea *dragHandle);
67+ void tryCompare(std::function<qreal ()> actualFunc, qreal expectedValue);
68+
69+ QQuickView *createView();
70+ QQuickView *m_view;
71+ QTouchDevice *m_device;
72+ FakeTimer *m_fakeTimer;
73+ FakeTimeSource *m_fakeTimeSource;
74+};
75+
76+
77+void tst_DragHandle::initTestCase()
78+{
79+ if (!m_device) {
80+ m_device = new QTouchDevice;
81+ m_device->setType(QTouchDevice::TouchScreen);
82+ QWindowSystemInterface::registerTouchDevice(m_device);
83+ }
84+
85+ m_view = 0;
86+}
87+
88+void tst_DragHandle::cleanupTestCase()
89+{
90+}
91+
92+void tst_DragHandle::init()
93+{
94+ m_view = createView();
95+ m_view->setSource(QUrl::fromLocalFile(TEST_DIR"/tst_DragHandle.qml"));
96+ m_view->show();
97+ QVERIFY(QTest::qWaitForWindowExposed(m_view));
98+ QVERIFY(m_view->rootObject() != 0);
99+ qApp->processEvents();
100+
101+ m_fakeTimer = new FakeTimer;
102+ m_fakeTimeSource = new FakeTimeSource;
103+}
104+
105+void tst_DragHandle::cleanup()
106+{
107+ delete m_view;
108+ m_view = 0;
109+
110+ delete m_fakeTimer;
111+ m_fakeTimer = 0;
112+
113+ delete m_fakeTimeSource;
114+ m_fakeTimeSource = 0;
115+}
116+
117+QQuickView *tst_DragHandle::createView()
118+{
119+ QQuickView *window = new QQuickView(0);
120+ window->setResizeMode(QQuickView::SizeRootObjectToView);
121+ window->resize(600, 600);
122+ window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
123+ window->engine()->addImportPath(QLatin1String(TEST_DIR));
124+
125+ return window;
126+}
127+
128+void tst_DragHandle::tryCompare(std::function<qreal ()> actualFunc,
129+ qreal expectedValue)
130+{
131+ int waitCount = 0;
132+ while (actualFunc() != expectedValue && waitCount < 100) {
133+ QTest::qWait(50);
134+ ++waitCount;
135+ }
136+ QCOMPARE(actualFunc(), expectedValue);
137+}
138+
139+namespace {
140+QPointF calculateDirectionVector(DirectionalDragArea *edgeDragArea)
141+{
142+
143+ switch (edgeDragArea->direction()) {
144+ case Direction::Upwards:
145+ return QPointF(0, -1);
146+ case Direction::Downwards:
147+ return QPointF(0, 1);
148+ case Direction::Leftwards:
149+ return QPointF(-1, 0);
150+ default: // Direction::Rightwards:
151+ return QPointF(1, 0);
152+ }
153+}
154+}
155+
156+void tst_DragHandle::flickAndHold(DirectionalDragArea *dragHandle,
157+ qreal distance)
158+{
159+ QPointF initialTouchPos = dragHandle->mapToScene(
160+ QPointF(dragHandle->width() / 2.0, dragHandle->height() / 2.0));
161+ QPointF touchPoint = initialTouchPos;
162+ int numSteps = 10;
163+ qint64 flickTimeMs = 500;
164+ qint64 timeStep = flickTimeMs / numSteps;
165+
166+ QPointF dragDirectionVector = calculateDirectionVector(dragHandle);
167+ QPointF touchMovement = dragDirectionVector * (distance / (qreal)numSteps);
168+
169+ QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());
170+
171+ for (int i = 0; i < numSteps; ++i) {
172+ touchPoint += touchMovement;
173+ m_fakeTimeSource->m_msecsSinceReference += timeStep;
174+ QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());
175+ }
176+
177+ // Wait for quite a bit before finally releasing to make a very low flick/release
178+ // speed.
179+ m_fakeTimeSource->m_msecsSinceReference += 5000;
180+ QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());
181+}
182+
183+DirectionalDragArea *tst_DragHandle::fetchAndSetupDragHandle(const char *objectName)
184+{
185+ DirectionalDragArea *dragHandle =
186+ m_view->rootObject()->findChild<DirectionalDragArea*>(objectName);
187+ Q_ASSERT(dragHandle != 0);
188+ dragHandle->setRecognitionTimer(m_fakeTimer);
189+ dragHandle->setTimeSource(m_fakeTimeSource);
190+
191+ AxisVelocityCalculator *edgeDragEvaluator =
192+ dragHandle->findChild<AxisVelocityCalculator*>("edgeDragEvaluator");
193+ Q_ASSERT(edgeDragEvaluator != 0);
194+ edgeDragEvaluator->setTimeSource(m_fakeTimeSource);
195+
196+ return dragHandle;
197+}
198+
199+qreal tst_DragHandle::fetchDragThreshold(DirectionalDragArea *dragHandle)
200+{
201+ AxisVelocityCalculator *edgeDragEvaluator =
202+ dragHandle->findChild<AxisVelocityCalculator*>("edgeDragEvaluator");
203+ Q_ASSERT(edgeDragEvaluator != 0);
204+
205+ return edgeDragEvaluator->property("dragThreshold").toReal();
206+}
207+
208+/*
209+ Checks that ending a low-speed drag before dragThreshold results in the
210+ Showable getting back to its original position, whereas ending after dragThreshold
211+ results in Showable continuing until reaching its new states (shown or hidden)
212+ */
213+void tst_DragHandle::dragThreshold_horizontal()
214+{
215+ DirectionalDragArea *dragHandle = fetchAndSetupDragHandle("rightwardsDragHandle");
216+
217+ qreal dragThreshold = fetchDragThreshold(dragHandle);
218+
219+ // end before the threshold
220+ flickAndHold(dragHandle, dragThreshold * 0.7);
221+
222+ // should rollback
223+ QQuickItem *parentItem = dragHandle->parentItem();
224+ tryCompare([&](){ return parentItem->x(); }, -parentItem->width());
225+ QCOMPARE(parentItem->property("shown").toBool(), false);
226+
227+ // end after the threshold
228+ flickAndHold(dragHandle, dragThreshold * 1.2);
229+
230+ // should keep going until completion
231+ tryCompare([&](){ return parentItem->x(); }, 0);
232+ QCOMPARE(parentItem->property("shown").toBool(), true);
233+
234+ dragHandle = fetchAndSetupDragHandle("leftwardsDragHandle");
235+
236+ dragThreshold = fetchDragThreshold(dragHandle);
237+
238+ // end before the threshold
239+ flickAndHold(dragHandle, dragThreshold * 0.7);
240+
241+ // should rollback
242+ tryCompare([&](){ return parentItem->x(); }, 0);
243+ QCOMPARE(parentItem->property("shown").toBool(), true);
244+
245+ // end after the threshold
246+ flickAndHold(dragHandle, dragThreshold * 1.2);
247+
248+ // should keep going until completion
249+ tryCompare([&](){ return parentItem->x(); }, -parentItem->width());
250+ QCOMPARE(parentItem->property("shown").toBool(), false);
251+}
252+
253+void tst_DragHandle::dragThreshold_vertical()
254+{
255+ DirectionalDragArea *dragHandle = fetchAndSetupDragHandle("downwardsDragHandle");
256+
257+ qreal dragThreshold = fetchDragThreshold(dragHandle);
258+
259+ // end before the threshold
260+ flickAndHold(dragHandle, dragThreshold * 0.7);
261+
262+ // should rollback
263+ QQuickItem *parentItem = dragHandle->parentItem();
264+ tryCompare([&](){ return parentItem->y(); }, -parentItem->height());
265+ QCOMPARE(parentItem->property("shown").toBool(), false);
266+
267+ // end after the threshold
268+ flickAndHold(dragHandle, dragThreshold * 1.2);
269+
270+ // should keep going until completion
271+ tryCompare([&](){ return parentItem->y(); }, 0);
272+ QCOMPARE(parentItem->property("shown").toBool(), true);
273+
274+ dragHandle = fetchAndSetupDragHandle("upwardsDragHandle");
275+
276+ dragThreshold = fetchDragThreshold(dragHandle);
277+
278+ // end before the threshold
279+ flickAndHold(dragHandle, dragThreshold * 0.7);
280+
281+ // should rollback
282+ tryCompare([&](){ return parentItem->y(); }, 0);
283+ QCOMPARE(parentItem->property("shown").toBool(), true);
284+
285+ // end after the threshold
286+ flickAndHold(dragHandle, dragThreshold * 1.2);
287+
288+ // should keep going until completion
289+ tryCompare([&](){ return parentItem->y(); }, -parentItem->height());
290+ QCOMPARE(parentItem->property("shown").toBool(), false);
291+}
292+
293+QTEST_MAIN(tst_DragHandle)
294+
295+#include "tst_DragHandle.moc"
tests/qmltests/Components/tst_DragHandle.qmlnew file+114
@@ -0,0 +1,114 @@
1+/*
2+ * Copyright 2013 Canonical Ltd.
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 "../../../Components"
19+import "tst_DragHandle"
20+import Ubuntu.Components 0.1
21+import Ubuntu.Gestures 0.1
22+
23+/*
24+ Two blue fullscreen Showables (a vertical and a horizontal one) with red handles you
25+ can use to drag them away and green handles to drag them in.
26+
27+ A black vertical line marks the point where a drag needs no forward velocity to
28+ achieve auto-completion (i.e., get Showable.show() called after touch release).
29+ */
30+Item {
31+ id: root
32+ width: 700
33+ height: 500
34+
35+ property var dragHandle
36+
37+ VerticalShowable {
38+ onDragHandleRecognizedGesture: { root.dragHandle = dragHandle }
39+ }
40+
41+ HorizontalShowable {
42+ onDragHandleRecognizedGesture: { root.dragHandle = dragHandle }
43+ }
44+
45+ // Visually mark drag threshold
46+ Rectangle {
47+ color: "black"
48+ width: 2
49+ height: parent.height
50+
51+ visible: dragHandle !== undefined && Direction.isHorizontal(dragHandle.direction)
52+
53+ x: {
54+ if (dragHandle) {
55+ if (dragHandle.direction === Direction.Rightwards) {
56+ dragHandle.edgeDragEvaluator.dragThreshold;
57+ } else {
58+ parent.width - dragHandle.edgeDragEvaluator.dragThreshold;
59+ }
60+ } else {
61+ 0
62+ }
63+ }
64+ }
65+ Rectangle {
66+ color: "black";
67+ height: 2
68+ width: parent.width
69+
70+ visible: dragHandle !== undefined && Direction.isVertical(dragHandle.direction)
71+
72+ y: {
73+ if (dragHandle) {
74+ if (dragHandle.direction === Direction.Downwards) {
75+ dragHandle.edgeDragEvaluator.dragThreshold;
76+ } else {
77+ parent.height - dragHandle.edgeDragEvaluator.dragThreshold;
78+ }
79+ } else {
80+ 0
81+ }
82+ }
83+ }
84+
85+ // Display velocities
86+ Rectangle {
87+ width: childrenRect.width
88+ height: childrenRect.height
89+ color: "white"
90+ opacity: 0.4
91+ Text {
92+ id: velocityText
93+ font.pixelSize: units.gu(2)
94+ text: {
95+ if (dragHandle !== undefined) {
96+ "Velocity: " + (dragHandle.edgeDragEvaluator.velocity * 1000);
97+ } else {
98+ "Velocity: -";
99+ }
100+ }
101+ }
102+ Text {
103+ anchors.top: velocityText.bottom
104+ font.pixelSize: units.gu(2)
105+ text: {
106+ if (dragHandle !== undefined) {
107+ "Minimum velocity: " + (dragHandle.edgeDragEvaluator.minVelocity * 1000);
108+ } else {
109+ "Minimum velocity: -";
110+ }
111+ }
112+ }
113+ }
114+}
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qmlnew file+77
@@ -0,0 +1,77 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
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 "../../../../Components"
19+import Ubuntu.Components 0.1
20+import Ubuntu.Gestures 0.1
21+
22+Showable {
23+ id: showable
24+ x: -width
25+ width: parent.width
26+ height: parent.height
27+
28+ shown: false
29+
30+ signal dragHandleRecognizedGesture(var dragHandle)
31+
32+ showAnimation: StandardAnimation { property: "x"; to: 0 }
33+ hideAnimation: StandardAnimation { property: "x"; to: -width }
34+
35+ Rectangle { color: "blue"; anchors.fill: parent }
36+
37+ DragHandle {
38+ objectName: "leftwardsDragHandle"
39+ id: leftwardsDragHandle
40+ anchors.top: parent.top
41+ anchors.bottom: parent.bottom
42+ anchors.right: parent.right
43+
44+ width: units.gu(2)
45+
46+ direction: Direction.Leftwards
47+
48+ onStatusChanged: {
49+ if (status === DirectionalDragArea.Recognized) {
50+ dragHandleRecognizedGesture(leftwardsDragHandle);
51+ }
52+ }
53+
54+ Rectangle { color: "red"; anchors.fill: parent }
55+ }
56+
57+ DragHandle {
58+ objectName: "rightwardsDragHandle"
59+ id: rightwardsDragHandle
60+ anchors.top: parent.top
61+ anchors.bottom: parent.bottom
62+ anchors.left: parent.right
63+
64+ width: units.gu(2)
65+
66+ direction: Direction.Rightwards
67+
68+ onStatusChanged: {
69+ if (status === DirectionalDragArea.Recognized) {
70+ dragHandleRecognizedGesture(rightwardsDragHandle);
71+ }
72+ }
73+
74+ Rectangle { color: "green"; anchors.fill: parent }
75+ }
76+
77+}
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qmlnew file+77
@@ -0,0 +1,77 @@
1+/*
2+ * Copyright (C) 2013 Canonical, Ltd.
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 "../../../../Components"
19+import Ubuntu.Components 0.1
20+import Ubuntu.Gestures 0.1
21+
22+Showable {
23+ id: showable
24+ y: -height
25+ width: parent.width
26+ height: parent.height
27+
28+ shown: false
29+
30+ signal dragHandleRecognizedGesture(var dragHandle)
31+
32+ showAnimation: StandardAnimation { property: "y"; to: 0 }
33+ hideAnimation: StandardAnimation { property: "y"; to: -height }
34+
35+ Rectangle { color: "blue"; anchors.fill: parent }
36+
37+ DragHandle {
38+ objectName: "upwardsDragHandle"
39+ id: upwardsDragHandle
40+ anchors.left: parent.left
41+ anchors.right: parent.right
42+ anchors.bottom: parent.bottom
43+
44+ height: units.gu(2)
45+
46+ direction: Direction.Upwards
47+
48+ onStatusChanged: {
49+ if (status === DirectionalDragArea.Recognized) {
50+ dragHandleRecognizedGesture(upwardsDragHandle);
51+ }
52+ }
53+
54+ Rectangle { color: "red"; anchors.fill: parent }
55+ }
56+
57+ DragHandle {
58+ objectName: "downwardsDragHandle"
59+ id: downwardsDragHandle
60+ anchors.left: parent.left
61+ anchors.right: parent.right
62+ anchors.top: parent.bottom
63+
64+ height: units.gu(2)
65+
66+ direction: Direction.Downwards
67+
68+ onStatusChanged: {
69+ if (status === DirectionalDragArea.Recognized) {
70+ dragHandleRecognizedGesture(downwardsDragHandle);
71+ }
72+ }
73+
74+ Rectangle { color: "green"; anchors.fill: parent }
75+ }
76+
77+}
tests/qmltests/Components/tst_Stage.qml+1−2
@@ -233,8 +233,7 @@ Rectangle {
233
233
234 var touchX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
234 var touchX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
235 var touchY = stage.height / 2
235 var touchY = stage.height / 2
236− touchFlick(stage, touchX, touchY,
236+ touchFlick(stage, touchX, touchY, stage.width * 0.25, touchY)
237− touchX - units.gu(5), touchY)
238
237
239 // wait until animations end, if any
238 // wait until animations end, if any
240 tryCompare(stage, "usingScreenshots", false)
239 tryCompare(stage, "usingScreenshots", false)
tests/qmltests/Greeter/tst_Lockscreen.qml+7−1
@@ -187,8 +187,8 @@ Rectangle {
187 unlockedCheckBox.checked = false
187 unlockedCheckBox.checked = false
188 LightDM.Greeter.authenticate(data.username)
188 LightDM.Greeter.authenticate(data.username)
189
189
190+ var inputField = findChild(lockscreen, "pinentryField")
190 if (data.alphanumeric) {
191 if (data.alphanumeric) {
191− var inputField = findChild(lockscreen, "pinentryField")
192 mouseClick(inputField, units.gu(1), units.gu(1))
192 mouseClick(inputField, units.gu(1), units.gu(1))
193 typeString(data.password)
193 typeString(data.password)
194 keyClick(Qt.Key_Enter)
194 keyClick(Qt.Key_Enter)
@@ -200,6 +200,12 @@ Rectangle {
200 }
200 }
201 }
201 }
202 tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
202 tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
203+ if (!data.unlockedSignal) {
204+ // make sure the input is cleared on wrong input
205+ tryCompareFunction(function() {return inputField.text.length == 0}, true)
206+ } else {
207+ tryCompareFunction(function() {return inputField.text.length > 0}, true)
208+ }
203 }
209 }
204 }
210 }
205}
211}