on xenial help sign in
Merged trunk.
commit543a6dacbec3c4d5b4915537cdb7882ec1d955e2 authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 20 Jun 2013, 13:46 (13 years ago) parent5a62ce3e90dbab
86 files changed+2812−497
CODING+16−16 Components/Stage.qml+1−1 Dash/Apps/ApplicationsFilterGrid.qml+1−1 Dash/DashBar.qml+3−8 Dash/graphics/scopeIcons/Applications@18.png Dash/graphics/scopeIcons/Home Scope.png Dash/graphics/scopeIcons/Home@18.png Dash/graphics/scopeIcons/Music@18.png Dash/graphics/scopeIcons/People@18.png Dash/graphics/scopeIcons/Videos@18.png Greeter/Greeter.qml+38−1 Greeter/GreeterContent.qml+5−3 Launcher/Launcher.qml+1−1 Notifications/Notification.qml+10−7 Notifications/Notifications.qml+4−2 Shell.qml+29 cmake/modules/QmlTest.cmake+39−1 debian/changelog+39−1 debian/control+2 plugins/Ubuntu/Gestures/CMakeLists.txt+1 plugins/Ubuntu/Gestures/Direction.cpp+27 plugins/Ubuntu/Gestures/Direction.h+43 plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+16−26 plugins/Ubuntu/Gestures/DirectionalDragArea.h+6−13 plugins/Ubuntu/Gestures/plugin.cpp+8 plugins/Unity/scopes.cpp+1−1 po/ar.po+47−29 po/az.po+21−3 po/bg.po+253 po/ca.po+21−3 po/de.po+51−33 po/el.po+21−3 po/en_AU.po+62−44 po/en_GB.po+252 po/eo.po+21−3 po/es.po+51−33 po/fi.po+21−3 po/fo.po+21−3 po/fr.po+21−3 po/gl.po+21−3 po/he.po+21−3 po/hr.po+21−3 po/hu.po+21−3 po/hy.po+21−3 po/id.po+21−3 po/it.po+21−3 po/ja.po+252 po/kn.po+21−3 po/ko.po+21−3 po/ky.po+21−3 po/lv.po+21−3 po/my.po+21−3 po/nb.po+28−10 po/nl.po+21−3 po/pl.po+49−31 po/pt_BR.po+21−3 po/ro.po+21−3 po/ru.po+21−3 po/si.po+21−3 po/sl.po+21−3 po/sr.po+21−3 po/sv.po+21−3 po/te.po+21−3 po/tr.po+21−3 po/ug.po+21−3 po/uk.po+62−44 po/unity8.pot+6−1 po/zh_CN.po+51−33 po/zh_TW.po+21−3 tests/CMakeLists.txt+1 tests/mocks/LightDM/demo/GreeterPrivate.cpp+24−3 tests/mocks/LightDM/demo/InfographicModelPrivate.cpp+19−26 tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml+1−1 tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml+1−1 tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml+1−1 tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml+1−1 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+9−10 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Greeter/tst_Phone.qml+13−8 tests/qmltests/Greeter/tst_Tablet.qml+19 tests/qmltests/Notifications/tst_Notifications.qml+30−12 tests/qmltests/plugins/Unity/Notifications/notification.js+23 tests/qmltests/plugins/Unity/Notifications/qmldir+2 tests/uqmlscene/CMakeLists.txt+18 tests/uqmlscene/README+1 tests/uqmlscene/main.cpp+543
CODING+16−16
@@ -1,15 +1,15 @@
1−Building UnityNext
2−==================
1+Building Unity 8
2+================
33
44download source
55---------------
66- the build requires some additional dependencies, so create the parent folder to not pollute your setup
77 $ mkdir ~/unity
88
9−- fetch Unity Next source
9+- fetch Unity 8 source
1010 $ sudo apt-get install bzr
11− $ bzr branch lp:unity/phablet ~/unity/unity-next
12− $ cd ~/unity/unity-next
11+ $ bzr branch lp:unity/8.0 ~/unity/unity8
12+ $ cd ~/unity/unity8
1313
1414build dependencies
1515------------------
@@ -20,8 +20,8 @@ $ ./build -s
2020 - build and install lp:libunity/phablet, lp:unity/phablet-mods, lp:hud/phablet locally
2121 - install build dependencies
2222
23−build UnityNext
24−---------------
23+build Unity 8
24+-------------
2525$ ./build
2626
2727subsequent updates of the dependencies
@@ -30,12 +30,12 @@ $ ./build_unity -u
3030$ ./build_unity
3131
3232
33−Running UnityNext on your desktop
34−=================================
33+Running Unity 8 on your desktop
34+===============================
3535
36−run the UnityNext shell
37−-----------------------
38−$ cd ~/unity/unity-next
36+run the Unity 8 shell
37+---------------------
38+$ cd ~/unity/unity8
3939$ ./run
4040
4141Notes
@@ -46,15 +46,15 @@ Notes
4646 later.
4747 $ cd builddir; make install
4848
49−Running UnityNext on devices
50−============================
49+Running Unity 8 on devices
50+==========================
5151- Ubuntu Touch builds are currently only available in 13.10 flavour
5252- supported hardware should match one those listed here https://wiki.ubuntu.com/Touch/Devices#Running_fine
5353- follow the Ubuntu Touch install instructions for your chosen device https://wiki.ubuntu.com/Touch/Install
5454- make sure your device is connected to a WiFi network
5555- also make sure you have your SSH key in ~/.ssh/id_rsa.pub (or install one on the device yourself)
5656
57−$ cd ~/unity/unity-next
57+$ cd ~/unity/unity8
5858$ ./run_on_device -s
5959 this will:
6060 - install your public SSH key on the device
@@ -90,4 +90,4 @@ https://launchpad.net/canonical-client-development-guidelines
9090
9191Development Environment
9292=======================
93−QtCreator (available via the Software Center) is the best IDE to hack on UnityNext.
93+QtCreator (available via the Software Center) is the best IDE to hack on Unity 8.
Components/Stage.qml+1−1
@@ -438,7 +438,7 @@ Showable {
438438 anchors.bottom: parent.bottom
439439 anchors.right: parent.right
440440
441− direction: DirectionalDragArea.Leftwards
441+ direction: Direction.Leftwards
442442 maxDeviation: units.gu(1)
443443 wideningAngle: 20
444444 distanceThreshold: units.gu(3)
Dash/Apps/ApplicationsFilterGrid.qml+1−1
@@ -35,7 +35,7 @@ FilterGrid {
3535 objectName: "delegate" + index
3636 Application {
3737 id: application
38− desktopFile: model.column_6 ? stripProtocol(model.column_6) : model.desktopFile // FIXME: this is temporary
38+ desktopFile: model.column_7 ? stripProtocol(model.column_7) : model.desktopFile // FIXME: this is temporary
3939
4040 function stripProtocol(uri) {
4141 var chunks = uri.split('file://')
Dash/DashBar.qml+3−8
@@ -26,7 +26,7 @@ Item {
2626
2727 property int lineHeight: units.dp(2)
2828 property int itemSize: units.gu(7)
29− property int iconSize: units.gu(2.5)
29+ property int iconSize: units.gu(3.5)
3030
3131 signal itemSelected(int index)
3232
@@ -97,14 +97,9 @@ Item {
9797
9898 Image {
9999 anchors.centerIn: parent
100− /* FIXME: should be 'source: scope.iconHint' but the
101− scopes do not contain the right icons yet
102− */
103− source: "graphics/scopeIcons/%1.png".arg(scope.name)
104− height: iconSize
105− width: iconSize
100+ source: scope.iconHint
101+ sourceSize { width: iconSize; height: iconSize }
106102 // opacity: index == currentIndex ? 1 : 1 // same opacity for now
107− smooth: true
108103 }
109104 }
110105 }
Dash/graphics/scopeIcons/Applications@18.pngdeleted

Binary file not shown.

Dash/graphics/scopeIcons/Home Scope.pngdeleted

Binary file not shown.

Dash/graphics/scopeIcons/Home@18.pngdeleted

Binary file not shown.

Dash/graphics/scopeIcons/Music@18.pngdeleted

Binary file not shown.

Dash/graphics/scopeIcons/People@18.pngdeleted

Binary file not shown.

Dash/graphics/scopeIcons/Videos@18.pngdeleted

Binary file not shown.

Greeter/Greeter.qml+38−1
@@ -30,11 +30,20 @@ Showable {
3030 readonly property bool narrowMode: !multiUser && width <= units.gu(60)
3131 readonly property bool multiUser: LightDM.Users.count > 1
3232
33− readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.leftTeaserPressed
33+ readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&
34+ greeterContentLoader.item.leftTeaserPressed
35+ readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&
36+ greeterContentLoader.item.rightTeaserPressed
3437
3538 signal selected(int uid)
3639 signal unlocked(int uid)
3740
41+ onRightTeaserPressedChanged: {
42+ if (rightTeaserPressed) {
43+ teasingTimer.start();
44+ }
45+ }
46+
3847 Loader {
3948 id: greeterContentLoader
4049 objectName: "greeterContentLoader"
@@ -54,4 +63,32 @@ Showable {
5463 onUnlocked: greeter.unlocked(uid);
5564 }
5665 }
66+
67+ Timer {
68+ id: teasingTimer
69+ interval: 200
70+ }
71+
72+ states: [
73+ State {
74+ name: "teasing"
75+ when: greeter.rightTeaserPressed || teasingTimer.running
76+ PropertyChanges {
77+ target: greeter
78+ x: -units.gu(2)
79+ }
80+ }
81+ ]
82+ transitions: [
83+ Transition {
84+ from: "*"
85+ to: "*"
86+ NumberAnimation {
87+ target: greeter
88+ property: "x"
89+ duration: 300
90+ easing.type: Easing.OutCubic
91+ }
92+ }
93+ ]
5794}
Greeter/GreeterContent.qml+5−3
@@ -25,7 +25,10 @@ MouseArea {
2525
2626 property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless
2727 property bool ready: wallpaper.status == Image.Ready
28− property alias leftTeaserPressed: leftTeaser.pressed
28+ property bool leftTeaserPressed: teasingMouseArea.pressed &&
29+ teasingMouseArea.mouseX < teasingMouseArea.width / 2
30+ property bool rightTeaserPressed: teasingMouseArea.pressed &&
31+ teasingMouseArea.mouseX > teasingMouseArea.width / 2
2932
3033 signal selected(int uid)
3134 signal unlocked(int uid)
@@ -57,9 +60,8 @@ MouseArea {
5760 }
5861
5962 MouseArea {
60− id: leftTeaser
63+ id: teasingMouseArea
6164 anchors.fill: parent
62− anchors.rightMargin: parent.width / 2
6365 }
6466
6567 Loader {
Launcher/Launcher.qml+1−1
@@ -184,7 +184,7 @@ Item {
184184 DirectionalDragArea {
185185 id: dragArea
186186
187− direction: DirectionalDragArea.Rightwards
187+ direction: Direction.Rightwards
188188
189189 // values to be tweaked and later removed from here and set in stone as defaults
190190 // once we are confident it's all good.
Notifications/Notification.qml+10−7
@@ -16,18 +16,19 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19+import Unity.Notifications 1.0
1920
2021UbuntuShape {
2122 id: notification
2223
23− property string type
2424 property alias iconSource: avatarIcon.source
2525 property alias secondaryIconSource: secondaryIcon.source
2626 property alias summary: summaryLabel.text
2727 property alias body: bodyLabel.text
2828 property var actions
29−
30− signal actionInvoked(string buttonId)
29+ property var notificationId
30+ property var type
31+ property var notification
3132
3233 implicitHeight: childrenRect.height
3334 color: Qt.rgba(0, 0, 0, 0.85)
@@ -38,8 +39,8 @@ UbuntuShape {
3839
3940 anchors.fill: contentColumn
4041 objectName: "interactiveArea"
41− enabled: notification.type == "Notifications.Type.Interactive"
42− onClicked: notification.actionInvoked(actions.get(0).id)
42+ enabled: notification.type == Notification.Interactive
43+ onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
4344 }
4445
4546 Column {
@@ -130,13 +131,14 @@ UbuntuShape {
130131 objectName: "buttonRow"
131132 spacing: contentColumn.spacing
132133 layoutDirection: Qt.RightToLeft
133− visible: notification.type == "Notifications.Type.SnapDecision"
134+ visible: notification.type == Notification.SnapDecision
134135 anchors {
135136 left: parent.left
136137 right: parent.right
137138 }
138139
139140 Repeater {
141+ id: actionRepeater
140142 model: notification.actions
141143
142144 Button {
@@ -145,7 +147,8 @@ UbuntuShape {
145147 width: (buttonRow.width - buttonRow.spacing) / 2
146148 height: units.gu(4)
147149 text: label
148− onClicked: notification.actionInvoked(id)
150+ property string actionId: id
151+ onClicked: notification.notification.invokeAction(id)
149152 }
150153 }
151154 }
Notifications/Notifications.qml+4−2
@@ -20,9 +20,9 @@ import "../Components"
2020import "timings.js" as Timings
2121
2222ListView {
23− id: notificationRenderer
23+ id: notificationList
2424
25− objectName: "notificationRenderer"
25+ objectName: "notificationList"
2626 interactive: false
2727
2828 spacing: units.gu(.5)
@@ -38,6 +38,8 @@ ListView {
3838 summary: model.summary
3939 body: model.body
4040 actions: model.actions
41+ notificationId: model.id
42+ notification: notificationList.model.getRaw(notificationId)
4143 }
4244
4345 populate: Transition {
Shell.qml+29
@@ -27,6 +27,8 @@ import "Components"
2727import "Components/Math.js" as MathLocal
2828import "Bottombar"
2929import "SideStage"
30+import "Notifications"
31+import Unity.Notifications 1.0 as NotificationBackend
3032
3133FocusScope {
3234 id: shell
@@ -559,6 +561,33 @@ FocusScope {
559561 }
560562 }
561563 }
564+
565+ Notifications {
566+ id: notifications
567+
568+ model: NotificationBackend.Model
569+ anchors {
570+ top: parent.top
571+ right: parent.right
572+ bottom: parent.bottom
573+ leftMargin: units.gu(1)
574+ rightMargin: units.gu(1)
575+ topMargin: panel.panelHeight + units.gu(1)
576+ }
577+ states: [
578+ State {
579+ name: "narrow"
580+ when: overlay.width <= units.gu(60)
581+ AnchorChanges { target: notifications; anchors.left: parent.left }
582+ },
583+ State {
584+ name: "wide"
585+ when: overlay.width > units.gu(60)
586+ AnchorChanges { target: notifications; anchors.left: undefined }
587+ PropertyChanges { target: notifications; width: units.gu(38) }
588+ }
589+ ]
590+ }
562591 }
563592
564593 focus: true
cmake/modules/QmlTest.cmake+39−1
@@ -9,6 +9,10 @@
99# IMPORT_PATHS will pass those paths to qmltestrunner as "-import" arguments
1010# PROPERTIES will be set on the target and test target. See CMake's set_target_properties()
1111#
12+# Two targets will be created:
13+# - testComponentName - Runs the test with qmltestrunner
14+# - tryComponentName - Runs the test with uqmlscene, for manual interaction
15+#
1216# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
1317# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
1418# qmltest_DEFAULT_TARGETS
@@ -21,6 +25,39 @@ if(NOT qmltestrunner_exe)
2125 msg(FATAL_ERROR "Could not locate qmltestrunner.")
2226endif()
2327
28+set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
29+
30+macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
31+ set(options NO_ADD_TEST NO_TARGETS)
32+ set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
33+
34+ cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
35+
36+ set(qmlscene_TARGET try${COMPONENT_NAME})
37+ set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
38+
39+ set(qmlscene_imports "")
40+ if(NOT "${qmltest_IMPORT_PATHS}" STREQUAL "")
41+ foreach(IMPORT_PATH ${qmltest_IMPORT_PATHS})
42+ list(APPEND qmlscene_imports "-I")
43+ list(APPEND qmlscene_imports ${IMPORT_PATH})
44+ endforeach(IMPORT_PATH)
45+ elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
46+ foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
47+ list(APPEND qmlscene_imports "-I")
48+ list(APPEND qmlscene_imports ${IMPORT_PATH})
49+ endforeach(IMPORT_PATH)
50+ endif()
51+
52+ set(qmlscene_command
53+ env ${qmltest_ENVIRONMENT}
54+ ${qmlscene_exe} ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
55+ ${qmlscene_imports}
56+ )
57+ add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
58+
59+endmacro(add_manual_qml_test)
60+
2461macro(add_qml_test SUBPATH COMPONENT_NAME)
2562 set(options NO_ADD_TEST NO_TARGETS)
2663 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
@@ -50,7 +87,6 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
5087 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
5188 -o -,txt
5289 )
53−
5490 add_custom_target(${qmltest_TARGET} ${qmltest_command})
5591
5692 if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
@@ -80,4 +116,6 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
80116 endforeach(TARGET)
81117 endif()
82118 endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
119+
120+ add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
83121endmacro(add_qml_test)
debian/changelog+39−1
@@ -1,5 +1,43 @@
1−unity8 (7.81.0) UNRELEASED; urgency=low
1+unity8 (7.81.0) saucy; urgency=low
22
3+ * Translation updates.
4+
5+ [ Michał Sawicz ]
6+ * Drop People lens.
7+ * Support git-backed checkout.
8+ * Revert focus stealing prevention for new apps. Fixes:
9+ https://bugs.launchpad.net/bugs/1190155.
10+ * Update CODING after unity8 rename.
11+ * Update translation template file.
12+ * Fix notification placement.
13+
14+ [ Michael Terry ]
15+ * Show login list when not in narrow mode, instead of only when we have
16+ multiple users.
17+
18+ [ Günter Schwann ]
19+ * Bring back ListView'ed Carousel now that Qt is fixed.
20+
21+ [ Daniel d'Andrada ]
22+ * Stage: code cleanup.
23+ * DirectionalDragArea: added minSpeed and maxSilenceTime constraints.
24+ * Move Direction enum out of DirectionalDragArea.
25+ * Added uqmlscene tool and tryFoo targets for manual testing.
26+
27+ [ Michael Zanetti ]
28+ * Add Lockscreens.
29+ * Added right edge hinting to greeter.
30+
31+ [ Nick Dedekind ]
32+ * Added Dash tests.
33+
34+ [ Nicolas d'Offay ]
35+ * Changed infographic gradient colours.
36+
37+ [ Mirco Müller ]
38+ * Integrate notifications.
39+
40+ [ Pawel Stołowski ]
341 * New version with support for smart scopes.
442
543 -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 14 Jun 2013 12:56:17 +0200
debian/control+2
@@ -40,6 +40,8 @@ Architecture: amd64 armhf i386
4040Depends: indicators-client (>= 0.6.1),
4141 qtdeclarative5-dee-plugin,
4242 qtdeclarative5-ubuntu-ui-toolkit-plugin,
43+ qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
44+ unity-notifications-impl-1,
4345 qtdeclarative5-xmllistmodel-plugin,
4446 qtubuntu,
4547 ${misc:Depends},
plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -7,6 +7,7 @@ find_package(Qt5Quick REQUIRED)
77set(UbuntuGestureQml_SOURCES
88 plugin.cpp
99 AxisVelocityCalculator.cpp
10+ Direction.cpp
1011 DirectionalDragArea.cpp
1112)
1213
plugins/Ubuntu/Gestures/Direction.cppnew file+27
@@ -0,0 +1,27 @@
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 "Direction.h"
18+
19+bool Direction::isHorizontal(Direction::Type type)
20+{
21+ return type == Direction::Leftwards || type == Direction::Rightwards;
22+}
23+
24+bool Direction::isVertical(Direction::Type type)
25+{
26+ return type == Direction::Upwards || type == Direction::Downwards;
27+}
plugins/Ubuntu/Gestures/Direction.hnew file+43
@@ -0,0 +1,43 @@
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+#ifndef DIRECTION_H
18+#define DIRECTION_H
19+
20+#include "UbuntuGesturesGlobal.h"
21+#include <QObject>
22+
23+/*
24+ A Direction enum wrapper so that we can do things like "direction: Direction.Righwards"
25+ from QML.
26+ */
27+class UBUNTUGESTURES_EXPORT Direction : public QObject {
28+ Q_OBJECT
29+ Q_ENUMS(Type)
30+
31+public:
32+ enum Type {
33+ Rightwards, // Along the positive direction of the X axis
34+ Leftwards, // Along the negative direction of the X axis
35+ Downwards, // Along the positive direction of the Y axis
36+ Upwards // Along the negative direction of the Y axis
37+ };
38+
39+ Q_INVOKABLE static bool isHorizontal(Direction::Type type);
40+ Q_INVOKABLE static bool isVertical(Direction::Type type);
41+};
42+
43+#endif // DIRECTION_H
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+16−26
@@ -41,7 +41,7 @@ DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
4141 : QQuickItem(parent)
4242 , m_status(WaitingForTouch)
4343 , m_touchId(-1)
44− , m_direction(DirectionalDragArea::Rightwards)
44+ , m_direction(Direction::Rightwards)
4545 , m_wideningAngle(0)
4646 , m_wideningFactor(0)
4747 , m_distanceThreshold(0)
@@ -58,12 +58,12 @@ DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
5858 m_velocityCalculator = new AxisVelocityCalculator(this);
5959}
6060
61−DirectionalDragArea::Direction DirectionalDragArea::direction() const
61+Direction::Type DirectionalDragArea::direction() const
6262{
6363 return m_direction;
6464}
6565
66−void DirectionalDragArea::setDirection(DirectionalDragArea::Direction direction)
66+void DirectionalDragArea::setDirection(Direction::Type direction)
6767{
6868 if (direction != m_direction) {
6969 m_direction = direction;
@@ -151,7 +151,7 @@ void DirectionalDragArea::setAxisVelocityCalculator(AxisVelocityCalculator *newV
151151
152152qreal DirectionalDragArea::distance() const
153153{
154− if (directionIsHorizontal()) {
154+ if (Direction::isHorizontal(m_direction)) {
155155 return m_previousPos.x() - m_startPos.x();
156156 } else {
157157 return m_previousPos.y() - m_startPos.y();
@@ -286,13 +286,13 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
286286 qreal dY = m_dampedPos.y() - m_startPos.y();
287287
288288 switch (m_direction) {
289− case Upwards:
289+ case Direction::Upwards:
290290 return dY <= 0 && qFabs(dX) <= qFabs(dY) * m_wideningFactor;
291− case Downwards:
291+ case Direction::Downwards:
292292 return dY >= 0 && qFabs(dX) <= dY * m_wideningFactor;
293− case Leftwards:
293+ case Direction::Leftwards:
294294 return dX <= 0 && qFabs(dY) <= qFabs(dX) * m_wideningFactor;
295− default: // Rightwards:
295+ default: // Direction::Rightwards:
296296 return dX >= 0 && qFabs(dY) <= dX * m_wideningFactor;
297297 }
298298}
@@ -300,20 +300,20 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
300300bool DirectionalDragArea::movingInRightDirection() const
301301{
302302 switch (m_direction) {
303− case Upwards:
303+ case Direction::Upwards:
304304 return m_dampedPos.y() <= m_previousDampedPos.y();
305− case Downwards:
305+ case Direction::Downwards:
306306 return m_dampedPos.y() >= m_previousDampedPos.y();
307− case Leftwards:
307+ case Direction::Leftwards:
308308 return m_dampedPos.x() <= m_previousDampedPos.x();
309− default: // Rightwards:
309+ default: // Direction::Rightwards:
310310 return m_dampedPos.x() >= m_previousDampedPos.x();
311311 }
312312}
313313
314314bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
315315{
316− if (directionIsHorizontal())
316+ if (Direction::isHorizontal(m_direction))
317317 return qFabs(point.x() - m_startPos.x()) > m_distanceThreshold;
318318 else
319319 return qFabs(point.y() - m_startPos.y()) > m_distanceThreshold;
@@ -386,35 +386,25 @@ void DirectionalDragArea::setPreviousPos(QPointF point)
386386
387387 if (xChanged) {
388388 Q_EMIT touchXChanged(point.x());
389− if (directionIsHorizontal())
389+ if (Direction::isHorizontal(m_direction))
390390 Q_EMIT distanceChanged(distance());
391391 }
392392
393393 if (yChanged) {
394394 Q_EMIT touchYChanged(point.y());
395− if (directionIsVertical())
395+ if (Direction::isVertical(m_direction))
396396 Q_EMIT distanceChanged(distance());
397397 }
398398}
399399
400400void DirectionalDragArea::updateVelocityCalculator(QPointF point)
401401{
402− if (directionIsHorizontal()) {
402+ if (Direction::isHorizontal(m_direction)) {
403403 m_velocityCalculator->setTrackedPosition(point.x());
404404 } else {
405405 m_velocityCalculator->setTrackedPosition(point.y());
406406 }
407407}
408408
409−bool DirectionalDragArea::directionIsHorizontal() const
410−{
411− return m_direction == Leftwards || m_direction == Rightwards;
412−}
413−
414−bool DirectionalDragArea::directionIsVertical() const
415−{
416− return m_direction == Upwards || m_direction == Downwards;
417−}
418−
419409// Because we are defining a new QObject-based class (RecognitionTimer) here.
420410#include "DirectionalDragArea.moc"
plugins/Ubuntu/Gestures/DirectionalDragArea.h+6−13
@@ -21,6 +21,7 @@
2121#include "AxisVelocityCalculator.h"
2222#include "UbuntuGesturesGlobal.h"
2323#include "Damper.h"
24+#include "Direction.h"
2425
2526namespace UbuntuGestures {
2627/* Defines an interface for a Timer. */
@@ -53,7 +54,7 @@ class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
5354 Q_OBJECT
5455
5556 // The direction in which the gesture should move in order to be recognized.
56− Q_PROPERTY(Direction direction READ direction WRITE setDirection NOTIFY directionChanged)
57+ Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)
5758
5859 // The distance travelled by the finger along the axis specified by
5960 // DirectionalDragArea's direction.
@@ -116,12 +117,8 @@ class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
116117public:
117118 DirectionalDragArea(QQuickItem *parent = 0);
118119
119− enum Direction { Rightwards, // Along the positive direction of the X axis
120− Leftwards, // Along the negative direction of the X axis
121− Downwards, // Along the positive direction of the Y axis
122− Upwards }; // Along the negative direction of the Y axis
123− Direction direction() const;
124− void setDirection(Direction);
120+ Direction::Type direction() const;
121+ void setDirection(Direction::Type);
125122
126123 // Describes the state of the directional drag gesture.
127124 enum Status {
@@ -179,7 +176,7 @@ public:
179176 void setAxisVelocityCalculator(AxisVelocityCalculator *velCalc);
180177
181178Q_SIGNALS:
182− void directionChanged(Direction direction);
179+ void directionChanged(Direction::Type direction);
183180 void statusChanged(Status value);
184181 void draggingChanged(bool value);
185182 void distanceChanged(qreal value);
@@ -210,10 +207,6 @@ private:
210207 void setPreviousPos(QPointF point);
211208 void updateVelocityCalculator(QPointF point);
212209
213− // convenience functions
214− bool directionIsHorizontal() const;
215− bool directionIsVertical() const;
216−
217210 Status m_status;
218211
219212 QPointF m_startPos;
@@ -225,7 +218,7 @@ private:
225218 DampedPointF m_dampedPos;
226219 QPointF m_previousDampedPos;
227220
228− Direction m_direction;
221+ Direction::Type m_direction;
229222 qreal m_wideningAngle; // in degrees
230223 qreal m_wideningFactor; // it's tan(degreesToRadian(m_wideningAngle))
231224 qreal m_distanceThreshold;
plugins/Ubuntu/Gestures/plugin.cpp+8
@@ -16,12 +16,20 @@
1616
1717#include "plugin.h"
1818#include "AxisVelocityCalculator.h"
19+#include "Direction.h"
1920#include "DirectionalDragArea.h"
2021
2122#include <qqml.h>
2223
24+static QObject* directionSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
25+ Q_UNUSED(engine);
26+ Q_UNUSED(scriptEngine);
27+ return new Direction;
28+}
29+
2330void UbuntuGestureQmlPlugin::registerTypes(const char *uri)
2431{
32+ qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
2533 qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
2634 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
2735}
plugins/Unity/scopes.cpp+1−1
@@ -128,7 +128,7 @@ void Scopes::onScopeRemoved(const unity::dash::Scope::Ptr& scope)
128128
129129void Scopes::onScopesReordered(const unity::dash::Scopes::ScopeList& scopes)
130130{
131− // is this QML-friendly? Shall it be more robust (beginMoveRows)?
131+ // FIXME Should use beginMoveRows()/endMoveRows() to not recreate the UI for every scope.
132132 beginResetModel();
133133
134134 // remove existing scopes
po/ar.po+47−29
@@ -7,59 +7,59 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-14 21:09+0000\n"
12+"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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\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"
30−msgstr ""
30+msgstr "المعرض"
3131
3232#: Applications/applications.js:40
3333msgid "Facebook"
34−msgstr ""
34+msgstr "فيسبوك"
3535
3636#: Applications/applications.js:46
3737msgid "Browser"
38−msgstr ""
38+msgstr "المتصفح"
3939
4040#: Applications/applications.js:51
4141msgid "Twitter"
42−msgstr ""
42+msgstr "تويتر"
4343
4444#: Applications/applications.js:57
4545msgid "GMail"
46−msgstr ""
46+msgstr "جي ميل"
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "الطقس"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "المذكرة"
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"
@@ -67,7 +67,7 @@ msgstr ""
6767
6868#: Applications/applications.js:91
6969msgid "Map"
70−msgstr ""
70+msgstr "الخريطة"
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
@@ -79,11 +79,11 @@ msgstr ""
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
82−msgstr ""
82+msgstr "ويكيبيديا"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "يوتيوب"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -135,15 +135,15 @@ msgstr "الرئيسية"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "المميز"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "الحديث"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "الإصدارات الجديدة"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
@@ -155,19 +155,19 @@ msgstr "موسيقى"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "المفضلات"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "على اتصال موخرا"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "أشخاص جدد"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "أشخاص"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "الشائع على الإنترنت"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "فيديوهات"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "أخرجه:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "النجوم:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "المؤلف:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -232,3 +245,8 @@ msgstr "عذراً، لا يوجد ما يطابق بحثك."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "الشاشة الرئيسية"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/az.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Təsdiqlə"
@@ -232,3 +245,8 @@ msgstr "Bağışlayın, amma axtarışınıza heç bir nəticə uyğun gəlmir."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Əsas Ekran"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/bg.ponew file+253
@@ -0,0 +1,253 @@
1+# Bulgarian 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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-19 15:47+0000\n"
12+"Last-Translator: Miroslav E. Hadzhiev (Хаджиев) "
13+"<miroslav.hadzhiev@gmail.com>\n"
14+"Language-Team: Bulgarian <bg@li.org>\n"
15+"MIME-Version: 1.0\n"
16+"Content-Type: text/plain; charset=UTF-8\n"
17+"Content-Transfer-Encoding: 8bit\n"
18+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
19+"X-Generator: Launchpad (build 16673)\n"
20+
21+#: Applications/applications.js:23
22+msgid "Phone"
23+msgstr "Телефон"
24+
25+#: Applications/applications.js:29
26+msgid "Camera"
27+msgstr "Камера"
28+
29+#: Applications/applications.js:35
30+msgid "Gallery"
31+msgstr "Колекция"
32+
33+#: Applications/applications.js:40
34+msgid "Facebook"
35+msgstr "Фейсбук"
36+
37+#: Applications/applications.js:46
38+msgid "Browser"
39+msgstr "Браузър"
40+
41+#: Applications/applications.js:51
42+msgid "Twitter"
43+msgstr "Туитър"
44+
45+#: Applications/applications.js:57
46+msgid "GMail"
47+msgstr "Е-поща от Гугъл"
48+
49+#: Applications/applications.js:62
50+msgid "Weather"
51+msgstr "Метеоусловия"
52+
53+#: Applications/applications.js:68
54+msgid "Notepad"
55+msgstr "Бележник"
56+
57+#: Applications/applications.js:74
58+msgid "Calendar"
59+msgstr "Календар"
60+
61+#: Applications/applications.js:80
62+msgid "Media Player"
63+msgstr "Мултимедиен плеър"
64+
65+#: Applications/applications.js:86
66+msgid "Evernote"
67+msgstr ""
68+
69+#: Applications/applications.js:91
70+msgid "Map"
71+msgstr "Карта"
72+
73+#: Applications/applications.js:96
74+msgid "Pinterest"
75+msgstr ""
76+
77+#: Applications/applications.js:101
78+msgid "SoundCloud"
79+msgstr ""
80+
81+#: Applications/applications.js:106
82+msgid "Wikipedia"
83+msgstr "Уикипедия"
84+
85+#: Applications/applications.js:111
86+msgid "YouTube"
87+msgstr "YouTube"
88+
89+#: Components/PageHeader.qml:300
90+msgid "Recent searches"
91+msgstr "Скорошни търсения"
92+
93+#: Dash/DashApps.qml:65
94+msgid "Running apps"
95+msgstr ""
96+
97+#: Dash/DashApps.qml:68
98+msgid "Frequently used"
99+msgstr ""
100+
101+#: Dash/DashApps.qml:71
102+msgid "Installed"
103+msgstr "Инсталирани"
104+
105+#: Dash/DashApps.qml:74
106+msgid "Available for download"
107+msgstr ""
108+
109+#: Dash/DashApps.qml:178
110+msgid "Apps"
111+msgstr "Приложения"
112+
113+#: Dash/DashHome.qml:43
114+msgid "Frequent Apps"
115+msgstr ""
116+
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
126+msgid "Recent Music"
127+msgstr ""
128+
129+#: Dash/DashHome.qml:55
130+msgid "Videos Popular Online"
131+msgstr ""
132+
133+#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
134+msgid "Home"
135+msgstr "Начало"
136+
137+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
138+msgid "Featured"
139+msgstr "Най-отличени"
140+
141+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
142+msgid "Recent"
143+msgstr "Най-нови"
144+
145+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
146+msgid "New Releases"
147+msgstr ""
148+
149+#: Dash/DashMusic.qml:30
150+msgid "Top Charting"
151+msgstr ""
152+
153+#: Dash/DashMusic.qml:99
154+msgid "Music"
155+msgstr "Музика"
156+
157+#: Dash/DashPeople.qml:31
158+msgid "Favourites"
159+msgstr "Любими"
160+
161+#: Dash/DashPeople.qml:32
162+msgid "Recently in touch"
163+msgstr ""
164+
165+#: Dash/DashPeople.qml:33
166+msgid "New Contacts"
167+msgstr ""
168+
169+#: Dash/DashPeople.qml:34
170+msgid "A-Z"
171+msgstr "А-Я"
172+
173+#: Dash/DashPeople.qml:123
174+msgid "People"
175+msgstr "Хора"
176+
177+#: Dash/DashVideos.qml:31
178+msgid "Popular Online"
179+msgstr ""
180+
181+#: Dash/DashVideos.qml:155
182+msgid "Videos"
183+msgstr "Видеоклипове"
184+
185+#: Dash/Video/VideoPreview.qml:98
186+msgid "Directed by:"
187+msgstr ""
188+
189+#: Dash/Video/VideoPreview.qml:121
190+msgid "Starring:"
191+msgstr ""
192+
193+#: Dash/Video/VideoPreview.qml:144
194+msgid "Author:"
195+msgstr "Автор:"
196+
197+#: Greeter/Lockscreen.qml:126
198+msgid "Emergency call"
199+msgstr ""
200+
201+#: Greeter/PassphraseLockscreen.qml:59
202+#, qt-format
203+msgid "Hello %1"
204+msgstr ""
205+
206+#: Greeter/PassphraseLockscreen.qml:59
207+msgid "Hello"
208+msgstr ""
209+
210+#: Hud/HudParametrizedActionsPage.qml:132
211+msgid "Confirm"
212+msgstr "Потвърди"
213+
214+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
215+msgid "Type or say a command"
216+msgstr ""
217+
218+#: Hud/Hud.qml:84
219+msgid "Loading. Please Wait..."
220+msgstr ""
221+
222+#: Hud/Hud.qml:89
223+msgid "Speak Now..."
224+msgstr ""
225+
226+#: Hud/Hud.qml:94
227+msgid "Speaking..."
228+msgstr ""
229+
230+#: Panel/MenuContent.qml:192
231+msgid "Device"
232+msgstr "Устройство"
233+
234+#: Panel/Menus/Overview/FlightModeWidget.qml:42
235+msgid "Flight mode"
236+msgstr ""
237+
238+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
239+msgid "Search"
240+msgstr "Търсене"
241+
242+#: plugins/Unity/lens.cpp:333
243+msgid "Sorry, there is nothing that matches your search."
244+msgstr "Съжаляваме, няма нищо, което да отговаря на вашето търсене."
245+
246+#: plugins/Unity/lenses.cpp:39
247+msgid "Home screen"
248+msgstr "Начален екран"
249+
250+#: Shell.qml:380
251+#, qt-format
252+msgid "Please enter %1:"
253+msgstr ""
po/ca.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Confirma"
@@ -232,3 +245,8 @@ msgstr "No hi ha res que coincideixi amb la cerca"
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Pantalla d'inici"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/de.po+51−33
@@ -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-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-15 20:04+0000\n"
12+"Last-Translator: Eduard Gotwig <eduardgotwig@gmail.com>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\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 "Kamera"
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 "Browser"
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 "Wetter"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Notizen"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Kalender"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Medienwiedergabe"
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 "Karte"
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 "Wikipedia"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -135,19 +135,19 @@ msgstr "Start"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Empfehlungen"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "Zuletzt verwendet"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "Neue Veröffentlichungen"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "Top Tabellenplatz"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "Musik"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Favoriten"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "Kürzlich im Gespräch"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Neue Kontakte"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "Personen"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Online Beliebt"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "Videos"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Regie:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "Darsteller:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "Autor:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -232,3 +245,8 @@ msgstr "Entschuldigung, es wurden keine Treffer erzielt."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Startseite"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/el.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Επιβεβαίωση"
@@ -232,3 +245,8 @@ msgstr "Λυπούμαστε, δεν υπάρχει τίποτα που να τ
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Αρχική οθόνη"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/en_AU.po+62−44
@@ -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-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-18 20:36+0000\n"
12+"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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "Phone"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "Camera"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Gallery"
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 "Browser"
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 "Weather"
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 "Calendar"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Media Player"
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 "Map"
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 "Wikipedia"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -91,19 +91,19 @@ msgstr "Recent searches"
9191
9292#: Dash/DashApps.qml:65
9393msgid "Running apps"
94−msgstr ""
94+msgstr "Running apps"
9595
9696#: Dash/DashApps.qml:68
9797msgid "Frequently used"
98−msgstr ""
98+msgstr "Frequently used"
9999
100100#: Dash/DashApps.qml:71
101101msgid "Installed"
102−msgstr ""
102+msgstr "Installed"
103103
104104#: Dash/DashApps.qml:74
105105msgid "Available for download"
106−msgstr ""
106+msgstr "Available for download"
107107
108108#: Dash/DashApps.qml:178
109109msgid "Apps"
@@ -111,23 +111,23 @@ msgstr "Apps"
111111
112112#: Dash/DashHome.qml:43
113113msgid "Frequent Apps"
114−msgstr ""
114+msgstr "Frequent Apps"
115115
116116#: Dash/DashHome.qml:46
117117msgid "Favourite People"
118−msgstr ""
118+msgstr "Favourite People"
119119
120120#: Dash/DashHome.qml:49
121121msgid "People Recently in Touch"
122−msgstr ""
122+msgstr "People Recently in Touch"
123123
124124#: Dash/DashHome.qml:52
125125msgid "Recent Music"
126−msgstr ""
126+msgstr "Recent Music"
127127
128128#: Dash/DashHome.qml:55
129129msgid "Videos Popular Online"
130−msgstr ""
130+msgstr "Videos Popular Online"
131131
132132#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
133133msgid "Home"
@@ -135,19 +135,19 @@ msgstr "Home"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Featured"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "Recent"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "New Releases"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "Top Charting"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "Music"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Favourites"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "Recently in touch"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "New Contacts"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "People"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Popular Online"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "Videos"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Directed by:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "Starring:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "Author:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -215,11 +228,11 @@ msgstr "Speaking..."
215228
216229#: Panel/MenuContent.qml:192
217230msgid "Device"
218−msgstr ""
231+msgstr "Device"
219232
220233#: Panel/Menus/Overview/FlightModeWidget.qml:42
221234msgid "Flight mode"
222−msgstr ""
235+msgstr "Flight mode"
223236
224237#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
225238msgid "Search"
@@ -232,3 +245,8 @@ msgstr "Sorry, there is nothing that matches your search."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Home screen"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/en_GB.ponew file+252
@@ -0,0 +1,252 @@
1+# English (United Kingdom) 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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-14 12:43+0000\n"
12+"Last-Translator: Andi Chandler <Unknown>\n"
13+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
19+
20+#: Applications/applications.js:23
21+msgid "Phone"
22+msgstr "Phone"
23+
24+#: Applications/applications.js:29
25+msgid "Camera"
26+msgstr "Camera"
27+
28+#: Applications/applications.js:35
29+msgid "Gallery"
30+msgstr "Gallery"
31+
32+#: Applications/applications.js:40
33+msgid "Facebook"
34+msgstr "Facebook"
35+
36+#: Applications/applications.js:46
37+msgid "Browser"
38+msgstr "Browser"
39+
40+#: Applications/applications.js:51
41+msgid "Twitter"
42+msgstr "Twitter"
43+
44+#: Applications/applications.js:57
45+msgid "GMail"
46+msgstr "GMail"
47+
48+#: Applications/applications.js:62
49+msgid "Weather"
50+msgstr "Weather"
51+
52+#: Applications/applications.js:68
53+msgid "Notepad"
54+msgstr "Notepad"
55+
56+#: Applications/applications.js:74
57+msgid "Calendar"
58+msgstr "Calendar"
59+
60+#: Applications/applications.js:80
61+msgid "Media Player"
62+msgstr "Media Player"
63+
64+#: Applications/applications.js:86
65+msgid "Evernote"
66+msgstr "Evernote"
67+
68+#: Applications/applications.js:91
69+msgid "Map"
70+msgstr "Map"
71+
72+#: Applications/applications.js:96
73+msgid "Pinterest"
74+msgstr "Pinterest"
75+
76+#: Applications/applications.js:101
77+msgid "SoundCloud"
78+msgstr "SoundCloud"
79+
80+#: Applications/applications.js:106
81+msgid "Wikipedia"
82+msgstr "Wikipedia"
83+
84+#: Applications/applications.js:111
85+msgid "YouTube"
86+msgstr "YouTube"
87+
88+#: Components/PageHeader.qml:300
89+msgid "Recent searches"
90+msgstr "Recent searches"
91+
92+#: Dash/DashApps.qml:65
93+msgid "Running apps"
94+msgstr "Running apps"
95+
96+#: Dash/DashApps.qml:68
97+msgid "Frequently used"
98+msgstr "Frequently used"
99+
100+#: Dash/DashApps.qml:71
101+msgid "Installed"
102+msgstr "Installed"
103+
104+#: Dash/DashApps.qml:74
105+msgid "Available for download"
106+msgstr "Available for download"
107+
108+#: Dash/DashApps.qml:178
109+msgid "Apps"
110+msgstr "Apps"
111+
112+#: Dash/DashHome.qml:43
113+msgid "Frequent Apps"
114+msgstr "Frequent Apps"
115+
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
125+msgid "Recent Music"
126+msgstr "Recent Music"
127+
128+#: Dash/DashHome.qml:55
129+msgid "Videos Popular Online"
130+msgstr "Videos Popular Online"
131+
132+#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
133+msgid "Home"
134+msgstr "Home"
135+
136+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137+msgid "Featured"
138+msgstr "Featured"
139+
140+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141+msgid "Recent"
142+msgstr "Recent"
143+
144+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145+msgid "New Releases"
146+msgstr "New Releases"
147+
148+#: Dash/DashMusic.qml:30
149+msgid "Top Charting"
150+msgstr "Top Charting"
151+
152+#: Dash/DashMusic.qml:99
153+msgid "Music"
154+msgstr "Music"
155+
156+#: Dash/DashPeople.qml:31
157+msgid "Favourites"
158+msgstr "Favourites"
159+
160+#: Dash/DashPeople.qml:32
161+msgid "Recently in touch"
162+msgstr "Recently in touch"
163+
164+#: Dash/DashPeople.qml:33
165+msgid "New Contacts"
166+msgstr "New Contacts"
167+
168+#: Dash/DashPeople.qml:34
169+msgid "A-Z"
170+msgstr "A-Z"
171+
172+#: Dash/DashPeople.qml:123
173+msgid "People"
174+msgstr "People"
175+
176+#: Dash/DashVideos.qml:31
177+msgid "Popular Online"
178+msgstr "Popular Online"
179+
180+#: Dash/DashVideos.qml:155
181+msgid "Videos"
182+msgstr "Videos"
183+
184+#: Dash/Video/VideoPreview.qml:98
185+msgid "Directed by:"
186+msgstr "Directed by:"
187+
188+#: Dash/Video/VideoPreview.qml:121
189+msgid "Starring:"
190+msgstr "Starring:"
191+
192+#: Dash/Video/VideoPreview.qml:144
193+msgid "Author:"
194+msgstr "Author:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
209+#: Hud/HudParametrizedActionsPage.qml:132
210+msgid "Confirm"
211+msgstr "Confirm"
212+
213+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
214+msgid "Type or say a command"
215+msgstr "Type or say a command"
216+
217+#: Hud/Hud.qml:84
218+msgid "Loading. Please Wait..."
219+msgstr "Loading. Please Wait..."
220+
221+#: Hud/Hud.qml:89
222+msgid "Speak Now..."
223+msgstr "Speak Now..."
224+
225+#: Hud/Hud.qml:94
226+msgid "Speaking..."
227+msgstr "Speaking..."
228+
229+#: Panel/MenuContent.qml:192
230+msgid "Device"
231+msgstr "Device"
232+
233+#: Panel/Menus/Overview/FlightModeWidget.qml:42
234+msgid "Flight mode"
235+msgstr "Flight mode"
236+
237+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
238+msgid "Search"
239+msgstr "Search"
240+
241+#: plugins/Unity/lens.cpp:333
242+msgid "Sorry, there is nothing that matches your search."
243+msgstr "Sorry, there is nothing that matches your search."
244+
245+#: plugins/Unity/lenses.cpp:39
246+msgid "Home screen"
247+msgstr "Home screen"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/eo.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/es.po+51−33
@@ -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-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-16 23:44+0000\n"
12+"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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "Teléfono"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "Cámara"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Galería"
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 "Navegador"
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 "Metereología"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Bloc de notas"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Calendario"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Reproductor multimedia"
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 "Mapa"
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 "Wikipedia"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -135,19 +135,19 @@ msgstr "Inicio"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Destacados"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "Recientes"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "Lanzamientos nuevos"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "Mejor posicionadas"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "Música"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Favoritos"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "Contactados recientemente"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Contactos nuevos"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "Gente"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Populares en línea"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "Vídeos"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Dirigida por:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "Protagonistas:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "Autor:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -232,3 +245,8 @@ msgstr "No hay nada que coincida con su búsqueda."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Pantalla de inicio"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/fi.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr "Pääosissa:"
193193msgid "Author:"
194194msgstr "Laatinut:"
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Hyväksy"
@@ -232,3 +245,8 @@ msgstr "Hakuun täsmääviä tuloksia ei löydy."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Kotinäyttö"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/fo.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Vátta"
@@ -232,3 +245,8 @@ msgstr "Tíanverri er tað einki sum hóskar til tína leiting."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Heimaskíggi"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/fr.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+0200\n"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/gl.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Confirmar"
@@ -232,3 +245,8 @@ msgstr "Sentímolo, non hai nada que coincida con esta busca."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Pantalla de inicio"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/he.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "אישור"
@@ -232,3 +245,8 @@ msgstr "שום דבר אינו תואם לחיפוש שלך, עמך הסליחה
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "מסך הבית"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/hr.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Potvrdi"
@@ -232,3 +245,8 @@ msgstr "Nažalost, ne postoji ništa što odgovara vašoj pretrazi."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Početni zaslon"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/hu.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Megerősítés"
@@ -232,3 +245,8 @@ msgstr "Elnézést, nincs találat a keresésre."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Kezdőképernyő"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/hy.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Հաստատել"
@@ -232,3 +245,8 @@ msgstr "Կներերք, բայց Ձեր հարցումով ոչինչ չկար"
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Տուն"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/id.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/it.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Conferma"
@@ -232,3 +245,8 @@ msgstr "Nessun risultato corrispondente alla ricerca."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Home"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/ja.ponew file+252
@@ -0,0 +1,252 @@
1+# Japanese 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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-15 14:12+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Japanese <ja@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-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\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:43
113+msgid "Frequent Apps"
114+msgstr ""
115+
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
125+msgid "Recent Music"
126+msgstr ""
127+
128+#: Dash/DashHome.qml:55
129+msgid "Videos Popular Online"
130+msgstr ""
131+
132+#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
133+msgid "Home"
134+msgstr ""
135+
136+#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137+msgid "Featured"
138+msgstr ""
139+
140+#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141+msgid "Recent"
142+msgstr ""
143+
144+#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145+msgid "New Releases"
146+msgstr ""
147+
148+#: Dash/DashMusic.qml:30
149+msgid "Top Charting"
150+msgstr ""
151+
152+#: Dash/DashMusic.qml:99
153+msgid "Music"
154+msgstr ""
155+
156+#: Dash/DashPeople.qml:31
157+msgid "Favourites"
158+msgstr ""
159+
160+#: Dash/DashPeople.qml:32
161+msgid "Recently in touch"
162+msgstr ""
163+
164+#: Dash/DashPeople.qml:33
165+msgid "New Contacts"
166+msgstr ""
167+
168+#: Dash/DashPeople.qml:34
169+msgid "A-Z"
170+msgstr ""
171+
172+#: Dash/DashPeople.qml:123
173+msgid "People"
174+msgstr ""
175+
176+#: Dash/DashVideos.qml:31
177+msgid "Popular Online"
178+msgstr ""
179+
180+#: Dash/DashVideos.qml:155
181+msgid "Videos"
182+msgstr ""
183+
184+#: Dash/Video/VideoPreview.qml:98
185+msgid "Directed by:"
186+msgstr ""
187+
188+#: Dash/Video/VideoPreview.qml:121
189+msgid "Starring:"
190+msgstr ""
191+
192+#: Dash/Video/VideoPreview.qml:144
193+msgid "Author:"
194+msgstr ""
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
209+#: Hud/HudParametrizedActionsPage.qml:132
210+msgid "Confirm"
211+msgstr ""
212+
213+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
214+msgid "Type or say a command"
215+msgstr ""
216+
217+#: Hud/Hud.qml:84
218+msgid "Loading. Please Wait..."
219+msgstr ""
220+
221+#: Hud/Hud.qml:89
222+msgid "Speak Now..."
223+msgstr ""
224+
225+#: Hud/Hud.qml:94
226+msgid "Speaking..."
227+msgstr ""
228+
229+#: Panel/MenuContent.qml:192
230+msgid "Device"
231+msgstr ""
232+
233+#: Panel/Menus/Overview/FlightModeWidget.qml:42
234+msgid "Flight mode"
235+msgstr ""
236+
237+#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
238+msgid "Search"
239+msgstr ""
240+
241+#: plugins/Unity/lens.cpp:333
242+msgid "Sorry, there is nothing that matches your search."
243+msgstr ""
244+
245+#: plugins/Unity/lenses.cpp:39
246+msgid "Home screen"
247+msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/kn.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "ಖಚಿತಪಡಿಸು"
@@ -232,3 +245,8 @@ msgstr "ಕ್ಷಮಿಸಿ ನಿಮ್ಮ ಶೋಧನೆಗೆ ಸರಿಯ
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "ಹೋಮ್ ಸ್ಕ್ರೀನ್"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/ko.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/ky.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Аныктоо"
@@ -232,3 +245,8 @@ msgstr "Тилекке каршы, сиздин издөөңүзгө эч нер
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Башкы экран"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/lv.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Apstiprināt"
@@ -232,3 +245,8 @@ msgstr "Diemžēl nekas neatbilst jūsu meklētajam."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Mājas ekrāns"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/my.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "အတည်ပြုပါ"
@@ -232,3 +245,8 @@ msgstr "ဆောရီး၊ သင်၏ရှာဖွေမူနှင့
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/nb.po+28−10
@@ -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-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-17 09:10+0000\n"
12+"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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\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 "Kamera"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
@@ -47,15 +47,15 @@ msgstr ""
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "Vær"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Notisblokk"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Kalender"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Bekreft"
@@ -232,3 +245,8 @@ msgstr "Søket ga ingen treff."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Hjemmeskjerm"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/nl.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Bevestigen"
@@ -232,3 +245,8 @@ msgstr "Er is helaas niets dat met uw zoekopdracht overeenkomt."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Startscherm"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/pl.po+49−31
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\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 "Aparat"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Galeria"
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 "Internet"
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 "Pogoda"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Notatki"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Kalendarz"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Odtwarzacz multimediów"
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 "Mapa"
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 "Wikipedia"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
@@ -135,19 +135,19 @@ msgstr "Dom"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Polecane"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "Najnowsze"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "Premiery"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "Przeboje"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "Muzyka"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Ulubione"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "Ostatnio w kontakcie"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Nowe kontakty"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "Ludzie"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Popularne w sieci"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "Filmy"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Reżyseria:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "Obsada:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "Autor:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -232,3 +245,8 @@ msgstr "Nie znaleziono pasujących wyników."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Ekran domowy"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/pt_BR.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Confirmar"
@@ -232,3 +245,8 @@ msgstr "Desculpe, não há nada que corresponda à sua pesquisa."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Tela inicial"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/ro.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Confirmați"
@@ -233,3 +246,8 @@ msgstr ""
233246#: plugins/Unity/lenses.cpp:39
234247msgid "Home screen"
235248msgstr "Ecran principal"
249+
250+#: Shell.qml:380
251+#, qt-format
252+msgid "Please enter %1:"
253+msgstr ""
po/ru.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+0200\n"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Подвердить"
@@ -232,3 +245,8 @@ msgstr "Извините, поиск не дал результатов."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Главный экран"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/si.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/sl.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+0200\n"
1111"PO-Revision-Date: 2013-06-09 10:23+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Potrdi"
@@ -232,3 +245,8 @@ msgstr "Nič se ne ujema z vašim iskalnim nizom."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Domači zaslon"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/sr.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Потврди"
@@ -232,3 +245,8 @@ msgstr "Нажалост, претрага није наишла на икакв
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Почетни екран"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/sv.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/te.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr ""
@@ -232,3 +245,8 @@ msgstr ""
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr ""
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/tr.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+0200\n"
1111"PO-Revision-Date: 2013-06-05 22:20+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "Onayla"
@@ -232,3 +245,8 @@ msgstr "Üzgünüz, aramanızla eşleşen hiçbir şey yok."
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Başlangıç ekranı"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/ug.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+0200\n"
1111"PO-Revision-Date: 2013-06-06 07:40+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "جەزملە"
@@ -232,3 +245,8 @@ msgstr "كەچۈرۈڭ، ئىزدىگىنىڭىزگە ماس نەتىجە تېپ
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "ماكان ئېكران"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/uk.po+62−44
@@ -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-08 14:40+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-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"
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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\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"
30−msgstr ""
30+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 "Блокнот"
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"
@@ -91,19 +91,19 @@ msgstr "Нещодавні пошуки"
9191
9292#: Dash/DashApps.qml:65
9393msgid "Running apps"
94−msgstr ""
94+msgstr "Запущені програми"
9595
9696#: Dash/DashApps.qml:68
9797msgid "Frequently used"
98−msgstr ""
98+msgstr "Найчастіше використовувані"
9999
100100#: Dash/DashApps.qml:71
101101msgid "Installed"
102−msgstr ""
102+msgstr "Встановлені"
103103
104104#: Dash/DashApps.qml:74
105105msgid "Available for download"
106−msgstr ""
106+msgstr "Доступно до завантаження"
107107
108108#: Dash/DashApps.qml:178
109109msgid "Apps"
@@ -111,23 +111,23 @@ msgstr "Програми"
111111
112112#: Dash/DashHome.qml:43
113113msgid "Frequent Apps"
114−msgstr ""
114+msgstr "Часто використовувані програми"
115115
116116#: Dash/DashHome.qml:46
117117msgid "Favourite People"
118−msgstr ""
118+msgstr "Вибрані контакти"
119119
120120#: Dash/DashHome.qml:49
121121msgid "People Recently in Touch"
122−msgstr ""
122+msgstr "Недавні контакти"
123123
124124#: Dash/DashHome.qml:52
125125msgid "Recent Music"
126−msgstr ""
126+msgstr "Нещодавно прослухана музика"
127127
128128#: Dash/DashHome.qml:55
129129msgid "Videos Popular Online"
130−msgstr ""
130+msgstr "Популярні в мережі відео"
131131
132132#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
133133msgid "Home"
@@ -135,19 +135,19 @@ msgstr "Домівка"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Рекомендовані"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "Нещодавні"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "Нові випуски"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "З високими оцінками"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "Музика"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Улюблене"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "Нещодавні контакти"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Нові контакти"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "А-Я"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "Люди"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Популярне у мережі"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "Відео"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Режисер:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "Актори:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "Автор:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -215,11 +228,11 @@ msgstr "Мовлення…"
215228
216229#: Panel/MenuContent.qml:192
217230msgid "Device"
218−msgstr ""
231+msgstr "Пристрій"
219232
220233#: Panel/Menus/Overview/FlightModeWidget.qml:42
221234msgid "Flight mode"
222−msgstr ""
235+msgstr "Автономний режим"
223236
224237#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
225238msgid "Search"
@@ -232,3 +245,8 @@ msgstr "Вибачте, для вказаних вами ключових слі
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "Екран домівки"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/unity8.pot+6−1
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2013-06-14 16:09+0200\n"
11+"POT-Creation-Date: 2013-06-19 17:06+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"
@@ -218,3 +218,8 @@ msgstr ""
218218#, qt-format
219219msgid "Please enter %1:"
220220msgstr ""
221+
222+#: Shell.qml:380
223+#, qt-format
224+msgid "Please enter %1:"
225+msgstr ""
po/zh_CN.po+51−33
@@ -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-08 14:40+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-19 17:06+0200\n"
11+"PO-Revision-Date: 2013-06-13 11:35+0000\n"
12+"Last-Translator: Wylmer Wang <Unknown>\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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\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"
30−msgstr ""
30+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 "记事本"
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 "印象笔记"
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"
@@ -135,19 +135,19 @@ msgstr "主页"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "推荐"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "最近"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "新版本"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
150−msgstr ""
150+msgstr "排行榜图"
151151
152152#: Dash/DashMusic.qml:99
153153msgid "Music"
@@ -155,19 +155,19 @@ msgstr "音乐"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "最爱"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
162−msgstr ""
162+msgstr "最近联系"
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "新建联系人"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "联系人"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "经常在线"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,14 +183,27 @@ msgstr "视频"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "导演:"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "主演:"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194+msgstr "作者:"
195+
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
194207msgstr ""
195208
196209#: Hud/HudParametrizedActionsPage.qml:132
@@ -232,3 +245,8 @@ msgstr "对不起,没有找到您想要的结果。"
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "主页"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
po/zh_TW.po+21−3
@@ -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-08 14:40+0200\n"
10+"POT-Creation-Date: 2013-06-19 17:06+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-11 06:34+0000\n"
18−"X-Generator: Launchpad (build 16667)\n"
17+"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18+"X-Generator: Launchpad (build 16673)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -193,6 +193,19 @@ msgstr ""
193193msgid "Author:"
194194msgstr ""
195195
196+#: Greeter/Lockscreen.qml:126
197+msgid "Emergency call"
198+msgstr ""
199+
200+#: Greeter/PassphraseLockscreen.qml:59
201+#, qt-format
202+msgid "Hello %1"
203+msgstr ""
204+
205+#: Greeter/PassphraseLockscreen.qml:59
206+msgid "Hello"
207+msgstr ""
208+
196209#: Hud/HudParametrizedActionsPage.qml:132
197210msgid "Confirm"
198211msgstr "確認"
@@ -232,3 +245,8 @@ msgstr "很抱歉,找不到符合您想搜尋的結果。"
232245#: plugins/Unity/lenses.cpp:39
233246msgid "Home screen"
234247msgstr "家屋畫面"
248+
249+#: Shell.qml:380
250+#, qt-format
251+msgid "Please enter %1:"
252+msgstr ""
tests/CMakeLists.txt+1
@@ -12,3 +12,4 @@ add_subdirectory(mocks)
1212add_subdirectory(whitespace)
1313add_subdirectory(plugins)
1414add_subdirectory(utils)
15+add_subdirectory(uqmlscene)
tests/mocks/LightDM/demo/GreeterPrivate.cpp+24−3
@@ -18,6 +18,8 @@
1818
1919#include "../Greeter.h"
2020#include "../GreeterPrivate.h"
21+#include <QtCore/QDir>
22+#include <QtCore/QSettings>
2123
2224namespace QLightDM
2325{
@@ -33,13 +35,32 @@ void GreeterPrivate::handleAuthenticate()
3335{
3436 Q_Q(Greeter);
3537
36− authenticated = true;
37− Q_EMIT q->authenticationComplete();
38+ QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
39+ QVariant password = settings.value("password", "none");
40+
41+ if (password == "pin") {
42+ Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
43+ } else if (password == "keyboard") {
44+ Q_EMIT q->showPrompt("Password", Greeter::PromptTypeSecret);
45+ } else {
46+ authenticated = true;
47+ Q_EMIT q->authenticationComplete();
48+ }
3849}
3950
4051void GreeterPrivate::handleRespond(const QString &response)
4152{
42− Q_UNUSED(response);
53+ Q_Q(Greeter);
54+
55+ QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
56+ QVariant password = settings.value("password", "none");
57+
58+ if (password == "pin") {
59+ authenticated = (response == "1234");
60+ } else {
61+ authenticated = (response == "password");
62+ }
63+ Q_EMIT q->authenticationComplete();
4364}
4465
4566}
tests/mocks/LightDM/demo/InfographicModelPrivate.cpp+19−26
@@ -27,27 +27,20 @@ void InfographicModelPrivate::generateFakeData()
2727 std::normal_distribution<qreal> distribution(0.5, 0.2);
2828 auto rand = std::bind(distribution, generator);
2929
30− QVector<QColor> colours;
31− colours.push_back(QColor::fromRgbF(0.3, 0.27, 0.32));
32− colours.push_back(QColor::fromRgbF(0.83, 0.49, 0.58));
33− colours.push_back(QColor::fromRgbF(0.63, 0.51, 0.59));
30+ QColor orange(QColor::fromRgbF(0.9, 0.3, 0.1, 1.0));
31+ QColor yellow(QColor::fromRgbF(1.0, 0.6, 0.0, 1.0));
32+ QColor red(QColor::fromRgbF(0.8, 0.0, 0.0, 1.0));
33+ QColor darkPurple(QColor::fromRgbF(0.5, 0.2, 0.3, 1.0));
34+ QColor lightPurple(QColor::fromRgbF(0.8, 0.1, 0.8, 1.0));
35+ QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
3436
35− colours.push_back(QColor::fromRgbF(0.28, 0.26, 0.4));
36− colours.push_back(QColor::fromRgbF(0.47, 0.38, 0.56));
37− colours.push_back(QColor::fromRgbF(0.69, 0.65, 0.78));
38−
39− colours.push_back(QColor::fromRgbF(0.32, 0.21, 0.16));
40− colours.push_back(QColor::fromRgbF(0.55, 0.45, 0.32));
41− colours.push_back(QColor::fromRgbF(0.85, 0.74, 0.53));
42−
43− colours.push_back(QColor::fromRgbF(0.25, 0.31, 0.19));
44− colours.push_back(QColor::fromRgbF(0.63, 0.53, 0.3));
45− colours.push_back(QColor::fromRgbF(0.89, 0.56, 0.31));
46−
47− InfographicColorTheme first(colours[0], colours[1], colours[2]);
48− InfographicColorTheme second(colours[3], colours[4], colours[5]);
49− InfographicColorTheme eighth(colours[6], colours[7], colours[8]);
50− InfographicColorTheme ninth(colours[9], colours[10], colours[11]);
37+ InfographicColorTheme orangeTheme(yellow, orange, red);
38+ InfographicColorTheme yellowTheme(orange, yellow, orange);
39+ InfographicColorTheme redTheme(red, red, red);
40+ InfographicColorTheme darkPurpleTheme(lightPurple, darkPurple, pink);
41+ InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
42+ lightPurple);
43+ InfographicColorTheme pinkTheme(lightPurple, pink, darkPurple);
5144
5245 {
5346 QVariantList firstMonth;
@@ -59,8 +52,8 @@ void InfographicModelPrivate::generateFakeData()
5952 while (secondMonth.size() < 31)
6053 secondMonth.push_back(QVariant(rand()));
6154 QSharedPointer<InfographicData> data(
62− new InfographicData("<b>52km</b> travelled", first, firstMonth,
63− ninth, secondMonth, this));
55+ new InfographicData("<b>52km</b> travelled", yellowTheme, firstMonth,
56+ orangeTheme, secondMonth, this));
6457 m_fakeData.insert("guest", data);
6558 }
6659
@@ -74,8 +67,8 @@ void InfographicModelPrivate::generateFakeData()
7467 while (secondMonth.size() < 31)
7568 secondMonth.push_back(QVariant(rand()));
7669 QSharedPointer<InfographicData> data(
77− new InfographicData("<b>33</b> messages today", second,
78− firstMonth, eighth, secondMonth, this));
70+ new InfographicData("<b>33</b> messages today", pinkTheme,
71+ firstMonth, orangeTheme, secondMonth, this));
7972 m_fakeData.insert("guest", data);
8073 }
8174
@@ -89,8 +82,8 @@ void InfographicModelPrivate::generateFakeData()
8982 while (secondMonth.size() < 31)
9083 secondMonth.push_back(QVariant(rand()));
9184 QSharedPointer<InfographicData> data(
92− new InfographicData("<b>69</b> minutes talk time", eighth,
93− firstMonth, second, secondMonth, this));
85+ new InfographicData("<b>69</b> minutes talk time", darkPurpleTheme,
86+ firstMonth, redTheme, secondMonth, this));
9487 m_fakeData.insert("guest", data);
9588 }
9689}
tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml+1−1
@@ -51,7 +51,7 @@ Item {
5151
5252 height: units.gu(5)
5353
54− direction: DirectionalDragArea.Downwards
54+ direction: Direction.Downwards
5555 maxDeviation: units.gu(2)
5656 wideningAngle: 10
5757 distanceThreshold: units.gu(4)
tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml+1−1
@@ -54,7 +54,7 @@ Item {
5454
5555 width: units.gu(5)
5656
57− direction: DirectionalDragArea.Leftwards
57+ direction: Direction.Leftwards
5858 maxDeviation: units.gu(2)
5959 wideningAngle: 10
6060 distanceThreshold: units.gu(4)
tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml+1−1
@@ -50,7 +50,7 @@ Item {
5050
5151 width: units.gu(5)
5252
53− direction: DirectionalDragArea.Rightwards
53+ direction: Direction.Rightwards
5454 maxDeviation: units.gu(2)
5555 wideningAngle: 10
5656 distanceThreshold: units.gu(4)
tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml+1−1
@@ -54,7 +54,7 @@ Item {
5454
5555 height: units.gu(5)
5656
57− direction: DirectionalDragArea.Upwards
57+ direction: Direction.Upwards
5858 maxDeviation: units.gu(2)
5959 wideningAngle: 10
6060 distanceThreshold: units.gu(4)
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+9−10
@@ -132,13 +132,13 @@ namespace {
132132QPointF calculateInitialTouchPos(DirectionalDragArea *edgeDragArea, QQuickView *view)
133133{
134134 switch (edgeDragArea->direction()) {
135− case DirectionalDragArea::Upwards:
135+ case Direction::Upwards:
136136 return QPointF(view->width()/2.0f, view->height() - (edgeDragArea->height()/2.0f));
137− case DirectionalDragArea::Downwards:
137+ case Direction::Downwards:
138138 return QPointF(view->width()/2.0f, edgeDragArea->height()/2.0f);
139− case DirectionalDragArea::Leftwards:
139+ case Direction::Leftwards:
140140 return QPointF(view->width() - (edgeDragArea->width()/2.0f), view->height()/2.0f);
141− default: // DirectionalDragArea::Rightwards:
141+ default: // Direction::Rightwards:
142142 return QPointF(edgeDragArea->width()/2.0f, view->height()/2.0f);
143143 }
144144}
@@ -153,13 +153,13 @@ QPointF calculateDirectionVector(DirectionalDragArea *edgeDragArea,
153153 qreal angleSin = qSin(angleRadians);
154154
155155 switch (edgeDragArea->direction()) {
156− case DirectionalDragArea::Upwards:
156+ case Direction::Upwards:
157157 return QPointF(angleSin, -angleCos);
158− case DirectionalDragArea::Downwards:
158+ case Direction::Downwards:
159159 return QPointF(angleSin, angleCos);
160− case DirectionalDragArea::Leftwards:
160+ case Direction::Leftwards:
161161 return QPointF(-angleCos, angleSin);
162− default: // DirectionalDragArea::Rightwards:
162+ default: // Direction::Rightwards:
163163 return QPointF(angleCos, angleSin);
164164 }
165165}
@@ -168,8 +168,7 @@ QPointF createTouchDeviation(DirectionalDragArea *edgeDragArea)
168168{
169169 qreal deviation = edgeDragArea->maxDeviation() * 0.8;
170170
171− if (edgeDragArea->direction() == DirectionalDragArea::Leftwards
172− || edgeDragArea->direction() == DirectionalDragArea::Rightwards) {
171+ if (Direction::isHorizontal(edgeDragArea->direction())) {
173172 return QPointF(0, deviation);
174173 } else {
175174 return QPointF(deviation, 0);
tests/qmltests/CMakeLists.txt+1−1
@@ -57,7 +57,7 @@ add_qml_test(Greeter Infographics IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} $
5757add_qml_test(Hud Hud)
5858add_qml_test(Hud Result)
5959add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
60−add_qml_test(Notifications Notifications)
60+add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
6161add_qml_test(Panel IndicatorRow)
6262add_qml_test(Panel Indicators)
6363add_qml_test(Panel MenuContent)
tests/qmltests/Greeter/tst_Phone.qml+13−8
@@ -46,17 +46,22 @@ Item {
4646 compare(greeter.narrowMode, true)
4747 }
4848
49− function test_teasingArea() {
50− tryCompare(greeter, "leftTeaserPressed", false)
51− mousePress(greeter, units.gu(2), greeter.height - units.gu(1))
52− tryCompare(greeter, "leftTeaserPressed", true)
53− mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
54− tryCompare(greeter, "leftTeaserPressed", false)
49+ function test_teasingArea_data() {
50+ return [
51+ {tag: "left", posX: units.gu(2), leftPressed: true, rightPressed: false},
52+ {tag: "right", posX: greeter.width - units.gu(2), leftPressed: false, rightPressed: true}
53+ ]
54+ }
5555
56− mousePress(greeter, greeter.width - units.gu(2), greeter.height - units.gu(1))
56+ function test_teasingArea(data) {
5757 tryCompare(greeter, "leftTeaserPressed", false)
58− mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
58+ tryCompare(greeter, "rightTeaserPressed", false)
59+ mousePress(greeter, data.posX, greeter.height - units.gu(1))
60+ tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
61+ tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
62+ mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
5963 tryCompare(greeter, "leftTeaserPressed", false)
64+ tryCompare(greeter, "rightTeaserPressed", false)
6065 }
6166 }
6267}
tests/qmltests/Greeter/tst_Tablet.qml+19
@@ -305,5 +305,24 @@ Item {
305305 var index = select_user("no-background")
306306 compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "")
307307 }
308+
309+ function test_teasingArea_data() {
310+ return [
311+ {tag: "left", posX: units.gu(2), leftPressed: true, rightPressed: false},
312+ {tag: "right", posX: greeter.width - units.gu(2), leftPressed: false, rightPressed: true}
313+ ]
314+ }
315+
316+ function test_teasingArea(data) {
317+ tryCompare(greeter, "leftTeaserPressed", false)
318+ tryCompare(greeter, "rightTeaserPressed", false)
319+ mousePress(greeter, data.posX, greeter.height - units.gu(1))
320+ tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
321+ tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
322+ mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
323+ tryCompare(greeter, "leftTeaserPressed", false)
324+ tryCompare(greeter, "rightTeaserPressed", false)
325+ }
326+
308327 }
309328}
tests/qmltests/Notifications/tst_Notifications.qml+30−12
@@ -20,17 +20,34 @@ import ".."
2020import "../../../Notifications"
2121import Ubuntu.Components 0.1
2222import Unity.Test 0.1
23+import Unity.Notifications 1.0
2324
2425Row {
2526 id: rootRow
2627
28+ Component {
29+ id: mockNotification
30+
31+ QtObject {
32+ function invokeAction(actionId) {
33+ mockModel.actionInvoked(actionId)
34+ }
35+ }
36+ }
37+
2738 ListModel {
2839 id: mockModel
40+
41+ signal actionInvoked(string actionId)
42+
43+ function getRaw(id) {
44+ return mockNotification.createObject(mockModel)
45+ }
2946 }
3047
3148 function addSnapDecisionNotification() {
3249 var n = {
33− type: "Notifications.Type.SnapDecision",
50+ type: Notification.SnapDecision,
3451 summary: "Tom Ato",
3552 body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
3653 icon: "../graphics/avatars/funky.png",
@@ -44,7 +61,7 @@ Row {
4461
4562 function addEphemeralNotification() {
4663 var n = {
47− type: "Notifications.Type.Ephemeral",
64+ type: Notification.Ephemeral,
4865 summary: "Cole Raby",
4966 body: "I did not expect it to be that late.",
5067 icon: "../graphics/avatars/amanda.png",
@@ -57,7 +74,7 @@ Row {
5774
5875 function addEphemeralIconSummaryNotification() {
5976 var n = {
60− type: "Notifications.Type.Ephemeral",
77+ type: Notification.Ephemeral,
6178 summary: "Photo upload completed",
6279 body: "",
6380 icon: "",
@@ -70,7 +87,7 @@ Row {
7087
7188 function addInteractiveNotification() {
7289 var n = {
73− type: "Notifications.Type.Interactive",
90+ type: Notification.Interactive,
7491 summary: "Interactive notification",
7592 body: "This is a notification that can be clicked",
7693 icon: "../graphics/avatars/anna_olsson.png",
@@ -170,7 +187,7 @@ Row {
170187 return [
171188 {
172189 tag: "Snap Decision with secondary icon",
173− type: "Notifications.Type.SnapDecision",
190+ type: Notification.SnapDecision,
174191 summary: "Tom Ato",
175192 body: "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.",
176193 icon: "../graphics/avatars/funky.png",
@@ -186,7 +203,7 @@ Row {
186203 },
187204 {
188205 tag: "Ephemeral notification - icon-summary layout",
189− type: "Notifications.Type.Ephemeral",
206+ type: Notification.Ephemeral,
190207 summary: "Photo upload completed",
191208 body: "",
192209 icon: "",
@@ -201,7 +218,7 @@ Row {
201218 },
202219 {
203220 tag: "Ephemeral notification - check suppression of secondary icon for icon-summary layout",
204− type: "Notifications.Type.Ephemeral",
221+ type: Notification.Ephemeral,
205222 summary: "New comment successfully published",
206223 body: "",
207224 icon: "",
@@ -216,7 +233,7 @@ Row {
216233 },
217234 {
218235 tag: "Interactive notification",
219− type: "Notifications.Type.Interactive",
236+ type: Notification.Interactive,
220237 summary: "Interactive notification",
221238 body: "This is a notification that can be clicked",
222239 icon: "../graphics/avatars/amanda.png",
@@ -231,7 +248,7 @@ Row {
231248 },
232249 {
233250 tag: "Snap Decision without secondary icon",
234− type: "Notifications.Type.SnapDecision",
251+ type: Notification.SnapDecision,
235252 summary: "Bro Coly",
236253 body: "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
237254 icon: "../graphics/avatars/anna_olsson.png",
@@ -247,7 +264,7 @@ Row {
247264 },
248265 {
249266 tag: "Ephemeral notification",
250− type: "Notifications.Type.Ephemeral",
267+ type: Notification.Ephemeral,
251268 summary: "Cole Raby",
252269 body: "I did not expect it to be that late.",
253270 icon: "../graphics/avatars/funky.png",
@@ -272,6 +289,8 @@ Row {
272289
273290 SignalSpy {
274291 id: actionSpy
292+
293+ target: mockModel
275294 signalName: "actionInvoked"
276295 }
277296
@@ -303,7 +322,6 @@ Row {
303322 compare(interactiveArea.enabled, data.interactiveAreaEnabled, "check for interactive area")
304323
305324 if(data.interactiveAreaEnabled) {
306− actionSpy.target = notification
307325 mouseClick(notification, notification.width / 2, notification.height / 2)
308326 actionSpy.wait()
309327 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")
@@ -323,7 +341,6 @@ Row {
323341 var buttonAccept = findChild(buttonRow, "button0")
324342
325343 waitForRendering(notification)
326− actionSpy.target = notification
327344 mouseClick(buttonCancel, buttonCancel.width / 2, buttonCancel.height / 2)
328345 actionSpy.wait()
329346 compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")
@@ -332,6 +349,7 @@ Row {
332349 mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2)
333350 actionSpy.wait()
334351 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
352+ actionSpy.clear()
335353 }
336354 }
337355 }
tests/qmltests/plugins/Unity/Notifications/notification.jsnew file+23
@@ -0,0 +1,23 @@
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+.pragma library
18+
19+var Confirmation = 0;
20+var Ephemeral = 1;
21+var Interactive = 2;
22+var SnapDecision = 3;
23+var PlaceHolder = 4;
tests/qmltests/plugins/Unity/Notifications/qmldirnew file+2
@@ -0,0 +1,2 @@
1+module Unity.Notifications
2+Notification 1.0 notification.js
tests/uqmlscene/CMakeLists.txtnew file+18
@@ -0,0 +1,18 @@
1+add_executable(uqmlscene
2+ ${shellapplication_MOC_SRCS}
3+ main.cpp
4+ ../../MouseTouchAdaptor.cpp
5+ )
6+
7+qt5_use_modules(uqmlscene Qml Quick Test)
8+pkg_check_modules(XCB REQUIRED xcb)
9+
10+if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
11+ set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
12+endif()
13+
14+target_link_libraries(uqmlscene
15+ ${Qt5Qml_LIBRARIES}
16+ ${Qt5Quick_LIBRARIES}
17+ ${XCB_LDFLAGS}
18+ )
tests/uqmlscene/READMEnew file+1
@@ -0,0 +1 @@
1+Qt's qmlscene tool modified to use MouseTouchAdaptor. That way we can interact with touch-only components
tests/uqmlscene/main.cppnew file+543
@@ -0,0 +1,543 @@
1+/****************************************************************************
2+**
3+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
4+** Contact: http://www.qt-project.org/legal
5+**
6+** This file is part of the tools applications of the Qt Toolkit.
7+**
8+** $QT_BEGIN_LICENSE:LGPL$
9+** Commercial License Usage
10+** Licensees holding valid commercial Qt licenses may use this file in
11+** accordance with the commercial license agreement provided with the
12+** Software or, alternatively, in accordance with the terms contained in
13+** a written agreement between you and Digia. For licensing terms and
14+** conditions see http://qt.digia.com/licensing. For further information
15+** use the contact form at http://qt.digia.com/contact-us.
16+**
17+** GNU Lesser General Public License Usage
18+** Alternatively, this file may be used under the terms of the GNU Lesser
19+** General Public License version 2.1 as published by the Free Software
20+** Foundation and appearing in the file LICENSE.LGPL included in the
21+** packaging of this file. Please review the following information to
22+** ensure the GNU Lesser General Public License version 2.1 requirements
23+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24+**
25+** In addition, as a special exception, Digia gives you certain additional
26+** rights. These rights are described in the Digia Qt LGPL Exception
27+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
28+**
29+** GNU General Public License Usage
30+** Alternatively, this file may be used under the terms of the GNU
31+** General Public License version 3.0 as published by the Free Software
32+** Foundation and appearing in the file LICENSE.GPL included in the
33+** packaging of this file. Please review the following information to
34+** ensure the GNU General Public License version 3.0 requirements will be
35+** met: http://www.gnu.org/copyleft/gpl.html.
36+**
37+**
38+** $QT_END_LICENSE$
39+**
40+****************************************************************************/
41+
42+#include <QtCore/qdebug.h>
43+#include <QtCore/qabstractanimation.h>
44+#include <QtCore/qdir.h>
45+#include <QtCore/qmath.h>
46+#include <QtCore/qdatetime.h>
47+
48+#include <QtGui/QGuiApplication>
49+
50+#include <QtQml/qqml.h>
51+#include <QtQml/qqmlengine.h>
52+#include <QtQml/qqmlcomponent.h>
53+#include <QtQml/qqmlcontext.h>
54+
55+#include <QtQuick/qquickitem.h>
56+#include <QtQuick/qquickview.h>
57+
58+#ifdef QT_WIDGETS_LIB
59+#include <QtWidgets/QApplication>
60+#include <QtWidgets/QFileDialog>
61+#endif
62+
63+#include <QtCore/QTranslator>
64+#include <QtCore/QLibraryInfo>
65+
66+#include "../../MouseTouchAdaptor.h"
67+
68+#ifdef QML_RUNTIME_TESTING
69+class RenderStatistics
70+{
71+public:
72+ static void updateStats();
73+ static void printTotalStats();
74+private:
75+ static QVector<qreal> timePerFrame;
76+ static QVector<int> timesPerFrames;
77+};
78+
79+QVector<qreal> RenderStatistics::timePerFrame;
80+QVector<int> RenderStatistics::timesPerFrames;
81+
82+void RenderStatistics::updateStats()
83+{
84+ static QTime time;
85+ static int frames;
86+ static int lastTime;
87+
88+ if (frames == 0) {
89+ time.start();
90+ } else {
91+ int elapsed = time.elapsed();
92+ timesPerFrames.append(elapsed - lastTime);
93+ lastTime = elapsed;
94+
95+ if (elapsed > 5000) {
96+ qreal avgtime = elapsed / (qreal) frames;
97+ qreal var = 0;
98+ for (int i = 0; i < timesPerFrames.size(); ++i) {
99+ qreal diff = timesPerFrames.at(i) - avgtime;
100+ var += diff * diff;
101+ }
102+ var /= timesPerFrames.size();
103+
104+ qDebug("Average time per frame: %f ms (%i fps), std.dev: %f ms", avgtime, qRound(1000. / avgtime), qSqrt(var));
105+
106+ timePerFrame.append(avgtime);
107+ timesPerFrames.clear();
108+ time.start();
109+ lastTime = 0;
110+ frames = 0;
111+ }
112+ }
113+ ++frames;
114+}
115+
116+void RenderStatistics::printTotalStats()
117+{
118+ int count = timePerFrame.count();
119+ if (count == 0)
120+ return;
121+
122+ qreal minTime = 0;
123+ qreal maxTime = 0;
124+ qreal avg = 0;
125+ for (int i = 0; i < count; ++i) {
126+ minTime = minTime == 0 ? timePerFrame.at(i) : qMin(minTime, timePerFrame.at(i));
127+ maxTime = qMax(maxTime, timePerFrame.at(i));
128+ avg += timePerFrame.at(i);
129+ }
130+ avg /= count;
131+
132+ qDebug(" ");
133+ qDebug("----- Statistics -----");
134+ qDebug("Average time per frame: %f ms (%i fps)", avg, qRound(1000. / avg));
135+ qDebug("Best time per frame: %f ms (%i fps)", minTime, int(1000 / minTime));
136+ qDebug("Worst time per frame: %f ms (%i fps)", maxTime, int(1000 / maxTime));
137+ qDebug("----------------------");
138+ qDebug(" ");
139+}
140+#endif
141+
142+struct Options
143+{
144+ Options()
145+ : originalQml(false)
146+ , originalQmlRaster(false)
147+ , maximized(false)
148+ , fullscreen(false)
149+ , transparent(false)
150+ , clip(false)
151+ , versionDetection(true)
152+ , quitImmediately(false)
153+ , resizeViewToRootItem(false)
154+ , multisample(false)
155+ {
156+ }
157+
158+ QUrl file;
159+ bool originalQml;
160+ bool originalQmlRaster;
161+ bool maximized;
162+ bool fullscreen;
163+ bool transparent;
164+ bool scenegraphOnGraphicsview;
165+ bool clip;
166+ bool versionDetection;
167+ bool quitImmediately;
168+ bool resizeViewToRootItem;
169+ bool multisample;
170+ QString translationFile;
171+};
172+
173+#if defined(QMLSCENE_BUNDLE)
174+QFileInfoList findQmlFiles(const QString &dirName)
175+{
176+ QDir dir(dirName);
177+
178+ QFileInfoList ret;
179+ if (dir.exists()) {
180+ QFileInfoList fileInfos = dir.entryInfoList(QStringList() << "*.qml",
181+ QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot);
182+
183+ Q_FOREACH (QFileInfo fileInfo, fileInfos) {
184+ if (fileInfo.isDir())
185+ ret += findQmlFiles(fileInfo.filePath());
186+ else if (fileInfo.fileName().length() > 0 && fileInfo.fileName().at(0).isLower())
187+ ret.append(fileInfo);
188+ }
189+ }
190+
191+ return ret;
192+}
193+
194+static int displayOptionsDialog(Options *options)
195+{
196+ QDialog dialog;
197+
198+ QFormLayout *layout = new QFormLayout(&dialog);
199+
200+ QComboBox *qmlFileComboBox = new QComboBox(&dialog);
201+ QFileInfoList fileInfos = findQmlFiles(":/bundle") + findQmlFiles("./qmlscene-resources");
202+
203+ Q_FOREACH (QFileInfo fileInfo, fileInfos)
204+ qmlFileComboBox->addItem(fileInfo.dir().dirName() + "/" + fileInfo.fileName(), QVariant::fromValue(fileInfo));
205+
206+ QCheckBox *originalCheckBox = new QCheckBox(&dialog);
207+ originalCheckBox->setText("Use original QML viewer");
208+ originalCheckBox->setChecked(options->originalQml);
209+
210+ QCheckBox *fullscreenCheckBox = new QCheckBox(&dialog);
211+ fullscreenCheckBox->setText("Start fullscreen");
212+ fullscreenCheckBox->setChecked(options->fullscreen);
213+
214+ QCheckBox *maximizedCheckBox = new QCheckBox(&dialog);
215+ maximizedCheckBox->setText("Start maximized");
216+ maximizedCheckBox->setChecked(options->maximized);
217+
218+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
219+ Qt::Horizontal,
220+ &dialog);
221+ QObject::connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
222+ QObject::connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
223+
224+ layout->addRow("Qml file:", qmlFileComboBox);
225+ layout->addWidget(originalCheckBox);
226+ layout->addWidget(maximizedCheckBox);
227+ layout->addWidget(fullscreenCheckBox);
228+ layout->addWidget(buttonBox);
229+
230+ int result = dialog.exec();
231+ if (result == QDialog::Accepted) {
232+ QVariant variant = qmlFileComboBox->itemData(qmlFileComboBox->currentIndex());
233+ QFileInfo fileInfo = variant.value<QFileInfo>();
234+
235+ if (fileInfo.canonicalFilePath().startsWith(":"))
236+ options->file = QUrl("qrc" + fileInfo.canonicalFilePath());
237+ else
238+ options->file = QUrl::fromLocalFile(fileInfo.canonicalFilePath());
239+ options->originalQml = originalCheckBox->isChecked();
240+ options->maximized = maximizedCheckBox->isChecked();
241+ options->fullscreen = fullscreenCheckBox->isChecked();
242+ }
243+ return result;
244+}
245+#endif
246+
247+static bool checkVersion(const QUrl &url)
248+{
249+ if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
250+ qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
251+
252+ QString fileName = url.toLocalFile();
253+ if (fileName.isEmpty()) {
254+ qWarning("qmlscene: filename required.");
255+ return false;
256+ }
257+
258+ QFile f(fileName);
259+ if (!f.open(QFile::ReadOnly | QFile::Text)) {
260+ qWarning("qmlscene: failed to check version of file '%s', could not open...",
261+ qPrintable(fileName));
262+ return false;
263+ }
264+
265+ QRegExp quick1("^\\s*import +QtQuick +1\\.\\w*");
266+ QRegExp qt47("^\\s*import +Qt +4\\.7");
267+
268+ QTextStream stream(&f);
269+ bool codeFound= false;
270+ while (!codeFound) {
271+ QString line = stream.readLine();
272+ if (line.contains("{")) {
273+ codeFound = true;
274+ } else {
275+ QString import;
276+ if (quick1.indexIn(line) >= 0)
277+ import = quick1.cap(0).trimmed();
278+ else if (qt47.indexIn(line) >= 0)
279+ import = qt47.cap(0).trimmed();
280+
281+ if (!import.isNull()) {
282+ qWarning("qmlscene: '%s' is no longer supported.\n"
283+ "Use qmlviewer to load file '%s'.",
284+ qPrintable(import),
285+ qPrintable(fileName));
286+ return false;
287+ }
288+ }
289+ }
290+
291+ return true;
292+}
293+
294+static void displayFileDialog(Options *options)
295+{
296+#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_FILEDIALOG)
297+ QString fileName = QFileDialog::getOpenFileName(0, "Open QML file", QString(), "QML Files (*.qml)");
298+ if (!fileName.isEmpty()) {
299+ QFileInfo fi(fileName);
300+ options->file = QUrl::fromLocalFile(fi.canonicalFilePath());
301+ }
302+#else
303+ Q_UNUSED(options);
304+ qWarning("No filename specified...");
305+#endif
306+}
307+
308+#ifndef QT_NO_TRANSLATION
309+static void loadTranslationFile(QTranslator &translator, const QString& directory)
310+{
311+ translator.load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
312+ QCoreApplication::installTranslator(&translator);
313+}
314+#endif
315+
316+static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
317+{
318+ QDir dir(directory+"/dummydata", "*.qml");
319+ QStringList list = dir.entryList();
320+ for (int i = 0; i < list.size(); ++i) {
321+ QString qml = list.at(i);
322+ QFile f(dir.filePath(qml));
323+ f.open(QIODevice::ReadOnly);
324+ QByteArray data = f.readAll();
325+ QQmlComponent comp(&engine);
326+ comp.setData(data, QUrl());
327+ QObject *dummyData = comp.create();
328+
329+ if(comp.isError()) {
330+ QList<QQmlError> errors = comp.errors();
331+ Q_FOREACH (const QQmlError &error, errors)
332+ qWarning() << error;
333+ }
334+
335+ if (dummyData) {
336+ qWarning() << "Loaded dummy data:" << dir.filePath(qml);
337+ qml.truncate(qml.length()-4);
338+ engine.rootContext()->setContextProperty(qml, dummyData);
339+ dummyData->setParent(&engine);
340+ }
341+ }
342+}
343+
344+static void usage()
345+{
346+ qWarning("Usage: uqmlscene [options] <filename>");
347+ qWarning(" ");
348+ qWarning(" Options:");
349+ qWarning(" --maximized ............................... Run maximized");
350+ qWarning(" --fullscreen .............................. Run fullscreen");
351+ qWarning(" --transparent ............................. Make the window transparent");
352+ qWarning(" --multisample ............................. Enable multisampling (OpenGL anti-aliasing)");
353+ qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file");
354+ qWarning(" --resize-to-root .......................... Resize the window to the size of the root item");
355+ qWarning(" --quit .................................... Quit immediately after starting");
356+ qWarning(" -I <path> ................................. Add <path> to the list of import paths");
357+ qWarning(" -B <name> <file> .......................... Add a named bundle");
358+ qWarning(" -translation <translationfile> ............ Set the language to run in");
359+
360+ qWarning(" ");
361+ exit(1);
362+}
363+
364+int main(int argc, char ** argv)
365+{
366+ Options options;
367+
368+ QStringList imports;
369+ QList<QPair<QString, QString> > bundles;
370+ for (int i = 1; i < argc; ++i) {
371+ if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
372+ options.file = QUrl::fromLocalFile(argv[i]);
373+ } else {
374+ const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();
375+ if (lowerArgument == QLatin1String("--maximized"))
376+ options.maximized = true;
377+ else if (lowerArgument == QLatin1String("--fullscreen"))
378+ options.fullscreen = true;
379+ else if (lowerArgument == QLatin1String("--transparent"))
380+ options.transparent = true;
381+ else if (lowerArgument == QLatin1String("--clip"))
382+ options.clip = true;
383+ else if (lowerArgument == QLatin1String("--no-version-detection"))
384+ options.versionDetection = false;
385+ else if (lowerArgument == QLatin1String("--quit"))
386+ options.quitImmediately = true;
387+ else if (lowerArgument == QLatin1String("-translation"))
388+ options.translationFile = QLatin1String(argv[++i]);
389+ else if (lowerArgument == QLatin1String("--resize-to-root"))
390+ options.resizeViewToRootItem = true;
391+ else if (lowerArgument == QLatin1String("--multisample"))
392+ options.multisample = true;
393+ else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
394+ imports.append(QString::fromLatin1(argv[++i]));
395+ else if (lowerArgument == QLatin1String("-b") && i + 2 < argc) {
396+ QString name = QString::fromLatin1(argv[++i]);
397+ QString file = QString::fromLatin1(argv[++i]);
398+ bundles.append(qMakePair(name, file));
399+ } else if (lowerArgument == QLatin1String("--help")
400+ || lowerArgument == QLatin1String("-help")
401+ || lowerArgument == QLatin1String("--h")
402+ || lowerArgument == QLatin1String("-h"))
403+ usage();
404+ }
405+ }
406+
407+#ifdef QT_WIDGETS_LIB
408+ QApplication app(argc, argv);
409+#else
410+ QGuiApplication app(argc, argv);
411+#endif
412+ app.setApplicationName("Unity8 QtQmlViewer");
413+ app.setOrganizationName("Qt Project");
414+ app.setOrganizationDomain("qt-project.org");
415+
416+ MouseTouchAdaptor mouseTouchAdaptor;
417+ app.installNativeEventFilter(&mouseTouchAdaptor);
418+
419+#ifndef QT_NO_TRANSLATION
420+ QTranslator translator;
421+ QTranslator qtTranslator;
422+ QString sysLocale = QLocale::system().name();
423+ if (translator.load(QLatin1String("qmlscene_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
424+ app.installTranslator(&translator);
425+ if (qtTranslator.load(QLatin1String("qt_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
426+ app.installTranslator(&qtTranslator);
427+ } else {
428+ app.removeTranslator(&translator);
429+ }
430+ }
431+
432+ QTranslator qmlTranslator;
433+ if (!options.translationFile.isEmpty()) {
434+ if (qmlTranslator.load(options.translationFile)) {
435+ app.installTranslator(&qmlTranslator);
436+ } else {
437+ qWarning() << "Could not load the translation file" << options.translationFile;
438+ }
439+ }
440+#endif
441+
442+ if (options.file.isEmpty())
443+#if defined(QMLSCENE_BUNDLE)
444+ displayOptionsDialog(&options);
445+#else
446+ displayFileDialog(&options);
447+#endif
448+
449+ int exitCode = 0;
450+
451+ if (!options.file.isEmpty()) {
452+ if (!options.versionDetection || checkVersion(options.file)) {
453+#ifndef QT_NO_TRANSLATION
454+ QTranslator translator;
455+#endif
456+
457+ // TODO: as soon as the engine construction completes, the debug service is
458+ // listening for connections. But actually we aren't ready to debug anything.
459+ QQmlEngine engine;
460+ QQmlComponent *component = new QQmlComponent(&engine);
461+ for (int i = 0; i < imports.size(); ++i)
462+ engine.addImportPath(imports.at(i));
463+ for (int i = 0; i < bundles.size(); ++i)
464+ engine.addNamedBundle(bundles.at(i).first, bundles.at(i).second);
465+ if (options.file.isLocalFile()) {
466+ QFileInfo fi(options.file.toLocalFile());
467+#ifndef QT_NO_TRANSLATION
468+ loadTranslationFile(translator, fi.path());
469+#endif
470+ loadDummyDataFiles(engine, fi.path());
471+ }
472+ QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
473+ component->loadUrl(options.file);
474+ if ( !component->isReady() ) {
475+ qWarning("%s", qPrintable(component->errorString()));
476+ return -1;
477+ }
478+
479+ QObject *topLevel = component->create();
480+ QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
481+ QQuickView* qxView = 0;
482+ if (!window) {
483+ QQuickItem *contentItem = qobject_cast<QQuickItem *>(topLevel);
484+ if (contentItem) {
485+ qxView = new QQuickView(&engine, NULL);
486+ window = qxView;
487+ // Set window default properties; the qml can still override them
488+ QString oname = contentItem->objectName();
489+ window->setTitle(oname.isEmpty() ? QString::fromLatin1("qmlscene") : QString::fromLatin1("qmlscene: ") + oname);
490+ window->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint);
491+ if (options.resizeViewToRootItem)
492+ qxView->setResizeMode(QQuickView::SizeViewToRootObject);
493+ else
494+ qxView->setResizeMode(QQuickView::SizeRootObjectToView);
495+ qxView->setContent(options.file, component, contentItem);
496+ }
497+ }
498+
499+ if (window) {
500+ mouseTouchAdaptor.setTargetWindow(window);
501+
502+ QSurfaceFormat surfaceFormat = window->requestedFormat();
503+ if (options.multisample)
504+ surfaceFormat.setSamples(16);
505+ if (options.transparent) {
506+ surfaceFormat.setAlphaBufferSize(8);
507+ window->setClearBeforeRendering(true);
508+ window->setColor(QColor(Qt::transparent));
509+ window->setFlags(Qt::FramelessWindowHint);
510+ }
511+ window->setFormat(surfaceFormat);
512+
513+ if (options.fullscreen)
514+ window->showFullScreen();
515+ else if (options.maximized)
516+ window->showMaximized();
517+ else
518+ window->show();
519+ }
520+
521+ if (options.quitImmediately)
522+ QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
523+
524+ // Now would be a good time to inform the debug service to start listening.
525+
526+ exitCode = app.exec();
527+
528+#ifdef QML_RUNTIME_TESTING
529+ RenderStatistics::printTotalStats();
530+#endif
531+ // Ready to exit. If we created qxView, it owns the component;
532+ // otherwise, the ownership is still right here. Nobody deletes the engine
533+ // (which is odd since the container constructor takes the engine pointer),
534+ // but it's stack-allocated anyway.
535+ if (qxView)
536+ delete qxView;
537+ else
538+ delete component;
539+ }
540+ }
541+
542+ return exitCode;
543+}