on xenial help sign in
Merge
commit52ee82ad966e4e47698bce7b360f0c6a9a818dbe authorAlbert Astals <albert.astals@canonical.com> dateMon 1 Jul 2013, 10:00 (13 years ago) parent6c75c2e99d28f4
87 files changed+2980−2328
CODING+75−29 Components/DragHandle.qml+148 Components/EdgeDragEvaluator.qml+88 Components/FilterGrid.qml+1−1 Components/PageHeader.qml+2−2 Components/Stage.qml+7−5 Components/Tile.qml+1−1 Components/UbuntuShapeForItem.qml+12−56 Components/WrongPasswordAnimation.qml+3−3 Dash/Apps/RunningApplicationTile.qml+1−1 Dash/Music/AlbumTile.qml+1−1 Greeter/Greeter.qml+26 Greeter/GreeterContent.qml+3−1 Greeter/LoginList.qml−8 Hud/SearchBar.qml−7 Hud/ToolBarIcon.qml+1−1 Launcher/Launcher.qml+5−5 Launcher/LauncherDelegate.qml+202−39 Launcher/LauncherPanel.qml+106−52 Launcher/graphics/home@18.png Shell.qml+36−39 build+3 debian/changelog+18 main.cpp+26−6 paths.h.in+10−3 plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+31−16 plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+31−20 plugins/Ubuntu/Gestures/Direction.cpp+5 plugins/Ubuntu/Gestures/Direction.h+1 plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+59−8 plugins/Ubuntu/Gestures/DirectionalDragArea.h+21−3 plugins/Unity/categories.cpp+26−17 plugins/Unity/categories.h+1 po/ar.po+37−45 po/az.po+18−44 po/bg.po+24−44 po/ca.po+24−44 po/de.po+38−46 po/el.po+18−44 po/en_AU.po+36−44 po/en_GB.po+38−46 po/eo.po+12−44 po/es.po+36−44 po/fi.po+33−44 po/fo.po+18−44 po/fr.po+71−82 po/gl.po+24−44 po/he.po+18−44 po/hr.po+18−44 po/hu.po+18−44 po/hy.po+24−44 po/id.po+12−44 po/it.po+18−44 po/ja.po+12−44 po/kn.po+18−44 po/ko.po+12−44 po/ky.po+18−44 po/lv.po+18−44 po/my.po+15−44 po/nb.po+18−44 po/nl.po+18−44 po/pl.po+36−44 po/pt_BR.po+18−44 po/ro.po+18−44 po/ru.po+27−44 po/si.po+12−44 po/sl.po+43−69 po/sr.po+18−44 po/sv.po+12−44 po/te.po+12−44 po/th.po+220 po/tr.po+33−44 po/ug.po+59−70 po/uk.po+42−50 po/unity8.pot+4−9 po/zh_CN.po+37−45 po/zh_TW.po+24−44 run_on_device+23−5 tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+40−28 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+99−11 tests/qmltests/CMakeLists.txt+2 tests/qmltests/Components/CMakeLists.txt+23 tests/qmltests/Components/tst_DragHandle.cpp+295 tests/qmltests/Components/tst_DragHandle.qml+114 tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+77 tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+77 tests/qmltests/Components/tst_Stage.qml+1−2
CODING+75−29
@@ -1,43 +1,64 @@
11Building Unity 8
22================
33
4+Only Ubuntu 13.10 (saucy) is supported as a developement environment.
5+
46download source
57---------------
6−- the build requires some additional dependencies, so create the parent folder to not pollute your setup
7− $ mkdir ~/unity
8+- create a parent folder to not pollute your setup. so that you can have different unity
9+ branches there (trunk, WIP etc)
10+
11+ $ mkdir ~/unity8
812
913- fetch Unity 8 source
1014 $ sudo apt-get install bzr
11− $ bzr branch lp:unity/8.0 ~/unity/unity8
12− $ cd ~/unity/unity8
15+ $ bzr branch lp:unity8 ~/unity8/trunk
16+ $ cd ~/unity8/trunk
17+
18+install dependencies
19+--------------------
20+If its your first time, install build dependencies
21+
22+$ cd ~/unity8/trunk
23+$ ./build --setup
1324
14−build dependencies
15−------------------
16−If its your first time, download & build deps
17−$ ./build -s
1825 this will:
19− - add ppa:phablet-team/desktop-deps, ppa:canonical-qt5-edgers/qt5-proper, ppa:ubuntu-sdk-team
20− - build and install lp:libunity/phablet, lp:unity/phablet-mods, lp:hud/phablet locally
21− - install build dependencies
26+ - add the following PPA's
27+ - ppa:phablet-team/desktop-deps
28+ - ppa:canonical-qt5-edgers/qt5-proper
29+ - ppa:ubuntu-sdk-team
30+ - install the required dependencies to build, as well as run on the desktop
31+ - it should also install unity-scope-home and unity-lens-application which
32+ are technically "recommends", not strict dependencies
33+
34+Note, once the PPA's are added, the script runs apt-get update, if you have
35+any failures associated with it, the build script will bail out of the setup
36+and fail to install all the required dependencies.
37+
2238
2339build Unity 8
2440-------------
25−$ ./build
2641
27−subsequent updates of the dependencies
28−--------------------------------------
29−$ ./build_unity -u
30−$ ./build_unity
42+$ cd ~/unity8/trunk
43+$ ./build
3144
45+You may also rebuild with the -c for clean, which just deletes the build
46+directory.
3247
3348Running Unity 8 on your desktop
3449===============================
3550
3651run the Unity 8 shell
3752---------------------
38−$ cd ~/unity/unity8
53+$ cd ~/unity8/trunk
3954$ ./run
4055
56+Options can be passed to test the lock screen
57+$ ./run -p OR -k
58+
59+-p is for pin lock, for which the default prompt answer is "1234"
60+-k is for keylock passphrase, for which the default prompt answer is "password"
61+
4162Notes
4263-----
4364- to navigate, utilize the mouse left button as you would your finger
@@ -45,17 +66,29 @@ Notes
4566 put the *.mo files into correct structure. We'll look for a better solution
4667 later.
4768 $ cd builddir; make install
69+- if you wish to populate contacts
70+ $ sudo apt-get install gir1.2-ebook-1.2
71+ $ manage-address-book.py create
72+ this will:
73+ - Create an EDS address book
74+ - Populate the address book with sample data
4875
4976Running Unity 8 on devices
5077==========================
5178- Ubuntu Touch builds are currently only available in 13.10 flavour
52−- supported hardware should match one those listed here https://wiki.ubuntu.com/Touch/Devices#Running_fine
53−- follow the Ubuntu Touch install instructions for your chosen device https://wiki.ubuntu.com/Touch/Install
79+- supported hardware should match one those listed here
80+ https://wiki.ubuntu.com/Touch/Devices#Running_fine
81+- follow the Ubuntu Touch install instructions for your chosen device
82+ https://wiki.ubuntu.com/Touch/Install
5483- make sure your device is connected to a WiFi network
55−- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one on the device yourself)
56−
57−$ cd ~/unity/unity8
58−$ ./run_on_device -s
84+- If you haven’t already or if you’ve just freshly flashed your device
85+ make sure you run phablet-network-setup which will allow package updates to
86+ the device
87+- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one
88+ on the device yourself)
89+
90+$ cd ~/unity/trunk
91+$ ./run_on_device --setup
5992 this will:
6093 - install your public SSH key on the device
6194 - add ppa:canonical-qt5-edgers/qt5-proper and ppa:phablet-team
@@ -67,19 +100,27 @@ $ ./run_on_device
67100 - build on the device
68101 - replace the running shell
69102
103+Options can be passed to test the lock screen
104+$ ./run_on_device -p OR -k
105+
106+-p is for pin lock, for which the default prompt answer is "1234"
107+-k is for keylock passphrase, for which the default prompt answer is "password"
108+
70109Notes
71110-----
72111- using adb over TCP has some advantages, Google will be of help here
73112 - TL;DR: `adb tcpip 5555; adb connect $your_device_ip`
74113 - you can persist the above via `adb shell setprop persist.adb.tcp.port 5555`
75114 - it's unsafe - anyone can connect to your device
76− - with TCP the Nexus 10 doesn't drop the adb connection when locking the screen
77−- exporting ANDROID_SERIAL=$your_device_serial or ANDROID_SERIAL=$your_device_ip:5555
78− will make adb not complain about multiple devices
115+ - with TCP the Nexus 10 doesn't drop the adb connection when locking
116+ the screen
117+- exporting ANDROID_SERIAL=$your_device_serial or
118+ ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
119+ multiple devices
79120- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device
80121 to not use adb forwarding - useful if you use multiple devices
81−- using Ninja (package ninja-build - run_on_device -s installs this now) will improve
82− build times (especially in the nothing-to-build case)
122+- using Ninja (package ninja-build - run_on_device -s installs this now)
123+ will improve build times (especially in the nothing-to-build case)
83124
84125
85126Coding guidelines
@@ -90,4 +131,9 @@ https://launchpad.net/canonical-client-development-guidelines
90131
91132Development Environment
92133=======================
93−QtCreator (available via the Software Center) is the best IDE to hack on Unity 8.
134+QtCreator (available via the Software Center) is the best IDE to hack on
135+Unity 8.
136+
137+If using VIM, make sure you install some syntax highlighting for QML, like
138+https://github.com/peterhoeg/vim-qml
139+
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/FilterGrid.qml+1−1
@@ -108,7 +108,7 @@ Item {
108108
109109 anchors.fill: parent
110110 radius: "small"
111− borderSource: ItemStyle.style.borderPressed
111+ borderSource: "radius_pressed.sci"
112112 opacity: button.pressed ? 1.0 : 0.0
113113 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
114114 }
Components/PageHeader.qml+2−2
@@ -149,7 +149,7 @@ Item {
149149
150150 primaryItem: Button {
151151 enabled: searchField.text != ""
152− ItemStyle.class: "transparent-button"
152+ color: "transparent"
153153 onClicked: {
154154 if (searchField.text != "") {
155155 searchHistory.addQuery(searchField.text)
@@ -272,7 +272,7 @@ Item {
272272 // FIXME: this should go into the first item below, but enable: false
273273 // prevents mouse events propagation
274274 Button {
275− ItemStyle.class: "transparent-button"
275+ color: "transparent"
276276 anchors {
277277 top: parent.top
278278 right: parent.right
Components/Stage.qml+7−5
@@ -416,9 +416,11 @@ Showable {
416416 }
417417 }
418418
419− AxisVelocityCalculator {
420− id: dragVelocityCalculator
421− trackedPosition: rightEdgeDraggingArea.distance
419+ EdgeDragEvaluator {
420+ id: dragEvaluator
421+ trackedPosition: rightEdgeDraggingArea.touchX
422+ direction: rightEdgeDraggingArea.direction
423+ maxDragDistance: stage.width
422424 }
423425
424426 DirectionalDragArea {
@@ -478,7 +480,7 @@ Showable {
478480 }
479481
480482 function onUndecided() {
481− dragVelocityCalculator.reset()
483+ dragEvaluator.reset();
482484
483485 var nextApplication = null;
484486 if (stage.applications.count > 1) {
@@ -491,7 +493,7 @@ Showable {
491493 }
492494
493495 function onGestureEnded() {
494− if (stage.applications.count > 1 && dragVelocityCalculator.calculate() < 0) {
496+ if (stage.applications.count > 1 && dragEvaluator.shouldAutoComplete()) {
495497 switchToApplicationAnimationController.completeToEndWithSignal();
496498 } else {
497499 switchToApplicationAnimationController.completeToBeginningWithSignal();
Components/Tile.qml+1−1
@@ -51,7 +51,7 @@ AbstractButton {
5151
5252 anchors.fill: icon
5353 radius: "medium"
54− borderSource: ItemStyle.style.borderPressed
54+ borderSource: "radius_pressed.sci"
5555 opacity: root.pressed ? 1.0 : 0.0
5656 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
5757 }
Components/UbuntuShapeForItem.qml+12−56
@@ -15,7 +15,7 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1 as Theming
18+import Ubuntu.Components 0.1
1919
2020/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
2121 * general (Item-based) components. This ability should be incorporated into the SDK's
@@ -24,66 +24,22 @@ import Ubuntu.Components 0.1 as Theming
2424 */
2525
2626Item {
27− id: shape
27+ id: root
2828
29− Theming.ItemStyle.class: "UbuntuShape-radius-" + radius
29+ property alias radius: shape.radius
30+ property alias image: source.sourceItem
3031
31− property string radius: "small"
32− property url maskSource: Theming.ComponentUtils.style(shape, "maskSource", "")
33− property url borderSource: Theming.ComponentUtils.style(shape, "borderIdle", "")
34− property Item image
35−
36− implicitWidth: units.gu(8)
37− implicitHeight: units.gu(8)
38−
39− onWidthChanged: __updateImageDimensions()
40− onHeightChanged: __updateImageDimensions()
41− onImageChanged: __updateImageDimensions()
42−
43− function __updateImageDimensions() {
44− if (!image) return;
45− image.width = shape.width;
46− image.height = shape.height;
47− image.visible = false;
48− }
49−
50− ShaderEffect {
51− anchors.fill: parent
52− visible: shape.image
53−
54− property ShaderEffectSource mask: ShaderEffectSource {
55− sourceItem: BorderImage {
56− width: shape.width
57− height: shape.height
58− source: shape.maskSource
59− visible: false
60− }
61− }
62−
63− property ShaderEffectSource image: ShaderEffectSource {
64− sourceItem: shape.image
65− }
66−
67− fragmentShader:
68− "
69− varying highp vec2 qt_TexCoord0;
70− uniform lowp float qt_Opacity;
71− uniform sampler2D mask;
72− uniform sampler2D image;
73−
74− void main(void)
75− {
76− lowp vec4 maskColor = texture2D(mask, qt_TexCoord0.st);
77− lowp vec4 imageColor = texture2D(image, qt_TexCoord0.st);
78− gl_FragColor = imageColor * maskColor.a * qt_Opacity;
79− }
80− "
32+ ShaderEffectSource {
33+ id: source
34+ width: 1
35+ height: 1
36+ hideSource: true
8137 }
8238
83− BorderImage {
84− id: border
39+ Shape {
40+ id: shape
41+ image: source
8542
8643 anchors.fill: parent
87− source: shape.borderSource
8844 }
8945}
Components/WrongPasswordAnimation.qml+3−3
@@ -26,14 +26,14 @@ SequentialAnimation {
2626 property: "anchors.horizontalCenterOffset"
2727 duration: 50
2828 easing.type: Easing.InQuad
29− to: units.gu(2)
29+ to: units.gu(1)
3030 }
3131 NumberAnimation {
3232 target: root.target
3333 property: "anchors.horizontalCenterOffset"
3434 duration: 100
3535 easing.type: Easing.InOutQuad
36− to: -units.gu(2)
36+ to: -units.gu(1)
3737 }
3838 NumberAnimation {
3939 target: root.target
@@ -41,6 +41,6 @@ SequentialAnimation {
4141 properties: "anchors.horizontalCenterOffset"
4242 to: 0
4343 duration: 400
44− easing.overshoot: units.gu(2)
44+ easing.overshoot: units.gu(1)
4545 }
4646}
Dash/Apps/RunningApplicationTile.qml+1−1
@@ -87,7 +87,7 @@ AbstractButton {
8787
8888 anchors.fill: shapedApplicationImage
8989 radius: "medium"
90− borderSource: ItemStyle.style.borderPressed
90+ borderSource: "radius_pressed.sci"
9191 opacity: root.pressed ? 1.0 : 0.0
9292 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
9393 }
Dash/Music/AlbumTile.qml+1−1
@@ -45,7 +45,7 @@ AbstractButton {
4545
4646 anchors.fill: icon
4747 radius: "medium"
48− borderSource: ItemStyle.style.borderPressed
48+ borderSource: "radius_pressed.sci"
4949 opacity: root.pressed ? 1.0 : 0.0
5050 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
5151 }
Greeter/Greeter.qml+26
@@ -16,14 +16,23 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import Ubuntu.Gestures 0.1
1920import LightDM 0.1 as LightDM
2021import "../Components"
22+import "../Components/Math.js" as MathLocal
2123
2224Showable {
2325 id: greeter
2426 enabled: shown
2527 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
2628
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
2736 property alias model: greeterContentLoader.model
2837 property bool locked: shown && multiUser && !greeterContentLoader.promptless
2938
@@ -91,4 +100,21 @@ Showable {
91100 }
92101 }
93102 ]
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+ }
94120}
Greeter/GreeterContent.qml+3−1
@@ -80,7 +80,9 @@ MouseArea {
8080 source: greeter.narrowMode ? "" : "LoginList.qml"
8181
8282 onLoaded: {
83− item.currentIndex = greeterContentLoader.currentIndex
83+ item.currentIndex = greeterContentLoader.currentIndex;
84+ selected(item.currentIndex);
85+ item.resetAuthentication();
8486 }
8587
8688 Binding {
Greeter/LoginList.qml−8
@@ -66,14 +66,6 @@ Item {
6666
6767 readonly property bool movingInternally: moveTimer.running || userList.moving
6868
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−
7769 onCurrentIndexChanged: {
7870 if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
7971 root.resetAuthentication();
Hud/SearchBar.qml−7
@@ -55,13 +55,6 @@ Item {
5555 }
5656 }
5757
58− // Don't let the style play with our opacity
59− Binding {
60− target: searchBar.ItemStyle.style
61− property: "opacity"
62− value: 1
63− }
64−
6558 Item {
6659 id: primary
6760 height: searchBar.height
Hud/ToolBarIcon.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919
2020Button {
21− ItemStyle.class: "transparent-button"
21+ color: "transparent"
2222
2323 property alias source: image.source
2424
Launcher/Launcher.qml+5−5
@@ -50,7 +50,7 @@ Item {
5050 }
5151
5252 function hide() {
53− state = ""
53+ switchToNextState("")
5454 }
5555
5656 function switchToNextState(state) {
@@ -215,11 +215,11 @@ Item {
215215
216216 onDraggingChanged: {
217217 if (!dragging) {
218− if (distance > root.width / 2) {
219− root.dash()
220− root.switchToNextState("")
221− } else if (distance > panel.width/2) {
218+ if (distance > panel.width / 2) {
222219 root.switchToNextState("visible")
220+ if (distance > panel.width * 2) {
221+ root.dash()
222+ }
223223 } else {
224224 root.switchToNextState("")
225225 }
Launcher/LauncherDelegate.qml+202−39
@@ -25,6 +25,8 @@ Item {
2525 property real angle: 0
2626 property bool highlighted: false
2727 property real offset: 0
28+ property alias brightness: transformEffect.brightness
29+ property real itemOpacity: 1
2830
2931 property real maxAngle: 0
3032 property bool inverted: false
@@ -32,74 +34,237 @@ Item {
3234 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
3335 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
3436
35− property int itemsBeforeThis: 0
36− property int itemsAfterThis: 0
37−
3837 property bool dragging:false
3938
4039 signal clicked()
4140 signal longtap()
4241 signal released()
4342
44− UbuntuShape {
43+ Item {
4544 id: iconItem
46− color: Qt.rgba(0, 0, 1, 0.5)
4745 width: parent.width
4846 height: parent.height
4947 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− }
6348
64− MouseArea {
65− id: mouseArea
49+ UbuntuShape {
50+ id: iconShape
6651 anchors.fill: parent
67− onClicked: root.clicked()
68− onCanceled: root.released()
69− preventStealing: false
52+ anchors.margins: units.gu(0.5)
53+ radius: "medium"
7054
71− onPressAndHold: {
72− root.state = "moving"
55+ image: Image {
56+ id: iconImage
57+ sourceSize.width: iconShape.width
58+ sourceSize.height: iconShape.height
59+ source: "../graphics/applicationIcons/" + root.iconName + ".png"
7360 }
74− onReleased: {
75− root.state = "docked"
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+ }
73+ onReleased: {
74+ root.state = "docked"
75+ }
7676 }
7777 }
78−
7978 BorderImage {
8079 id: overlayHighlight
8180 anchors.centerIn: iconItem
8281 rotation: inverted ? 180 : 0
83− source: root.highlighted || mouseArea.pressed ? "graphics/selected.sci" : "graphics/non-selected.sci"
84− width: iconItem.width + units.gu(1.5)
82+ source: isSelected ? "graphics/selected.sci" : "graphics/non-selected.sci"
83+ width: root.width + units.gu(0.5)
8584 height: width
85+ property bool isSelected: root.highlighted || mouseArea.pressed
86+ onIsSelectedChanged: shaderEffectSource.scheduleUpdate();
8687 }
8788 }
8889
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+
89171 states: [
90172 State {
91173 name: "docked"
92174 PropertyChanges {
93175 target: root
94− offset: if (launcherFlickable.contentY > itemsBeforeThis * (foldedHeight + launcherColumn.spacing*2)) {
95− return launcherFlickable.contentY - (index * (foldedHeight + launcherColumn.spacing*2));
96− } else if (y + height - launcherFlickable.contentY > launcherFlickable.height - (itemsAfterThis*(foldedHeight - launcherColumn.spacing))) {
97− return launcherFlickable.height - (y+height) + launcherFlickable.contentY - (itemsAfterThis*(foldedHeight - launcherColumn.spacing));
98− } else {
99− return 0;
176+
177+ // This is the offset that keeps the items inside the panel
178+ offset: {
179+ // First/last items are special
180+ if (index == 0 || index == priv.listView.count-1) {
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
100207 }
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+ }
102210
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+ }
103268 }
104269 },
105270
@@ -121,7 +286,5 @@ Item {
121286 drag.target: root
122287 }
123288 }
124−
125289 ]
126−
127290}
Launcher/LauncherPanel.qml+106−52
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import Unity 0.1
20+import "../Components/ListItems"
2021
2122Item {
2223 id: root
@@ -26,7 +27,7 @@ Item {
2627 property var model
2728 property bool inverted: true
2829 property bool dragging: false
29− property bool moving: launcherFlickable.moving
30+ property bool moving: launcherListView.moving || launcherListView.flicking
3031 property int dragPosition: 0
3132 property int highlightIndex: -1
3233
@@ -34,23 +35,23 @@ Item {
3435 signal dashItemSelected(int index)
3536
3637 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
3839
39− var hiddenContentHeight = launcherFlickable.contentHeight - launcherFlickable.height
40+ var hiddenContentHeight = launcherListView.contentHeight - launcherListView.height
4041 // 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
4243 // 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
4445 var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
4546
4647 // 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));
4849
4950 // Now calculate the current index:
5051 // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
5152 // > adjust that removing all the margins
5253 // > 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)
5455 }
5556
5657 BorderImage {
@@ -61,58 +62,111 @@ Item {
6162
6263 Column {
6364 id: mainColumn
64− anchors.fill: parent
65− anchors.margins: units.gu(1)
66− spacing: units.gu(1)
65+ anchors {
66+ fill: parent
67+ topMargin: units.gu(0.5)
68+ bottomMargin: units.gu(1)
69+ leftMargin: units.gu(0.5)
70+ rightMargin: units.gu(0.5)
71+ }
72+ spacing: units.gu(0.5)
6773
68− LauncherDelegate {
74+ MouseArea {
6975 id: dashItem
70− objectName: "dashItem"
71− width: launcherFlickable.itemSize
72− height: launcherFlickable.itemSize
73− anchors.horizontalCenter: parent.horizontalCenter
74− iconName: "dash"
76+ width: parent.width
77+ height: units.gu(6.5)
7578 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+ }
7687 }
77− Flickable {
78− id: launcherFlickable
88+ ThinDivider {
89+ anchors {
90+ left: parent.left
91+ right: parent.right
92+ margins: -mainColumn.anchors.leftMargin
93+ }
94+ rotation: root.rotation
95+ }
96+
97+ Item {
7998 anchors.left: parent.left
8099 anchors.right: parent.right
81− height: parent.height - dashItem.height - parent.spacing
82− contentHeight: launcherColumn.height
83−
84− property int itemSize: width
85−
86− Column {
87− id: launcherColumn
88− width: parent.width
89− spacing: units.gu(1)
90− anchors.horizontalCenter: parent.horizontalCenter
91−
92− Repeater {
93− id: iconRepeater
94− model: root.model
95−
96− LauncherDelegate {
97− id: launcherDelegate
98− objectName: "launcherDelegate" + index
99− width: launcherFlickable.itemSize
100− height: launcherFlickable.itemSize
101− iconName: model.icon
102− inverted: root.inverted
103− highlighted: root.dragging && index === root.highlightIndex
104− z: -Math.abs(offset)
105− state: "docked"
106−
107− maxAngle: 60
108−
109− itemsBeforeThis: index
110− itemsAfterThis: iconRepeater.count - (index+1)
111−
112− onClicked: {
113− root.applicationSelected(launcherModel.get(index).desktopFile);
114− }
100+ height: parent.height - dashItem.height - parent.spacing*2
101+ ListView {
102+ id: launcherListView
103+ anchors.fill: parent
104+ anchors.topMargin: -itemSize
105+ anchors.bottomMargin: -itemSize
106+ topMargin: itemSize
107+ bottomMargin: itemSize
108+ height: parent.height - dashItem.height - parent.spacing*2
109+ model: root.model
110+ cacheBuffer: itemSize * 3
111+ snapMode: ListView.SnapToItem
112+ highlightRangeMode: ListView.ApplyRange
113+ preferredHighlightBegin: (height - itemSize) / 2
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+
129+ delegate: LauncherDelegate {
130+ id: launcherDelegate
131+ objectName: "launcherDelegate" + index
132+ width: launcherListView.itemSize
133+ height: launcherListView.itemSize
134+ iconName: model.icon
135+ inverted: root.inverted
136+ highlighted: root.dragging && index === root.highlightIndex
137+ z: -Math.abs(offset)
138+ state: "docked"
139+ maxAngle: 60
140+
141+ onClicked: {
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
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
115166 }
167+ height: launcherListView.itemSize
168+ enabled: launcherListView.contentHeight - launcherListView.height - launcherListView.contentY > -launcherListView.bottomMargin
169+ onClicked: launcherListView.flick(0, -units.gu(40))
116170 }
117171 }
118172 }
Launcher/graphics/home@18.pngnew file

Binary file not shown.

Shell.qml+36−39
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818import Ubuntu.Application 0.1
1919import Ubuntu.Components 0.1
20+import Ubuntu.Gestures 0.1
2021import LightDM 0.1 as LightDM
2122import "Dash"
2223import "Greeter"
@@ -167,7 +168,14 @@ FocusScope {
167168
168169 contentScale: 1.0 - 0.2 * disappearingAnimationProgress
169170 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+
171179 // FIXME: only necessary because stagesRevealer.animatedProgress and
172180 // greeterRevealer.animatedProgress are not animated
173181 Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
@@ -176,26 +184,29 @@ FocusScope {
176184
177185
178186 Item {
187+ id: stagesOuterContainer
179188
180189 width: parent.width
181190 height: parent.height
182191 x: launcher.progress
183192 Behavior on x {SmoothedAnimation{velocity: 600}}
184193
194+ property real showProgress:
195+ MathLocal.clamp(1 - (x + stages.x) / shell.width, 0, 1)
185196
186197 Showable {
187198 id: stages
188199
189− property bool fullyShown: shown && stages[stagesRevealer.boundProperty] == stagesRevealer.openedValue
190− && parent.x == 0
200+ x: width
191201
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
193204 available: !greeter.shown
194205 hides: [launcher, panel.indicators]
195206 shown: false
196207 opacity: 1.0
197− showAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.openedValue; easing.type: Easing.OutCubic }
198− hideAnimation: StandardAnimation { property: "x"; duration: 350; to: stagesRevealer.closedValue; easing.type: Easing.OutCubic }
208+ showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }
209+ hideAnimation: StandardAnimation { property: "x"; duration: 350; to: width; easing.type: Easing.OutCubic }
199210
200211 width: parent.width
201212 height: parent.height
@@ -326,24 +337,19 @@ FocusScope {
326337 height: sideStage.height
327338 orientation: Qt.Horizontal
328339 }
329− }
330− }
331340
341+ DragHandle {
342+ id: stagesRevealer
332343
333− Revealer {
334− id: stagesRevealer
335−
336− property real animatedProgress: MathLocal.clamp((-dragPosition - launcher.progress) / closedValue, 0, 1)
337− enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
338− direction: Qt.RightToLeft
339− openedValue: 0
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
344+ anchors.top: parent.top
345+ anchors.bottom: parent.bottom
346+ anchors.right: parent.left
347+
348+ width: shell.edgeSize
349+ direction: Direction.Leftwards
350+ enabled: mainStage.applications.count > 0 || sideStage.applications.count > 0
351+ }
352+ }
347353 }
348354
349355 Lockscreen {
@@ -392,12 +398,13 @@ FocusScope {
392398 available: true
393399 hides: [launcher, panel.indicators, hud]
394400 shown: true
395− showAnimation: StandardAnimation { property: "x"; to: greeterRevealer.openedValue }
396− hideAnimation: StandardAnimation { property: "x"; to: greeterRevealer.closedValue }
401+
397402 y: panel.panelHeight
398403 width: parent.width
399404 height: parent.height - panel.panelHeight
400405
406+ dragHandleWidth: shell.edgeSize
407+
401408 property var previousMainApp: null
402409 property var previousSideApp: null
403410
@@ -439,19 +446,6 @@ FocusScope {
439446 blockInput: greeter.shown || lockscreen.shown
440447 }
441448
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−
455449 Item {
456450 id: overlay
457451
@@ -550,8 +544,11 @@ FocusScope {
550544 stages.hide();
551545 }
552546 onDash: {
553− dash.setCurrentScope("applications.scope", true, false)
554− stages.hide();
547+ if (stages.shown) {
548+ dash.setCurrentScope("applications.scope", true, false)
549+ stages.hide();
550+ launcher.hide();
551+ }
555552 }
556553 onLauncherApplicationSelected:{
557554 greeter.hide()
build+3
@@ -49,6 +49,9 @@ install_dependencies() {
4949 indicators-client-plugin-* \
5050 ubuntu-mobile-icons \
5151 unity-notifications-impl-1 \
52+ unity-scope-home \
53+ unity-lens-applications \
54+
5255 || exit 5
5356}
5457
debian/changelog+18
@@ -1,3 +1,21 @@
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+
119unity8 (7.81.1) saucy; urgency=low
220
321 * Translation updates.
main.cpp+26−6
@@ -31,13 +31,33 @@
3131#include "MouseTouchAdaptor.h"
3232
3333namespace {
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+
3448/* When you append and import path to the list of import paths it will be the *last*
3549 place where Qt will search for QML modules.
3650 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)
3852{
3953 QStringList importPathList = engine->importPathList();
40− importPathList.append(path);
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())
58+ importPathList.append(path);
59+ }
60+ importPathList.append(paths);
4161 engine->setImportPathList(importPathList);
4262}
4363
@@ -88,7 +108,7 @@ int main(int argc, char** argv)
88108 QQuickView* view = new QQuickView();
89109 view->setResizeMode(QQuickView::SizeRootObjectToView);
90110 view->setTitle("Qml Phone Shell");
91− view->engine()->setBaseUrl(QUrl::fromLocalFile(shellAppDirectory()));
111+ view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()));
92112 if (args.contains(QLatin1String("-frameless"))) {
93113 view->setFlags(Qt::FramelessWindowHint);
94114 }
@@ -114,9 +134,9 @@ int main(int argc, char** argv)
114134 QObject::connect(view->engine(), SIGNAL(quit()), qApp, SLOT(quit()));
115135
116136 QUrl source("Shell.qml");
117− view->engine()->addImportPath(shellAppDirectory());
118− view->engine()->addImportPath(shellImportPath());
119− appendImportPath(view->engine(), fakePluginsImportPath());
137+ prependImportPaths(view->engine(), QStringList() << ::shellAppDirectory());
138+ prependImportPaths(view->engine(), ::shellImportPaths());
139+ appendImportPaths(view->engine(), QStringList() << ::fakePluginsImportPath());
120140 view->setSource(source);
121141 view->setColor("transparent");
122142
paths.h.in+10−3
@@ -17,6 +17,9 @@
1717 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1818 */
1919
20+#ifndef PATHS_H
21+#define PATHS_H
22+
2023// Qt
2124#include <QtCore/QCoreApplication>
2225#include <QtCore/QDir>
@@ -43,12 +46,14 @@ inline QString shellAppDirectory() {
4346 }
4447}
4548
46−inline QString shellImportPath() {
49+inline QStringList shellImportPaths() {
50+ QStringList paths;
4751 if (isRunningInstalled()) {
48− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
52+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
4953 } else {
50− return QString("@CMAKE_BINARY_DIR@/plugins/");
54+ paths << QString("@CMAKE_BINARY_DIR@/plugins");
5155 }
56+ return paths;
5257}
5358
5459inline QString fakePluginsImportPath() {
@@ -62,3 +67,5 @@ inline QString fakePluginsImportPath() {
6267inline QString sourceDirectory() {
6368 return QString("@CMAKE_SOURCE_DIR@/");
6469}
70+
71+#endif
plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+31−16
@@ -21,9 +21,10 @@
2121#include "AxisVelocityCalculator.h"
2222#include <QtCore/QElapsedTimer>
2323
24−class RealTimeSource : public AxisVelocityCalculator::TimeSource {
24+class RealTimeSource : public UbuntuGestures::TimeSource {
2525public:
26− RealTimeSource() {
26+ RealTimeSource()
27+ : UbuntuGestures::TimeSource() {
2728 m_timer.start();
2829 }
2930 virtual qint64 msecsSinceReference() {
@@ -33,23 +34,17 @@ private:
3334 QElapsedTimer m_timer;
3435};
3536
36−
3737AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
38− : AxisVelocityCalculator(new RealTimeSource, parent)
39−{
40−}
41−
42−AxisVelocityCalculator::AxisVelocityCalculator(TimeSource *timeSource, QObject *parent)
4338 : QObject(parent)
44− , m_timeSource(timeSource)
39+ , m_timeSource(new RealTimeSource)
4540 , m_trackedPosition(0.0)
4641{
42+ m_timeSource->setParent(this);
4743 reset();
4844}
4945
5046AxisVelocityCalculator::~AxisVelocityCalculator()
5147{
52− delete m_timeSource;
5348}
5449
5550qreal AxisVelocityCalculator::trackedPosition() const
@@ -59,13 +54,17 @@ qreal AxisVelocityCalculator::trackedPosition() const
5954
6055void AxisVelocityCalculator::setTrackedPosition(qreal newPosition)
6156{
62− if (newPosition == m_trackedPosition) {
63− return;
57+ processMovement(newPosition - m_trackedPosition);
58+
59+ if (newPosition != m_trackedPosition) {
60+ m_trackedPosition = newPosition;
61+ Q_EMIT trackedPositionChanged(newPosition);
6462 }
63+}
6564
66− processMovement(newPosition - m_trackedPosition);
67− m_trackedPosition = newPosition;
68− Q_EMIT trackedPositionChanged(newPosition);
65+void AxisVelocityCalculator::updateIdleTime()
66+{
67+ processMovement(0);
6968}
7069
7170void AxisVelocityCalculator::processMovement(qreal movement)
@@ -83,11 +82,12 @@ void AxisVelocityCalculator::processMovement(qreal movement)
8382 m_samplesWrite = (m_samplesWrite + 1) % MAX_SAMPLES;
8483}
8584
86−qreal AxisVelocityCalculator::calculate() const
85+qreal AxisVelocityCalculator::calculate()
8786{
8887 if (numSamples() < MIN_SAMPLES_NEEDED) {
8988 return 0.0;
9089 }
90+ updateIdleTime(); // consider the time elapsed since the last update and now
9191
9292 int lastIndex;
9393 if (m_samplesWrite == 0) {
@@ -141,3 +141,18 @@ int AxisVelocityCalculator::numSamples() const
141141 }
142142 }
143143}
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 @@
2525#include <stdint.h>
2626#include <QtCore/QObject>
2727
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+
2841/*
2942 Estimates the current velocity of a finger based on recent movement along an axis
3043
@@ -59,27 +72,11 @@ class UBUNTUGESTURES_EXPORT AxisVelocityCalculator : public QObject
5972 NOTIFY trackedPositionChanged)
6073public:
6174
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−
7275 /*
7376 Regular constructor
7477 */
7578 AxisVelocityCalculator(QObject *parent = 0);
7679
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−
8380 virtual ~AxisVelocityCalculator();
8481
8582 qreal trackedPosition() const;
@@ -88,7 +85,7 @@ public:
8885 /*
8986 Calculates the finger velocity, in axis units/millisecond
9087 */
91− Q_INVOKABLE qreal calculate() const;
88+ Q_INVOKABLE qreal calculate();
9289
9390 /*
9491 Removes all stored movements from previous calls to setTrackedPosition()
@@ -97,6 +94,11 @@ public:
9794
9895 int numSamples() const;
9996
97+ /*
98+ Replaces the TimeSource with the given one. Useful for testing purposes.
99+ */
100+ void setTimeSource(UbuntuGestures::TimeSource *timeSource);
101+
100102 /*
101103 The minimum amount of samples needed for a velocity calculation.
102104 */
@@ -105,18 +107,27 @@ public:
105107 /*
106108 Maximum number of movement samples stored
107109 */
108− static const int MAX_SAMPLES = 10;
110+ static const int MAX_SAMPLES = 50;
109111
110112 /*
111113 Age of the oldest sample considered in the velocity calculations, in
112114 milliseconds, compared to the most recent one.
113115 */
114− static const int AGE_OLDEST_SAMPLE = 200;
116+ static const int AGE_OLDEST_SAMPLE = 100;
115117
116118Q_SIGNALS:
117119 void trackedPositionChanged(qreal value);
118120
119121private:
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+
120131 /*
121132 How much the finger has moved since processMovement() was last called.
122133 */
@@ -134,7 +145,7 @@ private:
134145 int m_samplesRead; /* index of the oldest sample available. -1 if buffer is empty */
135146 int m_samplesWrite; /* index where the next sample will be written */
136147
137− TimeSource *m_timeSource;
148+ UbuntuGestures::TimeSource *m_timeSource;
138149
139150 qreal m_trackedPosition;
140151};
plugins/Ubuntu/Gestures/Direction.cpp+5
@@ -25,3 +25,8 @@ bool Direction::isVertical(Direction::Type type)
2525{
2626 return type == Direction::Upwards || type == Direction::Downwards;
2727}
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:
3838
3939 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
4040 Q_INVOKABLE static bool isVertical(Direction::Type type);
41+ Q_INVOKABLE static bool isPositive(Direction::Type type);
4142};
4243
4344#endif // DIRECTION_H
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+59−8
@@ -141,12 +141,9 @@ void DirectionalDragArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *tim
141141 }
142142}
143143
144−void DirectionalDragArea::setAxisVelocityCalculator(AxisVelocityCalculator *newVelCalc)
144+void DirectionalDragArea::setTimeSource(UbuntuGestures::TimeSource *timeSource)
145145{
146− if (m_velocityCalculator->parent() == this)
147− delete m_velocityCalculator;
148−
149− m_velocityCalculator = newVelCalc;
146+ m_velocityCalculator->setTimeSource(timeSource);
150147}
151148
152149qreal DirectionalDragArea::distance() const
@@ -158,6 +155,15 @@ qreal DirectionalDragArea::distance() const
158155 }
159156}
160157
158+qreal DirectionalDragArea::sceneDistance() const
159+{
160+ if (Direction::isHorizontal(m_direction)) {
161+ return m_previousScenePos.x() - m_startScenePos.x();
162+ } else {
163+ return m_previousScenePos.y() - m_startScenePos.y();
164+ }
165+}
166+
161167qreal DirectionalDragArea::touchX() const
162168{
163169 return m_previousPos.x();
@@ -168,6 +174,16 @@ qreal DirectionalDragArea::touchY() const
168174 return m_previousPos.y();
169175}
170176
177+qreal DirectionalDragArea::touchSceneX() const
178+{
179+ return m_previousScenePos.x();
180+}
181+
182+qreal DirectionalDragArea::touchSceneY() const
183+{
184+ return m_previousScenePos.y();
185+}
186+
171187void DirectionalDragArea::touchEvent(QTouchEvent *event)
172188{
173189 if (!isEnabled() || !isVisible()) {
@@ -195,15 +211,22 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
195211{
196212 if ((event->touchPointStates() && (Qt::TouchPointPressed || Qt::TouchPointMoved))
197213 && event->touchPoints().count() == 1) {
198− m_startPos = event->touchPoints()[0].pos();
199− m_touchId = event->touchPoints()[0].id();
214+ const QTouchEvent::TouchPoint &touchPoint = event->touchPoints()[0];
215+ m_startPos = touchPoint.pos();
216+ m_startScenePos = touchPoint.scenePos();
217+ m_touchId = touchPoint.id();
200218 m_dampedPos.reset(m_startPos);
201219 updateVelocityCalculator(m_startPos);
202220 m_velocityCalculator->reset();
203221 m_numSamplesOnLastSpeedCheck = 0;
204222 m_silenceTime = 0;
205223 setPreviousPos(m_startPos);
206− setStatus(Undecided);
224+ setPreviousScenePos(m_startScenePos);
225+
226+ if (m_distanceThreshold > 0)
227+ setStatus(Undecided);
228+ else
229+ setStatus(Recognized);
207230 }
208231}
209232
@@ -241,6 +264,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
241264 }
242265
243266 setPreviousPos(touchPos);
267+ setPreviousScenePos(touchPoint->scenePos());
244268
245269 if (movedFarEnough(touchPos)) {
246270 setStatus(Recognized);
@@ -252,6 +276,7 @@ void DirectionalDragArea::touchEvent_recognized(QTouchEvent *event)
252276 const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
253277
254278 setPreviousPos(touchPoint->pos());
279+ setPreviousScenePos(touchPoint->scenePos());
255280
256281 if (touchPoint->state() == Qt::TouchPointReleased) {
257282 setStatus(WaitingForTouch);
@@ -366,6 +391,10 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
366391 m_recognitionTimer->start();
367392 Q_EMIT draggingChanged(true);
368393 break;
394+ case Recognized:
395+ if (oldStatus == WaitingForTouch)
396+ Q_EMIT draggingChanged(true);
397+ break;
369398 case Rejected:
370399 Q_EMIT draggingChanged(false);
371400 break;
@@ -397,6 +426,28 @@ void DirectionalDragArea::setPreviousPos(QPointF point)
397426 }
398427}
399428
429+void DirectionalDragArea::setPreviousScenePos(QPointF point)
430+{
431+ Q_ASSERT(m_status != Rejected);
432+
433+ bool xChanged = m_previousScenePos.x() != point.x();
434+ bool yChanged = m_previousScenePos.y() != point.y();
435+
436+ m_previousScenePos = point;
437+
438+ if (xChanged) {
439+ Q_EMIT touchSceneXChanged(point.x());
440+ if (Direction::isHorizontal(m_direction))
441+ Q_EMIT sceneDistanceChanged(sceneDistance());
442+ }
443+
444+ if (yChanged) {
445+ Q_EMIT touchSceneYChanged(point.y());
446+ if (Direction::isVertical(m_direction))
447+ Q_EMIT sceneDistanceChanged(sceneDistance());
448+ }
449+}
450+
400451void DirectionalDragArea::updateVelocityCalculator(QPointF point)
401452{
402453 if (Direction::isHorizontal(m_direction)) {
plugins/Ubuntu/Gestures/DirectionalDragArea.h+21−3
@@ -60,10 +60,18 @@ class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
6060 // DirectionalDragArea's direction.
6161 Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)
6262
63− // Position of the touch point performing the drag.
63+ // The distance travelled by the finger along the axis specified by
64+ // DirectionalDragArea's direction in scene coordinates
65+ Q_PROPERTY(qreal sceneDistance READ sceneDistance NOTIFY sceneDistanceChanged)
66+
67+ // Position of the touch point performing the drag relative to this item.
6468 Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)
6569 Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)
6670
71+ // Position of the touch point performing the drag, in scene's coordinate system
72+ Q_PROPERTY(qreal touchSceneX READ touchSceneX NOTIFY touchSceneXChanged)
73+ Q_PROPERTY(qreal touchSceneY READ touchSceneY NOTIFY touchSceneYChanged)
74+
6775 // The current status of the directional drag gesture area.
6876 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
6977
@@ -146,10 +154,14 @@ public:
146154 Status status() const { return m_status; }
147155
148156 qreal distance() const;
157+ qreal sceneDistance() const;
149158
150159 qreal touchX() const;
151160 qreal touchY() const;
152161
162+ qreal touchSceneX() const;
163+ qreal touchSceneY() const;
164+
153165 bool dragging() const { return (m_status == Undecided) || (m_status == Recognized); }
154166
155167 qreal maxDeviation() const { return m_dampedPos.maxDelta(); }
@@ -172,14 +184,15 @@ public:
172184 // Useful for providing a fake timer when testing.
173185 void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
174186
175− // Useful for testing, where a calculator with a fake time source can be supplied
176− void setAxisVelocityCalculator(AxisVelocityCalculator *velCalc);
187+ // Useful for testing, where a fake time source can be supplied
188+ void setTimeSource(UbuntuGestures::TimeSource *timeSource);
177189
178190Q_SIGNALS:
179191 void directionChanged(Direction::Type direction);
180192 void statusChanged(Status value);
181193 void draggingChanged(bool value);
182194 void distanceChanged(qreal value);
195+ void sceneDistanceChanged(qreal value);
183196 void maxDeviationChanged(qreal value);
184197 void wideningAngleChanged(qreal value);
185198 void distanceThresholdChanged(qreal value);
@@ -187,6 +200,8 @@ Q_SIGNALS:
187200 void maxSilenceTimeChanged(int value);
188201 void touchXChanged(qreal value);
189202 void touchYChanged(qreal value);
203+ void touchSceneXChanged(qreal value);
204+ void touchSceneYChanged(qreal value);
190205
191206protected:
192207 virtual void touchEvent(QTouchEvent *event);
@@ -205,12 +220,15 @@ private:
205220 const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);
206221 void setStatus(Status newStatus);
207222 void setPreviousPos(QPointF point);
223+ void setPreviousScenePos(QPointF point);
208224 void updateVelocityCalculator(QPointF point);
209225
210226 Status m_status;
211227
212228 QPointF m_startPos;
229+ QPointF m_startScenePos;
213230 QPointF m_previousPos;
231+ QPointF m_previousScenePos;
214232 int m_touchId;
215233
216234 // A movement damper is used in some of the gesture recognition calculations
plugins/Unity/categories.cpp+26−17
@@ -30,6 +30,7 @@ Categories::Categories(QObject* parent)
3030 m_roles[Categories::RoleName] = "name";
3131 m_roles[Categories::RoleIcon] = "icon";
3232 m_roles[Categories::RoleRenderer] = "renderer";
33+ m_roles[Categories::RoleContentType] = "content_type";
3334 m_roles[Categories::RoleHints] = "hints";
3435 m_roles[Categories::RoleResults] = "results";
3536 m_roles[Categories::RoleCount] = "count";
@@ -111,22 +112,30 @@ Categories::data(const QModelIndex& index, int role) const
111112 return QVariant();
112113 }
113114
114− if (role == RoleId) {
115− return QVariant::fromValue(index.row());
116− } else if (role == RoleName) {
117− return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
118− } else if (role == RoleIcon) {
119− return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
120− } else if (role == RoleRenderer) {
121− return QVariant::fromValue(DeeListModel::data(index, 3)); //RENDERER_NAME
122− } else if (role == RoleHints) {
123− return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
124− } else if (role == RoleResults) {
125− return QVariant::fromValue(getFilter(index.row()));
126− } else if (role == RoleCount) {
127− CategoryFilter* filter = getFilter(index.row());
128− return QVariant::fromValue(filter->rowCount());
129− } else {
130− return QVariant();
115+ switch (role) {
116+ case RoleId:
117+ return QVariant::fromValue(index.row());
118+ case RoleName:
119+ return QVariant::fromValue(DeeListModel::data(index, 1)); //DISPLAY_NAME
120+ case RoleIcon:
121+ return QVariant::fromValue(DeeListModel::data(index, 2)); //ICON_HINT
122+ case RoleRenderer:
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+ }
129+ case RoleHints:
130+ return QVariant::fromValue(DeeListModel::data(index, 4)); //HINTS
131+ case RoleResults:
132+ return QVariant::fromValue(getFilter(index.row()));
133+ case RoleCount:
134+ {
135+ CategoryFilter* filter = getFilter(index.row());
136+ return QVariant::fromValue(filter->rowCount());
137+ }
138+ default:
139+ return QVariant();
131140 }
132141}
plugins/Unity/categories.h+1
@@ -46,6 +46,7 @@ public:
4646 RoleName,
4747 RoleIcon,
4848 RoleRenderer,
49+ RoleContentType,
4950 RoleHints,
5051 RoleResults,
5152 RoleCount
po/ar.po+37−45
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-22 16:15+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-23 05:56+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "متوفرة للتنزيل"
109109msgid "Apps"
110110msgstr "تطبيقات"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "تطبيقات مألوفة"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "آخر الصوتيات المشغلة"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "فيديوهات رائجة على الإنترنت"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "الرئيسية"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "موسيقى"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "الشائع على الإنترنت"
@@ -193,7 +165,7 @@ msgstr "النجوم:"
193165msgid "Author:"
194166msgstr "المؤلف:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr "مكالمة طوارئ"
199171
@@ -234,19 +206,39 @@ msgstr "الجهاز"
234206msgid "Flight mode"
235207msgstr "نمط الطيران"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "ابحث"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "عذراً، لا يوجد ما يطابق بحثك."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "الشاشة الرئيسية"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr "رجاءً أدخِل %1:"
219+msgid "Please enter %1"
220+msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Azerbaijani <az@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Tətbiqlər"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Ev"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Musiqi"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Axtar"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Əsas Ekran"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-19 15:47+0000\n"
1212"Last-Translator: Miroslav E. Hadzhiev (Хаджиев) "
1313"<miroslav.hadzhiev@gmail.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
1515"MIME-Version: 1.0\n"
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
19−"X-Generator: Launchpad (build 16673)\n"
18+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
19+"X-Generator: Launchpad (build 16681)\n"
2020
2121#: Applications/applications.js:23
2222msgid "Phone"
@@ -110,27 +110,19 @@ msgstr ""
110110msgid "Apps"
111111msgstr "Приложения"
112112
113−#: Dash/DashHome.qml:43
113+#: Dash/DashHome.qml:40
114114msgid "Frequent Apps"
115115msgstr ""
116116
117−#: Dash/DashHome.qml:46
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
117+#: Dash/DashHome.qml:43
126118msgid "Recent Music"
127119msgstr ""
128120
129−#: Dash/DashHome.qml:55
121+#: Dash/DashHome.qml:46
130122msgid "Videos Popular Online"
131123msgstr ""
132124
133−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
125+#: Dash/DashHome.qml:175
134126msgid "Home"
135127msgstr "Начало"
136128
@@ -154,26 +146,6 @@ msgstr ""
154146msgid "Music"
155147msgstr "Музика"
156148
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−
177149#: Dash/DashVideos.qml:31
178150msgid "Popular Online"
179151msgstr ""
@@ -194,7 +166,7 @@ msgstr ""
194166msgid "Author:"
195167msgstr "Автор:"
196168
197−#: Greeter/Lockscreen.qml:126
169+#: Greeter/Lockscreen.qml:133
198170msgid "Emergency call"
199171msgstr ""
200172
@@ -235,19 +207,27 @@ msgstr "Устройство"
235207msgid "Flight mode"
236208msgstr ""
237209
238−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
210+#: Panel/SearchIndicator.qml:26
239211msgid "Search"
240212msgstr "Търсене"
241213
242−#: plugins/Unity/lens.cpp:333
214+#: plugins/Unity/scope.cpp:268
243215msgid "Sorry, there is nothing that matches your search."
244216msgstr "Съжаляваме, няма нищо, което да отговаря на вашето търсене."
245217
246−#: plugins/Unity/lenses.cpp:39
247−msgid "Home screen"
248−msgstr "Начален екран"
249−
250−#: Shell.qml:380
218+#: Shell.qml:383
251219#, qt-format
252−msgid "Please enter %1:"
220+msgid "Please enter %1"
253221msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Disponibles per baixar"
109109msgid "Apps"
110110msgstr "Aplicacions"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Aplicacions freqüents"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Música recent"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Vídeos populars en línia"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Inici"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Música"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,27 @@ msgstr "Dispositiu"
234206msgid "Flight mode"
235207msgstr "Mode d'avió"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Cerca"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "No hi ha res que coincideixi amb la cerca"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla d'inici"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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+38−46
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-23 18:17+0000\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-29 12:53+0000\n"
1212"Last-Translator: Phillip Sz <Unknown>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-24 05:27+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Generator: Launchpad (build 16692)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Zum Herunterladen verfügbar"
109109msgid "Apps"
110110msgstr "Anwendungen"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Häufig genutzte Anwendungen"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Zuletzt gehörte Musik"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Beliebte Online-Videos"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Start"
135127
@@ -153,26 +145,6 @@ msgstr "Top Tabellenplatz"
153145msgid "Music"
154146msgstr "Musik"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Online Beliebt"
@@ -193,7 +165,7 @@ msgstr "Darsteller:"
193165msgid "Author:"
194166msgstr "Autor:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr "Notruf"
199171
@@ -234,19 +206,39 @@ msgstr "Gerät"
234206msgid "Flight mode"
235207msgstr "Flugmodus"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Suchen"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Entschuldigung, es wurden keine Treffer erzielt."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Startseite"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr "Bitte geben Sie %1 ein:"
219+msgid "Please enter %1"
220+msgstr "Bitte geben Sie %1 ein"
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Greek <el@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Εφαρμογές"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Αρχή"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Μουσική"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Αναζήτηση"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να ταιριάζει στην αναζήτησή σας."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Αρχική οθόνη"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Πρόσωπα"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Αρχική οθόνη"
po/en_AU.po+36−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-18 20:36+0000\n"
1212"Last-Translator: Jackson Doak <Doak.jackson@gmail.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Available for download"
109109msgid "Apps"
110110msgstr "Apps"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Frequent Apps"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Recent Music"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Videos Popular Online"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Home"
135127
@@ -153,26 +145,6 @@ msgstr "Top Charting"
153145msgid "Music"
154146msgstr "Music"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Popular Online"
@@ -193,7 +165,7 @@ msgstr "Starring:"
193165msgid "Author:"
194166msgstr "Author:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,39 @@ msgstr "Device"
234206msgid "Flight mode"
235207msgstr "Flight mode"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Search"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Sorry, there is nothing that matches your search."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home screen"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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+38−46
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-23 22:34+0000\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-27 00:22+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-24 05:27+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Available for download"
109109msgid "Apps"
110110msgstr "Apps"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Frequent Apps"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Recent Music"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Videos Popular Online"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Home"
135127
@@ -153,26 +145,6 @@ msgstr "Top Charting"
153145msgid "Music"
154146msgstr "Music"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Popular Online"
@@ -193,7 +165,7 @@ msgstr "Starring:"
193165msgid "Author:"
194166msgstr "Author:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr "Emergency call"
199171
@@ -234,19 +206,39 @@ msgstr "Device"
234206msgid "Flight mode"
235207msgstr "Flight mode"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Search"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Sorry, there is nothing that matches your search."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home screen"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr "Please enter %1:"
219+msgid "Please enter %1"
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Esperanto <eo@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr ""
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/es.po+36−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-16 23:44+0000\n"
1212"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
1313"Language-Team: Spanish <es@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Disponibles para descargar"
109109msgid "Apps"
110110msgstr "Aplicaciones"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Aplicaciones frecuentes"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Música reciente"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Vídeos populares en línea"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Inicio"
135127
@@ -153,26 +145,6 @@ msgstr "Mejor posicionadas"
153145msgid "Music"
154146msgstr "Música"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Populares en línea"
@@ -193,7 +165,7 @@ msgstr "Protagonistas:"
193165msgid "Author:"
194166msgstr "Autor:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,39 @@ msgstr "Dispositivo"
234206msgid "Flight mode"
235207msgstr "Modo de vuelo"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Buscar"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "No hay nada que coincida con su búsqueda."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla de inicio"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-10 16:19+0000\n"
1212"Last-Translator: Jiri Grönroos <Unknown>\n"
1313"Language-Team: Finnish <fi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Ladattavissa"
109109msgid "Apps"
110110msgstr "Sovellukset"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Yleisimmät sovellukset"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Viimeisin musiikki"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Suositut verkkovideot"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Kotinäyttö"
135127
@@ -153,26 +145,6 @@ msgstr "Nousukiidossa"
153145msgid "Music"
154146msgstr "Musiikki"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Suosittua verkossa"
@@ -193,7 +165,7 @@ msgstr "Pääosissa:"
193165msgid "Author:"
194166msgstr "Laatinut:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,36 @@ msgstr "Laite"
234206msgid "Flight mode"
235207msgstr "Lentokonetila"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Hae"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Hakuun täsmääviä tuloksia ei löydy."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Kotinäyttö"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Faroese <fo@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Nýtsluskipanir"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Heim"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Tónleikur"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Leita"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Tíanverri er tað einki sum hóskar til tína leiting."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Heimaskíggi"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-26 15:11+0000\n"
12+"Last-Translator: Anne <anneonyme017@gmail.com>\n"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "Téléphone"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "Appareil photo"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Galerie"
3131
3232#: Applications/applications.js:40
3333msgid "Facebook"
34−msgstr ""
34+msgstr "Facebook"
3535
3636#: Applications/applications.js:46
3737msgid "Browser"
38−msgstr ""
38+msgstr "Navigateur"
3939
4040#: Applications/applications.js:51
4141msgid "Twitter"
42−msgstr ""
42+msgstr "Twitter"
4343
4444#: Applications/applications.js:57
4545msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "Météo"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Bloc-notes"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Agenda"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Lecteur multimédia"
6363
6464#: Applications/applications.js:86
6565msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
6767
6868#: Applications/applications.js:91
6969msgid "Map"
@@ -71,27 +71,27 @@ msgstr ""
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
7575
7676#: Applications/applications.js:101
7777msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
82−msgstr ""
82+msgstr "Wikipédia"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
90−msgstr ""
90+msgstr "Recherches récentes"
9191
9292#: Dash/DashApps.qml:65
9393msgid "Running apps"
94−msgstr ""
94+msgstr "Applications en cours d’exécution"
9595
9696#: Dash/DashApps.qml:68
9797msgid "Frequently used"
@@ -99,7 +99,7 @@ msgstr ""
9999
100100#: Dash/DashApps.qml:71
101101msgid "Installed"
102−msgstr ""
102+msgstr "Installées"
103103
104104#: Dash/DashApps.qml:74
105105msgid "Available for download"
@@ -109,29 +109,21 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Applications"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114−msgstr ""
115−
116−#: Dash/DashHome.qml:46
117−msgid "Favourite People"
118−msgstr ""
114+msgstr "Applications fréquemment utilisées"
119115
120−#: Dash/DashHome.qml:49
121−msgid "People Recently in Touch"
122−msgstr ""
123−
124−#: Dash/DashHome.qml:52
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126−msgstr ""
118+msgstr "Musique récente"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130−msgstr ""
122+msgstr "Vidéos populaires en ligne"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134−msgstr ""
126+msgstr "Accueil"
135127
136128#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137129msgid "Featured"
@@ -143,7 +135,7 @@ msgstr ""
143135
144136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145137msgid "New Releases"
146−msgstr ""
138+msgstr "Nouveautés"
147139
148140#: Dash/DashMusic.qml:30
149141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Musique"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -183,44 +155,44 @@ msgstr "Vidéos"
183155
184156#: Dash/Video/VideoPreview.qml:98
185157msgid "Directed by:"
186−msgstr ""
158+msgstr "Réalisé par :"
187159
188160#: Dash/Video/VideoPreview.qml:121
189161msgid "Starring:"
190−msgstr ""
162+msgstr "Acteurs :"
191163
192164#: Dash/Video/VideoPreview.qml:144
193165msgid "Author:"
194−msgstr ""
166+msgstr "Auteur :"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
200172#: Greeter/PassphraseLockscreen.qml:59
201173#, qt-format
202174msgid "Hello %1"
203−msgstr ""
175+msgstr "Bonjour %1"
204176
205177#: Greeter/PassphraseLockscreen.qml:59
206178msgid "Hello"
207−msgstr ""
179+msgstr "Bonjour"
208180
209181#: Hud/HudParametrizedActionsPage.qml:132
210182msgid "Confirm"
211−msgstr ""
183+msgstr "Confirmer"
212184
213185#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
214186msgid "Type or say a command"
215−msgstr ""
187+msgstr "Entrez ou dictez une commande"
216188
217189#: Hud/Hud.qml:84
218190msgid "Loading. Please Wait..."
219−msgstr ""
191+msgstr "Chargement. Veuillez patienter..."
220192
221193#: Hud/Hud.qml:89
222194msgid "Speak Now..."
223−msgstr ""
195+msgstr "Parlez maintenant..."
224196
225197#: Hud/Hud.qml:94
226198msgid "Speaking..."
@@ -232,21 +204,38 @@ msgstr ""
232204
233205#: Panel/Menus/Overview/FlightModeWidget.qml:42
234206msgid "Flight mode"
235−msgstr ""
207+msgstr "Mode avion"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239−msgstr ""
211+msgstr "Rechercher"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243−msgstr ""
244−
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
215+msgstr "Désolé, aucun résultat ne correspond à votre recherche."
248216
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Dispoñíbel para descargar"
109109msgid "Apps"
110110msgstr "Aplicativos"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Aplicativos frecuentes"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Música recente"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Vídeos populares en liña"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Cartafol persoal"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Música"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,27 @@ msgstr "Dispositivo"
234206msgid "Flight mode"
235207msgstr "Modo de voo"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Buscar"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Sentímolo, non hai nada que coincida con esta busca."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Pantalla de inicio"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Hebrew <he@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "יישומים"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "בית"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "מוזיקה"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "חיפוש"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "מסך הבית"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "אנשים"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "מסך הבית"
po/hr.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Croatian <hr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Aplikacije"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Početna"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Glazba"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Pretraživanje"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Početni zaslon"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Alkalmazások"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Kezdőoldal"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Zene"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr "Eszköz"
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Keresés"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Elnézést, nincs találat a keresésre."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Kezdőképernyő"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-07 12:42+0000\n"
1212"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
1313"Language-Team: Armenian <hy@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Հասանելի ծրագրեր"
109109msgid "Apps"
110110msgstr "Ծրագրեր"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Հաճախակի ծրագրերը"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Վերջին երգերը"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Հայտնի օնլայն վիդեոներ"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Տուն"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Երգեր"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,27 @@ msgstr "Սարք"
234206msgid "Flight mode"
235207msgstr "Անկապ րեժիմ"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Որոնում"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Տուն"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Indonesian <id@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr ""
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/it.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Italian <it@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Applicazioni"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Home"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Musica"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Cerca"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Nessun risultato corrispondente alla ricerca."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Home"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-15 14:12+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Japanese <ja@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr ""
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/kn.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Kannada <kn@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "ಮನೆ (Home)"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "ಸಂಗೀತ"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "ಹುಡುಕು"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯಾದ ಹೊಂದಾಣಿಕೆಗಳು ದೊರಕುತ್ತಿಲ್ಲ"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "ಹೋಮ್ ಸ್ಕ್ರೀನ್"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "ಜನರು"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "ಹೋಮ್ ಸ್ಕ್ರೀನ್"
po/ko.po+12−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Korean <ko@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "내려받을 수 있음"
109109msgid "Apps"
110110msgstr "앱"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "자주 쓰는 앱"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "요즈음 찾는 음악"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "음악"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "찾기"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/ky.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Kirghiz <ky@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Тиркемелер"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Үй папкасы"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Музыка"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Издөө"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Тилекке каршы, сиздин издөөңүзгө эч нерсе дал келген жок."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Башкы экран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Адамдар"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Башкы экран"
po/lv.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Latvian <lv@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Lietotnes"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Mājas"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Mūzika"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Meklēt"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Diemžēl nekas neatbilst jūsu meklētajam."
244216
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
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Burmese <my@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Apps"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "ပင်မ"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "တေးဂီတ"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,18 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "ရှာဖွေ"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့်တူညီတာဘာမှမရှိပါ။"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "လူ"
po/nb.po+18−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-17 09:10+0000\n"
1212"Last-Translator: Joakim Langvand <jlangvand@gmail.com>\n"
1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Tilgjengelig for nedlasting"
109109msgid "Apps"
110110msgstr "Programmer"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Hjem"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Musikk"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr "Enhet"
234206msgid "Flight mode"
235207msgstr "Flymodus"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Søk"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Søket ga ingen treff."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Hjemmeskjerm"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Dutch <nl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:15+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Apps"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Hoofdvenster"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Muziek"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Zoeken"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Startscherm"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:43+0000\n"
1212"Last-Translator: Piotr Merski <Unknown>\n"
1313"Language-Team: Polish <pl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Dostępne do pobrania"
109109msgid "Apps"
110110msgstr "Aplikacje"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Często używane aplikacje"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Najnowsza muzyka"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Wideo popularne online"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Dom"
135127
@@ -153,26 +145,6 @@ msgstr "Przeboje"
153145msgid "Music"
154146msgstr "Muzyka"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Popularne w sieci"
@@ -193,7 +165,7 @@ msgstr "Obsada:"
193165msgid "Author:"
194166msgstr "Autor:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,39 @@ msgstr "Urządzenie"
234206msgid "Flight mode"
235207msgstr "Tryb samolotowy"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Szukaj"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Nie znaleziono pasujących wyników."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Ekran domowy"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Aplicativos"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Início"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Músicas"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Pesquisar"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Desculpe, não há nada que corresponda à sua pesquisa."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Tela inicial"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Romanian <ro@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Aplicații"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Acasă"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Muzică"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,20 +206,22 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Căutare"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216"Ne pare rău, nu este nimic care se potrivește căutării dumneavoastră."
245217
246−#: plugins/Unity/lenses.cpp:39
247−msgid "Home screen"
248−msgstr "Ecran principal"
249−
250−#: Shell.qml:380
218+#: Shell.qml:383
251219#, qt-format
252−msgid "Please enter %1:"
220+msgid "Please enter %1"
253221msgstr ""
222+
223+#~ msgid "People"
224+#~ msgstr "Persoane"
225+
226+#~ msgid "Home screen"
227+#~ msgstr "Ecran principal"
po/ru.po+27−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-21 10:08+0000\n"
1212"Last-Translator: Andrey Dedikov <iamawesome.ndr@gmail.com>\n"
1313"Language-Team: Russian <ru@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-22 06:26+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Доступно для загрузки"
109109msgid "Apps"
110110msgstr "Приложения"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Часто используемые приложения"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Недавно прослушанная музыка"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Популярные видео из сети"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Главная"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Музыка"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr "В главных ролях"
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,30 @@ msgstr "Устройство"
234206msgid "Flight mode"
235207msgstr "Режим полета"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Поиск"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Извините, поиск не дал результатов."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Главный экран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Sinhalese <si@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr ""
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/sl.po+43−69
@@ -7,83 +7,83 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-09 10:23+0000\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-29 10:26+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Generator: Launchpad (build 16692)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "Telefon"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "Fotoaparat"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Galerija"
3131
3232#: Applications/applications.js:40
3333msgid "Facebook"
34−msgstr ""
34+msgstr "Facebook"
3535
3636#: Applications/applications.js:46
3737msgid "Browser"
38−msgstr ""
38+msgstr "Brskalnik"
3939
4040#: Applications/applications.js:51
4141msgid "Twitter"
42−msgstr ""
42+msgstr "Twitter"
4343
4444#: Applications/applications.js:57
4545msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "Vreme"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Beležnica"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Koledar"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Predvajalnik predstavnosti"
6363
6464#: Applications/applications.js:86
6565msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
6767
6868#: Applications/applications.js:91
6969msgid "Map"
70−msgstr ""
70+msgstr "Zemljevid"
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
7575
7676#: Applications/applications.js:101
7777msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
82−msgstr ""
82+msgstr "Wikipedija"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -109,27 +109,19 @@ msgstr "Na voljo za prejem"
109109msgid "Apps"
110110msgstr "Programi"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Nedavna glasba"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Domov"
135127
@@ -139,11 +131,11 @@ msgstr ""
139131
140132#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141133msgid "Recent"
142−msgstr ""
134+msgstr "Nedavno"
143135
144136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145137msgid "New Releases"
146−msgstr ""
138+msgstr "Nove izdaje"
147139
148140#: Dash/DashMusic.qml:30
149141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Glasba"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -191,20 +163,20 @@ msgstr ""
191163
192164#: Dash/Video/VideoPreview.qml:144
193165msgid "Author:"
194−msgstr ""
166+msgstr "Avtor:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198−msgstr ""
170+msgstr "Klic v sili"
199171
200172#: Greeter/PassphraseLockscreen.qml:59
201173#, qt-format
202174msgid "Hello %1"
203−msgstr ""
175+msgstr "Pozdravljeni, %1"
204176
205177#: Greeter/PassphraseLockscreen.qml:59
206178msgid "Hello"
207−msgstr ""
179+msgstr "Pozdravljeni"
208180
209181#: Hud/HudParametrizedActionsPage.qml:132
210182msgid "Confirm"
@@ -234,19 +206,21 @@ msgstr "Naprava"
234206msgid "Flight mode"
235207msgstr "Način letenja"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Iskanje"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Nič se ne ujema z vašim iskalnim nizom."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Domači zaslon"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr ""
219+msgid "Please enter %1"
220+msgstr "Vnesite %1"
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Serbian <sr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr "Програми"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Почетна"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Музика"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,21 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Претрага"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Нажалост, претрага није наишла на икакво подударање."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Почетни екран"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
221+
222+#~ msgid "People"
223+#~ msgstr "Људи"
224+
225+#~ msgid "Home screen"
226+#~ msgstr "Почетни екран"
po/sv.po+12−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Swedish <sv@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr ""
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr ""
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/te.po+12−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Telugu <te@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr ""
109109msgid "Apps"
110110msgstr ""
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr ""
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr ""
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr ""
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "నివాసం"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "సంగీతం"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,15 @@ msgstr ""
234206msgid "Flight mode"
235207msgstr ""
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr ""
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr ""
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr ""
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
po/th.ponew file+220
@@ -0,0 +1,220 @@
1+# Thai translation for unity
2+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3+# This file is distributed under the same license as the unity package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-28 15:34+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Thai <th@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Generator: Launchpad (build 16692)\n"
19+
20+#: Applications/applications.js:23
21+msgid "Phone"
22+msgstr ""
23+
24+#: Applications/applications.js:29
25+msgid "Camera"
26+msgstr ""
27+
28+#: Applications/applications.js:35
29+msgid "Gallery"
30+msgstr ""
31+
32+#: Applications/applications.js:40
33+msgid "Facebook"
34+msgstr ""
35+
36+#: Applications/applications.js:46
37+msgid "Browser"
38+msgstr ""
39+
40+#: Applications/applications.js:51
41+msgid "Twitter"
42+msgstr ""
43+
44+#: Applications/applications.js:57
45+msgid "GMail"
46+msgstr ""
47+
48+#: Applications/applications.js:62
49+msgid "Weather"
50+msgstr ""
51+
52+#: Applications/applications.js:68
53+msgid "Notepad"
54+msgstr ""
55+
56+#: Applications/applications.js:74
57+msgid "Calendar"
58+msgstr ""
59+
60+#: Applications/applications.js:80
61+msgid "Media Player"
62+msgstr ""
63+
64+#: Applications/applications.js:86
65+msgid "Evernote"
66+msgstr ""
67+
68+#: Applications/applications.js:91
69+msgid "Map"
70+msgstr ""
71+
72+#: Applications/applications.js:96
73+msgid "Pinterest"
74+msgstr ""
75+
76+#: Applications/applications.js:101
77+msgid "SoundCloud"
78+msgstr ""
79+
80+#: Applications/applications.js:106
81+msgid "Wikipedia"
82+msgstr ""
83+
84+#: Applications/applications.js:111
85+msgid "YouTube"
86+msgstr ""
87+
88+#: Components/PageHeader.qml:300
89+msgid "Recent searches"
90+msgstr ""
91+
92+#: Dash/DashApps.qml:65
93+msgid "Running apps"
94+msgstr ""
95+
96+#: Dash/DashApps.qml:68
97+msgid "Frequently used"
98+msgstr ""
99+
100+#: Dash/DashApps.qml:71
101+msgid "Installed"
102+msgstr ""
103+
104+#: Dash/DashApps.qml:74
105+msgid "Available for download"
106+msgstr ""
107+
108+#: Dash/DashApps.qml:178
109+msgid "Apps"
110+msgstr ""
111+
112+#: Dash/DashHome.qml:40
113+msgid "Frequent Apps"
114+msgstr ""
115+
116+#: Dash/DashHome.qml:43
117+msgid "Recent Music"
118+msgstr ""
119+
120+#: Dash/DashHome.qml:46
121+msgid "Videos Popular Online"
122+msgstr ""
123+
124+#: Dash/DashHome.qml:175
125+msgid "Home"
126+msgstr ""
127+
128+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
129+msgid "Featured"
130+msgstr ""
131+
132+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
133+msgid "Recent"
134+msgstr ""
135+
136+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
137+msgid "New Releases"
138+msgstr ""
139+
140+#: Dash/DashMusic.qml:30
141+msgid "Top Charting"
142+msgstr ""
143+
144+#: Dash/DashMusic.qml:99
145+msgid "Music"
146+msgstr ""
147+
148+#: Dash/DashVideos.qml:31
149+msgid "Popular Online"
150+msgstr ""
151+
152+#: Dash/DashVideos.qml:155
153+msgid "Videos"
154+msgstr ""
155+
156+#: Dash/Video/VideoPreview.qml:98
157+msgid "Directed by:"
158+msgstr ""
159+
160+#: Dash/Video/VideoPreview.qml:121
161+msgid "Starring:"
162+msgstr ""
163+
164+#: Dash/Video/VideoPreview.qml:144
165+msgid "Author:"
166+msgstr ""
167+
168+#: Greeter/Lockscreen.qml:133
169+msgid "Emergency call"
170+msgstr ""
171+
172+#: Greeter/PassphraseLockscreen.qml:59
173+#, qt-format
174+msgid "Hello %1"
175+msgstr ""
176+
177+#: Greeter/PassphraseLockscreen.qml:59
178+msgid "Hello"
179+msgstr ""
180+
181+#: Hud/HudParametrizedActionsPage.qml:132
182+msgid "Confirm"
183+msgstr ""
184+
185+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
186+msgid "Type or say a command"
187+msgstr ""
188+
189+#: Hud/Hud.qml:84
190+msgid "Loading. Please Wait..."
191+msgstr ""
192+
193+#: Hud/Hud.qml:89
194+msgid "Speak Now..."
195+msgstr ""
196+
197+#: Hud/Hud.qml:94
198+msgid "Speaking..."
199+msgstr ""
200+
201+#: Panel/MenuContent.qml:192
202+msgid "Device"
203+msgstr ""
204+
205+#: Panel/Menus/Overview/FlightModeWidget.qml:42
206+msgid "Flight mode"
207+msgstr ""
208+
209+#: Panel/SearchIndicator.qml:26
210+msgid "Search"
211+msgstr ""
212+
213+#: plugins/Unity/scope.cpp:268
214+msgid "Sorry, there is nothing that matches your search."
215+msgstr ""
216+
217+#: Shell.qml:383
218+#, qt-format
219+msgid "Please enter %1"
220+msgstr ""
po/tr.po+33−44
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-24 17:24+0000\n"
1212"Last-Translator: Adar Cem EREN <adarcemeren34@gmail.com>\n"
1313"Language-Team: Turkish <tr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-25 06:00+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "İndirilebilir durumda"
109109msgid "Apps"
110110msgstr "Uygulamalar"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Sıkça Kullanılan Uygulamalar"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "En Son Müzik"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Çevrimiçi Yaygın Videolar"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Ana Sayfa"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "Müzik"
155147
156−#: Dash/DashPeople.qml:31
157−msgid "Favourites"
158−msgstr "Favoriler"
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 "Yeni Kişiler"
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 "Kişiler"
175−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Genellikle Çevrimiçi"
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr "Yazar:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr "Acil Arama"
199171
@@ -234,19 +206,36 @@ msgstr "Aygıt"
234206msgid "Flight mode"
235207msgstr "Uçak Modu"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Ara"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Başlangıç ekranı"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-06 07:40+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-28 04:36+0000\n"
12+"Last-Translator: Gheyret T.Kenji <Unknown>\n"
1313"Language-Team: Uyghur <ug@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Generator: Launchpad (build 16692)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "تېلېفون"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "كامېرا"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
@@ -31,59 +31,59 @@ msgstr ""
3131
3232#: Applications/applications.js:40
3333msgid "Facebook"
34−msgstr ""
34+msgstr "فېيىسبۇك(Facebook)"
3535
3636#: Applications/applications.js:46
3737msgid "Browser"
38−msgstr ""
38+msgstr "توركۆرگۈ"
3939
4040#: Applications/applications.js:51
4141msgid "Twitter"
42−msgstr ""
42+msgstr "تىۋىتتېر(Twitter)"
4343
4444#: Applications/applications.js:57
4545msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "ھاۋا رايى"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "خاتىرە دەپتەر(Notepad)"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "يىلنامە"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "ۋاسىتە قويغۇ"
6363
6464#: Applications/applications.js:86
6565msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
6767
6868#: Applications/applications.js:91
6969msgid "Map"
70−msgstr ""
70+msgstr "خەرىتە"
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
7575
7676#: Applications/applications.js:101
7777msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
82−msgstr ""
82+msgstr "ۋىكىپېدىيە"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -109,41 +109,33 @@ msgstr "چۈشۈرگىلى بولىدىغانلىرى"
109109msgid "Apps"
110110msgstr "ئەپلەر"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "دائىم ئىشلىتىلىدىغان ئەپلەر"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "يېقىندا ئاڭلىغان مۇزىكىلار"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "توردىكى ئالقىشقا ئېرىشكەن سىنلار"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "ماكان"
135127
136128#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137129msgid "Featured"
138−msgstr ""
130+msgstr "داڭلىق"
139131
140132#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141133msgid "Recent"
142−msgstr ""
134+msgstr "يېقىنقى"
143135
144136#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145137msgid "New Releases"
146−msgstr ""
138+msgstr "يېڭى ئېلان قىلىنغانلىرى"
147139
148140#: Dash/DashMusic.qml:30
149141msgid "Top Charting"
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "مۇزىكا"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -191,20 +163,20 @@ msgstr ""
191163
192164#: Dash/Video/VideoPreview.qml:144
193165msgid "Author:"
194−msgstr ""
166+msgstr "ئاپتور:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198−msgstr ""
170+msgstr "جىددىي تېلېفون"
199171
200172#: Greeter/PassphraseLockscreen.qml:59
201173#, qt-format
202174msgid "Hello %1"
203−msgstr ""
175+msgstr "سالام %1"
204176
205177#: Greeter/PassphraseLockscreen.qml:59
206178msgid "Hello"
207−msgstr ""
179+msgstr "سالام"
208180
209181#: Hud/HudParametrizedActionsPage.qml:132
210182msgid "Confirm"
@@ -234,19 +206,36 @@ msgstr "ئۈسكۈنە"
234206msgid "Flight mode"
235207msgstr "ئايروپىلاندا"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "ئىزدە"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپىلمىدى."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "ماكان ئېكران"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr ""
219+msgid "Please enter %1"
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+42−50
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-14 11:26+0000\n"
12−"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
10+"POT-Creation-Date: 2013-06-26 22:58+0200\n"
11+"PO-Revision-Date: 2013-06-29 14:27+0000\n"
12+"Last-Translator: Roman Koshkin <mar2008m@rambler.ru>\n"
1313"Language-Team: Ukrainian <uk@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Generator: Launchpad (build 16692)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "Доступно до завантаження"
109109msgid "Apps"
110110msgstr "Програми"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "Часто використовувані програми"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "Нещодавно прослухана музика"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "Популярні в мережі відео"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "Домівка"
135127
@@ -153,26 +145,6 @@ msgstr "З високими оцінками"
153145msgid "Music"
154146msgstr "Музика"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "Популярне у мережі"
@@ -193,18 +165,18 @@ msgstr "Актори:"
193165msgid "Author:"
194166msgstr "Автор:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198−msgstr ""
170+msgstr "Екстрений виклик"
199171
200172#: Greeter/PassphraseLockscreen.qml:59
201173#, qt-format
202174msgid "Hello %1"
203−msgstr ""
175+msgstr "Привіт, %1"
204176
205177#: Greeter/PassphraseLockscreen.qml:59
206178msgid "Hello"
207−msgstr ""
179+msgstr "Привіт!"
208180
209181#: Hud/HudParametrizedActionsPage.qml:132
210182msgid "Confirm"
@@ -234,19 +206,39 @@ msgstr "Пристрій"
234206msgid "Flight mode"
235207msgstr "Автономний режим"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "Пошук"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "Вибачте, для вказаних вами ключових слів нічого не знайдено."
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "Екран домівки"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr ""
219+msgid "Please enter %1"
220+msgstr "Будь ласка, введіть %1"
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 ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"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"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -165,7 +165,7 @@ msgstr ""
165165msgid "Author:"
166166msgstr ""
167167
168−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
169169msgid "Emergency call"
170170msgstr ""
171171
@@ -214,12 +214,7 @@ msgstr ""
214214msgid "Sorry, there is nothing that matches your search."
215215msgstr ""
216216
217−#: Shell.qml:380
217+#: Shell.qml:383
218218#, qt-format
219−msgid "Please enter %1:"
220−msgstr ""
221−
222−#: Shell.qml:380
223−#, qt-format
224−msgid "Please enter %1:"
219+msgid "Please enter %1"
225220msgstr ""
po/zh_CN.po+37−45
@@ -7,15 +7,15 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-22 21:20+0000\n"
1212"Last-Translator: Anthony Wong <anthony.wong@canonical.com>\n"
1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-23 05:56+0000\n"
18−"X-Generator: Launchpad (build 16677)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "可供下载"
109109msgid "Apps"
110110msgstr "应用程序"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "常用软件"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "近期听过的音乐"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "热门在线视频"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "主页"
135127
@@ -153,26 +145,6 @@ msgstr "排行榜图"
153145msgid "Music"
154146msgstr "音乐"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr "经常在线"
@@ -193,7 +165,7 @@ msgstr "主演:"
193165msgid "Author:"
194166msgstr "作者:"
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr "紧急呼救"
199171
@@ -234,19 +206,39 @@ msgstr "设备"
234206msgid "Flight mode"
235207msgstr "飞行模式"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "搜索"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "对不起,没有找到您想要的结果。"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "主页"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
252−msgstr "请输入 %1:"
219+msgid "Please enter %1"
220+msgstr ""
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 ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"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"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-27 16:16+0000\n"
18+"X-Generator: Launchpad (build 16681)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -109,27 +109,19 @@ msgstr "可供下載"
109109msgid "Apps"
110110msgstr "程式"
111111
112−#: Dash/DashHome.qml:43
112+#: Dash/DashHome.qml:40
113113msgid "Frequent Apps"
114114msgstr "常用的程式"
115115
116−#: Dash/DashHome.qml:46
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
116+#: Dash/DashHome.qml:43
125117msgid "Recent Music"
126118msgstr "最近聽過的音樂"
127119
128−#: Dash/DashHome.qml:55
120+#: Dash/DashHome.qml:46
129121msgid "Videos Popular Online"
130122msgstr "線上熱門的影片"
131123
132−#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
124+#: Dash/DashHome.qml:175
133125msgid "Home"
134126msgstr "家屋"
135127
@@ -153,26 +145,6 @@ msgstr ""
153145msgid "Music"
154146msgstr "音樂"
155147
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−
176148#: Dash/DashVideos.qml:31
177149msgid "Popular Online"
178150msgstr ""
@@ -193,7 +165,7 @@ msgstr ""
193165msgid "Author:"
194166msgstr ""
195167
196−#: Greeter/Lockscreen.qml:126
168+#: Greeter/Lockscreen.qml:133
197169msgid "Emergency call"
198170msgstr ""
199171
@@ -234,19 +206,27 @@ msgstr "裝置"
234206msgid "Flight mode"
235207msgstr "飛航模式"
236208
237−#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
209+#: Panel/SearchIndicator.qml:26
238210msgid "Search"
239211msgstr "搜尋"
240212
241−#: plugins/Unity/lens.cpp:333
213+#: plugins/Unity/scope.cpp:268
242214msgid "Sorry, there is nothing that matches your search."
243215msgstr "很抱歉,找不到符合您想搜尋的結果。"
244216
245−#: plugins/Unity/lenses.cpp:39
246−msgid "Home screen"
247−msgstr "家屋畫面"
248−
249−#: Shell.qml:380
217+#: Shell.qml:383
250218#, qt-format
251−msgid "Please enter %1:"
219+msgid "Please enter %1"
252220msgstr ""
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
1515KEYLOCK=false
1616SUDO="echo $PASSWORD | sudo -S"
1717NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
18+FLIPPED=false
19+CHROOT_PREFIX="/data/ubuntu"
1820
1921usage() {
2022 echo "usage: run_on_device [OPTIONS]\n"
@@ -35,7 +37,11 @@ exec_with_ssh() {
3537}
3638
3739exec_with_adb() {
38− adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
40+ if $FLIPPED; then
41+ adb shell $@
42+ else
43+ adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
44+ fi
3945}
4046
4147adb_root() {
@@ -45,7 +51,7 @@ adb_root() {
4551
4652install_ssh_key() {
4753 ssh-keygen -R $TARGET_IP
48− HOME_DIR=/data/ubuntu/home/phablet
54+ HOME_DIR="${CHROOT_PREFIX}/home/phablet"
4955 adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
5056 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
5157 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
@@ -79,14 +85,15 @@ build() {
7985}
8086
8187run() {
82− SERVICEFILE="/data/ubuntu/etc/device-services"
88+ SERVICEFILE="${CHROOT_PREFIX}/etc/device-services"
8389 adb shell "egrep '$BINARY|qml-phone-shell' $SERVICEFILE"
8490 CONTAINS_SHELL=$?
8591 if [ $CONTAINS_SHELL -eq 0 ]; then
8692 echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
8793 adb shell cp $SERVICEFILE $SERVICEFILE.backup
8894 adb shell sed -i "/$BINARY\\\\\|qml-phone-shell/d" $SERVICEFILE
89− adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
95+ if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
96+ else exec_with_adb /usr/bin/service ubuntu-session restart; fi
9097 fi
9198 adb shell pkill qml-phone-shell
9299 adb shell pkill $BINARY
@@ -106,7 +113,8 @@ run() {
106113 if [ $CONTAINS_SHELL -eq 0 ]; then
107114 echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
108115 adb shell cp $SERVICEFILE.backup $SERVICEFILE
109− adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
116+ if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
117+ else exec_with_adb /usr/bin/service ubuntu-session restart; fi
110118 fi
111119}
112120
@@ -130,6 +138,16 @@ done
130138adb_root
131139[ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
132140
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+
133151if $SETUP; then
134152 echo "Setting up environment for building shell.."
135153 install_ssh_key
tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp+40−28
@@ -20,7 +20,7 @@
2020
2121#include <AxisVelocityCalculator.h>
2222
23−class FakeTimeSource : public AxisVelocityCalculator::TimeSource {
23+class FakeTimeSource : public UbuntuGestures::TimeSource {
2424public:
2525 FakeTimeSource() : m_value(0) {}
2626
@@ -44,71 +44,85 @@ class tst_AxisVelocityCalculator : public QObject
4444{
4545 Q_OBJECT
4646private 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+
4750 void simpleSamples();
4851 void noSamples();
4952 void overflowSamples();
5053 void average();
54+
55+private:
56+ AxisVelocityCalculator *velCalc;
57+ FakeTimeSource *fakeTimeSource;
5158};
5259
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+
5374void tst_AxisVelocityCalculator::simpleSamples()
5475{
55− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
56− AxisVelocityCalculator velCalc(fakeTimeSource);
5776 qreal pos = 0;
5877
59− velCalc.setTrackedPosition(pos);
60− velCalc.reset();
78+ velCalc->setTrackedPosition(pos);
79+ velCalc->reset();
6180
6281 fakeTimeSource->setMsecsSinceReference(10);
6382 pos += 20;
64− velCalc.setTrackedPosition(pos);
83+ velCalc->setTrackedPosition(pos);
6584
6685 fakeTimeSource->setMsecsSinceReference(20);
6786 pos += 20;
68− velCalc.setTrackedPosition(pos);
87+ velCalc->setTrackedPosition(pos);
6988
7089 fakeTimeSource->setMsecsSinceReference(30);
7190 pos += 20;
72− velCalc.setTrackedPosition(pos);
91+ velCalc->setTrackedPosition(pos);
7392
74− qreal velocity = velCalc.calculate();
93+ qreal velocity = velCalc->calculate();
7594
7695 QCOMPARE(velocity, 2.0f);
7796}
7897
7998void tst_AxisVelocityCalculator::noSamples()
8099{
81− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
82− AxisVelocityCalculator velCalc(fakeTimeSource);
83−
84− float velocity = velCalc.calculate();
100+ float velocity = velCalc->calculate();
85101
86102 QCOMPARE(velocity, 0.0f);
87103}
88104
89105void tst_AxisVelocityCalculator::overflowSamples()
90106{
91− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
92− AxisVelocityCalculator velCalc(fakeTimeSource);
93107 qreal pos = 0;
94108
95− velCalc.setTrackedPosition(pos);
96− velCalc.reset();
109+ velCalc->setTrackedPosition(pos);
110+ velCalc->reset();
97111
98112 for (int i = 0; i < 1000; ++i) {
99113 fakeTimeSource->increaseMsecsSinceReference(10);
100114 pos += 20;
101− velCalc.setTrackedPosition(pos);
115+ velCalc->setTrackedPosition(pos);
102116 }
103117
104118 /* overwrite all existing samples with faster ones */
105119 for (int i = 0; i < AxisVelocityCalculator::MAX_SAMPLES; ++i) {
106120 fakeTimeSource->increaseMsecsSinceReference(10);
107121 pos += 40;
108− velCalc.setTrackedPosition(pos);
122+ velCalc->setTrackedPosition(pos);
109123 }
110124
111− float velocity = velCalc.calculate();
125+ float velocity = velCalc->calculate();
112126
113127 /* check that the calculated velocity correspond to the latest, faster, samples */
114128 QCOMPARE(velocity, 4.0f);
@@ -116,28 +130,26 @@ void tst_AxisVelocityCalculator::overflowSamples()
116130
117131void tst_AxisVelocityCalculator::average()
118132{
119− FakeTimeSource *fakeTimeSource = new FakeTimeSource;
120− AxisVelocityCalculator velCalc(fakeTimeSource);
121133 qreal pos = 0;
122134
123− velCalc.setTrackedPosition(pos);
124− velCalc.reset();
135+ velCalc->setTrackedPosition(pos);
136+ velCalc->reset();
125137
126138 fakeTimeSource->increaseMsecsSinceReference(10);
127139 pos += 20;
128− velCalc.setTrackedPosition(pos);
140+ velCalc->setTrackedPosition(pos);
129141
130142 fakeTimeSource->increaseMsecsSinceReference(10);
131143 pos += 20;
132− velCalc.setTrackedPosition(pos);
144+ velCalc->setTrackedPosition(pos);
133145
134146 /* the last sample is an erratic one and would yield a big velocity if
135147 considered isolatedly */
136148 fakeTimeSource->increaseMsecsSinceReference(10);
137149 pos += 100;
138− velCalc.setTrackedPosition(pos);
150+ velCalc->setTrackedPosition(pos);
139151
140− float velocity = velCalc.calculate();
152+ float velocity = velCalc->calculate();
141153
142154 /* calculated velocity is lower than the one from the last sample */
143155 QVERIFY(velocity < 9.0f);
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+99−11
@@ -38,7 +38,7 @@ private:
3838 int m_duration;
3939};
4040
41−class FakeTimeSource : public AxisVelocityCalculator::TimeSource
41+class FakeTimeSource : public UbuntuGestures::TimeSource
4242{
4343public:
4444 FakeTimeSource() { m_msecsSinceReference = 0; }
@@ -65,6 +65,9 @@ private Q_SLOTS:
6565 void minSpeed_data();
6666 void recognitionTimerUsage();
6767 void maxSilenceTime();
68+ void sceneXAndX();
69+ void sceneYAndY();
70+ void emitDraggingChangedOnDirectRecognition();
6871
6972private:
7073 QQuickView *createView();
@@ -72,7 +75,6 @@ private:
7275 QTouchDevice *device;
7376 FakeTimer *fakeTimer;
7477 FakeTimeSource *fakeTimeSource;
75− AxisVelocityCalculator *velCalcWithFakeTiming;
7678};
7779
7880void tst_DirectionalDragArea::initTestCase()
@@ -101,7 +103,6 @@ void tst_DirectionalDragArea::init()
101103
102104 fakeTimer = new FakeTimer;
103105 fakeTimeSource = new FakeTimeSource;
104− velCalcWithFakeTiming = new AxisVelocityCalculator(fakeTimeSource);
105106}
106107
107108void tst_DirectionalDragArea::cleanup()
@@ -112,10 +113,8 @@ void tst_DirectionalDragArea::cleanup()
112113 delete fakeTimer;
113114 fakeTimer = 0;
114115
115− // will bring fakeTimeSource down with it
116− delete velCalcWithFakeTiming;
116+ delete fakeTimeSource;
117117 fakeTimeSource = 0;
118− velCalcWithFakeTiming = 0;
119118}
120119
121120QQuickView *tst_DirectionalDragArea::createView()
@@ -187,7 +186,7 @@ void tst_DirectionalDragArea::edgeDrag()
187186 view->rootObject()->findChild<DirectionalDragArea*>(dragAreaObjectName);
188187 QVERIFY(edgeDragArea != 0);
189188 edgeDragArea->setRecognitionTimer(fakeTimer);
190− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
189+ edgeDragArea->setTimeSource(fakeTimeSource);
191190
192191 QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
193192
@@ -292,7 +291,7 @@ void tst_DirectionalDragArea::dragWithShortDirectionChange()
292291 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
293292 QVERIFY(edgeDragArea != 0);
294293 edgeDragArea->setRecognitionTimer(fakeTimer);
295− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
294+ edgeDragArea->setTimeSource(fakeTimeSource);
296295
297296 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
298297 QPointF touchPoint = initialTouchPos;
@@ -337,7 +336,7 @@ void tst_DirectionalDragArea::minSpeed()
337336 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
338337 QVERIFY(edgeDragArea != 0);
339338 edgeDragArea->setRecognitionTimer(fakeTimer);
340− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
339+ edgeDragArea->setTimeSource(fakeTimeSource);
341340
342341 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
343342 QPointF touchPoint = initialTouchPos;
@@ -390,7 +389,7 @@ void tst_DirectionalDragArea::recognitionTimerUsage()
390389 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
391390 QVERIFY(edgeDragArea != 0);
392391 edgeDragArea->setRecognitionTimer(fakeTimer);
393− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
392+ edgeDragArea->setTimeSource(fakeTimeSource);
394393
395394 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
396395 QPointF touchPoint = initialTouchPos;
@@ -431,7 +430,7 @@ void tst_DirectionalDragArea::maxSilenceTime()
431430 view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
432431 QVERIFY(edgeDragArea != 0);
433432 edgeDragArea->setRecognitionTimer(fakeTimer);
434− edgeDragArea->setAxisVelocityCalculator(velCalcWithFakeTiming);
433+ edgeDragArea->setTimeSource(fakeTimeSource);
435434
436435 QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
437436 QPointF touchPoint = initialTouchPos;
@@ -458,6 +457,95 @@ void tst_DirectionalDragArea::maxSilenceTime()
458457 QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Rejected);
459458}
460459
460+/*
461+ Checks that it informs the X coordinate of the touch point in local and scene coordinates
462+ correctly.
463+ */
464+void tst_DirectionalDragArea::sceneXAndX()
465+{
466+ DirectionalDragArea *edgeDragArea =
467+ view->rootObject()->findChild<DirectionalDragArea*>("hnDragArea");
468+ QVERIFY(edgeDragArea != 0);
469+ edgeDragArea->setRecognitionTimer(fakeTimer);
470+ edgeDragArea->setTimeSource(fakeTimeSource);
471+
472+ QPointF touchScenePos(view->width() - (edgeDragArea->width()/2.0f), view->height()/2.0f);
473+
474+ fakeTimeSource->m_msecsSinceReference = 0;
475+ QTest::touchEvent(view, device).press(0, touchScenePos.toPoint());
476+
477+ QSignalSpy touchXSpy(edgeDragArea, SIGNAL(touchXChanged(qreal)));
478+ QSignalSpy touchSceneXSpy(edgeDragArea, SIGNAL(touchSceneXChanged(qreal)));
479+
480+ touchScenePos.rx() = view->width() / 2;
481+ QTest::touchEvent(view, device).move(0, touchScenePos.toPoint());
482+
483+ QCOMPARE(touchXSpy.count(), 1);
484+ QCOMPARE(touchSceneXSpy.count(), 1);
485+ QCOMPARE(edgeDragArea->touchX(), touchScenePos.x() - edgeDragArea->x());
486+ QCOMPARE(edgeDragArea->touchSceneX(), touchScenePos.x());
487+}
488+
489+/*
490+ Checks that it informs the Y coordinate of the touch point in local and scene coordinates
491+ correctly.
492+ */
493+void tst_DirectionalDragArea::sceneYAndY()
494+{
495+ DirectionalDragArea *edgeDragArea =
496+ view->rootObject()->findChild<DirectionalDragArea*>("vnDragArea");
497+ QVERIFY(edgeDragArea != 0);
498+ edgeDragArea->setRecognitionTimer(fakeTimer);
499+ edgeDragArea->setTimeSource(fakeTimeSource);
500+
501+ QPointF touchScenePos(view->width()/2.0f, view->height() - (edgeDragArea->height()/2.0f));
502+
503+ fakeTimeSource->m_msecsSinceReference = 0;
504+ QTest::touchEvent(view, device).press(0, touchScenePos.toPoint());
505+
506+ QSignalSpy touchYSpy(edgeDragArea, SIGNAL(touchYChanged(qreal)));
507+ QSignalSpy touchSceneYSpy(edgeDragArea, SIGNAL(touchSceneYChanged(qreal)));
508+
509+ touchScenePos.ry() = view->height() / 2;
510+ QTest::touchEvent(view, device).move(0, touchScenePos.toPoint());
511+
512+ QCOMPARE(touchYSpy.count(), 1);
513+ QCOMPARE(touchSceneYSpy.count(), 1);
514+ QCOMPARE(edgeDragArea->touchY(), touchScenePos.y() - edgeDragArea->y());
515+ QCOMPARE(edgeDragArea->touchSceneY(), touchScenePos.y());
516+}
517+
518+/*
519+ Emit draggingChanged() when status change from WaitingForTouch directly to Recognized.
520+ This happens when the gesture recognition is effectively disabled (e.g. by setting a
521+ distanceThreshold of zero)
522+ */
523+void tst_DirectionalDragArea::emitDraggingChangedOnDirectRecognition()
524+{
525+ DirectionalDragArea *edgeDragArea =
526+ view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
527+ QVERIFY(edgeDragArea != 0);
528+ edgeDragArea->setRecognitionTimer(fakeTimer);
529+ edgeDragArea->setTimeSource(fakeTimeSource);
530+
531+ QPointF touchPos = calculateInitialTouchPos(edgeDragArea, view);
532+
533+ QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
534+
535+ // That will make it completetly skip the recognition phase ("Undecided" status).
536+ edgeDragArea->setDistanceThreshold(0.0);
537+
538+ QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::WaitingForTouch);
539+ QCOMPARE(edgeDragArea->dragging(), false);
540+
541+ fakeTimeSource->m_msecsSinceReference = 0;
542+ QTest::touchEvent(view, device).press(0, touchPos.toPoint());
543+
544+ QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
545+ QCOMPARE(draggingSpy.count(), 1);
546+ QCOMPARE(edgeDragArea->dragging(), true);
547+}
548+
461549QTEST_MAIN(tst_DirectionalDragArea)
462550
463551#include "tst_DirectionalDragArea.moc"
tests/qmltests/CMakeLists.txt+2
@@ -2,6 +2,7 @@
22include(QmlTest)
33
44add_subdirectory(plugins)
5+add_subdirectory(Components)
56
67set(qmltest_DEFAULT_IMPORT_PATHS
78 ${CMAKE_CURRENT_BINARY_DIR}/plugins
@@ -25,6 +26,7 @@ add_qml_test(utils/Unity/Test UnityTest)
2526set(qmltest_DEFAULT_TARGETS qmluitests)
2627set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
2728set(qmltest_DEFAULT_PROPERTIES "")
29+add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
2830add_qml_test(Components DraggingArea)
2931add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
3032add_qml_test(Components ResponsiveFlowView)
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 {
233233
234234 var touchX = stage.width - (stage.rightEdgeDraggingAreaWidth / 2)
235235 var touchY = stage.height / 2
236− touchFlick(stage, touchX, touchY,
237− touchX - units.gu(5), touchY)
236+ touchFlick(stage, touchX, touchY, stage.width * 0.25, touchY)
238237
239238 // wait until animations end, if any
240239 tryCompare(stage, "usingScreenshots", false)