on xenial help sign in
Merge from trunk
commitfcb534adc8a2abee721d161aa61997c1fffc8e37 authorMichael Terry <michael.terry@canonical.com> dateTue 16 Dec 2014, 11:49 (12 years ago) parent84adc8a621ea5f
386 files changed+29584−13606
CMakeLists.txt+6 build.sh+2−3 com.canonical.Unity8.gschema.xml+14 debian/changelog+279 debian/control+14−7 debian/unity8-common.install+2 debian/unity8-private.install+2−1 debian/unity8.install+1−1 include/paths.h.in+2 libs/UbuntuGestures/DebugHelpers.cpp+1−1 libs/UbuntuGestures/Pool.h−2 plugins/AccountsService/AccountsService.cpp+61−2 plugins/AccountsService/AccountsService.h+20 plugins/CMakeLists.txt+2−1 plugins/Dash/CMakeLists.txt+3−2 plugins/Dash/CardAttributes.qml+1−3 plugins/Dash/CardCreator.js+9−11 plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18 plugins/Dash/ScopeStyle.qml+1−1 plugins/Dash/abstractdashview.cpp+24−5 plugins/Dash/abstractdashview.h+10 plugins/Dash/croppedimagesizer.cpp+136 plugins/Dash/croppedimagesizer.h+72 plugins/Dash/croppedimagesizerasyncworker.cpp+74 plugins/HudClient/hudtoolbarmodel.h → plugins/Dash/croppedimagesizerasyncworker.h+18−15 plugins/Dash/horizontaljournal.cpp+5−1 plugins/Dash/horizontaljournal.h+4 plugins/Dash/listviewwithpageheader.cpp+9−4 plugins/Dash/listviewwithpageheader.h+4−4 plugins/Dash/organicgrid.cpp+5−1 plugins/Dash/organicgrid.h+4 plugins/Dash/plugin.cpp+2 plugins/Dash/verticaljournal.cpp+5−1 plugins/Dash/verticaljournal.h+4 plugins/HudClient/CMakeLists.txt−38 plugins/HudClient/HudClient.qmltypes−91 plugins/HudClient/hudclient.cpp−294 plugins/HudClient/hudclient.h−71 plugins/HudClient/hudtoolbarmodel.cpp−98 plugins/HudClient/qmldir−3 plugins/HudClient/volumepeakdetector.cpp−223 plugins/HudClient/volumepeakdetector.h−78 plugins/ScreenGrabber/CMakeLists.txt+13 plugins/ScreenGrabber/ScreenGrabber.qmltypes+17 plugins/ScreenGrabber/plugin.cpp+28 qml/Hud/ToolBar.qml → plugins/ScreenGrabber/plugin.h+16−16 plugins/ScreenGrabber/qmldir+3 plugins/ScreenGrabber/screengrabber.cpp+94 plugins/ScreenGrabber/screengrabber.h+42 plugins/Ubuntu/Gestures/Direction.cpp+6−2 plugins/Ubuntu/Gestures/Direction.h+2−1 plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+30−38 plugins/Ubuntu/Gestures/TouchDispatcher.cpp+43 plugins/Ubuntu/Gestures/TouchDispatcher.h+3 plugins/Unity/Launcher/CMakeLists.txt+1−1 plugins/Unity/Launcher/dbusinterface.cpp+2−2 plugins/Unity/Launcher/desktopfilehandler.cpp+3−1 plugins/Unity/Launcher/launcheritem.cpp+11−4 plugins/Unity/Launcher/launchermodel.cpp+16−4 plugins/Unity/Launcher/launchermodel.h+1−1 plugins/Unity/Session/dbusunitysessionservice.h+5 plugins/Utils/CMakeLists.txt+1−1 plugins/Utils/relativetimeformatter.cpp+31−39 plugins/Wizard/50-com.canonical.unity.wizard.pkla+6 plugins/Wizard/CMakeLists.txt+11 plugins/Wizard/PageList.cpp+112 plugins/Wizard/PageList.h+53 plugins/Wizard/System.cpp+99 plugins/Wizard/System.h+50 plugins/Wizard/Wizard.qmltypes+36 plugins/Wizard/plugin.cpp+35 plugins/Wizard/plugin.h+32 plugins/Wizard/qmldir+3 po/am.po+277−99 po/ar.po+261−89 po/ast.po+277−99 po/az.po+271−96 po/be.po+246−89 po/bg.po+261−89 po/br.po+285−99 po/bs.po+250−93 po/ca.po+277−99 po/ca@valencia.po+279−95 po/ckb.po+261−89 po/cs.po+261−89 po/da.po+261−89 po/de.po+281−97 po/el.po+302−115 po/en_AU.po+278−94 po/en_GB.po+277−99 po/eo.po+246−89 po/es.po+278−100 po/eu.po+280−102 po/fa.po+279−95 po/fi.po+284−99 po/fo.po+261−89 po/fr.po+278−100 po/gd.po+277−99 po/gl.po+284−99 po/he.po+273−92 po/hi.po+255−89 po/hr.po+261−89 po/hu.po+287−95 po/hy.po+274−93 po/id.po+334−141 po/is.po+283−101 po/it.po+288−106 po/ja.po+286−109 po/km.po+272−97 po/kn.po+261−89 po/ko.po+276−98 po/ku.po+272−97 po/ky.po+261−89 po/lo.po+255−89 po/lt.po+261−89 po/lv.po+272−94 po/ml.po+261−89 po/mr.po+246−89 po/ms.po+325−133 po/my.po+261−89 po/nb.po+278−100 po/nl.po+278−100 po/pa.po+246−89 po/pl.po+261−89 po/pt.po+289−110 po/pt_BR.po+276−98 po/ro.po+277−99 po/ru.po+290−107 po/shn.po+246−89 po/si.po+246−89 po/sl.po+274−99 po/sq.po+246−89 po/sr.po+272−97 po/sv.po+276−98 po/sw.po+249−89 po/ta.po+261−89 po/te.po+258−89 po/th.po+246−89 po/tr.po+265−93 po/ug.po+276−98 po/uk.po+281−99 po/unity8.pot+244−87 po/update-unity-pot+1 po/vi.po+246−89 po/xh.po+246−89 po/zh_CN.po+275−94 po/zh_HK.po+261−89 po/zh_TW.po+279−98 qml/CMakeLists.txt+2−2 qml/Components/Dialogs.qml+77−87 qml/Components/DragHandle.qml+10−2 qml/Components/EdgeDragEvaluator.qml+11−5 qml/Components/Lockscreen.qml+15 qml/Hud/ToolBarIcon.qml → qml/Components/PanelState/PanelState.qml+9−12 qml/Components/PanelState/qmldir+1 qml/Components/ResponsiveFlowView.qml−74 qml/Components/ResponsiveVerticalJournal.qml+1 qml/Components/ScreenGrabber.qml+72 tests/mocks/HudClient/fake_hud_plugin.cpp → qml/Components/ShellDialog.qml+15−17 qml/Components/Showable.qml+13 qml/Components/VolumeKeyFilter.qml+63 qml/Components/WindowControlButtons.qml+60 qml/Dash/CardCarousel.qml+1 qml/Dash/CardGrid.qml+1−2 qml/Dash/CardHorizontalList.qml+1 qml/Dash/CardTool.qml+1−1 qml/Dash/CardVerticalJournal.qml+1−1 qml/Dash/Dash.qml+103−133 qml/Dash/DashContent.qml+13−1 qml/Dash/DashNavigationButton.qml+28−23 qml/Dash/DashRenderer.qml+2−4 qml/Dash/GenericScopeView.qml+47−24 qml/Dash/PageHeader.qml+20−4 qml/Dash/Previews/PreviewActions.qml+2−1 qml/Dash/Previews/PreviewPayments.qml+1−1 qml/Dash/Previews/PreviewZoomableImage.qml+1 qml/Dash/ScopeListView.qml+4−2 qml/Dash/ScopesList.qml+131 qml/Dash/ScopesListCategory.qml+176 qml/Dash/ScopesListCategoryItem.qml+107 qml/Dash/ScopesOverview.qml−575 qml/Dash/ScopesOverviewAll.qml−56 qml/Dash/ScopesOverviewFavorites.qml−73 qml/Dash/ScopesOverviewTab.qml−74 qml/Greeter/Clock.qml+10 qml/Greeter/Greeter.qml+92−83 qml/Greeter/GreeterContent.qml+6−18 qml/Greeter/Infographics.qml+20−18 qml/Greeter/LoginList.qml−1 qml/Hud/Hud.qml−496 qml/Hud/HudParametrizedActionsPage.qml−179 qml/Hud/Result.qml−84 qml/Hud/ResultList.qml−106 qml/Hud/SearchBar.qml−100 qml/Hud/ShowingAnimation.qml−54 qml/Hud/SliderLabel.qml−76 qml/Hud/SoundAmplitudeDelegate.qml−52 qml/Hud/SoundAmplitudeVisual.qml−146 qml/Hud/graphics/divider@20.png qml/Hud/graphics/divider@20.sci−5 qml/Hud/graphics/help@20.png qml/Hud/graphics/hud_bg@20.png qml/Hud/graphics/hud_handlearrow@20.png qml/Hud/graphics/hud_handlebar@20.png qml/Hud/graphics/icon_arrow@20.png qml/Hud/graphics/icon_clear@20.png qml/Hud/graphics/icon_search@20.png qml/Hud/graphics/microphone@20.png qml/Hud/graphics/popup_triangle@20.png qml/Hud/graphics/settings@20.png qml/Hud/graphics/undo@20.png qml/Hud/graphics/view-fullscreen@20.png qml/Launcher/Launcher.qml+37−19 qml/Launcher/LauncherPanel.qml+51−23 qml/Launcher/graphics/quicklist_tooltip@30.png qml/Notifications/Notification.qml+30−102 qml/Notifications/NotificationMenuItemFactory.qml+20−2 qml/Notifications/OptionToggle.qml+123 qml/Notifications/ShapedIcon.qml+1−1 qml/Notifications/SwipeToAct.qml+309 qml/Panel/IndicatorItem.qml+1−2 qml/Panel/IndicatorPage.qml+12−1 qml/Panel/Indicators/MenuItemFactory.qml+36−8 qml/Panel/IndicatorsBar.qml+29−20 qml/Panel/Panel.qml+17−2 qml/Shell.qml+117−64 qml/Stages/ApplicationWindow.qml+1 qml/Stages/DecoratedWindow.qml+60 qml/Stages/DesktopStage.qml+175 qml/Stages/PhoneStage.qml+19−35 qml/Stages/SessionContainer.qml+4 qml/Stages/SpreadDelegate.qml+20−3 qml/Stages/SurfaceContainer.qml+1 qml/Stages/TabletStage.qml+7−16 qml/Stages/TransformedSpreadDelegate.qml+10−3 qml/Stages/WindowDecoration.qml+65 qml/Wizard/CheckableSetting.qml+84 qml/Wizard/Page.qml+108 qml/Wizard/Pages.qml+136 qml/Wizard/Pages/10-welcome.qml+99 qml/Wizard/Pages/20-sim.qml+73 qml/Wizard/Pages/30-passwd-type.qml+135 qml/Wizard/Pages/40-wifi.qml+201 qml/Wizard/Pages/50-location.qml+150 qml/Wizard/Pages/60-reporting.qml+54 qml/Wizard/Pages/80-finished.qml+57 qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png qml/Wizard/Pages/here-terms.qml+121 qml/Wizard/Pages/passwd-confirm.qml+86 qml/Wizard/Pages/passwd-set.qml+94 qml/Wizard/StackButton.qml+47 qml/Wizard/Wizard.qml+55 qml/graphics/applicationIcons/dash@18.png → qml/graphics/applicationIcons/dash.png src/CMakeLists.txt+4−1 src/CachingNetworkManagerFactory.cpp+2−11 src/CachingNetworkManagerFactory.h+2−6 src/Dash/CMakeLists.txt+1−1 tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+1−1 tests/autopilot/unity8/shell/emulators/dash.py+23−9 tests/autopilot/unity8/shell/emulators/hud.py−94 tests/autopilot/unity8/shell/emulators/main_window.py−13 tests/autopilot/unity8/shell/tests/__init__.py−3 tests/autopilot/unity8/shell/tests/disabled_test_hud.py−225 tests/autopilot/unity8/shell/tests/test_emulators.py+10−47 tests/autopilot/unity8/shell/tests/test_notifications.py−51 tests/mocks/AccountsService/AccountsService.cpp+37−1 tests/mocks/AccountsService/AccountsService.h+20 tests/mocks/CMakeLists.txt+2−1 tests/mocks/HudClient/CMakeLists.txt−38 tests/mocks/HudClient/HudClient.qmltypes−113 tests/mocks/HudClient/fake_libhud_client.cpp−247 tests/mocks/HudClient/libhud_client_stub.cpp−93 tests/mocks/HudClient/libhud_client_stub.h−64 tests/mocks/HudClient/qmldir−3 tests/mocks/MeeGo/CMakeLists.txt+1 tests/mocks/MeeGo/QOfono/CMakeLists.txt+10 tests/mocks/Unity/Notifications/notification.js → tests/mocks/MeeGo/QOfono/MockOfonoManager.qml+7−7 tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+42 tests/mocks/MeeGo/QOfono/MockQOfono.cpp+54 tests/mocks/MeeGo/QOfono/MockQOfono.h+52 plugins/HudClient/plugin.cpp → tests/mocks/MeeGo/QOfono/plugin.cpp+12−15 plugins/HudClient/plugin.h → tests/mocks/MeeGo/QOfono/plugin.h+6−6 tests/mocks/MeeGo/QOfono/qmldir+4 tests/mocks/QMenuModel/CMakeLists.txt+1 tests/mocks/QMenuModel/QDBusActionGroup.qml+12 tests/mocks/QMenuModel/dbus-enums.h+52 tests/mocks/QMenuModel/plugin.cpp+3 tests/mocks/Ubuntu/CMakeLists.txt+1 tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt+2 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt+1 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+23 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+2 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+10 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+28 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+42 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp+26 tests/mocks/HudClient/fake_hud_plugin.h → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h+6−6 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir+2 tests/mocks/Unity/Application/ApplicationManager.cpp+7 tests/mocks/Unity/Application/Session.h+1−1 tests/mocks/Unity/CMakeLists.txt+2−6 tests/mocks/Unity/Launcher/CMakeLists.txt+1−1 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+5 tests/mocks/Unity/Launcher/MockLauncherModel.h+3 tests/mocks/Unity/Notifications/CMakeLists.txt+15−1 tests/mocks/Unity/Notifications/MockActionModel.cpp+72 tests/mocks/Unity/Notifications/MockActionModel.h+51 tests/mocks/Unity/Notifications/MockNotificationTypes.cpp+26 tests/mocks/Unity/Notifications/MockNotificationTypes.h+36 tests/mocks/Unity/Notifications/plugin.cpp+31 tests/mocks/Unity/Notifications/plugin.h+35 tests/mocks/Unity/Notifications/qmldir+2−1 tests/mocks/Unity/fake_navigation.cpp+1−1 tests/mocks/Unity/fake_scope.cpp+2−7 tests/mocks/Unity/fake_scopes.cpp+70−4 tests/mocks/Unity/fake_scopes.h+9−3 tests/mocks/Unity/fake_scopesoverview.cpp+77−11 tests/mocks/Unity/fake_scopesoverview.h+18−3 tests/mocks/Wizard/CMakeLists.txt+12 tests/mocks/Wizard/MockSystem.cpp+39 tests/mocks/Wizard/MockSystem.h+47 tests/mocks/Wizard/Wizard.qmltypes+36 tests/mocks/Wizard/mockplugin.cpp+35 tests/mocks/Wizard/mockplugin.h+32 tests/mocks/Wizard/qmldir+3 tests/plugins/CMakeLists.txt+1 tests/plugins/Dash/CMakeLists.txt+1 tests/plugins/Dash/cardcreator/1.res+4−4 tests/plugins/Dash/cardcreator/2.res+2−3 tests/plugins/Dash/cardcreator/3.res+10−10 tests/plugins/Dash/cardcreator/4.res+3−4 tests/plugins/Dash/cardcreator/5.res+10−10 tests/plugins/Dash/cardcreator/6.res+1−1 tests/plugins/Dash/cardcreator/7.res+2−3 tests/plugins/Dash/horizontaljournaltest.qml+1 tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1 tests/plugins/Dash/organicgridtest.qml+1 tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml+56 tests/plugins/Dash/tst_ScopeStyle.qml+1−1 tests/plugins/Dash/verticaljournaltest.qml+1 tests/plugins/Ubuntu/Gestures/GestureTest.cpp+6 tests/plugins/Ubuntu/Gestures/GestureTest.h+2 tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp+59 tests/plugins/Unity/Launcher/CMakeLists.txt+1−1 tests/plugins/Unity/Launcher/gsettings.cpp+1 tests/plugins/Unity/Launcher/gsettings.h+1 tests/plugins/Unity/Launcher/launchermodeltest.cpp+14−2 tests/plugins/Utils/qsortfilterproxymodeltest.cpp+1−1 tests/plugins/Wizard/CMakeLists.txt+18 tests/plugins/Wizard/tst_pagelist.cpp+154 tests/plugins/Wizard/tst_system.cpp+124 tests/qmltests/CMakeLists.txt+4−3 tests/qmltests/Components/tst_Dialogs.qml+104 tests/qmltests/Components/tst_DragHandle.cpp+4 tests/qmltests/Components/tst_DragHandle.qml+43−8 tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+69 tests/qmltests/Components/tst_ResponsiveFlowView.qml−191 tests/qmltests/Dash/tst_Card.qml−22 tests/qmltests/Dash/tst_Dash.qml+240−145 tests/qmltests/Dash/tst_DashContent.qml+13−6 tests/qmltests/Dash/tst_GenericScopeView.qml+4−2 tests/qmltests/Dash/tst_PreviewListView.qml+2−2 tests/qmltests/Greeter/tst_MultiGreeter.qml+15−15 tests/qmltests/Greeter/tst_SingleGreeter.qml+163−32 tests/qmltests/Hud/tst_Hud.qml−239 tests/qmltests/Hud/tst_Result.qml−98 tests/qmltests/Launcher/tst_Launcher.qml+46−11 tests/qmltests/Notifications/tst_Notifications.qml+506−552 tests/qmltests/Notifications/tst_OptionToggle.qml+286 tests/qmltests/Notifications/tst_SwipeToAct.qml+276 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+17−1 tests/qmltests/Panel/tst_IndicatorPage.qml+54−9 tests/qmltests/Panel/tst_IndicatorsBar.qml+27−2 tests/qmltests/Panel/tst_IndicatorsMenu.qml+3−3 tests/qmltests/Panel/tst_Panel.qml+5−10 tests/qmltests/Stages/tst_PhoneStage.qml+41−6 tests/qmltests/Stages/tst_SessionContainer.qml+35 tests/qmltests/Stages/tst_SpreadDelegate.qml+11−5 tests/qmltests/Wizard/licenses/en_US.html+1 tests/qmltests/Wizard/licenses/fr_CA.html+1 tests/qmltests/Wizard/licenses/fr_FR.html+1 tests/qmltests/Wizard/tst_Wizard.qml+479 tests/qmltests/tst_Shell.qml+8−11 tests/qmltests/tst_ShellWithPin.qml+86 tests/qmltests/tst_TabletShell.qml+18−14 tests/utils/modules/Unity/Test/UnityTestCase.qml+11−7
CMakeLists.txt+6
@@ -53,6 +53,7 @@ find_package(Qt5Qml 5.2 REQUIRED)
5353find_package(Qt5Quick 5.2 REQUIRED)
5454find_package(Qt5Gui 5.2 REQUIRED)
5555find_package(Qt5DBus 5.2 REQUIRED)
56+find_package(Qt5Concurrent 5.2 REQUIRED)
5657
5758# Standard install paths
5859include(GNUInstallDirs)
@@ -60,6 +61,11 @@ include(GNUInstallDirs)
6061set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
6162set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
6263
64+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
65+if(USS_PRIVATE_PLUGINDIR STREQUAL "")
66+ message(FATAL_ERROR "Could not determine USS private plugin installation dir.")
67+endif()
68+
6369execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
6470if(SHELL_INSTALL_QML STREQUAL "")
6571 message(FATAL_ERROR "Could not determine plugin installation dir.")
build.sh+2−3
@@ -51,11 +51,10 @@ install_dependencies() {
5151 qtdeclarative5-ubuntu-settings-components \
5252 qtdeclarative5-ubuntu-telephony0.1 \
5353 qtdeclarative5-ubuntu-thumbnailer0.1 \
54+ qtdeclarative5-unity-notifications-plugin \
5455 qml-module-ubuntu-connectivity \
55− unity-notifications-impl \
5656 ubuntu-mobile-icons \
57− unity-scope-home \
58− unity-lens-applications \
57+ ubuntu-system-settings \
5958 unity-plugin-scopes \
6059 xvfb \
6160 || exit 5
com.canonical.Unity8.gschema.xmlnew file+14
@@ -0,0 +1,14 @@
1+<schemalist>
2+ <enum id="usage-mode-enum">
3+ <value nick="Staged" value="0" />
4+ <value nick="Windowed" value="1" />
5+ </enum>
6+
7+ <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">
8+ <key enum="usage-mode-enum" name="usage-mode">
9+ <default>"Staged"</default>
10+ <summary>The usage mode.</summary>
11+ <description>The usage mode chosen will affect the Window Management behaviour.</description>
12+ </key>
13+ </schema>
14+</schemalist>
debian/changelog+279
@@ -1,3 +1,282 @@
1+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low
2+
3+ [ Ubuntu daily release ]
4+ * New rebuild forced
5+
6+ [ Albert Astals ]
7+ * Need to wait until loaded is true to use the count property
8+ * Manage Dash: Ellide properly
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000
11+
12+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low
13+
14+ [ Albert Astals Cid ]
15+ * ScopesList: Use the default scope style for the header
16+
17+ [ Daniel d'Andrada ]
18+ * Refactor Dialogs.qml to use proper in-scene dialogs
19+ * Make Greeter nicely handle being resized
20+
21+ [ Albert Astals ]
22+ * Rework how we set the ranges so we get some more asynchronousity
23+ from item views (LP: #1384374)
24+ * clickscope is back to being unfavoritable (LP: #1400762)
25+ * Fix clicking on the manage dash list after having moved the current
26+ scope
27+ * Make the drag range be a multiple of the drag "rate" value.
28+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690
29+
30+ [ Gerry Boland ]
31+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)
32+
33+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000
34+
35+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low
36+
37+ [ Ubuntu daily release ]
38+ * New rebuild forced
39+
40+ [ Albert Astals ]
41+ * Make Navigation work when "jumping" to the non root
42+
43+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000
44+
45+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium
46+
47+ [ Michał Sawicz ]
48+ * Bump version due to new Manage Dash
49+
50+ [ Gerry Boland ]
51+ * [indicators] Fix positioning on panel resize.
52+
53+ [ Nick Dedekind ]
54+ * [indicators] Fix positioning on panel resize.
55+
56+ [ Albert Astals ]
57+ * Fix the Dash Header hamburger menu background color
58+ * Fix tests (LP: #1400449)
59+ * Allow pulling manage dash if there's no favorite scopes (LP:
60+ #1400774)
61+ * Manage Dash: Make store button work even if you have no favorites
62+ (LP: #1400771)
63+ * Make pot_file
64+
65+ [ CI Train Bot ]
66+ * Resync trunk
67+
68+ [ Andrea Cimitan ]
69+ * Remove dismiss timer in Launcher (LP: #1368778)
70+
71+ [ Michael Zanetti ]
72+ * decrease opacity changes in spread, move it to a separate surface.
73+ * Add an initial, rudimentary DesktopStage to get started
74+ * Uninvert Launcher in Desktop Mode
75+ * Add support for Wallpaper in Desktop stage
76+ * Add window control buttons to panel for fullscreen applications
77+
78+ [ Rodney Dawes ]
79+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.
80+ (LP: #1400437)
81+
82+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000
83+
84+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low
85+
86+ [ CI Train Bot ]
87+ * Resync trunk
88+
89+ [ Albert Astals ]
90+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,
91+ #1368670)
92+
93+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000
94+
95+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low
96+
97+ [ Michael Terry ]
98+ * Import wizard code from ubuntu-system-settings.
99+ * Convert the welcome wizard from a separate executable into a qml
100+ plugin (with a small C++ plugin for support).
101+ * Add tests for welcome wizard.
102+
103+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000
104+
105+unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low
106+
107+ [ Michael Terry ]
108+ * Make sure that there is no window of opportunity for swiping away
109+ greeter before the lockscreen appears.
110+ * Don't allow dragging the greeter out from the left edge if it's
111+ hidden there. (LP: #1372952)
112+
113+ [ Michał Sawicz ]
114+ * Move from Theme colour to direct UbuntuColors.orange for activity
115+ indicator and preview buttons
116+
117+ [ Albert Astals ]
118+ * Use QImageReader not to load the image into memory twice (LP:
119+ #1384374)
120+ * Don't create the whole current scope delegates, just height * 3 (LP:
121+ #1384393, #1384374)
122+ * Make CroppedImageSizer async
123+ * Use ubuntu::connectivity::NetworkingStatus instead of
124+ QNetworkConfigurationManager
125+ * Compile with Qt 5.4 (LP: #1395636)
126+
127+ [ Michael Zanetti ]
128+ * close previews and temp scopes on left edge/BFB (LP: #1391798)
129+ * make spread reversible (LP: #1368668, #1355284, #1368677)
130+
131+ [ Andrea Cimitan ]
132+ * Different drag behaviour for not closable apps in spread (LP:
133+ #1368287)
134+
135+ [ Daniel d'Andrada ]
136+ * Make UnityTestCase.touchFlick properly map event coordinates
137+
138+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 02 Dec 2014 09:26:49 +0000
139+
140+unity8 (8.01+15.04.20141125.2-0ubuntu1) vivid; urgency=low
141+
142+ [ Michael Zanetti ]
143+ * improve snapping after dragging
144+ * Make the launcher BFB rounded on one end (LP: #1382596)
145+ * disable swipeToClose while some snapping is happening (LP: #1378938)
146+ * increase threshold and avoid jumping in SpreadDelegate dragging (LP:
147+ #1352842, #1350803)
148+
149+ [ Ying-Chun Liu ]
150+ * Notifications should be on right side when wide. (LP: 1379384) (LP:
151+ #1379384)
152+
153+ [ Albert Astals ]
154+ * Fix qml warnings
155+ * Fix some qmluitests
156+
157+ [ Lars Uebernickel ]
158+ * Use Icon instead of StatusIcon
159+
160+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 25 Nov 2014 13:54:47 +0000
161+
162+unity8 (8.01+15.04.20141117-0ubuntu1) vivid; urgency=low
163+
164+ [ josharenson ]
165+ * Return focus to the application after a tusted session overlay is
166+ closing. (LP: #1381292)
167+
168+ [ Josh Arenson ]
169+ * Return focus to the application after a tusted session overlay is
170+ closing. (LP: #1381292)
171+
172+ [ Albert Astals ]
173+ * Remove unused ResponsiveFlowView
174+ * Fix a few cmake warnings when running ./build.sh in a clean checkout
175+
176+ [ Mirco Müller ]
177+ * Make sure non-square icons are not cropped. (LP: #1378417)
178+
179+ [ Michael Terry ]
180+ * Drop the "EARLY ALPHA" scare label when running in testing mode.
181+
182+ [ Michael Zanetti ]
183+ * unify Greeter and Lockscreen wallpaper again
184+ * hide quicklist when launcher hides (LP: #1387088)
185+ * Keep applications suspended while lockscreen is shown (LP: #1378126)
186+ * change spread background color to 111111
187+
188+ [ Omer Akram ]
189+ * show password when tapped on the 'Show password' label, not just the
190+ checkbox. (LP: #1389832)
191+
192+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 17 Nov 2014 13:48:33 +0000
193+
194+unity8 (8.01+15.04.20141107.2-0ubuntu2) vivid; urgency=medium
195+
196+ * No-change rebuild against Qt 5.3.2.
197+
198+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Sat, 08 Nov 2014 13:50:11 +0200
199+
200+unity8 (8.01+15.04.20141107.2-0ubuntu1) vivid; urgency=low
201+
202+ [ Michael Terry ]
203+ * Skip second SIM unlock dialog if user presses Emergency Call on
204+ first one (LP: #1387925)
205+
206+ [ Michael Zanetti ]
207+ * fix positive/negative answer order on the new swipe notification
208+ (LP: #1358343)
209+ * Update PageHeader to use new SDK api
210+ * antialias surfaces when in spread (LP: #1351559)
211+
212+ [ Albert Astals ]
213+ * Remove Hud
214+
215+ [ Mirco Müller ]
216+ * Replace ComboButton in snap-decision notifications, used for
217+ additional actions (> 3 actions), with custom widget immune to
218+ accidental taps. (LP: #1384730)
219+
220+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Nov 2014 14:33:02 +0000
221+
222+unity8 (8.01+15.04.20141104-0ubuntu1) vivid; urgency=low
223+
224+ [ Sebastien Bacher ]
225+ * Drop workaround, it's not needed and create issues for desktop-next
226+ (LP: #1387671)
227+
228+ [ Albert Astals ]
229+ * Do not append integer to char *
230+ * Remove unused end() function
231+ * Update build.sh
232+ * Fix i18n
233+
234+ [ Michael Zanetti ]
235+ * rework launcher quicklist visuals to fit new design (LP: #1368660)
236+ * Fix DBusVariant conversion for launcher emblems (LP: #1387261)
237+ * Fix desktop file encoding in launcher (LP: #1387083)
238+ * Add a hinting animation to indicate changes in the backend (LP:
239+ #1376707)
240+
241+ [ Alberto Aguirre ]
242+ * Add audioRole to QtMultimedia mock
243+ * Add a plugin to take screenshots on vol up + vol down
244+
245+ [ CI bot ]
246+ * Fix relative time formatter when using non-UTC timezone. (LP:
247+ #1378821)
248+
249+ [ Leo Arias ]
250+ * Removed the tests for the alternate paths of the autopilot helpers.
251+
252+ [ Nick Dedekind ]
253+ * Fix relative time formatter when using non-UTC timezone. (LP:
254+ #1378821)
255+ * Reset current item selection on deleted. (LP: #1378462)
256+ * Added timer to re-assert server value after indicator menu item
257+ activation. (LP: #1336715)
258+
259+ [ Mirco Müller ]
260+ * Added dedicated swipe-to-act button for snap-decisions, which avoids
261+ accidental taps/button-presses. (LP: #1358343)
262+
263+ [ Chris Gagnon ]
264+ * add missing unity-scope-click dependancy to unity8-autopilot package
265+ (LP: #1336276)
266+
267+ [ Michael Terry ]
268+ * Don't lock phone if user tries to switch back to an active call.
269+ (LP: #1388156)
270+
271+ [ Daniel d'Andrada ]
272+ * DirectionalDragArea: Update TODO comment in light of new events
273+ * TouchDispatcher: synthesize MouseButtonDblClick events
274+
275+ [ Leonardo Arias Fonseca ]
276+ * Removed the tests for the alternate paths of the autopilot helpers.
277+
278+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 04 Nov 2014 12:56:08 +0000
279+
1280unity8 (8.01+15.04.20141030-0ubuntu1) vivid; urgency=medium
2281
3282 [ Michael Terry ]
debian/control+14−7
@@ -12,20 +12,20 @@ Build-Depends: cmake,
1212# in libstdc++ causing us issues, we explicitly select a G++
1313# version.
1414 g++-4.9,
15− libdee-qt5-dev (>= 3.2),
15+ libconnectivity-qt1-dev,
1616 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1717 libgl1-mesa-dri,
1818 libgles2-mesa-dev[armhf],
1919 libglib2.0-dev,
2020 libgsettings-qt-dev,
2121 libhardware-dev,
22− libhud-client2-dev,
2322 libpam0g-dev,
2423 libpay2-dev,
2524 libpulse-dev,
2625 libqmenumodel-dev (>= 0.2.8),
2726 libqt5xmlpatterns5-dev,
28− libunity-api-dev (>= 7.92),
27+ libsystemsettings-dev,
28+ libunity-api-dev (>= 7.94),
2929 libusermetricsoutput1-dev,
3030 libxcb1-dev,
3131 pkg-config,
@@ -33,6 +33,7 @@ Build-Depends: cmake,
3333 python3-all:any,
3434 python3-setuptools,
3535 python:any (>= 2.7),
36+ qml-module-qt-labs-folderlistmodel,
3637 qml-module-qtquick-layouts,
3738 qml-module-qtquick-xmllistmodel,
3839 qml-module-qtquick2,
@@ -46,7 +47,8 @@ Build-Depends: cmake,
4647 qtdeclarative5-private-dev (>= 5.2.1),
4748 qtdeclarative5-qtmultimedia-plugin,
4849 qtdeclarative5-ubuntu-settings-components (>= 0.4),
49− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
50+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
51+ qtdeclarative5-ubuntu-web-plugin,
5052 ttf-ubuntu-font-family,
5153Standards-Version: 3.9.4
5254Homepage: http://launchpad.net/unity
@@ -60,7 +62,7 @@ X-Ubuntu-Use-Langpack: yes
6062Package: indicators-client
6163Architecture: amd64 armhf i386
6264Depends: qmenumodel-qml (>= 0.2.8),
63− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
65+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
6466 unity8 (= ${binary:Version}),
6567 ${misc:Depends},
6668 ${shlibs:Depends},
@@ -84,10 +86,13 @@ Depends: gsettings-desktop-schemas,
8486 libcap2-bin,
8587 libglib2.0-bin,
8688 qmenumodel-qml (>= 0.2.8),
89+ qml-module-qt-labs-folderlistmodel,
8790 qml-module-qtquick-xmllistmodel,
8891 qtdeclarative5-gsettings1.0,
8992 qtdeclarative5-qtmir-plugin (>= 0.4.4),
9093 qtdeclarative5-ubuntu-telephony0.1,
94+ qtdeclarative5-ubuntu-web-plugin,
95+ ubuntu-system-settings,
9196 unity-launcher-impl-4,
9297 unity8-common (= ${source:Version}),
9398 unity8-private (= ${binary:Version}),
@@ -102,6 +107,7 @@ Breaks: indicator-network (<< 0.5.1+14.10.20141014),
102107 unity8-greeter (<< 7.89),
103108Replaces: ubuntu-touch-session (<< 0.82~),
104109 unity8-greeter (<< 7.89),
110+Conflicts: ubuntu-system-settings-wizard,
105111Description: Unity 8 shell
106112 The Unity 8 shell is the primary user interface for Ubuntu devices.
107113
@@ -110,7 +116,7 @@ Architecture: all
110116Depends: qml-module-qtquick-layouts,
111117 qtdeclarative5-ubuntu-settings-components (>= 0.4),
112118 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
113− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
119+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
114120 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
115121 ubuntu-thumbnailer-impl-0,
116122 unity-application-impl-4,
@@ -130,6 +136,7 @@ Description: Unity 8 shell (common files)
130136Package: unity8-autopilot
131137Architecture: all
132138Depends: gir1.2-glib-2.0,
139+ gir1.2-notify-0.7,
133140 libautopilot-qt (>= 1.4),
134141 libqt5test5,
135142 libqt5widgets5,
@@ -143,6 +150,7 @@ Depends: gir1.2-glib-2.0,
143150 python3-fixtures,
144151 python3-gi,
145152 ubuntu-ui-toolkit-autopilot,
153+ unity-scope-click,
146154 unity8 (= ${source:Version}),
147155 unity8-fake-env (= ${source:Version}),
148156 url-dispatcher-tools,
@@ -174,7 +182,6 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
174182 libhardware2,
175183 unity-schemas (>= 7.3.1+14.10.20140915),
176184 pay-service,
177− qml-module-ubuntu-connectivity,
178185 ${misc:Depends},
179186 ${shlibs:Depends},
180187Provides: unity-launcher-impl,
debian/unity8-common.install+2
@@ -3,3 +3,5 @@ usr/share/unity8/Components
33usr/share/unity8/Dash
44usr/share/unity8/Notifications
55usr/share/unity8/graphics
6+com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/
7+var/lib/polkit-1/localauthority/10-vendor.d
debian/unity8-private.install+2−1
@@ -1,14 +1,15 @@
11usr/lib/*/libunity8-private.*
22usr/lib/*/unity8/qml/AccountsService
33usr/lib/*/unity8/qml/Dash
4−usr/lib/*/unity8/qml/HudClient
54usr/lib/*/unity8/qml/LightDM
65usr/lib/*/unity8/qml/Lights
76usr/lib/*/unity8/qml/Powerd
87usr/lib/*/unity8/qml/SessionBroadcast
8+usr/lib/*/unity8/qml/ScreenGrabber
99usr/lib/*/unity8/qml/Ubuntu
1010usr/lib/*/unity8/qml/Unity
1111usr/lib/*/unity8/qml/Utils
12+usr/lib/*/unity8/qml/Wizard
1213usr/lib/*/unity8/libUbuntuGestures*
1314usr/share/accountsservice/interfaces
1415usr/share/dbus-1/interfaces
debian/unity8.install+1−1
@@ -6,10 +6,10 @@ usr/bin/unity8-dash
66usr/share/applications/unity8.desktop
77usr/share/applications/unity8-dash.desktop
88usr/share/unity8/Greeter
9−usr/share/unity8/Hud
109usr/share/unity8/Launcher
1110usr/share/unity8/Panel
1211usr/share/unity8/Shell.qml
1312usr/share/unity8/Stages
1413usr/share/unity8/Tutorial
14+usr/share/unity8/Wizard
1515usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
include/paths.h.in+2
@@ -71,9 +71,11 @@ inline QStringList fallbackImportPaths() {
7171 QStringList paths;
7272 if (isRunningInstalled()) {
7373 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
74+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
7475 paths << QString("@SHELL_PLUGINDIR@");
7576 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
7677 } else {
78+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
7779 paths << QString("@SHELL_PLUGINDIR@");
7880 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
7981 }
libs/UbuntuGestures/DebugHelpers.cpp+1−1
@@ -83,7 +83,7 @@ QString mouseEventToString(const QMouseEvent *ev)
8383 message.append("MouseButtonDblClick ");
8484 break;
8585 case QEvent::MouseMove:
86− message.append("MouseButtonMove ");
86+ message.append("MouseMove ");
8787 break;
8888 default:
8989 message.append("INVALID_MOUSE_EVENT_TYPE ");
libs/UbuntuGestures/Pool.h−2
@@ -74,8 +74,6 @@ public:
7474 ItemType *item;
7575 };
7676
77− Iterator &end() const { return Iterator(); }
78−
7977 ItemType &getEmptySlot() {
8078 Q_ASSERT(m_lastUsedIndex < m_slots.size());
8179
plugins/AccountsService/AccountsService.cpp+61−2
@@ -19,23 +19,28 @@
1919#include "AccountsService.h"
2020#include "AccountsServiceDBusAdaptor.h"
2121
22+#include <QFile>
2223#include <QStringList>
2324
2425AccountsService::AccountsService(QObject* parent)
2526 : QObject(parent),
2627 m_service(new AccountsServiceDBusAdaptor(this)),
27− m_user(qgetenv("USER")),
28+ m_user(""),
2829 m_demoEdges(false),
2930 m_enableLauncherWhileLocked(false),
3031 m_enableIndicatorsWhileLocked(false),
3132 m_statsWelcomeScreen(false),
3233 m_passwordDisplayHint(Keyboard),
33− m_failedLogins(0)
34+ m_failedLogins(0),
35+ m_hereEnabled(false),
36+ m_hereLicensePath() // null means not set yet
3437{
3538 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
3639 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
3740 connect(m_service, SIGNAL(maybeChanged(const QString &)),
3841 this, SLOT(maybeChanged(const QString &)));
42+
43+ setUser(qgetenv("USER"));
3944}
4045
4146QString AccountsService::user() const
@@ -45,6 +50,9 @@ QString AccountsService::user() const
4550
4651void AccountsService::setUser(const QString &user)
4752{
53+ if (user.isEmpty() || m_user == user)
54+ return;
55+
4856 m_user = user;
4957 Q_EMIT userChanged();
5058
@@ -55,6 +63,8 @@ void AccountsService::setUser(const QString &user)
5563 updateStatsWelcomeScreen();
5664 updatePasswordDisplayHint();
5765 updateFailedLogins();
66+ updateHereEnabled();
67+ updateHereLicensePath();
5868}
5969
6070bool AccountsService::demoEdges() const
@@ -93,6 +103,26 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
93103 return m_passwordDisplayHint;
94104}
95105
106+bool AccountsService::hereEnabled() const
107+{
108+ return m_hereEnabled;
109+}
110+
111+void AccountsService::setHereEnabled(bool enabled)
112+{
113+ m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
114+}
115+
116+QString AccountsService::hereLicensePath() const
117+{
118+ return m_hereLicensePath;
119+}
120+
121+bool AccountsService::hereLicensePathValid() const
122+{
123+ return !m_hereLicensePath.isNull();
124+}
125+
96126void AccountsService::updateDemoEdges()
97127{
98128 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
@@ -156,6 +186,28 @@ void AccountsService::updateFailedLogins()
156186 }
157187}
158188
189+void AccountsService::updateHereEnabled()
190+{
191+ bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();
192+ if (m_hereEnabled != hereEnabled) {
193+ m_hereEnabled = hereEnabled;
194+ Q_EMIT hereEnabledChanged();
195+ }
196+}
197+
198+void AccountsService::updateHereLicensePath()
199+{
200+ QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();
201+
202+ if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
203+ hereLicensePath = "";
204+
205+ if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
206+ m_hereLicensePath = hereLicensePath;
207+ Q_EMIT hereLicensePathChanged();
208+ }
209+}
210+
159211uint AccountsService::failedLogins() const
160212{
161213 return m_failedLogins;
@@ -195,6 +247,13 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
195247 if (changed.contains("EnableIndicatorsWhileLocked")) {
196248 updateEnableIndicatorsWhileLocked();
197249 }
250+ } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {
251+ if (changed.contains("LicenseAccepted")) {
252+ updateHereEnabled();
253+ }
254+ if (changed.contains("LicenseBasePath")) {
255+ updateHereLicensePath();
256+ }
198257 }
199258}
200259
plugins/AccountsService/AccountsService.h+20
@@ -55,6 +55,16 @@ class AccountsService: public QObject
5555 READ failedLogins
5656 WRITE setFailedLogins
5757 NOTIFY failedLoginsChanged)
58+ Q_PROPERTY(bool hereEnabled
59+ READ hereEnabled
60+ WRITE setHereEnabled
61+ NOTIFY hereEnabledChanged)
62+ Q_PROPERTY(QString hereLicensePath
63+ READ hereLicensePath
64+ NOTIFY hereLicensePathChanged)
65+ Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
66+ READ hereLicensePathValid
67+ NOTIFY hereLicensePathChanged)
5868
5969public:
6070 enum PasswordDisplayHint {
@@ -75,6 +85,10 @@ public:
7585 PasswordDisplayHint passwordDisplayHint() const;
7686 uint failedLogins() const;
7787 void setFailedLogins(uint failedLogins);
88+ bool hereEnabled() const;
89+ void setHereEnabled(bool enabled);
90+ QString hereLicensePath() const;
91+ bool hereLicensePathValid() const;
7892
7993Q_SIGNALS:
8094 void userChanged();
@@ -85,6 +99,8 @@ Q_SIGNALS:
8599 void statsWelcomeScreenChanged();
86100 void passwordDisplayHintChanged();
87101 void failedLoginsChanged();
102+ void hereEnabledChanged();
103+ void hereLicensePathChanged();
88104
89105private Q_SLOTS:
90106 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -98,6 +114,8 @@ private:
98114 void updateStatsWelcomeScreen();
99115 void updatePasswordDisplayHint();
100116 void updateFailedLogins();
117+ void updateHereEnabled();
118+ void updateHereLicensePath();
101119
102120 AccountsServiceDBusAdaptor *m_service;
103121 QString m_user;
@@ -108,6 +126,8 @@ private:
108126 bool m_statsWelcomeScreen;
109127 PasswordDisplayHint m_passwordDisplayHint;
110128 uint m_failedLogins;
129+ bool m_hereEnabled;
130+ QString m_hereLicensePath;
111131};
112132
113133#endif
plugins/CMakeLists.txt+2−1
@@ -12,12 +12,13 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)
1212endmacro()
1313
1414add_subdirectory(AccountsService)
15−add_subdirectory(HudClient)
1615add_subdirectory(LightDM)
1716add_subdirectory(Lights)
1817add_subdirectory(Dash)
1918add_subdirectory(Powerd)
2019add_subdirectory(SessionBroadcast)
20+add_subdirectory(ScreenGrabber)
2121add_subdirectory(Ubuntu)
2222add_subdirectory(Unity)
2323add_subdirectory(Utils)
24+add_subdirectory(Wizard)
plugins/Dash/CMakeLists.txt+3−2
@@ -11,7 +11,6 @@ include_directories(
1111 ${CMAKE_CURRENT_SOURCE_DIR}
1212 ${CMAKE_CURRENT_BINARY_DIR}
1313 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
14− ${Qt5Quick_INCLUDE_DIRS}
1514 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
1615 ${Qt5V8_PRIVATE_INCLUDE_DIR}
1716)
@@ -25,6 +24,8 @@ set(QMLPLUGIN_SRC
2524 verticaljournal.cpp
2625 horizontaljournal.cpp
2726 organicgrid.cpp
27+ croppedimagesizer.cpp
28+ croppedimagesizerasyncworker.cpp
2829 )
2930
3031add_library(Dash-qml MODULE
@@ -36,6 +37,6 @@ target_link_libraries(Dash-qml
3637 ${Qt5Quick_LIBRARIES}
3738 )
3839
39−qt5_use_modules(Dash-qml Qml Quick)
40+qt5_use_modules(Dash-qml Qml Quick Concurrent)
4041
4142add_unity8_plugin(Dash 0.1 Dash TARGETS Dash-qml)
plugins/Dash/CardAttributes.qml+1−3
@@ -17,7 +17,6 @@
1717import QtQuick 2.2
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.1
20−import Ubuntu.Settings.Components 0.1
2120
2221GridLayout {
2322 id: grid
@@ -47,10 +46,9 @@ GridLayout {
4746 Layout.maximumWidth: Math.max(icon.width, label.x + label.implicitWidth)
4847 Layout.fillWidth: true
4948 height: units.gu(2)
50− StatusIcon {
49+ Icon {
5150 id: icon
5251 height: units.gu(2)
53− sets: ["actions", "status", "apps"]
5452 source: "icon" in modelData && modelData["icon"] || ""
5553 color: grid.color
5654 }
plugins/Dash/CardCreator.js+9−11
@@ -82,16 +82,16 @@ var kArtShapeHolderCode = 'Item { \n\
8282 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
8383 } \n\
8484 } \n\
85− image: CroppedImageMinimumSourceSize { \n\
85+ CroppedImageMinimumSourceSize { \n\
86+ id: artImage; \n\
8687 objectName: "artImage"; \n\
87− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
88− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
89− cache: true; \n\
88+ source: cardData && cardData["art"] || ""; \n\
9089 asynchronous: root.asynchronous; \n\
9190 visible: false; \n\
9291 width: %2; \n\
9392 height: %3; \n\
9493 } \n\
94+ image: artImage.image; \n\
9595 } \n\
9696 } \n\
9797 }\n';
@@ -181,11 +181,11 @@ var kMascotShapeLoaderCode = 'Loader { \n\
181181 id: mascotShapeLoader; \n\
182182 objectName: "mascotShapeLoader"; \n\
183183 asynchronous: root.asynchronous; \n\
184− active: mascotImage.status === Image.Ready; \n\
184+ active: mascotImage.image.status === Image.Ready; \n\
185185 visible: showHeader && active && status == Loader.Ready; \n\
186186 width: units.gu(6); \n\
187187 height: units.gu(5.625); \n\
188− sourceComponent: UbuntuShape { image: mascotImage } \n\
188+ sourceComponent: UbuntuShape { image: mascotImage.image } \n\
189189 anchors { %1 } \n\
190190 }\n';
191191
@@ -195,8 +195,7 @@ var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
195195 id: mascotImage; \n\
196196 objectName: "mascotImage"; \n\
197197 anchors { %1 } \n\
198− property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
199− source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
198+ source: cardData && cardData["mascot"] || ""; \n\
200199 width: units.gu(6); \n\
201200 height: units.gu(5.625); \n\
202201 horizontalAlignment: Image.AlignHCenter; \n\
@@ -225,7 +224,7 @@ var kTitleLabelCode = 'Label { \n\
225224
226225// %1 is used as extra anchors of emblemIcon
227226// %2 is used as color of emblemIcon
228−var kEmblemIconCode = 'StatusIcon { \n\
227+var kEmblemIconCode = 'Icon { \n\
229228 id: emblemIcon; \n\
230229 objectName: "emblemIcon"; \n\
231230 anchors { \n\
@@ -435,7 +434,7 @@ function cardString(template, components) {
435434 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
436435 }
437436
438− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';
437+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
439438 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
440439 }
441440
@@ -655,7 +654,6 @@ function createCardComponent(parent, template, components) {
655654 var imports = 'import QtQuick 2.2; \n\
656655 import Ubuntu.Components 1.1; \n\
657656 import Ubuntu.Settings.Components 0.1; \n\
658− import Ubuntu.Connectivity 1.0; \n\
659657 import Dash 0.1;\n\
660658 import Utils 0.1;\n';
661659 var card = cardString(template, components);
plugins/Dash/CroppedImageMinimumSourceSize.qml+24−18
@@ -15,24 +15,30 @@
1515 */
1616
1717import QtQuick 2.3
18+import Dash 0.1
1819
19−Image {
20− property bool resized: false
21− property bool resizing: false
22− fillMode: Image.PreserveAspectCrop
23− visible: resized
24− onSourceSizeChanged: {
25− if (!resized && !resizing) {
26− resizing = true;
27− var ar = width / height;
28− var ssar = sourceSize.width / sourceSize.height;
29− if (ar > ssar) {
30− sourceSize = Qt.size(width, 0);
31− } else {
32− sourceSize = Qt.size(0, height);
33− }
34− resizing = false;
35− resized = true;
36− }
20+Item {
21+ id: root
22+
23+ property string source
24+ property alias image: innerImage
25+ property alias asynchronous: innerImage.asynchronous
26+ property alias verticalAlignment: innerImage.verticalAlignment
27+ property alias horizontalAlignment: innerImage.horizontalAlignment
28+ property alias fillMode: innerImage.fillMode
29+
30+ CroppedImageSizer {
31+ id: sizer
32+ source: root.source
33+ width: root.width
34+ height: root.height
35+ }
36+
37+ Image {
38+ id: innerImage
39+ anchors.fill: parent
40+ fillMode: Image.PreserveAspectCrop
41+ sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
42+ source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source
3743 }
3844}
plugins/Dash/ScopeStyle.qml+1−1
@@ -70,7 +70,7 @@ QtObject {
7070 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
7171
7272 /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground
73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
7474
7575 //! @cond
7676 property var d: QtObject {
plugins/Dash/abstractdashview.cpp+24−5
@@ -16,13 +16,12 @@
1616
1717#include "abstractdashview.h"
1818
19−static const qreal bufferRatio = 0.5;
20−
2119AbstractDashView::AbstractDashView()
2220 : m_delegateModel(nullptr)
2321 , m_asyncRequestedIndex(-1)
2422 , m_columnSpacing(0)
2523 , m_rowSpacing(0)
24+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
2625 , m_displayMarginBeginning(0)
2726 , m_displayMarginEnd(0)
2827 , m_needsRelayout(false)
@@ -112,6 +111,27 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)
112111 }
113112}
114113
114+int AbstractDashView::cacheBuffer() const
115+{
116+ return m_buffer;
117+}
118+
119+void AbstractDashView::setCacheBuffer(int buffer)
120+{
121+ if (buffer < 0) {
122+ qmlInfo(this) << "Cannot set a negative cache buffer";
123+ return;
124+ }
125+
126+ if (m_buffer != buffer) {
127+ m_buffer = buffer;
128+ if (isComponentComplete()) {
129+ polish();
130+ }
131+ emit cacheBufferChanged();
132+ }
133+}
134+
115135qreal AbstractDashView::displayMarginBeginning() const
116136{
117137 return m_displayMarginBeginning;
@@ -160,9 +180,8 @@ void AbstractDashView::refill()
160180
161181 const qreal from = -m_displayMarginBeginning;
162182 const qreal to = height() + m_displayMarginEnd;
163− const qreal buffer = (to - from) * bufferRatio;
164− const qreal bufferFrom = from - buffer;
165− const qreal bufferTo = to + buffer;
183+ const qreal bufferFrom = from - m_buffer;
184+ const qreal bufferTo = to + m_buffer;
166185
167186 bool added = addVisibleItems(from, to, false);
168187 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
plugins/Dash/abstractdashview.h+10
@@ -35,6 +35,7 @@ class AbstractDashView : public QQuickItem
3535 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
3636 Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
3737 Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
38+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
3839 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
3940 WRITE setDisplayMarginBeginning
4041 NOTIFY displayMarginBeginningChanged)
@@ -61,6 +62,9 @@ public:
6162 qreal rowSpacing() const;
6263 void setRowSpacing(qreal rowSpacing);
6364
65+ int cacheBuffer() const;
66+ void setCacheBuffer(int);
67+
6468 qreal displayMarginBeginning() const;
6569 void setDisplayMarginBeginning(qreal);
6670
@@ -72,6 +76,7 @@ Q_SIGNALS:
7276 void delegateChanged();
7377 void columnSpacingChanged();
7478 void rowSpacingChanged();
79+ void cacheBufferChanged();
7580 void displayMarginBeginningChanged();
7681 void displayMarginEndChanged();
7782
@@ -104,7 +109,11 @@ private:
104109 virtual void doRelayout() = 0;
105110 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
106111 virtual void calculateImplicitHeight() = 0;
112+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
107113 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
114+#else
115+ virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
116+#endif
108117
109118 QQmlDelegateModel *m_delegateModel;
110119
@@ -113,6 +122,7 @@ private:
113122
114123 int m_columnSpacing;
115124 int m_rowSpacing;
125+ int m_buffer;
116126 qreal m_displayMarginBeginning;
117127 qreal m_displayMarginEnd;
118128 bool m_needsRelayout;
plugins/Dash/croppedimagesizer.cppnew file+136
@@ -0,0 +1,136 @@
1+/*
2+ * Copyright (C) 2014 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 "croppedimagesizer.h"
18+
19+#include "croppedimagesizerasyncworker.h"
20+
21+#include <QNetworkAccessManager>
22+#include <QNetworkRequest>
23+#include <QQmlEngine>
24+#include <QQuickItem>
25+
26+CroppedImageSizer::CroppedImageSizer()
27+ : m_width(0),
28+ m_height(0),
29+ m_sourceSize(QSize(-1, -1)),
30+ m_worker(nullptr)
31+{
32+ connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
33+ connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
34+}
35+
36+CroppedImageSizer::~CroppedImageSizer()
37+{
38+ if (m_worker) {
39+ m_worker->abort();
40+ }
41+}
42+
43+QUrl CroppedImageSizer::source() const
44+{
45+ return m_source;
46+}
47+
48+void CroppedImageSizer::setSource(const QUrl &source)
49+{
50+ if (source != m_source) {
51+ m_source = source;
52+ Q_EMIT sourceChanged();
53+ }
54+}
55+
56+qreal CroppedImageSizer::width() const
57+{
58+ return m_width;
59+}
60+
61+void CroppedImageSizer::setWidth(qreal width)
62+{
63+ if (width != m_width) {
64+ m_width = width;
65+ Q_EMIT inputParamsChanged();
66+ }
67+}
68+
69+qreal CroppedImageSizer::height() const
70+{
71+ return m_height;
72+}
73+
74+void CroppedImageSizer::setHeight(qreal height)
75+{
76+ if (height != m_height) {
77+ m_height = height;
78+ Q_EMIT inputParamsChanged();
79+ }
80+}
81+
82+QSize CroppedImageSizer::sourceSize() const
83+{
84+ return m_sourceSize;
85+}
86+
87+void CroppedImageSizer::setSourceSize(const QSize &sourceSize)
88+{
89+ if (sourceSize != m_sourceSize) {
90+ m_sourceSize = sourceSize;
91+ Q_EMIT sourceSizeChanged();
92+ }
93+}
94+
95+void CroppedImageSizer::setImageSize(const QSize &imageSize)
96+{
97+ m_imageSize = imageSize;
98+ m_worker = nullptr;
99+ calculateSourceSize();
100+}
101+
102+void CroppedImageSizer::requestImage()
103+{
104+ if (m_worker) {
105+ m_worker->abort();
106+ m_worker = nullptr;
107+ }
108+
109+ if (m_source.isValid() && qmlEngine(this) && qmlEngine(this)->networkAccessManager()) {
110+ QNetworkRequest request(m_source);
111+ QNetworkReply *reply = qmlEngine(this)->networkAccessManager()->get(request);
112+ m_worker = new CroppedImageSizerAsyncWorker(this, reply);
113+ } else {
114+ setSourceSize(QSize(-1, -1));
115+ }
116+}
117+
118+void CroppedImageSizer::calculateSourceSize()
119+{
120+ if (m_source.isValid() && m_width > 0 && m_height > 0 && !m_worker) {
121+ if (!m_imageSize.isEmpty()) {
122+ const qreal ar = m_width / m_height;
123+ const qreal ssar = m_imageSize.width() / (qreal)m_imageSize.height();
124+ if (ar > ssar) {
125+ setSourceSize(QSize(m_width, 0));
126+ } else {
127+ setSourceSize(QSize(0, m_height));
128+ }
129+ } else {
130+ qWarning() << "Invalid size for " << m_source << m_imageSize;
131+ setSourceSize(QSize(0, 0));
132+ }
133+ } else {
134+ setSourceSize(QSize(-1, -1));
135+ }
136+}
plugins/Dash/croppedimagesizer.hnew file+72
@@ -0,0 +1,72 @@
1+/*
2+ * Copyright (C) 2014 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 CROPPEDIMAGESIZER_H
18+#define CROPPEDIMAGESIZER_H
19+
20+#include <QImageReader>
21+#include <QObject>
22+#include <QSize>
23+#include <QUrl>
24+
25+class CroppedImageSizerAsyncWorker;
26+
27+class CroppedImageSizer : public QObject
28+{
29+ Q_OBJECT
30+
31+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
32+ Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY inputParamsChanged)
33+ Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY inputParamsChanged)
34+ Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
35+
36+public:
37+ CroppedImageSizer();
38+ ~CroppedImageSizer();
39+
40+ QUrl source() const;
41+ void setSource(const QUrl &source);
42+
43+ qreal width() const;
44+ void setWidth(qreal width);
45+
46+ qreal height() const;
47+ void setHeight(qreal height);
48+
49+ QSize sourceSize() const;
50+ void setSourceSize(const QSize &sourceSize);
51+
52+ Q_INVOKABLE void setImageSize(const QSize &imageSize);
53+
54+Q_SIGNALS:
55+ void inputParamsChanged();
56+ void sourceChanged();
57+ void sourceSizeChanged();
58+
59+private Q_SLOT:
60+ void calculateSourceSize();
61+ void requestImage();
62+
63+private:
64+ QUrl m_source;
65+ qreal m_width;
66+ qreal m_height;
67+ QSize m_sourceSize;
68+ QSize m_imageSize;
69+ QPointer<CroppedImageSizerAsyncWorker> m_worker;
70+};
71+
72+#endif
plugins/Dash/croppedimagesizerasyncworker.cppnew file+74
@@ -0,0 +1,74 @@
1+/*
2+ * Copyright (C) 2014 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 "croppedimagesizerasyncworker.h"
18+
19+#include "croppedimagesizer.h"
20+
21+#include <QNetworkReply>
22+#include <QtConcurrentRun>
23+
24+CroppedImageSizerAsyncWorker::CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply)
25+ : m_sizer(sizer),
26+ m_reply(reply),
27+ m_ignoreAbort(false)
28+{
29+ connect(m_reply, &QNetworkReply::finished, this, &CroppedImageSizerAsyncWorker::requestFinished);
30+}
31+
32+void CroppedImageSizerAsyncWorker::abort()
33+{
34+ // This runs on main thread
35+ QMutexLocker locker(&m_mutex);
36+ m_sizer = nullptr;
37+ // If we already started the future run we can't abort the reply
38+ // since we don't know at which stage the future is, just let it finish
39+ if (!m_ignoreAbort) {
40+ QMetaObject::invokeMethod(m_reply, "abort", Qt::QueuedConnection);
41+ }
42+}
43+
44+void CroppedImageSizerAsyncWorker::requestFinished()
45+{
46+ // This runs on main thread
47+ QMutexLocker locker(&m_mutex);
48+ if (m_sizer) {
49+ m_ignoreAbort = true;
50+ QtConcurrent::run(processRequestFinished, this);
51+ } else {
52+ // We were aborted delete ourselves
53+ m_reply->deleteLater();
54+ deleteLater();
55+ }
56+}
57+
58+void CroppedImageSizerAsyncWorker::processRequestFinished(CroppedImageSizerAsyncWorker *worker)
59+{
60+ // This runs on non main thread
61+ // m_reply has finished at this point and is protected against change by m_ignoreAbort
62+ QImageReader reader(worker->m_reply);
63+ const QSize imageSize = reader.size();
64+
65+ worker->m_mutex.lock();
66+ if (worker->m_sizer) {
67+ QMetaObject::invokeMethod(worker->m_sizer, "setImageSize", Qt::QueuedConnection, Q_ARG(QSize, imageSize));
68+ }
69+ worker->m_mutex.unlock();
70+
71+ // All work is done, delete ourselves
72+ worker->m_reply->deleteLater();
73+ worker->deleteLater();
74+}
plugins/HudClient/hudtoolbarmodel.h → plugins/Dash/croppedimagesizerasyncworker.hrenamed+18−15
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -14,31 +14,34 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef HUDTOOLBARMODEL_H
18−#define HUDTOOLBARMODEL_H
17+#ifndef CROPPEDIMAGESIZERASYNCWORKER_H
18+#define CROPPEDIMAGESIZERASYNCWORKER_H
1919
20−#include <QAbstractListModel>
20+#include <QMutex>
21+#include <QObject>
2122
22−#include <hud-client.h>
23+class CroppedImageSizer;
2324
24−class HudToolBarModel : public QAbstractListModel
25+class QNetworkReply;
26+
27+class CroppedImageSizerAsyncWorker : public QObject
2528{
2629 Q_OBJECT
27−
2830public:
29− HudToolBarModel(HudClientQuery *query);
30− ~HudToolBarModel();
31+ CroppedImageSizerAsyncWorker(CroppedImageSizer *sizer, QNetworkReply *reply);
3132
32− int rowCount(const QModelIndex &parent = QModelIndex()) const;
33− QVariant data(const QModelIndex &parent, int role) const;
34− QHash<int,QByteArray> roleNames() const;
33+ void abort();
3534
36− void updatedByBackend();
35+private Q_SLOTS:
36+ void requestFinished();
3737
3838private:
39− QList<HudClientQueryToolbarItems> m_actions;
39+ static void processRequestFinished(CroppedImageSizerAsyncWorker *worker);
4040
41− HudClientQuery *m_query;
41+ QMutex m_mutex;
42+ CroppedImageSizer *m_sizer;
43+ QNetworkReply *m_reply;
44+ bool m_ignoreAbort;
4245};
4346
4447#endif
plugins/Dash/horizontaljournal.cpp+5−1
@@ -184,9 +184,13 @@ void HorizontalJournal::calculateImplicitHeight()
184184 }
185185}
186186
187+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
187188void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
189+#else
190+void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
191+#endif
188192{
189− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
193+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
190194 for (int i = remove.count - 1; i >= 0; --i) {
191195 const int indexToRemove = remove.index + i;
192196 // We only support removing from the end so
plugins/Dash/horizontaljournal.h+4
@@ -52,7 +52,11 @@ private:
5252 void calculateImplicitHeight() override;
5353 void doRelayout() override;
5454 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
55+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
5556 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
57+#else
58+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
59+#endif
5660
5761 int m_firstVisibleIndex;
5862 QList<QQuickItem*> m_visibleItems;
plugins/Dash/listviewwithpageheader.cpp+9−4
@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
334334 return m_headerItemShownHeight;
335335}
336336
337−qreal ListViewWithPageHeader::cacheBuffer() const
337+int ListViewWithPageHeader::cacheBuffer() const
338338{
339339 return m_cacheBuffer;
340340}
341341
342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
343343{
344+ if (cacheBuffer < 0) {
345+ qmlInfo(this) << "Cannot set a negative cache buffer";
346+ return;
347+ }
348+
344349 if (cacheBuffer != m_cacheBuffer) {
345350 m_cacheBuffer = cacheBuffer;
346351 Q_EMIT cacheBufferChanged();
@@ -936,7 +941,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
936941// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
937942 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
938943
939− Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {
944+ Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {
940945// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
941946 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
942947 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
@@ -990,7 +995,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
990995 }
991996 }
992997
993− Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {
998+ Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {
994999// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
9951000 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
9961001 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
plugins/Dash/listviewwithpageheader.h+4−4
@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
5656 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
57+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
5858
5959 friend class ListViewWithPageHeaderTest;
6060 friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@ public:
8585 int stickyHeaderHeight() const;
8686 qreal headerItemShownHeight() const;
8787
88− qreal cacheBuffer() const;
89− void setCacheBuffer(qreal cacheBuffer);
88+ int cacheBuffer() const;
89+ void setCacheBuffer(int cacheBuffer);
9090
9191 Q_INVOKABLE void positionAtBeginning();
9292 Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@ private:
204204 bool m_forceNoClip;
205205 bool m_inLayout;
206206 bool m_inContentHeightKeepHeaderShown;
207− qreal m_cacheBuffer;
207+ int m_cacheBuffer;
208208
209209 // Qt 5.0 doesn't like releasing the items just after itemCreated
210210 // so we delay the releasing until the next updatePolish
plugins/Dash/organicgrid.cpp+5−1
@@ -237,9 +237,13 @@ void OrganicGrid::calculateImplicitHeight()
237237 }
238238}
239239
240+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
240241void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
242+#else
243+void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
244+#endif
241245{
242− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
246+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
243247 for (int i = remove.count - 1; i >= 0; --i) {
244248 const int indexToRemove = remove.index + i;
245249 // We only support removing from the end
plugins/Dash/organicgrid.h+4
@@ -79,7 +79,11 @@ private:
7979 void doRelayout() override;
8080 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
8181 void calculateImplicitHeight() override;
82+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
8283 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
84+#else
85+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
86+#endif
8387
8488 QSizeF m_smallDelegateSize;
8589 QSizeF m_bigDelegateSize;
plugins/Dash/plugin.cpp+2
@@ -17,6 +17,7 @@
1717
1818#include "plugin.h"
1919
20+#include "croppedimagesizer.h"
2021#include "horizontaljournal.h"
2122#include "listviewwithpageheader.h"
2223#include "organicgrid.h"
@@ -32,4 +33,5 @@ void DashPlugin::registerTypes(const char *uri)
3233 qmlRegisterType<ListViewWithPageHeader>(uri, 0, 1, "ListViewWithPageHeader");
3334 qmlRegisterType<OrganicGrid>(uri, 0, 1, "OrganicGrid");
3435 qmlRegisterType<VerticalJournal>(uri, 0, 1, "VerticalJournal");
36+ qmlRegisterType<CroppedImageSizer>(uri, 0, 1, "CroppedImageSizer");
3537}
plugins/Dash/verticaljournal.cpp+5−1
@@ -239,9 +239,13 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
239239 }
240240}
241241
242+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
242243void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
244+#else
245+void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
246+#endif
243247{
244− Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {
248+ Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
245249 for (int i = remove.count - 1; i >= 0; --i) {
246250 const int indexToRemove = remove.index + i;
247251 // Since we only support removing from the end, indexToRemove
plugins/Dash/verticaljournal.h+4
@@ -90,7 +90,11 @@ private:
9090 void calculateImplicitHeight() override;
9191 void doRelayout() override;
9292 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93+#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
9394 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
95+#else
96+ void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
97+#endif
9498
9599 QVector<QList<ViewItem>> m_columnVisibleItems;
96100 QHash<int, int> m_indexColumnMap;
plugins/HudClient/CMakeLists.txtdeleted−38
@@ -1,38 +0,0 @@
1−find_package(Qt5Core REQUIRED)
2−find_package(Qt5Quick REQUIRED)
3−pkg_search_module(DEE dee-1.0 REQUIRED)
4−pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
5−pkg_search_module(HUDCLIENT hud-client-2 REQUIRED)
6−pkg_search_module(DEEQT libdee-qt5 REQUIRED)
7−pkg_search_module(PULSE libpulse REQUIRED)
8−
9−include_directories(
10− ${CMAKE_CURRENT_BINARY_DIR}
11− ${Qt5Core_INCLUDE_DIRS}
12− ${Qt5Quick_INCLUDE_DIRS}
13− ${DEE_INCLUDE_DIRS}
14− ${DEEQT_INCLUDE_DIRS}
15− ${HUDCLIENT_INCLUDE_DIRS}
16− ${PULSE_INCLUDE_DIRS}
17−)
18−
19−set(HudQML_SOURCES
20− hudclient.cpp
21− hudtoolbarmodel.cpp
22− volumepeakdetector.cpp
23− plugin.cpp
24−)
25−
26−add_library(HudClientQml MODULE ${HudQML_SOURCES})
27−target_link_libraries(HudClientQml
28− ${Qt5Core_LIBRARIES}
29− ${Qt5Quick_LIBRARIES}
30− ${DEEQT_LDFLAGS}
31− ${HUDCLIENT_LDFLAGS}
32− ${GOBJECT_LDFLAGS}
33− ${PULSE_LDFLAGS}
34−)
35−
36−qt5_use_modules(HudClientQml Qml)
37−
38−add_unity8_plugin(HudClient 0.1 HudClient TARGETS HudClientQml)
plugins/HudClient/HudClient.qmltypesdeleted−91
@@ -1,91 +0,0 @@
1−import QtQuick.tooling 1.1
2−
3−// This file describes the plugin-supplied types contained in the library.
4−// It is used for QML tooling purposes only.
5−//
6−// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable HudClient 0.1 plugins'
8−
9−Module {
10− Component {
11− name: "DeeListModel"
12− prototype: "QAbstractListModel"
13− Property { name: "name"; type: "string" }
14− Property { name: "synchronized"; type: "bool"; isReadonly: true }
15− Property { name: "count"; type: "int"; isReadonly: true }
16− Signal {
17− name: "nameChanged"
18− Parameter { type: "string" }
19− }
20− Signal {
21− name: "synchronizedChanged"
22− Parameter { type: "bool" }
23− }
24− Signal {
25− name: "roleNamesChanged"
26− Parameter { type: "QHash<int,QByteArray>" }
27− }
28− Method {
29− name: "get"
30− type: "QVariantMap"
31− Parameter { name: "row"; type: "int" }
32− }
33− Method { name: "count"; type: "int" }
34− }
35− Component {
36− name: "HudClient"
37− prototype: "QObject"
38− exports: ["HudClient/HudClient 0.1"]
39− exportMetaObjectRevisions: [0]
40− Property { name: "results"; type: "DeeListModel"; isReadonly: true; isPointer: true }
41− Property { name: "toolBarModel"; type: "QAbstractItemModel"; isReadonly: true; isPointer: true }
42− Signal { name: "voiceQueryLoading" }
43− Signal { name: "voiceQueryListening" }
44− Signal { name: "voiceQueryHeardSomething" }
45− Signal { name: "voiceQueryFailed" }
46− Signal {
47− name: "voiceQueryFinished"
48− Parameter { name: "query"; type: "string" }
49− }
50− Signal { name: "commandExecuted" }
51− Signal {
52− name: "showParametrizedAction"
53− Parameter { name: "action"; type: "string" }
54− Parameter { name: "items"; type: "QVariant" }
55− }
56− Method {
57− name: "executeCommand"
58− Parameter { name: "index"; type: "int" }
59− }
60− Method {
61− name: "setQuery"
62− Parameter { name: "new_query"; type: "string" }
63− }
64− Method { name: "startVoiceQuery" }
65− Method {
66− name: "executeParametrizedAction"
67− Parameter { name: "values"; type: "QVariant" }
68− }
69− Method {
70− name: "updateParametrizedAction"
71− Parameter { name: "values"; type: "QVariant" }
72− }
73− Method { name: "cancelParametrizedAction" }
74− Method {
75− name: "executeToolBarAction"
76− Parameter { name: "action"; type: "HudClientQueryToolbarItems" }
77− }
78− }
79− Component {
80− name: "VolumePeakDetector"
81− prototype: "QObject"
82− exports: ["HudClient/VolumePeakDetector 0.1"]
83− exportMetaObjectRevisions: [0]
84− Property { name: "enabled"; type: "bool" }
85− Property { name: "desiredInterval"; type: "int" }
86− Signal {
87− name: "newPeak"
88− Parameter { name: "volume"; type: "float" }
89− }
90− }
91−}
plugins/HudClient/hudclient.cppdeleted−294
@@ -1,294 +0,0 @@
1−/*
2− * Copyright (C) 2012, 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 "hudclient.h"
18−
19−#include "hudtoolbarmodel.h"
20−
21−#include <deelistmodel.h>
22−
23−#include <QDebug>
24−
25−namespace
26−{
27−
28−extern "C"
29−{
30−
31−void loadingCB(GObject* /*src*/, gpointer dst)
32−{
33− static_cast<HudClient*>(dst)->voiceQueryLoading();
34−}
35−
36−void listeningCB(GObject* /*src*/, gpointer dst)
37−{
38− static_cast<HudClient*>(dst)->voiceQueryListening();
39−}
40−
41−void heardSomethingCB(GObject* /*src*/, gpointer dst)
42−{
43− static_cast<HudClient*>(dst)->voiceQueryHeardSomething();
44−}
45−
46−void failedCB(GObject* /*src*/, const gchar * /*reason*/, gpointer dst)
47−{
48− static_cast<HudClient*>(dst)->voiceQueryFailed();
49−}
50−
51−void finishedCB(GObject* /*src*/, const gchar* query, gpointer dst)
52−{
53− static_cast<HudClient*>(dst)->voiceQueryFinished(QString::fromUtf8(query));
54−}
55−
56−void modelReadyCB(GObject* /*src*/, gpointer dst)
57−{
58− static_cast<HudClient*>(dst)->modelReady(true);
59−}
60−
61−void modelReallyReadyCB(GObject* /*src*/, gint /*position*/, gint /*removed*/, gint /*added*/, gpointer dst)
62−{
63− static_cast<HudClient*>(dst)->modelReallyReady(true);
64−}
65−
66−static void modelsChangedCB(GObject* /*src*/, gpointer dst)
67−{
68− static_cast<HudClient*>(dst)->queryModelsChanged();
69−}
70−
71−static void toolBarUpdatedCB(GObject* /*src*/, gpointer dst)
72−{
73− static_cast<HudToolBarModel*>(dst)->updatedByBackend();
74−}
75−
76−} // extern "C"
77−
78−} // namespace
79−
80−HudClient::HudClient()
81−{
82− m_results = new DeeListModel();
83− m_clientQuery = hud_client_query_new("");
84− m_toolBarModel = new HudToolBarModel(m_clientQuery);
85− m_currentActionParam = nullptr;
86− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));
87−
88− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-loading", G_CALLBACK(loadingCB), this);
89− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-listening", G_CALLBACK(listeningCB), this);
90− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-heard-something", G_CALLBACK(heardSomethingCB), this);
91− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-finished", G_CALLBACK(finishedCB), this);
92− g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-failed", G_CALLBACK(failedCB), this);
93− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_MODELS_CHANGED, G_CALLBACK(modelsChangedCB), this);
94− g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_TOOLBAR_UPDATED, G_CALLBACK(toolBarUpdatedCB), m_toolBarModel);
95−}
96−
97−// Terrible hack to get around GLib. GLib stores function pointers as gpointer, which violates the C and C++ spec
98−// because data and function pointers may have different sizes. gcc rightfully emits a warning. There is no #pragma
99−// in gcc to selectively turn off the warning, however. This hack gets around the problem, by using a union (ick) to
100−// convert between the two types.
101−
102−class ToGPointer
103−{
104−public:
105− ToGPointer(void (*cb)())
106− {
107− u_.cb = cb;
108− }
109−
110− operator gpointer()
111− {
112− return u_.p;
113− }
114−
115−private:
116− union
117− {
118− void (*cb)();
119− gpointer p;
120− } u_;
121−};
122−
123−#define TO_GPOINTER(cb) (ToGPointer(reinterpret_cast<void(*)()>((cb))))
124−
125−HudClient::~HudClient()
126−{
127− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(loadingCB), this);
128− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(listeningCB), this);
129− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(heardSomethingCB), this);
130− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(finishedCB), this);
131− g_signal_handlers_disconnect_by_func(G_OBJECT(m_clientQuery), TO_GPOINTER(toolBarUpdatedCB), m_toolBarModel);
132−
133− delete m_results;
134− delete m_toolBarModel;
135−
136− g_object_unref(m_clientQuery);
137−}
138−
139−void HudClient::setQuery(const QString &new_query)
140−{
141− hud_client_query_set_query(m_clientQuery, new_query.toUtf8().constData());
142−}
143−
144−void HudClient::startVoiceQuery()
145−{
146− hud_client_query_voice_query(m_clientQuery);
147−}
148−
149−void HudClient::executeParametrizedAction(const QVariant &values)
150−{
151− updateParametrizedAction(values);
152− hud_client_param_send_commit(m_currentActionParam);
153− g_object_unref(m_currentActionParam);
154− m_currentActionParam = nullptr;
155− Q_EMIT commandExecuted();
156−}
157−
158−void HudClient::updateParametrizedAction(const QVariant &values)
159−{
160− if (m_currentActionParam != nullptr) {
161− const QVariantMap map = values.value<QVariantMap>();
162− GActionGroup *ag = hud_client_param_get_actions(m_currentActionParam);
163−
164− auto it = map.begin();
165− for ( ; it != map.end(); ++it) {
166− const QString action = it.key();
167− const QVariant value = it.value();
168− const GVariantType *actionType = g_action_group_get_action_parameter_type(ag, action.toUtf8().constData());
169− if (g_variant_type_equal(actionType, G_VARIANT_TYPE_DOUBLE) && value.canConvert(QVariant::Double)) {
170− g_action_group_activate_action(ag, action.toUtf8().constData(), g_variant_new_double(value.toDouble()));
171− } else {
172− qWarning() << "Unsuported action type in HudClient::executeParametrizedAction";
173− }
174− }
175− } else {
176− qWarning() << "Got to HudClient::updateParametrizedAction with no m_currentActionParam";
177− }
178−}
179−
180−void HudClient::cancelParametrizedAction()
181−{
182− if (m_currentActionParam != nullptr) {
183− hud_client_param_send_cancel(m_currentActionParam);
184− g_object_unref(m_currentActionParam);
185− m_currentActionParam = nullptr;
186− }
187−}
188−
189−void HudClient::executeToolBarAction(HudClientQueryToolbarItems action)
190−{
191− hud_client_query_execute_toolbar_item(m_clientQuery, action, /* timestamp */ 0);
192− Q_EMIT commandExecuted();
193−}
194−
195−DeeListModel *HudClient::results() const
196−{
197− return m_results;
198−}
199−
200−QAbstractItemModel *HudClient::toolBarModel() const
201−{
202− return m_toolBarModel;
203−}
204−
205−void HudClient::executeCommand(int index)
206−{
207− m_currentActionIndex = index;
208− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);
209− DeeModelIter *iter = dee_model_get_iter_at_row(model, index);
210−
211− GVariant *command_key = dee_model_get_value(model, iter, 0);
212− GVariant *is_parametrized = dee_model_get_value(model, iter, 7);
213− if (g_variant_get_boolean(is_parametrized)) {
214− m_currentActionParam = hud_client_query_execute_param_command(m_clientQuery, command_key, /* timestamp */ 0);
215− if (m_currentActionParam != nullptr) {
216− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
217− if (menuModel == nullptr) {
218− g_signal_connect(m_currentActionParam, HUD_CLIENT_PARAM_SIGNAL_MODEL_READY, G_CALLBACK(modelReadyCB), this);
219− } else {
220− modelReady(false);
221− }
222− } else {
223− qWarning() << "HudClient::executeCommand::Could not get the HudClientParam for parametrized action with index" << index;
224− }
225− } else {
226− hud_client_query_execute_command(m_clientQuery, command_key, /* timestamp */ 0);
227− Q_EMIT commandExecuted();
228− }
229− g_variant_unref(command_key);
230− g_variant_unref(is_parametrized);
231−}
232−
233−void HudClient::modelReady(bool needDisconnect)
234−{
235− if (needDisconnect) {
236− g_signal_handlers_disconnect_by_func(m_currentActionParam, TO_GPOINTER(modelReadyCB), this);
237− }
238− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
239− if (g_menu_model_get_n_items(menuModel) == 0) {
240− g_signal_connect(menuModel, "items-changed", G_CALLBACK(modelReallyReadyCB), this);
241− } else {
242− modelReallyReady(false);
243− }
244−}
245−
246−static void addAttribute(QVariantMap &properties, GMenuModel *menuModel, int item, const char *attribute) {
247− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, item, attribute, nullptr);
248−
249− if (v == nullptr)
250− return;
251−
252− properties.insert(attribute, DeeListModel::VariantForData(v));
253− g_variant_unref(v);
254−}
255−
256−void HudClient::modelReallyReady(bool needDisconnect)
257−{
258− GMenuModel *menuModel = hud_client_param_get_model (m_currentActionParam);
259− if (needDisconnect) {
260− g_signal_handlers_disconnect_by_func(menuModel, TO_GPOINTER(modelReallyReadyCB), this);
261− }
262−
263− QVariantList items;
264− for (int i = 0; i < g_menu_model_get_n_items(menuModel); i++) {
265− GVariant *v = g_menu_model_get_item_attribute_value(menuModel, i, "parameter-type", G_VARIANT_TYPE_STRING);
266−
267− if (v == nullptr)
268− continue;
269−
270− const QString type = QString::fromUtf8(g_variant_get_string(v, nullptr));
271− if (type == "slider") {
272− const char *sliderAttributes[] = { "label", "min", "max", "step", "value", "live", "action" };
273− QVariantMap properties;
274− properties.insert("parameter-type", "slider");
275− for (uint j = 0; j < sizeof(sliderAttributes)/sizeof(sliderAttributes[0]); ++j) {
276− addAttribute(properties, menuModel, i, sliderAttributes[j]);
277− }
278− items << properties;
279− }
280− g_variant_unref(v);
281− }
282−
283− DeeModel *model = hud_client_query_get_results_model(m_clientQuery);
284− DeeModelIter *iter = dee_model_get_iter_at_row(model, m_currentActionIndex);
285− GVariant *actionTextVariant = dee_model_get_value(model, iter, 1);
286− const QString actionText = QString::fromUtf8(g_variant_get_string(actionTextVariant, nullptr));
287− g_variant_unref(actionTextVariant);
288− Q_EMIT showParametrizedAction(actionText, QVariant::fromValue(items));
289−}
290−
291−void HudClient::queryModelsChanged()
292−{
293− m_results->setModel(hud_client_query_get_results_model(m_clientQuery));
294−}
plugins/HudClient/hudclient.hdeleted−71
@@ -1,71 +0,0 @@
1−/*
2− * Copyright (C) 2012, 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 HUDCLIENT_H
18−#define HUDCLIENT_H
19−
20−#include <QObject>
21−
22−#include <hud-client.h>
23−
24−class DeeListModel;
25−class QAbstractItemModel;
26−
27−class HudClient : public QObject
28−{
29− Q_OBJECT
30− Q_PROPERTY(DeeListModel* results READ results)
31− Q_PROPERTY(QAbstractItemModel* toolBarModel READ toolBarModel)
32−
33−public:
34− HudClient();
35− ~HudClient();
36−
37− DeeListModel *results() const;
38−
39− QAbstractItemModel *toolBarModel() const;
40−
41− Q_INVOKABLE void executeCommand(int index);
42− Q_INVOKABLE void setQuery(const QString &new_query);
43− Q_INVOKABLE void startVoiceQuery();
44− Q_INVOKABLE void executeParametrizedAction(const QVariant &values);
45− Q_INVOKABLE void updateParametrizedAction(const QVariant &values);
46− Q_INVOKABLE void cancelParametrizedAction();
47− Q_INVOKABLE void executeToolBarAction(HudClientQueryToolbarItems action);
48−
49− void modelReady(bool needDisconnect);
50− void modelReallyReady(bool needDisconnect);
51− void queryModelsChanged();
52−
53−Q_SIGNALS:
54− void voiceQueryLoading();
55− void voiceQueryListening();
56− void voiceQueryHeardSomething();
57− void voiceQueryFailed();
58− void voiceQueryFinished(const QString &query);
59− void commandExecuted();
60− void showParametrizedAction(const QString &action, const QVariant &items);
61−
62−private:
63− HudClientQuery *m_clientQuery;
64− DeeListModel *m_results;
65− QAbstractItemModel *m_toolBarModel;
66− int m_currentActionIndex;
67− HudClientParam *m_currentActionParam;
68−};
69−Q_DECLARE_METATYPE(HudClientQueryToolbarItems)
70−
71−#endif
plugins/HudClient/hudtoolbarmodel.cppdeleted−98
@@ -1,98 +0,0 @@
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 "hudtoolbarmodel.h"
18−
19−#include "hudclient.h"
20−
21−static const int ActionRole = Qt::UserRole;
22−static const int EnabledRole = Qt::UserRole + 1;
23−
24−static QString iconForAction(int action)
25−{
26− switch (action) {
27− case HUD_CLIENT_QUERY_TOOLBAR_UNDO:
28− return "graphics/undo.png";
29− case HUD_CLIENT_QUERY_TOOLBAR_HELP:
30− return "graphics/help.png";
31− case HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN:
32− return "graphics/view-fullscreen.png";
33− case HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES:
34− return "graphics/settings.png";
35− }
36− return QString();
37−}
38−
39−HudToolBarModel::HudToolBarModel(HudClientQuery *query)
40− : m_query(query)
41−{
42− m_actions << HUD_CLIENT_QUERY_TOOLBAR_UNDO
43− << HUD_CLIENT_QUERY_TOOLBAR_HELP
44− << HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN
45− << HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES;
46−}
47−
48−HudToolBarModel::~HudToolBarModel()
49−{
50−}
51−
52−int HudToolBarModel::rowCount(const QModelIndex &parent) const
53−{
54− if (parent.isValid())
55− return 0;
56−
57− return m_actions.count();
58−}
59−
60−QVariant HudToolBarModel::data(const QModelIndex &index, int role) const
61−{
62− const int row = index.row();
63− if (row >= m_actions.count())
64− return QVariant();
65−
66− const HudClientQueryToolbarItems action = m_actions[row];
67−
68− switch (role) {
69− case Qt::DecorationRole:
70− return iconForAction(action);
71− break;
72−
73− case ActionRole:
74− return action;
75− break;
76−
77− case EnabledRole:
78− return hud_client_query_toolbar_item_active(m_query, action);
79− break;
80− }
81− return QVariant();
82−}
83−
84−QHash<int,QByteArray> HudToolBarModel::roleNames() const
85−{
86− static QHash<int,QByteArray> roles;
87− if (roles.isEmpty()) {
88− roles[Qt::DecorationRole] = "iconPath";
89− roles[ActionRole] = "action";
90− roles[EnabledRole] = "enabled";
91− }
92− return roles;
93−}
94−
95−void HudToolBarModel::updatedByBackend()
96−{
97− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << EnabledRole);
98−}
plugins/HudClient/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module HudClient
2−plugin HudClientQml
3−typeinfo HudClient.qmltypes
plugins/HudClient/volumepeakdetector.cppdeleted−223
@@ -1,223 +0,0 @@
1−/*
2− * Copyright (C) 2012, 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 "volumepeakdetector.h"
18−
19−static void stream_read_callback(pa_stream * /*s*/, size_t /*length*/, void *userdata) {
20− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);
21− peakDetector->processData();
22−}
23−
24−static void context_state_callback(pa_context *c, void *userdata) {
25− PulseAudioVolumePeakDetector *peakDetector = static_cast<PulseAudioVolumePeakDetector *>(userdata);
26−
27− switch (pa_context_get_state(c)) {
28− case PA_CONTEXT_CONNECTING:
29− case PA_CONTEXT_AUTHORIZING:
30− case PA_CONTEXT_SETTING_NAME:
31− break;
32−
33− case PA_CONTEXT_READY:
34− peakDetector->startStream();
35− break;
36−
37− case PA_CONTEXT_TERMINATED:
38− case PA_CONTEXT_FAILED:
39− default:
40− peakDetector->quit();
41− }
42−}
43−
44−PulseAudioVolumePeakDetector::PulseAudioVolumePeakDetector()
45− : m_accumulatedValue(0)
46− , m_nAccumulatedValues(0)
47− , m_accumulatedValuesLimit(1)
48− , m_context(nullptr)
49− , m_mainloop_api(nullptr)
50− , m_stream(nullptr)
51−{
52−}
53−
54−void PulseAudioVolumePeakDetector::start()
55−{
56− pa_mainloop *mainloop = nullptr;
57−
58− /* Set up a new main loop */
59− mainloop = pa_mainloop_new();
60− if (!mainloop)
61− return;
62−
63− m_mainloop_api = pa_mainloop_get_api(mainloop);
64−
65− /* Create a new connection context */
66− m_context = pa_context_new(m_mainloop_api, nullptr);
67− if (!m_context) {
68− goto quit;
69− }
70−
71− pa_context_set_state_callback(m_context, context_state_callback, this);
72−
73− /* Connect the context */
74− if (pa_context_connect(m_context, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0) {
75− goto quit;
76− }
77−
78− /* Run the main loop */
79− if (pa_mainloop_run(mainloop, nullptr) < 0) {
80− goto quit;
81− }
82−
83−quit:
84− if (m_stream)
85− pa_stream_unref(m_stream);
86−
87− if (m_context)
88− pa_context_unref(m_context);
89−
90− if (mainloop) {
91− pa_signal_done();
92− pa_mainloop_free(mainloop);
93− }
94−
95− QThread::currentThread()->quit();
96−}
97−
98−int PulseAudioVolumePeakDetector::nAccumulatedValuesLimit() const
99−{
100− return m_accumulatedValuesLimit;
101−}
102−
103−void PulseAudioVolumePeakDetector::setNAccumulatedValuesLimit(int limit)
104−{
105− m_accumulatedValuesLimit = limit;
106−}
107−
108−// FIXME 16000 is hardcoded because julius needs it
109−// and the hardware/driver/pulse something gets confused
110−// if we use different rates
111−// We would be happier with a much smaller value like 100
112−static uint voice_needed_rate = 16000;
113−
114−void PulseAudioVolumePeakDetector::startStream()
115−{
116− pa_buffer_attr buffer_attr;
117− pa_proplist *proplist = pa_proplist_new();
118−
119− // FIXME 16000 is hardcoded because julius needs it
120− // and the hardware/driver/pulse something gets confused
121− // if we use different rates
122− // We would be happier with a much smaller value like 100
123− pa_sample_spec sample_spec;
124− sample_spec.format = PA_SAMPLE_FLOAT32;
125− sample_spec.rate = 16000;
126− sample_spec.channels = 1;
127−
128− pa_channel_map channel_map;
129−
130− pa_channel_map_init_extend(&channel_map, sample_spec.channels, PA_CHANNEL_MAP_DEFAULT);
131− pa_proplist_sets(proplist, PA_PROP_MEDIA_NAME, "HUD Peak Detector");
132−
133− m_stream = pa_stream_new_with_proplist(m_context, nullptr, &sample_spec, &channel_map, proplist);
134− if (!m_stream) {
135− pa_proplist_free(proplist);
136− quit();
137− return;
138− }
139− pa_proplist_free(proplist);
140−
141− pa_stream_set_read_callback(m_stream, stream_read_callback, this);
142−
143− memset(&buffer_attr, 0, sizeof(buffer_attr));
144− buffer_attr.maxlength = (uint32_t) -1;
145− buffer_attr.fragsize = sizeof(float);
146−
147− if (pa_stream_connect_record(m_stream, nullptr, &buffer_attr, (pa_stream_flags_t)(PA_STREAM_PEAK_DETECT | PA_STREAM_ADJUST_LATENCY)) < 0) {
148− quit();
149− }
150−}
151−
152−void PulseAudioVolumePeakDetector::processData()
153−{
154− while (pa_stream_readable_size(m_stream) > 0) {
155− const void *data;
156− size_t length;
157−
158− if (pa_stream_peek(m_stream, &data, &length) < 0) {
159− quit();
160− return;
161− }
162−
163− const float *values = (float*)data;
164− for (size_t i = 0; i < length / sizeof(float); ++i) {
165− float value = values[i];
166− if (value < 0) value = 0;
167− if (value > 1) value = 1;
168− m_nAccumulatedValues++;
169− m_accumulatedValue += value;
170− if (m_nAccumulatedValues == m_accumulatedValuesLimit) {
171− Q_EMIT newPeak(m_accumulatedValue / m_nAccumulatedValues);
172− m_nAccumulatedValues = 0;
173− m_accumulatedValue = 0;
174− }
175− }
176−
177− pa_stream_drop(m_stream);
178− }
179−}
180−
181−void PulseAudioVolumePeakDetector::quit()
182−{
183− m_mainloop_api->quit(m_mainloop_api, 0);
184−}
185−
186−
187−/* VolumePeakDetector */
188−
189−VolumePeakDetector::VolumePeakDetector()
190−{
191− QObject::connect(&m_thread, SIGNAL(started()), &m_volumeDetector, SLOT(start()));
192− QObject::connect(&m_volumeDetector, SIGNAL(newPeak(float)), this, SIGNAL(newPeak(float)));
193−
194− m_volumeDetector.moveToThread(&m_thread);
195−}
196−
197−bool VolumePeakDetector::enabled() const
198−{
199− return m_thread.isRunning();
200−}
201−
202−int VolumePeakDetector::desiredInterval() const
203−{
204− return m_volumeDetector.nAccumulatedValuesLimit() * 1000 / voice_needed_rate;
205−}
206−
207−void VolumePeakDetector::setDesiredInterval(int interval)
208−{
209− m_volumeDetector.setNAccumulatedValuesLimit(voice_needed_rate * interval / 1000);
210−}
211−
212−void VolumePeakDetector::setEnabled(int enabled)
213−{
214− if (enabled) {
215− if (!m_thread.isRunning()) {
216− m_thread.start();
217− }
218− } else {
219− if (m_thread.isRunning()) {
220− m_volumeDetector.quit();
221− }
222− }
223−}
plugins/HudClient/volumepeakdetector.hdeleted−78
@@ -1,78 +0,0 @@
1−/*
2− * Copyright (C) 2012, 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 VOLUMEPEAKDETECTOR_H
18−#define VOLUMEPEAKDETECTOR_H
19−
20−#include <QObject>
21−
22−#include <QThread>
23−
24−#include <pulse/pulseaudio.h>
25−
26−class PulseAudioVolumePeakDetector : public QObject
27−{
28− Q_OBJECT
29−
30−public:
31− PulseAudioVolumePeakDetector();
32−
33− int nAccumulatedValuesLimit() const;
34− void setNAccumulatedValuesLimit(int limit);
35−
36− void startStream();
37− void processData();
38− void quit();
39−
40−public Q_SLOTS:
41− void start();
42−
43−Q_SIGNALS:
44− void newPeak(float value);
45−
46−private:
47− float m_accumulatedValue;
48− int m_nAccumulatedValues;
49− int m_accumulatedValuesLimit;
50− pa_context *m_context;
51− pa_mainloop_api *m_mainloop_api;
52− pa_stream *m_stream;
53−};
54−
55−class VolumePeakDetector : public QObject
56−{
57− Q_OBJECT
58− Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
59− Q_PROPERTY(int desiredInterval READ desiredInterval WRITE setDesiredInterval)
60−
61−public:
62− VolumePeakDetector();
63−
64− bool enabled() const;
65− void setEnabled(int enabled);
66−
67− int desiredInterval() const;
68− void setDesiredInterval(int interval);
69−
70−Q_SIGNALS:
71− void newPeak(float volume);
72−
73−private:
74− QThread m_thread;
75− PulseAudioVolumePeakDetector m_volumeDetector;
76−};
77−
78−#endif
plugins/ScreenGrabber/CMakeLists.txtnew file+13
@@ -0,0 +1,13 @@
1+include_directories(
2+ ${CMAKE_CURRENT_BINARY_DIR}
3+)
4+
5+set(SCREENGRABBERSOURCES
6+ screengrabber.cpp
7+ plugin.cpp
8+)
9+
10+add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})
11+qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)
12+
13+add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)
plugins/ScreenGrabber/ScreenGrabber.qmltypesnew file+17
@@ -0,0 +1,17 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "ScreenGrabber"
12+ prototype: "QObject"
13+ exports: ["ScreenGrabber/ScreenGrabber 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Method { name: "captureAndSave" }
16+ }
17+}
plugins/ScreenGrabber/plugin.cppnew file+28
@@ -0,0 +1,28 @@
1+/*
2+ * Copyright (C) 2014 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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#include "plugin.h"
20+#include "screengrabber.h"
21+
22+#include <QtQml/qqml.h>
23+
24+void ScreenGrabberPlugin::registerTypes(const char *uri)
25+{
26+ Q_ASSERT(uri == QLatin1String("ScreenGrabber"));
27+ qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");
28+}
qml/Hud/ToolBar.qml → plugins/ScreenGrabber/plugin.hrenamed+16−16
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -12,22 +12,22 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
1517 */
1618
17−import QtQuick 2.0
18−import HudClient 0.1
19+#ifndef SCREENGRABBER_PLUGIN_H
20+#define SCREENGRABBER_PLUGIN_H
21+
22+#include <QtQml/QQmlExtensionPlugin>
23+
24+class ScreenGrabberPlugin : public QQmlExtensionPlugin
25+{
26+ Q_OBJECT
27+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1928
20−Row {
21− signal actionTriggered(int action)
22− property alias model: repeater.model
29+public:
30+ void registerTypes(const char *uri);
31+};
2332
24− spacing: units.gu(3)
25− Repeater {
26− id: repeater
27− ToolBarIcon {
28− source: model.iconPath
29− onClicked: actionTriggered(model.action)
30− enabled: model.enabled
31− }
32− }
33−}
33+#endif // SCREENGRABBER_PLUGIN_H
plugins/ScreenGrabber/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module ScreenGrabber
2+plugin ScreenGrabber-qml
3+typeinfo ScreenGrabber.qmltypes
plugins/ScreenGrabber/screengrabber.cppnew file+94
@@ -0,0 +1,94 @@
1+/*
2+ * Copyright (C) 2014 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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#include "screengrabber.h"
20+
21+#include <QDir>
22+#include <QDateTime>
23+#include <QStandardPaths>
24+#include <QtGui/QImage>
25+#include <QtGui/QGuiApplication>
26+#include <QtQuick/QQuickWindow>
27+#include <QtConcurrent/QtConcurrentRun>
28+
29+#include <QDebug>
30+
31+void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)
32+{
33+ if (!screenshot.save(filename, format.toLatin1().data(), quality))
34+ qWarning() << "ScreenShotter: failed to save snapshot!";
35+}
36+
37+ScreenGrabber::ScreenGrabber(QObject *parent)
38+ : QObject(parent),
39+ screenshotQuality(0)
40+{
41+ QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));
42+ screenshotsDir.mkdir("Screenshots");
43+ screenshotsDir.cd("Screenshots");
44+ if (screenshotsDir.exists())
45+ {
46+ fileNamePrefix = screenshotsDir.absolutePath();
47+ fileNamePrefix.append("/screenshot");
48+ }
49+ else
50+ {
51+ qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();
52+ }
53+}
54+
55+void ScreenGrabber::captureAndSave()
56+{
57+ if (fileNamePrefix.isEmpty())
58+ {
59+ qWarning() << "ScreenShotter: no directory to save screenshot";
60+ return;
61+ }
62+
63+ const QWindowList windows = QGuiApplication::topLevelWindows();
64+ if (windows.empty())
65+ {
66+ qWarning() << "ScreenShotter: no top level windows found!";
67+ return;
68+ }
69+
70+ QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);
71+ if (!main_window)
72+ {
73+ qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";
74+ return;
75+ }
76+
77+ QImage screenshot = main_window->grabWindow();
78+ QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);
79+}
80+
81+QString ScreenGrabber::makeFileName()
82+{
83+ QString fileName(fileNamePrefix);
84+ fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));
85+ fileName.append(".");
86+ fileName.append(getFormat());
87+ return fileName;
88+}
89+
90+QString ScreenGrabber::getFormat()
91+{
92+ //TODO: This should be configurable (perhaps through gsettings?)
93+ return "png";
94+}
plugins/ScreenGrabber/screengrabber.hnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright (C) 2014 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+ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17+ */
18+
19+#ifndef SNAPSHOTTER_H
20+#define SNAPSHOTTER_H
21+
22+#include <QObject>
23+#include <QString>
24+
25+class ScreenGrabber: public QObject
26+{
27+ Q_OBJECT
28+
29+public:
30+ explicit ScreenGrabber(QObject *parent = 0);
31+
32+public Q_SLOTS:
33+ void captureAndSave();
34+
35+private:
36+ QString makeFileName();
37+ QString getFormat();
38+ QString fileNamePrefix;
39+ int screenshotQuality;
40+};
41+
42+#endif
plugins/Ubuntu/Gestures/Direction.cpp+6−2
@@ -18,7 +18,9 @@
1818
1919bool Direction::isHorizontal(Direction::Type type)
2020{
21− return type == Direction::Leftwards || type == Direction::Rightwards;
21+ return type == Direction::Leftwards
22+ || type == Direction::Rightwards
23+ || type == Direction::Horizontal;
2224}
2325
2426bool Direction::isVertical(Direction::Type type)
@@ -28,5 +30,7 @@ bool Direction::isVertical(Direction::Type type)
2830
2931bool Direction::isPositive(Direction::Type type)
3032{
31− return type == Rightwards || type == Downwards;
33+ return type == Rightwards
34+ || type == Downwards
35+ || type == Horizontal;
3236}
plugins/Ubuntu/Gestures/Direction.h+2−1
@@ -33,7 +33,8 @@ public:
3333 Rightwards, // Along the positive direction of the X axis
3434 Leftwards, // Along the negative direction of the X axis
3535 Downwards, // Along the positive direction of the Y axis
36− Upwards // Along the negative direction of the Y axis
36+ Upwards, // Along the negative direction of the Y axis
37+ Horizontal // Along the X axis, in any direction
3738 };
3839
3940 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+30−38
@@ -36,7 +36,7 @@
3636using namespace UbuntuGestures;
3737
3838#if DIRECTIONALDRAGAREA_DEBUG
39−#define DDA_DEBUG(msg) qDebug("[DDA] " msg)
39+#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params
4040#include "DebugHelpers.h"
4141
4242namespace {
@@ -53,7 +53,7 @@ const char *statusToString(DirectionalDragArea::Status status)
5353
5454} // namespace {
5555#else // DIRECTIONALDRAGAREA_DEBUG
56−#define DDA_DEBUG(msg) do{}while(0)
56+#define ddaDebug(params) ((void)0)
5757#endif // DIRECTIONALDRAGAREA_DEBUG
5858
5959
@@ -253,17 +253,19 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
253253 if (event->gained()) {
254254 QVector<int> ids;
255255 ids.append(event->touchId());
256− DDA_DEBUG("grabbing touch");
256+ ddaDebug("grabbing touch");
257257 grabTouchPoints(ids);
258258
259259 // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
260260 // emulation it will cause the emulation logic to go nuts.
261261 // Thus we have to also grab the mouse in this case.
262− // TODO: Report bug to Qt
262+ //
263+ // The fix for this bug has landed in Qt 5.4 (https://codereview.qt-project.org/96887)
264+ // TODO: Remove this workaround once we start using Qt 5.4
263265 if (window()) {
264266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
265267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
266− DDA_DEBUG("removing mouse grabber");
268+ ddaDebug("removing mouse grabber");
267269 window()->mouseGrabberItem()->ungrabMouse();
268270 }
269271 }
@@ -281,11 +283,7 @@ void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent
281283
282284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
283285
284− #if DIRECTIONALDRAGAREA_DEBUG
285− // TODO Consider using qCDebug() when available (Qt 5.2)
286− qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()
287− << qPrintable(touchEventToString(event));
288− #endif
286+ ddaDebug("Unowned " << m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
289287
290288 switch (m_status) {
291289 case WaitingForTouch:
@@ -320,7 +318,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
320318
321319 if (touchPoint->state() == Qt::TouchPointReleased) {
322320 // touch has ended before recognition concluded
323− DDA_DEBUG("Touch has ended before recognition concluded");
321+ ddaDebug("Touch has ended before recognition concluded");
324322 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
325323 emitSignalIfTapped();
326324 setStatus(WaitingForTouch);
@@ -333,7 +331,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
333331 updateVelocityCalculator(touchScenePos);
334332
335333 if (!pointInsideAllowedArea()) {
336− DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
334+ ddaDebug("Rejecting gesture because touch point is outside allowed area.");
337335 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
338336 // We still wanna know when it ends for keeping the composition time window up-to-date
339337 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -342,7 +340,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
342340 }
343341
344342 if (!movingInRightDirection()) {
345− DDA_DEBUG("Rejecting gesture because touch point is moving in the wrong direction.");
343+ ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");
346344 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
347345 // We still wanna know when it ends for keeping the composition time window up-to-date
348346 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -356,7 +354,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
356354 if (isWithinTouchCompositionWindow()) {
357355 // There's still time for some new touch to appear and ruin our party as it would be combined
358356 // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
359− DDA_DEBUG("Sill within composition window. Let's wait more.");
357+ ddaDebug("Sill within composition window. Let's wait more.");
360358 return;
361359 }
362360
@@ -364,7 +362,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
364362 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
365363 setStatus(Recognized);
366364 } else {
367− DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
365+ ddaDebug("Didn't move far enough yet. Let's wait more.");
368366 }
369367}
370368
@@ -373,11 +371,7 @@ void DirectionalDragArea::touchEvent(QTouchEvent *event)
373371 // TODO: Consider when more than one touch starts in the same event (although it's not possible
374372 // with Mir's android-input). Have to track them all. Consider it a plus/bonus.
375373
376− #if DIRECTIONALDRAGAREA_DEBUG
377− // TODO Consider using qCDebug() when available (Qt 5.2)
378− qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()
379− << qPrintable(touchEventToString(event));
380− #endif
374+ ddaDebug(m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
381375
382376 if (!isEnabled() || !isVisible()) {
383377 QQuickItem::touchEvent(event);
@@ -414,9 +408,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
414408 if (isWithinTouchCompositionWindow()) {
415409 // too close to the last touch start. So we consider them as starting roughly at the same time.
416410 // Can't be a single-touch gesture.
417− #if DIRECTIONALDRAGAREA_DEBUG
418− qDebug("[DDA] A new touch point came in but we're still within time composition window. Ignoring it.");
419− #endif
411+ ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");
420412 allGood = false;
421413 }
422414
@@ -454,6 +446,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
454446
455447 if (recognitionIsDisabled()) {
456448 // Behave like a dumb TouchArea
449+ ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
457450 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
458451 setStatus(Recognized);
459452 event->accept();
@@ -485,7 +478,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
485478
486479 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
487480 // multi-finger drags are not accepted
488− DDA_DEBUG("Multi-finger drags are not accepted");
481+ ddaDebug("Multi-finger drags are not accepted");
489482
490483 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
491484 // We still wanna know when it ends for keeping the composition time window up-to-date
@@ -579,12 +572,16 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
579572
580573bool DirectionalDragArea::movingInRightDirection() const
581574{
582− QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
583− m_dampedScenePos.y() - m_previousDampedScenePos.y());
575+ if (m_direction == Direction::Horizontal) {
576+ return true;
577+ } else {
578+ QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
579+ m_dampedScenePos.y() - m_previousDampedScenePos.y());
584580
585− qreal scalarProjection = projectOntoDirectionVector(movementVector);
581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);
586582
587− return scalarProjection >= 0.;
583+ return scalarProjection >= 0.;
584+ }
588585}
589586
590587bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
@@ -612,7 +609,7 @@ void DirectionalDragArea::checkSpeed()
612609 qreal minSpeedMsecs = m_minSpeed / 1000.0;
613610
614611 if (speed < minSpeedMsecs) {
615− DDA_DEBUG("Rejecting gesture because it's below minimum speed.");
612+ ddaDebug("Rejecting gesture because it's below minimum speed.");
616613 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
617614 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
618615 setStatus(WaitingForTouch);
@@ -623,7 +620,7 @@ void DirectionalDragArea::checkSpeed()
623620 m_silenceTime += m_recognitionTimer->interval();
624621
625622 if (m_silenceTime > m_maxSilenceTime) {
626− DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");
623+ ddaDebug("Rejecting gesture because its silence time has been exceeded.");
627624 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
628625 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
629626 setStatus(WaitingForTouch);
@@ -644,7 +641,7 @@ void DirectionalDragArea::giveUpIfDisabledOrInvisible()
644641 }
645642
646643 if (m_status != WaitingForTouch) {
647− DDA_DEBUG("Resetting status because got disabled or made invisible");
644+ ddaDebug("Resetting status because got disabled or made invisible");
648645 setStatus(WaitingForTouch);
649646 }
650647 }
@@ -664,9 +661,7 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
664661 m_status = newStatus;
665662 Q_EMIT statusChanged(m_status);
666663
667− #if DIRECTIONALDRAGAREA_DEBUG
668− qDebug() << "[DDA]" << statusToString(oldStatus) << "->" << statusToString(newStatus);
669− #endif
664+ ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
670665
671666 switch (newStatus) {
672667 case WaitingForTouch:
@@ -873,7 +868,7 @@ void DirectionalDragArea::updateSceneDirectionVector()
873868 localDirection.rx() = -1.;
874869 localDirection.ry() = 0.;
875870 break;
876− default: // Direction::Rightwards:
871+ default: // Direction::Rightwards || Direction.Horizontal
877872 localDirection.rx() = 1.;
878873 localDirection.ry() = 0.;
879874 break;
@@ -889,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector
889884 return sceneVector.x() * m_sceneDirectionVector.x() +
890885 sceneVector.y() * m_sceneDirectionVector.y();
891886}
892−
893−// Because we are defining a new QObject-based class (RecognitionTimer) here.
894−#include "DirectionalDragArea.moc"
plugins/Ubuntu/Gestures/TouchDispatcher.cpp+43
@@ -16,7 +16,9 @@
1616
1717#include "TouchDispatcher.h"
1818
19+#include <QGuiApplication>
1920#include <QScopedPointer>
21+#include <QStyleHints>
2022
2123#pragma GCC diagnostic push
2224#pragma GCC diagnostic ignored "-pedantic"
@@ -32,6 +34,7 @@
3234TouchDispatcher::TouchDispatcher()
3335 : m_status(NoActiveTouch)
3436 , m_touchMouseId(-1)
37+ , m_touchMousePressTimestamp(0)
3538{
3639}
3740
@@ -148,6 +151,18 @@ void TouchDispatcher::dispatchTouchBegin(
148151 #endif
149152 m_status = DeliveringMouseEvents;
150153 m_touchMouseId = targetTouchPoints.at(0).id();
154+
155+ if (checkIfDoubleClicked(timestamp)) {
156+ QScopedPointer<QMouseEvent> doubleClickEvent(
157+ touchToMouseEvent(QEvent::MouseButtonDblClick, targetTouchPoints.at(0), timestamp,
158+ modifiers, false /* transformNeeded */));
159+ #if TOUCHDISPATCHER_DEBUG
160+ qDebug() << "[TouchDispatcher] dispatching" << qPrintable(mouseEventToString(doubleClickEvent.data()))
161+ << "to" << m_targetItem.data();
162+ #endif
163+ QCoreApplication::sendEvent(targetItem, doubleClickEvent.data());
164+ }
165+
151166 } else {
152167 #if TOUCHDISPATCHER_DEBUG
153168 qDebug() << "[TouchDispatcher] Item rejected the QMouseEvent.";
@@ -322,3 +337,31 @@ QMouseEvent *TouchDispatcher::touchToMouseEvent(
322337 //QGuiApplicationPrivate::setMouseEventSource(me, Qt::MouseEventSynthesizedByQt);
323338 return me;
324339}
340+
341+/*
342+ Copied from qquickwindow.cpp which has:
343+ Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies)
344+ Under GPL 3.0 license.
345+*/
346+bool TouchDispatcher::checkIfDoubleClicked(ulong newPressEventTimestamp)
347+{
348+ bool doubleClicked;
349+
350+ if (m_touchMousePressTimestamp == 0) {
351+ // just initialize the variable
352+ m_touchMousePressTimestamp = newPressEventTimestamp;
353+ doubleClicked = false;
354+ } else {
355+ ulong timeBetweenPresses = newPressEventTimestamp - m_touchMousePressTimestamp;
356+ ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->
357+ mouseDoubleClickInterval());
358+ doubleClicked = timeBetweenPresses < doubleClickInterval;
359+ if (doubleClicked) {
360+ m_touchMousePressTimestamp = 0;
361+ } else {
362+ m_touchMousePressTimestamp = newPressEventTimestamp;
363+ }
364+ }
365+
366+ return doubleClicked;
367+}
plugins/Ubuntu/Gestures/TouchDispatcher.h+3
@@ -71,6 +71,8 @@ private:
7171 QMouseEvent *touchToMouseEvent(QEvent::Type type, const QTouchEvent::TouchPoint &p,
7272 ulong timestamp, Qt::KeyboardModifiers modifiers, bool transformNeeded = true);
7373
74+ bool checkIfDoubleClicked(ulong newPressEventTimestamp);
75+
7476 QPointer<QQuickItem> m_targetItem;
7577
7678 enum {
@@ -81,6 +83,7 @@ private:
8183 } m_status;
8284
8385 int m_touchMouseId;
86+ ulong m_touchMousePressTimestamp;
8487};
8588
8689#endif // UBUNTU_TOUCH_DISPATCHER_H
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,5 +1,5 @@
11include(FindPkgConfig)
2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
33pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
55
plugins/Unity/Launcher/dbusinterface.cpp+2−2
@@ -171,13 +171,13 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
171171 }
172172 } else if (message.member() == "Set") {
173173 if (message.arguments()[1].toString() == "count") {
174− int newCount = message.arguments()[2].toInt();
174+ int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
175175 if (!item || newCount != item->count()) {
176176 Q_EMIT countChanged(appid, newCount);
177177 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
178178 }
179179 } else if (message.arguments()[1].toString() == "countVisible") {
180− bool newVisible = message.arguments()[2].toBool();
180+ bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
181181 if (!item || newVisible != item->countVisible()) {
182182 Q_EMIT countVisibleChanged(appid, newVisible);
183183 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
plugins/Unity/Launcher/desktopfilehandler.cpp+3−1
@@ -106,10 +106,11 @@ QString DesktopFileHandler::displayName() const
106106 }
107107
108108 QSettings settings(m_filename, QSettings::IniFormat);
109+ settings.setIniCodec("UTF-8");
109110 settings.beginGroup("Desktop Entry");
110111
111112 // First try to find Name[xx_YY] and Name[xx] in .desktop file
112− QString locale = QLocale::system().name();
113+ QString locale = QLocale().name();
113114 QString shortLocale = locale.split('_').first();
114115
115116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
@@ -138,6 +139,7 @@ QString DesktopFileHandler::icon() const
138139 }
139140
140141 QSettings settings(m_filename, QSettings::IniFormat);
142+ settings.setIniCodec("UTF-8");
141143 settings.beginGroup("Desktop Entry");
142144 QString iconString = settings.value("Icon").toString();
143145 QString pathString = settings.value("Path").toString();
plugins/Unity/Launcher/launcheritem.cpp+11−4
@@ -60,6 +60,10 @@ void LauncherItem::setName(const QString &name)
6060{
6161 if (m_name != name) {
6262 m_name = name;
63+ QuickListEntry entry;
64+ entry.setActionId("launch_item");
65+ entry.setText(m_name);
66+ m_quickList->updateAction(entry);
6367 Q_EMIT nameChanged(name);
6468 }
6569}
@@ -86,12 +90,15 @@ void LauncherItem::setPinned(bool pinned)
8690{
8791 if (m_pinned != pinned) {
8892 m_pinned = pinned;
89− QuickListEntry entry;
90− entry.setActionId("pin_item");
91− entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
92− m_quickList->updateAction(entry);
9393 Q_EMIT pinnedChanged(pinned);
9494 }
95+
96+ // Even if pinned status didn't change, we want to update text in case
97+ // the locale has changed since we last set pinned status.
98+ QuickListEntry entry;
99+ entry.setActionId("pin_item");
100+ entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
101+ m_quickList->updateAction(entry);
95102}
96103
97104bool LauncherItem::running() const
plugins/Unity/Launcher/launchermodel.cpp+16−4
@@ -281,9 +281,11 @@ void LauncherModel::unpin(const QString &appId)
281281 }
282282
283283 if (m_appManager->findApplication(appId)) {
284− m_list.at(index)->setPinned(false);
285− QModelIndex modelIndex = this->index(index);
286− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
284+ if (m_list.at(index)->pinned()) {
285+ m_list.at(index)->setPinned(false);
286+ QModelIndex modelIndex = this->index(index);
287+ Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
288+ }
287289 } else {
288290 beginRemoveRows(QModelIndex(), index, index);
289291 m_list.takeAt(index)->deleteLater();
@@ -347,6 +349,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
347349 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
348350 m_list.append(item);
349351 endInsertRows();
352+ Q_EMIT hint();
350353 }
351354 }
352355}
@@ -367,6 +370,7 @@ void LauncherModel::refresh()
367370 int idx = m_list.indexOf(item);
368371 item->setName(desktopFile.displayName());
369372 item->setIcon(desktopFile.icon());
373+ item->setPinned(item->pinned()); // update pinned text if needed
370374 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
371375 }
372376 }
@@ -375,6 +379,8 @@ void LauncherModel::refresh()
375379 unpin(item->appId());
376380 }
377381
382+ bool changed = toBeRemoved.count() > 0;
383+
378384 // This brings the Launcher into sync with the settings backend again. There's an issue though:
379385 // If we can't find a .desktop file for an entry we need to skip it. That makes our settingsIndex
380386 // go out of sync with the actual index of items. So let's also use an addedIndex which reflects
@@ -409,18 +415,24 @@ void LauncherModel::refresh()
409415 beginInsertRows(QModelIndex(), addedIndex, addedIndex);
410416 m_list.insert(addedIndex, item);
411417 endInsertRows();
418+ changed = true;
412419 } else if (itemIndex != addedIndex) {
413− // The item is already there, but it is in a different place then in the settings.
420+ // The item is already there, but it is in a different place than in the settings.
414421 // Move it to the addedIndex
415422 beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), addedIndex);
416423 m_list.move(itemIndex, addedIndex);
417424 endMoveRows();
425+ changed = true;
418426 }
419427
420428 // Just like settingsIndex, this will increase with every item, except the ones we
421429 // skipped with the "continue" call above.
422430 addedIndex++;
423431 }
432+
433+ if (changed) {
434+ Q_EMIT hint();
435+ }
424436}
425437
426438void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
plugins/Unity/Launcher/launchermodel.h+1−1
@@ -58,6 +58,7 @@ public:
5858
5959public Q_SLOTS:
6060 void requestRemove(const QString &appId);
61+ Q_INVOKABLE void refresh();
6162
6263private:
6364 void storeAppList();
@@ -68,7 +69,6 @@ private Q_SLOTS:
6869 void countChanged(const QString &appId, int count);
6970 void countVisibleChanged(const QString &appId, int count);
7071 void progressChanged(const QString &appId, int progress);
71− void refresh();
7272
7373 void applicationAdded(const QModelIndex &parent, int row);
7474 void applicationRemoved(const QModelIndex &parent, int row);
plugins/Unity/Session/dbusunitysessionservice.h+5
@@ -35,6 +35,11 @@ public:
3535 DBusUnitySessionService();
3636 ~DBusUnitySessionService();
3737
38+ // For use in QML. Javascript doesn't accept functions beginning with capital letters
39+ Q_INVOKABLE void logout() { Logout(); }
40+ Q_INVOKABLE void reboot() { Reboot(); }
41+ Q_INVOKABLE void shutdown() { Shutdown(); }
42+
3843Q_SIGNALS:
3944 /**
4045 * logoutRequested signal
plugins/Utils/CMakeLists.txt+1−1
@@ -33,6 +33,6 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
3333# files directly in targets.
3434set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
3535
36−qt5_use_modules(Utils-qml Qml Quick DBus Network XmlPatterns Gui Concurrent)
36+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)
3737
3838add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/Utils/relativetimeformatter.cpp+31−39
@@ -74,53 +74,45 @@ getDateProximity(GDateTime* now, GDateTime* time)
7474 }
7575
7676 // did it happen yesterday?
77− GDateTime* tomorrow = g_date_time_add_days(now, -1);
77+ GDateTime* yesterday = g_date_time_add_days(now, -1);
7878 gint tom_year, tom_month, tom_day;
79− g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
80− g_date_time_unref(tomorrow);
79+ g_date_time_get_ymd(yesterday, &tom_year, &tom_month, &tom_day);
80+ g_date_time_unref(yesterday);
8181 if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
8282 return DATE_PROXIMITY_YESTERDAY;
8383 }
8484
8585 // does it happen tomorrow?
86− if (prox == DATE_PROXIMITY_FAR)
87− {
88− GDateTime* tomorrow = g_date_time_add_days(now, 1);
89−
90− gint tom_year, tom_month, tom_day;
91− g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
92− g_date_time_unref(tomorrow);
93− if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
94− return DATE_PROXIMITY_TOMORROW;
95− }
86+ GDateTime* tomorrow = g_date_time_add_days(now, 1);
87+ g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
88+ g_date_time_unref(tomorrow);
89+ if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
90+ return DATE_PROXIMITY_TOMORROW;
9691 }
9792
9893 // does it happen this week?
99− if (prox == DATE_PROXIMITY_FAR) {
100− if (g_date_time_compare(time, now) < 0) {
101− GDateTime* last_week = g_date_time_add_days(now, -6);
102− GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
103− g_date_time_get_month(last_week),
104− g_date_time_get_day_of_month(last_week),
105− 0, 0, 0);
106− if (g_date_time_compare(time, last_week_bound) >= 0)
107− prox = DATE_PROXIMITY_LAST_WEEK;
108−
109− g_date_time_unref(last_week);
110− g_date_time_unref(last_week_bound);
111− } else {
112− GDateTime* next_week = g_date_time_add_days(now, 6);
113− GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
114− g_date_time_get_month(next_week),
115− g_date_time_get_day_of_month(next_week),
116− 23, 59, 59.9);
117− if (g_date_time_compare(time, next_week_bound) <= 0)
118− prox = DATE_PROXIMITY_NEXT_WEEK;
119−
120− g_date_time_unref(next_week);
121− g_date_time_unref(next_week_bound);
122− }
123−
94+ if (g_date_time_compare(time, now) < 0) {
95+ GDateTime* last_week = g_date_time_add_days(now, -6);
96+ GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
97+ g_date_time_get_month(last_week),
98+ g_date_time_get_day_of_month(last_week),
99+ 0, 0, 0);
100+ if (g_date_time_compare(time, last_week_bound) >= 0)
101+ prox = DATE_PROXIMITY_LAST_WEEK;
102+
103+ g_date_time_unref(last_week);
104+ g_date_time_unref(last_week_bound);
105+ } else {
106+ GDateTime* next_week = g_date_time_add_days(now, 6);
107+ GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
108+ g_date_time_get_month(next_week),
109+ g_date_time_get_day_of_month(next_week),
110+ 23, 59, 59.9);
111+ if (g_date_time_compare(time, next_week_bound) <= 0)
112+ prox = DATE_PROXIMITY_NEXT_WEEK;
113+
114+ g_date_time_unref(next_week);
115+ g_date_time_unref(next_week_bound);
124116 }
125117
126118 return prox;
@@ -250,7 +242,7 @@ char* generate_full_format_string_at_time (GDateTime* now,
250242
251243QString RelativeTimeFormatter::format() const
252244{
253− GDateTime* now = g_date_time_new_from_unix_utc(QDateTime::currentMSecsSinceEpoch() / 1000);
245+ GDateTime* now = g_date_time_new_now_local();
254246 if (!now) { return QString(); }
255247
256248 GDateTime* then = g_date_time_new_from_unix_local(time());
plugins/Wizard/50-com.canonical.unity.wizard.pklanew file+6
@@ -0,0 +1,6 @@
1+[Allow welcome wizard to set AccountsService fields]
2+Identity=unix-user:lightdm
3+Action=org.freedesktop.accounts.user-administration
4+ResultActive=yes
5+ResultInactive=no
6+ResultAny=no
plugins/Wizard/CMakeLists.txtnew file+11
@@ -0,0 +1,11 @@
1+add_library(Wizard-qml MODULE
2+ plugin.cpp
3+ PageList.cpp
4+ System.cpp
5+)
6+
7+qt5_use_modules(Wizard-qml DBus Qml)
8+add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
9+
10+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
11+install(FILES 50-com.canonical.unity.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
plugins/Wizard/PageList.cppnew file+112
@@ -0,0 +1,112 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+/**
18+ * This class lets the list of wizard pages be dynamic.
19+ * - To add new ones, drop them into
20+ * $XDG_DATA_DIRS/Wizard/Pages with a numbered prefix,
21+ * like "21-custom-page.qml". The number determines the order in the page
22+ * sequence that your page will appear.
23+ * - To disable an existing page, add a file like "21-custom-page.qml.disabled"
24+ * - To go to the next page, use pageStack.next()
25+ * - To go back to the previous page, use pageStack.prev()
26+ * - To load a page outside of the normal flow (so that it doesn't affect the
27+ * back button), use pageStack.push(Qt.resolvedUrl("custom-page.qml")) in
28+ * your page.
29+ * - See default pages for plenty of examples.
30+ */
31+
32+#include "PageList.h"
33+#include <paths.h>
34+#include <QDir>
35+#include <QSet>
36+#include <QStandardPaths>
37+
38+PageList::PageList(QObject *parent)
39+ : QObject(parent),
40+ m_index(-1),
41+ m_pages()
42+{
43+ QString qmlSuffix = ".qml";
44+ QString disabledSuffix = ".disabled";
45+ QSet<QString> disabledPages;
46+ QStringList dataDirs;
47+
48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
49+ dataDirs = QStringList() << qmlDirectory();
50+ } else {
51+ dataDirs = shellDataDirs();
52+ }
53+
54+ Q_FOREACH(const QString &dataDir, dataDirs) {
55+ QDir dir(dataDir + "/Wizard/Pages");
56+ QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
57+ Q_FOREACH(const QString &entry, entries) {
58+ if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
59+ m_pages.insert(entry, dir.absoluteFilePath(entry));
60+ else if (entry.endsWith(qmlSuffix + disabledSuffix))
61+ disabledPages.insert(entry.left(entry.size() - disabledSuffix.size()));
62+ }
63+ }
64+
65+ // Now remove any explicitly disabled entries
66+ Q_FOREACH(const QString &page, disabledPages) {
67+ m_pages.remove(page);
68+ }
69+}
70+
71+QStringList PageList::entries() const
72+{
73+ return m_pages.keys();
74+}
75+
76+QStringList PageList::paths() const
77+{
78+ return m_pages.values();
79+}
80+
81+int PageList::index() const
82+{
83+ return m_index;
84+}
85+
86+int PageList::numPages() const
87+{
88+ return m_pages.size();
89+}
90+
91+QString PageList::prev()
92+{
93+ if (m_index > 0)
94+ return m_pages.values()[setIndex(m_index - 1)];
95+ else
96+ return QString();
97+}
98+
99+QString PageList::next()
100+{
101+ if (m_index < m_pages.count() - 1)
102+ return m_pages.values()[setIndex(m_index + 1)];
103+ else
104+ return QString();
105+}
106+
107+int PageList::setIndex(int index)
108+{
109+ m_index = index;
110+ Q_EMIT indexChanged();
111+ return m_index;
112+}
plugins/Wizard/PageList.hnew file+53
@@ -0,0 +1,53 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_PAGELIST_H
18+#define WIZARD_PAGELIST_H
19+
20+#include <QMap>
21+#include <QObject>
22+#include <QString>
23+
24+class PageList : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(int index READ index NOTIFY indexChanged)
28+ Q_PROPERTY(int numPages READ numPages NOTIFY numPagesChanged)
29+
30+public:
31+ explicit PageList(QObject *parent = 0);
32+
33+ QStringList entries() const;
34+ QStringList paths() const;
35+ int index() const;
36+ int numPages() const;
37+
38+public Q_SLOTS:
39+ QString prev();
40+ QString next();
41+
42+Q_SIGNALS:
43+ void indexChanged();
44+ void numPagesChanged(); // never emitted, just here to quiet Qml warnings
45+
46+private:
47+ int setIndex(int index);
48+
49+ int m_index;
50+ QMap<QString, QString> m_pages;
51+};
52+
53+#endif // WIZARD_PAGELIST_H
plugins/Wizard/System.cppnew file+99
@@ -0,0 +1,99 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "System.h"
18+
19+#include <QDBusInterface>
20+#include <QDBusMetaType>
21+#include <QDir>
22+#include <QFile>
23+#include <QLocale>
24+#include <QMap>
25+#include <QProcess>
26+
27+System::System()
28+ : QObject(),
29+ m_fsWatcher()
30+{
31+ // Register the argument needed for UpdateActivationEnvironment below
32+ qDBusRegisterMetaType<QMap<QString,QString>>();
33+
34+ m_fsWatcher.addPath(wizardEnabledPath());
35+ connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),
36+ this, SIGNAL(wizardEnabledChanged()));
37+}
38+
39+QString System::wizardEnabledPath()
40+{
41+ // Uses ubuntu-system-settings namespace for historic compatibility reasons
42+ return QDir::home().filePath(".config/ubuntu-system-settings/wizard-has-run");
43+}
44+
45+bool System::wizardEnabled() const
46+{
47+ return !QFile::exists(wizardEnabledPath());
48+}
49+
50+void System::setWizardEnabled(bool enabled)
51+{
52+ if (wizardEnabled() == enabled)
53+ return;
54+
55+ if (enabled) {
56+ QFile::remove(wizardEnabledPath());
57+ } else {
58+ QDir(wizardEnabledPath()).mkpath("..");
59+ QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
60+ m_fsWatcher.addPath(wizardEnabledPath());
61+ wizardEnabledChanged();
62+ }
63+}
64+
65+void System::setSessionVariable(const QString &variable, const QString &value)
66+{
67+ // We need to update both upstart's and DBus's environment
68+ QProcess::execute(QString("initctl set-env --global %1=%2").arg(variable, value));
69+
70+ QDBusInterface iface("org.freedesktop.DBus",
71+ "/org/freedesktop/DBus",
72+ "org.freedesktop.DBus",
73+ QDBusConnection::sessionBus());
74+
75+ QMap<QString,QString> valueMap;
76+ valueMap.insert(variable, value);
77+ iface.call("UpdateActivationEnvironment", QVariant::fromValue(valueMap));
78+}
79+
80+void System::updateSessionLanguage(const QString &locale)
81+{
82+ QString language = locale.split(".")[0];
83+
84+ setSessionVariable("LANGUAGE", language);
85+ setSessionVariable("LANG", locale);
86+ setSessionVariable("LC_ALL", locale);
87+
88+ // QLocale caches the default locale on startup, and Qt uses that cached
89+ // copy when formatting dates. So manually update it here.
90+ QLocale::setDefault(QLocale(locale));
91+
92+ // Restart bits of the session to pick up new language.
93+ QProcess::startDetached("sh -c \"initctl emit indicator-services-end; \
94+ initctl stop scope-registry; \
95+ initctl stop smart-scopes-proxy; \
96+ initctl emit --no-wait indicator-services-start; \
97+ initctl restart --no-wait maliit-server; \
98+ initctl restart --no-wait unity8-dash\"");
99+}
plugins/Wizard/System.hnew file+50
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_SYSTEM_H
18+#define WIZARD_SYSTEM_H
19+
20+#include <QFileSystemWatcher>
21+#include <QObject>
22+#include <QString>
23+
24+class System : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)
28+
29+public:
30+ System();
31+
32+ bool wizardEnabled() const;
33+ void setWizardEnabled(bool enabled);
34+
35+public Q_SLOTS:
36+ void updateSessionLanguage(const QString &locale);
37+
38+Q_SIGNALS:
39+ void wizardEnabledChanged();
40+
41+private:
42+ Q_DISABLE_COPY(System)
43+
44+ static QString wizardEnabledPath();
45+ static void setSessionVariable(const QString &variable, const QString &value);
46+
47+ QFileSystemWatcher m_fsWatcher;
48+};
49+
50+#endif
plugins/Wizard/Wizard.qmltypesnew file+36
@@ -0,0 +1,36 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Wizard 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "PageList"
12+ prototype: "QObject"
13+ exports: ["Wizard/PageList 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Property { name: "index"; type: "int"; isReadonly: true }
18+ Property { name: "numPages"; type: "int"; isReadonly: true }
19+ Method { name: "prev"; type: "string" }
20+ Method { name: "next"; type: "string" }
21+ }
22+ Component {
23+ name: "System"
24+ prototype: "QObject"
25+ exports: ["Wizard/System 0.1"]
26+ isCreatable: false
27+ isSingleton: true
28+ exportMetaObjectRevisions: [0]
29+ Property { name: "wizardEnabled"; type: "bool" }
30+ Method {
31+ name: "updateSessionLanguage"
32+ Parameter { name: "locale"; type: "string" }
33+ }
34+ }
35+}
36+
plugins/Wizard/plugin.cppnew file+35
@@ -0,0 +1,35 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "plugin.h"
18+#include "PageList.h"
19+#include "System.h"
20+
21+#include <QtQml/qqml.h>
22+
23+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24+{
25+ Q_UNUSED(engine)
26+ Q_UNUSED(scriptEngine)
27+ return new System();
28+}
29+
30+void WizardPlugin::registerTypes(const char *uri)
31+{
32+ Q_ASSERT(uri == QLatin1String("Wizard"));
33+ qmlRegisterType<PageList>(uri, 0, 1, "PageList");
34+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
35+}
plugins/Wizard/plugin.hnew file+32
@@ -0,0 +1,32 @@
1+/*
2+ * Copyright (C) 2014 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 WIZARD_PLUGIN_H
18+#define WIZARD_PLUGIN_H
19+
20+#include <QtQml/QQmlEngine>
21+#include <QtQml/QQmlExtensionPlugin>
22+
23+class WizardPlugin : public QQmlExtensionPlugin
24+{
25+ Q_OBJECT
26+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27+
28+public:
29+ void registerTypes(const char *uri);
30+};
31+
32+#endif
plugins/Wizard/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Wizard
2+plugin Wizard-qml
3+typeinfo Wizard.qmltypes
po/am.po+277−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-08 00:48+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-06 00:53+0000\n"
1212"Last-Translator: samson <Unknown>\n"
1313"Language-Team: Amharic <am@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "የ መግቢያ ቃል: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "አቋራጭ ማጣበቂያ"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "አቋራጭ መለያያ"
3333
@@ -112,79 +112,87 @@ msgstr "መሰረዣ"
112112msgid "Skip intro"
113113msgstr "መግቢያውን መዝለያ"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "የቀኝ ጠርዝ"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "የላይ ጠርዝ"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "መዝጊያ"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
138138
139−#: qml/Components/EdgeDemo.qml:198
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "የግራ ጠርዝ"
142142
143−#: qml/Components/EdgeDemo.qml:199
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "ጥሩ አድረገዋል"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
155155msgstr ""
156156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
157157
158−#: qml/Components/Lockscreen.qml:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr "ወደ ጥሪ መመለሻ"
161+
162+#: qml/Components/Lockscreen.qml:238
159163msgid "Emergency Call"
160164msgstr "የ ድንገተኛ ጥሪ"
161165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163167msgid "OK"
164168msgstr "እሺ"
165169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167171msgid "See less"
168172msgstr "አነስተኛ መመልከቻ"
169173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171175msgid "See all"
172176msgstr "ሁሉንም መመልከቻ"
173177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175179#: qml/Panel/SearchIndicator.qml:27
176180msgid "Search"
177181msgstr "መፈለጊያ"
178182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr "ማስቀመጫ"
186+
187+#: qml/Dash/PageHeader.qml:277
180188msgid "Settings"
181189msgstr "ማሰናጃ"
182190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184192msgid "Remove from Favorites"
185193msgstr "ከምወዳቸው ማስወገጃ"
186194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188196msgid "Add to Favorites"
189197msgstr "ወደምወዳቸው መጨመሪያ"
190198
@@ -216,87 +224,59 @@ msgstr "ይሳቡ ለማነቃቃት…"
216224msgid "Release to refresh…"
217225msgstr "ይልቀቁ ለማነቃቃት…"
218226
219−#: qml/Dash/ScopesOverview.qml:206
220−msgid "Manage Scopes"
221−msgstr "የ ክልል አስተዳዳሪ"
222−
223−#: qml/Dash/ScopesOverview.qml:428
224−msgid "Done"
225−msgstr "ጨርሷል"
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
229−msgstr "ማስቀመጫ"
227+#: qml/Dash/ScopesList.qml:63
228+msgid "Manage"
229+msgstr ""
230230
231−#: qml/Dash/ScopesOverviewTab.qml:36
232−msgid "Favorites"
233−msgstr "የምወዳቸው"
231+#: qml/Dash/ScopesList.qml:107
232+msgid "Home"
233+msgstr ""
234234
235−#: qml/Dash/ScopesOverviewTab.qml:54
236−msgid "All"
237−msgstr "ሁሉንም"
235+#: qml/Dash/ScopesList.qml:108
236+msgid "Also installed"
237+msgstr ""
238238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240240msgid "Unlock"
241241msgstr "መክፈቻ"
242242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "ማረጋገጫ"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "እባክዎን ይቆዩ በመጫን ላይ..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "አሁን ይናገሩ..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "በመናገር ላይ..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264244msgid "Show password"
265245msgstr "የመግቢያ ቃል ማሳያ"
266246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268248msgid "Tap to return to call..."
269249msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
270250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272252msgid "Conference"
273253msgstr "ስብሰባ"
274254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276256msgid "Nothing is playing"
277257msgstr "ምንም አይጫወትም"
278258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280260msgid "In queue…"
281261msgstr "ወረፋ በመጠበቅ ላይ…"
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284264msgid "Downloading"
285265msgstr "በማውረድ ላይ"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288268msgid "Paused, tap to resume"
289269msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292272msgid "Canceled"
293273msgstr "ተሰርዟል"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296276msgid "Finished"
297277msgstr "ጨርሷል"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300280msgid "Failed, tap to retry"
301281msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
302282
@@ -308,49 +288,49 @@ msgstr "ሲም መክፈቻ"
308288msgid "Roaming"
309289msgstr "ማዘዋወሪያ"
310290
311−#: qml/Shell.qml:346
291+#: qml/Shell.qml:367
292+#, qt-format
293+msgid "Enter %1"
294+msgstr "ማስገቢያ %1"
295+
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
312297msgid "Enter passphrase"
313298msgstr "የ ማለፊያ ሀረግ ያስገቡ"
314299
315−#: qml/Shell.qml:347
300+#: qml/Shell.qml:369
301+msgid "Enter passcode"
302+msgstr "የ ማለፊያ ኮድ ያስገቡ"
303+
304+#: qml/Shell.qml:370
305+#, qt-format
306+msgid "Sorry, incorrect %1"
307+msgstr "አዝናለሁ: የተሳሳተ%1"
308+
309+#: qml/Shell.qml:371
316310msgid "Sorry, incorrect passphrase"
317311msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
318312
319−#: qml/Shell.qml:348
313+#: qml/Shell.qml:372
320314msgid "Please re-enter"
321315msgstr "እባክዎን እንደገና-ያስገቡ"
322316
323−#: qml/Shell.qml:350
324−msgid "Enter passcode"
325−msgstr "የ ማለፊያ ኮድ ያስገቡ"
326−
327−#: qml/Shell.qml:351
317+#: qml/Shell.qml:373
328318msgid "Sorry, incorrect passcode"
329319msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
330320
331−#: qml/Shell.qml:354
332−#, qt-format
333−msgid "Enter %1"
334−msgstr "ማስገቢያ %1"
335−
336−#: qml/Shell.qml:355
337−#, qt-format
338−msgid "Sorry, incorrect %1"
339−msgstr "አዝናለሁ: የተሳሳተ%1"
340−
341−#: qml/Shell.qml:390
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342322msgid "Sorry, incorrect passphrase."
343323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
344324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346326msgid "Sorry, incorrect passcode."
347327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
348328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350330msgid "This will be your last attempt."
351331msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
352332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354334msgid ""
355335"If passphrase is entered incorrectly, your phone will conduct a factory "
356336"reset and all personal data will be deleted."
@@ -358,7 +338,7 @@ msgstr ""
358338"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
359339"ይጠፋል"
360340
361−#: qml/Shell.qml:395
341+#: qml/Shell.qml:472
362342msgid ""
363343"If passcode is entered incorrectly, your phone will conduct a factory reset "
364344"and all personal data will be deleted."
@@ -366,8 +346,206 @@ msgstr ""
366346"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
367347"ይጠፋል"
368348
369−#~ msgid "Sorry, incorrect PIN"
370−#~ msgstr "አዝናለሁ የተሳሳተ ፒን"
349+#: qml/Wizard/Page.qml:89
350+msgid "Back"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:27
354+msgid "Hi!"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:44
358+msgid "Welcome to your Ubuntu phone."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:52
362+msgid "Let’s get started."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368+#: qml/Wizard/Pages/passwd-set.qml:90
369+msgid "Continue"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:25
373+msgid "Add a SIM card and restart your device"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:55
377+msgid "Without it, you won’t be able to make calls or use text messaging."
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381+msgid "Skip"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:39
385+msgid "Lock security"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:74
389+msgid "Please select how you’d like to unlock your phone."
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:97
393+msgid "Swipe"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:98
397+msgid "No security"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:100
401+msgid "Passcode"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:101
405+msgid "4 digits only"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:103
409+msgid "Passphrase"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:104
413+msgid "Numbers and letters"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:28
417+msgid "Connect to Wi‑Fi"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:147
421+msgid "Available networks…"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:148
425+msgid "No available networks."
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:27
429+msgid "Location"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:62
433+msgid "Let the phone detect your location:"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:69
437+msgid "Using GPS only (less accurate)"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:86
441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442+msgstr ""
443+
444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445+#: qml/Wizard/Pages/50-location.qml:103
446+msgid ""
447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448+"conditions</a>."
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:112
452+msgid "Not at all"
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:124
456+msgid "You can change your mind later in <b>System Settings</b>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:24
460+msgid "Improving your experience"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:36
464+msgid ""
465+"Your phone is set up to automatically report errors to Canonical and its "
466+"partners, the makers of the operating system."
467+msgstr ""
468+
469+#: qml/Wizard/Pages/60-reporting.qml:43
470+msgid ""
471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472+"Privacy</b>"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:24
476+msgid "All done"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:39
480+msgid "Nice work!"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:46
484+msgid "Your phone is now ready to use."
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:53
488+msgid "Finish"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/here-terms.qml:27
492+msgid "Terms & Conditions"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:49
496+msgid "Confirm passphrase"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:50
500+msgid "Confirm passcode"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:53
504+#: qml/Wizard/Pages/passwd-confirm.qml:54
505+msgid "Please try again."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:61
509+msgid "Choose your passcode"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:68
513+msgid "Passphrase must be 4 characters long"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:39
517+#, qt-format
518+msgid "〈 %1"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:42
522+#, qt-format
523+msgid "%1 〉"
524+msgstr ""
525+
526+#~ msgid "Type or say a command"
527+#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
528+
529+#~ msgid "Loading. Please Wait..."
530+#~ msgstr "እባክዎን ይቆዩ በመጫን ላይ..."
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "በመናገር ላይ..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "አሁን ይናገሩ..."
537+
538+#~ msgid "Confirm"
539+#~ msgstr "ማረጋገጫ"
540+
541+#~ msgid "Favorites"
542+#~ msgstr "የምወዳቸው"
543+
544+#~ msgid "All"
545+#~ msgstr "ሁሉንም"
546+
547+#~ msgid "Done"
548+#~ msgstr "ጨርሷል"
371549
372−#~ msgid "Enter SIM PIN"
373−#~ msgstr "ሲም ፒን ያስገቡ"
550+#~ msgid "Manage Scopes"
551+#~ msgstr "የ ክልል አስተዳዳሪ"
po/ar.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -111,44 +111,44 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr "تخطي المقدمة"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr "الحافة اليمنى"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr "الحافة العلوية"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr "أغلق"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
137137
138−#: qml/Components/EdgeDemo.qml:198
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr "الحافة اليسرى"
141141
142−#: qml/Components/EdgeDemo.qml:199
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "أحسنت!"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,36 +156,44 @@ msgstr ""
156156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
157157"الشاشة للبدء"
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr "مكالمة طوارئ"
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr "شاهد أقل"
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr ""
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "ابحث"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr ""
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr ""
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr ""
191199
@@ -217,87 +225,59 @@ msgstr ""
217225msgid "Release to refresh…"
218226msgstr ""
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234234msgstr ""
235235
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238238msgstr ""
239239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr ""
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "التأكيد"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "اكتب أو قُل أمرا"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "يجري التحميل. برجاء الانتظار..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "تكلم الآن..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "تتكلم الآن..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "عرض كلمة السر"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr ""
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr ""
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr ""
303283
@@ -309,56 +289,248 @@ msgstr ""
309289msgid "Roaming"
310290msgstr ""
311291
312−#: qml/Shell.qml:346
313−msgid "Enter passphrase"
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
314295msgstr ""
315296
316−#: qml/Shell.qml:347
317−msgid "Sorry, incorrect passphrase"
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
298+msgid "Enter passphrase"
318299msgstr ""
319300
320−#: qml/Shell.qml:348
321−msgid "Please re-enter"
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
322303msgstr ""
323304
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
326308msgstr ""
327309
328−#: qml/Shell.qml:351
329−msgid "Sorry, incorrect passcode"
310+#: qml/Shell.qml:371
311+msgid "Sorry, incorrect passphrase"
330312msgstr ""
331313
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
314+#: qml/Shell.qml:372
315+msgid "Please re-enter"
335316msgstr ""
336317
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
318+#: qml/Shell.qml:373
319+msgid "Sorry, incorrect passcode"
340320msgstr ""
341321
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr ""
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr ""
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr ""
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
358338msgstr ""
359339
360−#: qml/Shell.qml:395
340+#: qml/Shell.qml:472
361341msgid ""
362342"If passcode is entered incorrectly, your phone will conduct a factory reset "
363343"and all personal data will be deleted."
364344msgstr ""
345+
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
523+#~ msgid "Confirm"
524+#~ msgstr "التأكيد"
525+
526+#~ msgid "Type or say a command"
527+#~ msgstr "اكتب أو قُل أمرا"
528+
529+#~ msgid "Loading. Please Wait..."
530+#~ msgstr "يجري التحميل. برجاء الانتظار..."
531+
532+#~ msgid "Speak Now..."
533+#~ msgstr "تكلم الآن..."
534+
535+#~ msgid "Speaking..."
536+#~ msgstr "تتكلم الآن..."
po/ast.po+277−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-09 09:49+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-08 18:24+0000\n"
1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-10 05:23+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Anclar"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
@@ -113,45 +113,45 @@ msgstr "Encaboxar"
113113msgid "Skip intro"
114114msgstr "Omitir la intro"
115115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117117msgid "Right edge"
118118msgstr "Berbesu drechu"
119119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121121msgid "Try swiping from the right edge to unlock the phone"
122122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
123123
124−#: qml/Components/EdgeDemo.qml:144
124+#: qml/Components/EdgeDemo.qml:157
125125msgid "Top edge"
126126msgstr "Berbesu superior"
127127
128−#: qml/Components/EdgeDemo.qml:145
128+#: qml/Components/EdgeDemo.qml:158
129129msgid "Try swiping from the top edge to access the indicators"
130130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
131131
132−#: qml/Components/EdgeDemo.qml:170
132+#: qml/Components/EdgeDemo.qml:183
133133msgid "Close"
134134msgstr "Zarrar"
135135
136−#: qml/Components/EdgeDemo.qml:171
136+#: qml/Components/EdgeDemo.qml:184
137137msgid "Swipe up again to close the settings screen"
138138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
139139
140−#: qml/Components/EdgeDemo.qml:198
140+#: qml/Components/EdgeDemo.qml:214
141141msgid "Left edge"
142142msgstr "Berbesu esquierdu"
143143
144−#: qml/Components/EdgeDemo.qml:199
144+#: qml/Components/EdgeDemo.qml:215
145145msgid "Swipe from the left to reveal the launcher for quick access to apps"
146146msgstr ""
147147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
148148"a les aplicaciones"
149149
150−#: qml/Components/EdgeDemo.qml:226
150+#: qml/Components/EdgeDemo.qml:242
151151msgid "Well done"
152152msgstr "Bien fecho"
153153
154−#: qml/Components/EdgeDemo.qml:227
154+#: qml/Components/EdgeDemo.qml:243
155155msgid ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
@@ -159,36 +159,44 @@ msgstr ""
159159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
160160"teléfonu<br><br>Toca la pantalla pa comenzar"
161161
162−#: qml/Components/Lockscreen.qml:220
162+#: qml/Components/Lockscreen.qml:238
163+msgid "Return to Call"
164+msgstr "Tornar a la llamada"
165+
166+#: qml/Components/Lockscreen.qml:238
163167msgid "Emergency Call"
164168msgstr "Llamada d'emerxencia"
165169
166−#: qml/Components/Lockscreen.qml:252
170+#: qml/Components/Lockscreen.qml:270
167171msgid "OK"
168172msgstr "Aceutar"
169173
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171175msgid "See less"
172176msgstr "Ver menos"
173177
174−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:431
175179msgid "See all"
176180msgstr "Ver too"
177181
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179183#: qml/Panel/SearchIndicator.qml:27
180184msgid "Search"
181185msgstr "Guetar"
182186
183−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:260
188+msgid "Store"
189+msgstr "Tienda"
190+
191+#: qml/Dash/PageHeader.qml:277
184192msgid "Settings"
185193msgstr "Axustes"
186194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188196msgid "Remove from Favorites"
189197msgstr "Desaniciar de favoritos"
190198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192200msgid "Add to Favorites"
193201msgstr "Amestar a favoritos"
194202
@@ -220,87 +228,59 @@ msgstr "Tirar p'anovar..."
220228msgid "Release to refresh…"
221229msgstr "Soltar p'anovar..."
222230
223−#: qml/Dash/ScopesOverview.qml:206
224−msgid "Manage Scopes"
225−msgstr "Xestionar ámbitos"
226−
227−#: qml/Dash/ScopesOverview.qml:428
228−msgid "Done"
229−msgstr "Fecho"
230−
231−#: qml/Dash/ScopesOverview.qml:454
232−msgid "Store"
233−msgstr "Tienda"
231+#: qml/Dash/ScopesList.qml:63
232+msgid "Manage"
233+msgstr ""
234234
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
237−msgstr "Favoritos"
235+#: qml/Dash/ScopesList.qml:107
236+msgid "Home"
237+msgstr ""
238238
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
241−msgstr "Too"
239+#: qml/Dash/ScopesList.qml:108
240+msgid "Also installed"
241+msgstr ""
242242
243−#: qml/Greeter/Greeter.qml:157
243+#: qml/Greeter/Greeter.qml:174
244244msgid "Unlock"
245245msgstr "Desbloquiar"
246246
247−#: qml/Hud/HudParametrizedActionsPage.qml:139
248−msgid "Confirm"
249−msgstr "Confirmar"
250−
251−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
252−msgid "Type or say a command"
253−msgstr "Escribi o di una orde"
254−
255−#: qml/Hud/Hud.qml:84
256−msgid "Loading. Please Wait..."
257−msgstr "Cargando, espera…"
258−
259−#: qml/Hud/Hud.qml:89
260−msgid "Speak Now..."
261−msgstr "Fala agora…"
262−
263−#: qml/Hud/Hud.qml:94
264−msgid "Speaking..."
265−msgstr "Falando…"
266−
267−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
268248msgid "Show password"
269249msgstr "Amosar contraseña"
270250
271−#: qml/Panel/ActiveCallHint.qml:77
251+#: qml/Panel/ActiveCallHint.qml:79
272252msgid "Tap to return to call..."
273253msgstr "Tocar pa tornar a la llamada..."
274254
275−#: qml/Panel/ActiveCallHint.qml:90
255+#: qml/Panel/ActiveCallHint.qml:92
276256msgid "Conference"
277257msgstr "Conferencia"
278258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:600
259+#: qml/Panel/Indicators/MenuItemFactory.qml:643
280260msgid "Nothing is playing"
281261msgstr "Nun hai nada en reproducción"
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:748
263+#: qml/Panel/Indicators/MenuItemFactory.qml:791
284264msgid "In queue…"
285265msgstr "N'espera…"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:752
267+#: qml/Panel/Indicators/MenuItemFactory.qml:795
288268msgid "Downloading"
289269msgstr "Baxando"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:754
271+#: qml/Panel/Indicators/MenuItemFactory.qml:797
292272msgid "Paused, tap to resume"
293273msgstr "Posáu, toca pa reanudar"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:756
275+#: qml/Panel/Indicators/MenuItemFactory.qml:799
296276msgid "Canceled"
297277msgstr "Encaboxáu"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:758
279+#: qml/Panel/Indicators/MenuItemFactory.qml:801
300280msgid "Finished"
301281msgstr "Finó"
302282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:760
283+#: qml/Panel/Indicators/MenuItemFactory.qml:803
304284msgid "Failed, tap to retry"
305285msgstr "Falló, toca pa reintentar"
306286
@@ -312,49 +292,49 @@ msgstr "Desbloquiar SIM"
312292msgid "Roaming"
313293msgstr "Roaming"
314294
315−#: qml/Shell.qml:346
295+#: qml/Shell.qml:367
296+#, qt-format
297+msgid "Enter %1"
298+msgstr "Escribi %1"
299+
300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
316301msgid "Enter passphrase"
317302msgstr "Escribi la frase contraseña"
318303
319−#: qml/Shell.qml:347
304+#: qml/Shell.qml:369
305+msgid "Enter passcode"
306+msgstr "Escribi'l códigu de pasu"
307+
308+#: qml/Shell.qml:370
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr "Sentímoslo, %1 incorreutu"
312+
313+#: qml/Shell.qml:371
320314msgid "Sorry, incorrect passphrase"
321315msgstr "Sentímoslo, contraseña incorreuta"
322316
323−#: qml/Shell.qml:348
317+#: qml/Shell.qml:372
324318msgid "Please re-enter"
325319msgstr "Vuelvi a escribila"
326320
327−#: qml/Shell.qml:350
328−msgid "Enter passcode"
329−msgstr "Escribi'l códigu de pasu"
330−
331−#: qml/Shell.qml:351
321+#: qml/Shell.qml:373
332322msgid "Sorry, incorrect passcode"
333323msgstr "Sentímoslo, códigu de pasu incorreutu"
334324
335−#: qml/Shell.qml:354
336−#, qt-format
337−msgid "Enter %1"
338−msgstr "Escribi %1"
339−
340−#: qml/Shell.qml:355
341−#, qt-format
342−msgid "Sorry, incorrect %1"
343−msgstr "Sentímoslo, %1 incorreutu"
344−
345−#: qml/Shell.qml:390
325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
346326msgid "Sorry, incorrect passphrase."
347327msgstr "Fras de pasu incorreuta"
348328
349−#: qml/Shell.qml:391
329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
350330msgid "Sorry, incorrect passcode."
351331msgstr "Códigu de pasu incorreutu"
352332
353−#: qml/Shell.qml:392
333+#: qml/Shell.qml:469
354334msgid "This will be your last attempt."
355335msgstr "Esti ye'l caberu intentu."
356336
357−#: qml/Shell.qml:394
337+#: qml/Shell.qml:471
358338msgid ""
359339"If passphrase is entered incorrectly, your phone will conduct a factory "
360340"reset and all personal data will be deleted."
@@ -362,7 +342,7 @@ msgstr ""
362342"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
363343"configuración de fábrica y van perdese tolos datos personales."
364344
365−#: qml/Shell.qml:395
345+#: qml/Shell.qml:472
366346msgid ""
367347"If passcode is entered incorrectly, your phone will conduct a factory reset "
368348"and all personal data will be deleted."
@@ -370,8 +350,206 @@ msgstr ""
370350"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
371351"configuración de fábrica y van perdese tolos datos personales."
372352
373−#~ msgid "Sorry, incorrect PIN"
374−#~ msgstr "PIN incorreutu"
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr ""
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:43
474+msgid ""
475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476+"Privacy</b>"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:24
480+msgid "All done"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:39
484+msgid "Nice work!"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:46
488+msgid "Your phone is now ready to use."
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:53
492+msgid "Finish"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/here-terms.qml:27
496+msgid "Terms & Conditions"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:49
500+msgid "Confirm passphrase"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:50
504+msgid "Confirm passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:53
508+#: qml/Wizard/Pages/passwd-confirm.qml:54
509+msgid "Please try again."
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:61
513+msgid "Choose your passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:68
517+msgid "Passphrase must be 4 characters long"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:39
521+#, qt-format
522+msgid "〈 %1"
523+msgstr ""
524+
525+#: qml/Wizard/StackButton.qml:42
526+#, qt-format
527+msgid "%1 〉"
528+msgstr ""
529+
530+#~ msgid "Confirm"
531+#~ msgstr "Confirmar"
532+
533+#~ msgid "Speaking..."
534+#~ msgstr "Falando…"
535+
536+#~ msgid "Loading. Please Wait..."
537+#~ msgstr "Cargando, espera…"
538+
539+#~ msgid "Type or say a command"
540+#~ msgstr "Escribi o di una orde"
541+
542+#~ msgid "Speak Now..."
543+#~ msgstr "Fala agora…"
544+
545+#~ msgid "Done"
546+#~ msgstr "Fecho"
547+
548+#~ msgid "Favorites"
549+#~ msgstr "Favoritos"
550+
551+#~ msgid "All"
552+#~ msgstr "Too"
375553
376−#~ msgid "Enter SIM PIN"
377−#~ msgstr "Escribi'l PIN de la SIM"
554+#~ msgid "Manage Scopes"
555+#~ msgstr "Xestionar ámbitos"
po/az.po+271−96
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-09-03 16:39+0000\n"
1212"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
1313"Language-Team: Azerbaijani <az@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Şifrә: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin qısayolu"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Açma qısayolu"
3333
@@ -110,44 +110,44 @@ msgstr "İmtina"
110110msgid "Skip intro"
111111msgstr "Tәqdimatı keç"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Sağ Künc"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Yuxarı künc"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Bağla"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Sol künc"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
145145
146−#: qml/Components/EdgeDemo.qml:226
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr "Təbriklər"
149149
150−#: qml/Components/EdgeDemo.qml:227
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
@@ -155,36 +155,44 @@ msgstr ""
155155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
156156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
157157
158−#: qml/Components/Lockscreen.qml:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr ""
161+
162+#: qml/Components/Lockscreen.qml:238
159163msgid "Emergency Call"
160164msgstr "Zərurət zəngi"
161165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163167msgid "OK"
164168msgstr "Oldu"
165169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167171msgid "See less"
168172msgstr "Daha azını gör"
169173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171175msgid "See all"
172176msgstr "Hamısını gör"
173177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175179#: qml/Panel/SearchIndicator.qml:27
176180msgid "Search"
177181msgstr "Axtar"
178182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:277
180188msgid "Settings"
181189msgstr "Tənzimləmələr"
182190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184192msgid "Remove from Favorites"
185193msgstr "Seçilmişlәrdәn çıxart"
186194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188196msgid "Add to Favorites"
189197msgstr "Seçilmişlәrә әlavә et"
190198
@@ -216,87 +224,59 @@ msgstr ""
216224msgid "Release to refresh…"
217225msgstr ""
218226
219−#: qml/Dash/ScopesOverview.qml:206
220−msgid "Manage Scopes"
227+#: qml/Dash/ScopesList.qml:63
228+msgid "Manage"
221229msgstr ""
222230
223−#: qml/Dash/ScopesOverview.qml:428
224−msgid "Done"
225−msgstr "Başa çatdı"
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
231+#: qml/Dash/ScopesList.qml:107
232+msgid "Home"
229233msgstr ""
230234
231−#: qml/Dash/ScopesOverviewTab.qml:36
232−msgid "Favorites"
233−msgstr "Seçilmişlər"
234−
235−#: qml/Dash/ScopesOverviewTab.qml:54
236−msgid "All"
237−msgstr "Hamısı"
235+#: qml/Dash/ScopesList.qml:108
236+msgid "Also installed"
237+msgstr ""
238238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240240msgid "Unlock"
241241msgstr ""
242242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "Təsdiqlə"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "Bir әmr söyləyin və ya yazın"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "Yüklənir. Zəhmət olmasa, gözləyin..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "Danışın..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "Danışır..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264244msgid "Show password"
265245msgstr "Şifrәni göstәr"
266246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268248msgid "Tap to return to call..."
269249msgstr "Zəngə qayıtmaq üçün toxunun..."
270250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272252msgid "Conference"
273253msgstr "Konfrans"
274254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276256msgid "Nothing is playing"
277257msgstr ""
278258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280260msgid "In queue…"
281261msgstr "Növbədədir..."
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284264msgid "Downloading"
285265msgstr "Endirilir"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288268msgid "Paused, tap to resume"
289269msgstr "Dayandırıldı. Davam etmək üçün toxunun"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292272msgid "Canceled"
293273msgstr "İmtina edildi"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296276msgid "Finished"
297277msgstr "Bitdi"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300280msgid "Failed, tap to retry"
301281msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
302282
@@ -308,49 +288,49 @@ msgstr "SIM kilidini aç"
308288msgid "Roaming"
309289msgstr "Rominq"
310290
311−#: qml/Shell.qml:346
291+#: qml/Shell.qml:367
292+#, qt-format
293+msgid "Enter %1"
294+msgstr ""
295+
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
312297msgid "Enter passphrase"
313298msgstr ""
314299
315−#: qml/Shell.qml:347
300+#: qml/Shell.qml:369
301+msgid "Enter passcode"
302+msgstr ""
303+
304+#: qml/Shell.qml:370
305+#, qt-format
306+msgid "Sorry, incorrect %1"
307+msgstr "Bağışlayın, %1 yanlışdır"
308+
309+#: qml/Shell.qml:371
316310msgid "Sorry, incorrect passphrase"
317311msgstr "Bağışlayın, açar söz yanlışdır"
318312
319−#: qml/Shell.qml:348
313+#: qml/Shell.qml:372
320314msgid "Please re-enter"
321315msgstr ""
322316
323−#: qml/Shell.qml:350
324−msgid "Enter passcode"
325−msgstr ""
326−
327−#: qml/Shell.qml:351
317+#: qml/Shell.qml:373
328318msgid "Sorry, incorrect passcode"
329319msgstr ""
330320
331−#: qml/Shell.qml:354
332−#, qt-format
333−msgid "Enter %1"
334−msgstr ""
335−
336−#: qml/Shell.qml:355
337−#, qt-format
338−msgid "Sorry, incorrect %1"
339−msgstr "Bağışlayın, %1 yanlışdır"
340−
341−#: qml/Shell.qml:390
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342322msgid "Sorry, incorrect passphrase."
343323msgstr "Bağışlayın, açar söz yanlışdır."
344324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346326msgid "Sorry, incorrect passcode."
347327msgstr "Təəssüf ki, açar kod yanlışdır."
348328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350330msgid "This will be your last attempt."
351331msgstr "Bu sizin son cəhdiniz olacaq."
352332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354334msgid ""
355335"If passphrase is entered incorrectly, your phone will conduct a factory "
356336"reset and all personal data will be deleted."
@@ -358,7 +338,7 @@ msgstr ""
358338"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
359339"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
360340
361−#: qml/Shell.qml:395
341+#: qml/Shell.qml:472
362342msgid ""
363343"If passcode is entered incorrectly, your phone will conduct a factory reset "
364344"and all personal data will be deleted."
@@ -366,8 +346,203 @@ msgstr ""
366346"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
367347"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
368348
369−#~ msgid "Enter SIM PIN"
370−#~ msgstr "SIM PIN kodunuzu daxil edin"
349+#: qml/Wizard/Page.qml:89
350+msgid "Back"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:27
354+msgid "Hi!"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:44
358+msgid "Welcome to your Ubuntu phone."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:52
362+msgid "Let’s get started."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368+#: qml/Wizard/Pages/passwd-set.qml:90
369+msgid "Continue"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:25
373+msgid "Add a SIM card and restart your device"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:55
377+msgid "Without it, you won’t be able to make calls or use text messaging."
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381+msgid "Skip"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:39
385+msgid "Lock security"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:74
389+msgid "Please select how you’d like to unlock your phone."
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:97
393+msgid "Swipe"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:98
397+msgid "No security"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:100
401+msgid "Passcode"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:101
405+msgid "4 digits only"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:103
409+msgid "Passphrase"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:104
413+msgid "Numbers and letters"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:28
417+msgid "Connect to Wi‑Fi"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:147
421+msgid "Available networks…"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:148
425+msgid "No available networks."
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:27
429+msgid "Location"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:62
433+msgid "Let the phone detect your location:"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:69
437+msgid "Using GPS only (less accurate)"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:86
441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442+msgstr ""
443+
444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445+#: qml/Wizard/Pages/50-location.qml:103
446+msgid ""
447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448+"conditions</a>."
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:112
452+msgid "Not at all"
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:124
456+msgid "You can change your mind later in <b>System Settings</b>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:24
460+msgid "Improving your experience"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:36
464+msgid ""
465+"Your phone is set up to automatically report errors to Canonical and its "
466+"partners, the makers of the operating system."
467+msgstr ""
468+
469+#: qml/Wizard/Pages/60-reporting.qml:43
470+msgid ""
471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472+"Privacy</b>"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:24
476+msgid "All done"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:39
480+msgid "Nice work!"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:46
484+msgid "Your phone is now ready to use."
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:53
488+msgid "Finish"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/here-terms.qml:27
492+msgid "Terms & Conditions"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:49
496+msgid "Confirm passphrase"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:50
500+msgid "Confirm passcode"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:53
504+#: qml/Wizard/Pages/passwd-confirm.qml:54
505+msgid "Please try again."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:61
509+msgid "Choose your passcode"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:68
513+msgid "Passphrase must be 4 characters long"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:39
517+#, qt-format
518+msgid "〈 %1"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:42
522+#, qt-format
523+msgid "%1 〉"
524+msgstr ""
525+
526+#~ msgid "Confirm"
527+#~ msgstr "Təsdiqlə"
528+
529+#~ msgid "Speaking..."
530+#~ msgstr "Danışır..."
531+
532+#~ msgid "Loading. Please Wait..."
533+#~ msgstr "Yüklənir. Zəhmət olmasa, gözləyin..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Danışın..."
537+
538+#~ msgid "All"
539+#~ msgstr "Hamısı"
540+
541+#~ msgid "Favorites"
542+#~ msgstr "Seçilmişlər"
543+
544+#~ msgid "Done"
545+#~ msgstr "Başa çatdı"
371546
372−#~ msgid "Sorry, incorrect PIN"
373−#~ msgstr "Bağışlayın, PIN yanlışdır"
547+#~ msgid "Type or say a command"
548+#~ msgstr "Bir әmr söyləyin və ya yazın"
po/be.po+246−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-09-24 17:12+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Belarusian <be@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -111,78 +111,86 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr ""
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr ""
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr ""
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr ""
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr ""
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr ""
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr ""
137137
138−#: qml/Components/EdgeDemo.qml:198
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr ""
141141
142−#: qml/Components/EdgeDemo.qml:199
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145
146−#: qml/Components/EdgeDemo.qml:226
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr ""
149149
150−#: qml/Components/EdgeDemo.qml:227
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
154154msgstr ""
155155
156−#: qml/Components/Lockscreen.qml:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157161msgid "Emergency Call"
158162msgstr ""
159163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161165msgid "OK"
162166msgstr ""
163167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165169msgid "See less"
166170msgstr ""
167171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169173msgid "See all"
170174msgstr ""
171175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173177#: qml/Panel/SearchIndicator.qml:27
174178msgid "Search"
175179msgstr ""
176180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178186msgid "Settings"
179187msgstr ""
180188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182190msgid "Remove from Favorites"
183191msgstr ""
184192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186194msgid "Add to Favorites"
187195msgstr ""
188196
@@ -214,87 +222,59 @@ msgstr ""
214222msgid "Release to refresh…"
215223msgstr ""
216224
217−#: qml/Dash/ScopesOverview.qml:206
218−msgid "Manage Scopes"
219−msgstr ""
220−
221−#: qml/Dash/ScopesOverview.qml:428
222−msgid "Done"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:454
226−msgid "Store"
225+#: qml/Dash/ScopesList.qml:63
226+msgid "Manage"
227227msgstr ""
228228
229−#: qml/Dash/ScopesOverviewTab.qml:36
230−msgid "Favorites"
229+#: qml/Dash/ScopesList.qml:107
230+msgid "Home"
231231msgstr ""
232232
233−#: qml/Dash/ScopesOverviewTab.qml:54
234−msgid "All"
233+#: qml/Dash/ScopesList.qml:108
234+msgid "Also installed"
235235msgstr ""
236236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238238msgid "Unlock"
239239msgstr ""
240240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr ""
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr ""
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr ""
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr ""
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr ""
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262242msgid "Show password"
263243msgstr ""
264244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266246msgid "Tap to return to call..."
267247msgstr ""
268248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270250msgid "Conference"
271251msgstr ""
272252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274254msgid "Nothing is playing"
275255msgstr ""
276256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278258msgid "In queue…"
279259msgstr ""
280260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282262msgid "Downloading"
283263msgstr ""
284264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286266msgid "Paused, tap to resume"
287267msgstr ""
288268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290270msgid "Canceled"
291271msgstr ""
292272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294274msgid "Finished"
295275msgstr ""
296276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298278msgid "Failed, tap to retry"
299279msgstr ""
300280
@@ -306,56 +286,233 @@ msgstr ""
306286msgid "Roaming"
307287msgstr ""
308288
309−#: qml/Shell.qml:346
310−msgid "Enter passphrase"
289+#: qml/Shell.qml:367
290+#, qt-format
291+msgid "Enter %1"
311292msgstr ""
312293
313−#: qml/Shell.qml:347
314−msgid "Sorry, incorrect passphrase"
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
295+msgid "Enter passphrase"
315296msgstr ""
316297
317−#: qml/Shell.qml:348
318−msgid "Please re-enter"
298+#: qml/Shell.qml:369
299+msgid "Enter passcode"
319300msgstr ""
320301
321−#: qml/Shell.qml:350
322−msgid "Enter passcode"
302+#: qml/Shell.qml:370
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323305msgstr ""
324306
325−#: qml/Shell.qml:351
326−msgid "Sorry, incorrect passcode"
307+#: qml/Shell.qml:371
308+msgid "Sorry, incorrect passphrase"
327309msgstr ""
328310
329−#: qml/Shell.qml:354
330−#, qt-format
331−msgid "Enter %1"
311+#: qml/Shell.qml:372
312+msgid "Please re-enter"
332313msgstr ""
333314
334−#: qml/Shell.qml:355
335−#, qt-format
336−msgid "Sorry, incorrect %1"
315+#: qml/Shell.qml:373
316+msgid "Sorry, incorrect passcode"
337317msgstr ""
338318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340320msgid "Sorry, incorrect passphrase."
341321msgstr ""
342322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344324msgid "Sorry, incorrect passcode."
345325msgstr ""
346326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348328msgid "This will be your last attempt."
349329msgstr ""
350330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352332msgid ""
353333"If passphrase is entered incorrectly, your phone will conduct a factory "
354334"reset and all personal data will be deleted."
355335msgstr ""
356336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358338msgid ""
359339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360340"and all personal data will be deleted."
361341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
po/bg.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-04-01 14:08+0000\n"
1212"Last-Translator: Atanas Kovachki <Unknown>\n"
1313"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,85 +110,93 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "Пропусни интрото"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Десен край"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
121121"отключите телефона"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Горен край"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr ""
130130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
131131"получите достъп до индикаторите"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Затвори"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr ""
140140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
141141
142−#: qml/Components/EdgeDemo.qml:198
142+#: qml/Components/EdgeDemo.qml:214
143143msgid "Left edge"
144144msgstr "Ляв край"
145145
146−#: qml/Components/EdgeDemo.qml:199
146+#: qml/Components/EdgeDemo.qml:215
147147msgid "Swipe from the left to reveal the launcher for quick access to apps"
148148msgstr ""
149149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
150150"бърз достъп до приложенията"
151151
152−#: qml/Components/EdgeDemo.qml:226
152+#: qml/Components/EdgeDemo.qml:242
153153msgid "Well done"
154154msgstr "Великолепно"
155155
156−#: qml/Components/EdgeDemo.qml:227
156+#: qml/Components/EdgeDemo.qml:243
157157msgid ""
158158"You have now mastered the edge gestures and can start using the "
159159"phone<br><br>Tap on the screen to start"
160160msgstr ""
161161
162−#: qml/Components/Lockscreen.qml:220
162+#: qml/Components/Lockscreen.qml:238
163+msgid "Return to Call"
164+msgstr ""
165+
166+#: qml/Components/Lockscreen.qml:238
163167msgid "Emergency Call"
164168msgstr "Спешно повикване"
165169
166−#: qml/Components/Lockscreen.qml:252
170+#: qml/Components/Lockscreen.qml:270
167171msgid "OK"
168172msgstr ""
169173
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171175msgid "See less"
172176msgstr ""
173177
174−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:431
175179msgid "See all"
176180msgstr ""
177181
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179183#: qml/Panel/SearchIndicator.qml:27
180184msgid "Search"
181185msgstr "Търсене"
182186
183−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:260
188+msgid "Store"
189+msgstr ""
190+
191+#: qml/Dash/PageHeader.qml:277
184192msgid "Settings"
185193msgstr ""
186194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188196msgid "Remove from Favorites"
189197msgstr ""
190198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192200msgid "Add to Favorites"
193201msgstr ""
194202
@@ -220,87 +228,59 @@ msgstr ""
220228msgid "Release to refresh…"
221229msgstr ""
222230
223−#: qml/Dash/ScopesOverview.qml:206
224−msgid "Manage Scopes"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:428
228−msgid "Done"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:454
232−msgid "Store"
231+#: qml/Dash/ScopesList.qml:63
232+msgid "Manage"
233233msgstr ""
234234
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
235+#: qml/Dash/ScopesList.qml:107
236+msgid "Home"
237237msgstr ""
238238
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
239+#: qml/Dash/ScopesList.qml:108
240+msgid "Also installed"
241241msgstr ""
242242
243−#: qml/Greeter/Greeter.qml:157
243+#: qml/Greeter/Greeter.qml:174
244244msgid "Unlock"
245245msgstr ""
246246
247−#: qml/Hud/HudParametrizedActionsPage.qml:139
248−msgid "Confirm"
249−msgstr "Потвърди"
250−
251−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
252−msgid "Type or say a command"
253−msgstr "Въведете или кажете команда"
254−
255−#: qml/Hud/Hud.qml:84
256−msgid "Loading. Please Wait..."
257−msgstr "Зарежда се. Моля, почакайте..."
258−
259−#: qml/Hud/Hud.qml:89
260−msgid "Speak Now..."
261−msgstr "Говорете сега..."
262−
263−#: qml/Hud/Hud.qml:94
264−msgid "Speaking..."
265−msgstr "Говорете..."
266−
267−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
268248msgid "Show password"
269249msgstr "Покажи паролата"
270250
271−#: qml/Panel/ActiveCallHint.qml:77
251+#: qml/Panel/ActiveCallHint.qml:79
272252msgid "Tap to return to call..."
273253msgstr ""
274254
275−#: qml/Panel/ActiveCallHint.qml:90
255+#: qml/Panel/ActiveCallHint.qml:92
276256msgid "Conference"
277257msgstr ""
278258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:600
259+#: qml/Panel/Indicators/MenuItemFactory.qml:643
280260msgid "Nothing is playing"
281261msgstr ""
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:748
263+#: qml/Panel/Indicators/MenuItemFactory.qml:791
284264msgid "In queue…"
285265msgstr ""
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:752
267+#: qml/Panel/Indicators/MenuItemFactory.qml:795
288268msgid "Downloading"
289269msgstr ""
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:754
271+#: qml/Panel/Indicators/MenuItemFactory.qml:797
292272msgid "Paused, tap to resume"
293273msgstr ""
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:756
275+#: qml/Panel/Indicators/MenuItemFactory.qml:799
296276msgid "Canceled"
297277msgstr ""
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:758
279+#: qml/Panel/Indicators/MenuItemFactory.qml:801
300280msgid "Finished"
301281msgstr ""
302282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:760
283+#: qml/Panel/Indicators/MenuItemFactory.qml:803
304284msgid "Failed, tap to retry"
305285msgstr ""
306286
@@ -312,56 +292,248 @@ msgstr ""
312292msgid "Roaming"
313293msgstr ""
314294
315−#: qml/Shell.qml:346
316−msgid "Enter passphrase"
295+#: qml/Shell.qml:367
296+#, qt-format
297+msgid "Enter %1"
317298msgstr ""
318299
319−#: qml/Shell.qml:347
320−msgid "Sorry, incorrect passphrase"
300+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
301+msgid "Enter passphrase"
321302msgstr ""
322303
323−#: qml/Shell.qml:348
324−msgid "Please re-enter"
304+#: qml/Shell.qml:369
305+msgid "Enter passcode"
325306msgstr ""
326307
327−#: qml/Shell.qml:350
328−msgid "Enter passcode"
308+#: qml/Shell.qml:370
309+#, qt-format
310+msgid "Sorry, incorrect %1"
329311msgstr ""
330312
331−#: qml/Shell.qml:351
332−msgid "Sorry, incorrect passcode"
313+#: qml/Shell.qml:371
314+msgid "Sorry, incorrect passphrase"
333315msgstr ""
334316
335−#: qml/Shell.qml:354
336−#, qt-format
337−msgid "Enter %1"
317+#: qml/Shell.qml:372
318+msgid "Please re-enter"
338319msgstr ""
339320
340−#: qml/Shell.qml:355
341−#, qt-format
342−msgid "Sorry, incorrect %1"
321+#: qml/Shell.qml:373
322+msgid "Sorry, incorrect passcode"
343323msgstr ""
344324
345−#: qml/Shell.qml:390
325+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
346326msgid "Sorry, incorrect passphrase."
347327msgstr ""
348328
349−#: qml/Shell.qml:391
329+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
350330msgid "Sorry, incorrect passcode."
351331msgstr ""
352332
353−#: qml/Shell.qml:392
333+#: qml/Shell.qml:469
354334msgid "This will be your last attempt."
355335msgstr ""
356336
357−#: qml/Shell.qml:394
337+#: qml/Shell.qml:471
358338msgid ""
359339"If passphrase is entered incorrectly, your phone will conduct a factory "
360340"reset and all personal data will be deleted."
361341msgstr ""
362342
363−#: qml/Shell.qml:395
343+#: qml/Shell.qml:472
364344msgid ""
365345"If passcode is entered incorrectly, your phone will conduct a factory reset "
366346"and all personal data will be deleted."
367347msgstr ""
348+
349+#: qml/Wizard/Page.qml:89
350+msgid "Back"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:27
354+msgid "Hi!"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:44
358+msgid "Welcome to your Ubuntu phone."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:52
362+msgid "Let’s get started."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368+#: qml/Wizard/Pages/passwd-set.qml:90
369+msgid "Continue"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:25
373+msgid "Add a SIM card and restart your device"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:55
377+msgid "Without it, you won’t be able to make calls or use text messaging."
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381+msgid "Skip"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:39
385+msgid "Lock security"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:74
389+msgid "Please select how you’d like to unlock your phone."
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:97
393+msgid "Swipe"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:98
397+msgid "No security"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:100
401+msgid "Passcode"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:101
405+msgid "4 digits only"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:103
409+msgid "Passphrase"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:104
413+msgid "Numbers and letters"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:28
417+msgid "Connect to Wi‑Fi"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:147
421+msgid "Available networks…"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:148
425+msgid "No available networks."
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:27
429+msgid "Location"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:62
433+msgid "Let the phone detect your location:"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:69
437+msgid "Using GPS only (less accurate)"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:86
441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442+msgstr ""
443+
444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445+#: qml/Wizard/Pages/50-location.qml:103
446+msgid ""
447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448+"conditions</a>."
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:112
452+msgid "Not at all"
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:124
456+msgid "You can change your mind later in <b>System Settings</b>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:24
460+msgid "Improving your experience"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:36
464+msgid ""
465+"Your phone is set up to automatically report errors to Canonical and its "
466+"partners, the makers of the operating system."
467+msgstr ""
468+
469+#: qml/Wizard/Pages/60-reporting.qml:43
470+msgid ""
471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472+"Privacy</b>"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:24
476+msgid "All done"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:39
480+msgid "Nice work!"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:46
484+msgid "Your phone is now ready to use."
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:53
488+msgid "Finish"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/here-terms.qml:27
492+msgid "Terms & Conditions"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:49
496+msgid "Confirm passphrase"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:50
500+msgid "Confirm passcode"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:53
504+#: qml/Wizard/Pages/passwd-confirm.qml:54
505+msgid "Please try again."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:61
509+msgid "Choose your passcode"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:68
513+msgid "Passphrase must be 4 characters long"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:39
517+#, qt-format
518+msgid "〈 %1"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:42
522+#, qt-format
523+msgid "%1 〉"
524+msgstr ""
525+
526+#~ msgid "Confirm"
527+#~ msgstr "Потвърди"
528+
529+#~ msgid "Type or say a command"
530+#~ msgstr "Въведете или кажете команда"
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "Говорете..."
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Говорете сега..."
537+
538+#~ msgid "Loading. Please Wait..."
539+#~ msgstr "Зарежда се. Моля, почакайте..."
po/br.po+285−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-07 07:03+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-16 07:27+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <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"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-16 07:34+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Ger-tremen : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Spilhennañ ar verradenn"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Dispilhennañ ar verradenn"
3333
@@ -116,48 +116,48 @@ msgstr "Nullañ"
116116msgid "Skip intro"
117117msgstr "Tremen hep sellet ouzh an digoradur"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Bord dehoù"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Bord uhelañ"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Serriñ"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
145145
146−#: qml/Components/EdgeDemo.qml:198
146+#: qml/Components/EdgeDemo.qml:214
147147msgid "Left edge"
148148msgstr "Bord kleiz"
149149
150−#: qml/Components/EdgeDemo.qml:199
150+#: qml/Components/EdgeDemo.qml:215
151151msgid "Swipe from the left to reveal the launcher for quick access to apps"
152152msgstr ""
153153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
154154"prim."
155155
156−#: qml/Components/EdgeDemo.qml:226
156+#: qml/Components/EdgeDemo.qml:242
157157msgid "Well done"
158158msgstr "Gourc'hemennoù !"
159159
160−#: qml/Components/EdgeDemo.qml:227
160+#: qml/Components/EdgeDemo.qml:243
161161msgid ""
162162"You have now mastered the edge gestures and can start using the "
163163"phone<br><br>Tap on the screen to start"
@@ -165,36 +165,44 @@ msgstr ""
165165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
166166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
167167
168−#: qml/Components/Lockscreen.qml:220
168+#: qml/Components/Lockscreen.qml:238
169+msgid "Return to Call"
170+msgstr "Distreiñ d'ar bellgomzadenn"
171+
172+#: qml/Components/Lockscreen.qml:238
169173msgid "Emergency Call"
170174msgstr "Pellgomzadenn vallus"
171175
172−#: qml/Components/Lockscreen.qml:252
176+#: qml/Components/Lockscreen.qml:270
173177msgid "OK"
174178msgstr "Mat eo"
175179
176−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
180+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
177181msgid "See less"
178182msgstr "Gwelet nebeutoc'h"
179183
180−#: qml/Dash/GenericScopeView.qml:434
184+#: qml/Dash/GenericScopeView.qml:431
181185msgid "See all"
182186msgstr "Gwelet pep tra"
183187
184−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
188+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
185189#: qml/Panel/SearchIndicator.qml:27
186190msgid "Search"
187191msgstr "Klask"
188192
189−#: qml/Dash/PageHeader.qml:268
193+#: qml/Dash/PageHeader.qml:260
194+msgid "Store"
195+msgstr "Enrollañ"
196+
197+#: qml/Dash/PageHeader.qml:277
190198msgid "Settings"
191199msgstr "Arventennoù"
192200
193−#: qml/Dash/PageHeader.qml:275
201+#: qml/Dash/PageHeader.qml:284
194202msgid "Remove from Favorites"
195203msgstr "Lemel eus ar sinedoù"
196204
197−#: qml/Dash/PageHeader.qml:275
205+#: qml/Dash/PageHeader.qml:284
198206msgid "Add to Favorites"
199207msgstr "Ouzhpennañ d'ar sinedoù"
200208
@@ -226,87 +234,59 @@ msgstr "Tennañ evit freskaat..."
226234msgid "Release to refresh…"
227235msgstr "Lezel da vont evit freskaat..."
228236
229−#: qml/Dash/ScopesOverview.qml:206
230−msgid "Manage Scopes"
231−msgstr "Merañ ar c'hefluskerioù enklask"
232−
233−#: qml/Dash/ScopesOverview.qml:428
234−msgid "Done"
235−msgstr "Graet eo"
236−
237−#: qml/Dash/ScopesOverview.qml:454
238−msgid "Store"
239−msgstr "Enrollañ"
237+#: qml/Dash/ScopesList.qml:63
238+msgid "Manage"
239+msgstr "Merañ"
240240
241−#: qml/Dash/ScopesOverviewTab.qml:36
242−msgid "Favorites"
243−msgstr "Gwellañ deuet"
241+#: qml/Dash/ScopesList.qml:107
242+msgid "Home"
243+msgstr "Er gêr"
244244
245−#: qml/Dash/ScopesOverviewTab.qml:54
246−msgid "All"
247−msgstr "An holl anezho"
245+#: qml/Dash/ScopesList.qml:108
246+msgid "Also installed"
247+msgstr "Staliet ivez"
248248
249−#: qml/Greeter/Greeter.qml:157
249+#: qml/Greeter/Greeter.qml:174
250250msgid "Unlock"
251251msgstr "Dibrennañ"
252252
253−#: qml/Hud/HudParametrizedActionsPage.qml:139
254−msgid "Confirm"
255−msgstr "Kadarnaat"
256−
257−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
258−msgid "Type or say a command"
259−msgstr "Skrivit pe lavarit un urzhiad"
260−
261−#: qml/Hud/Hud.qml:84
262−msgid "Loading. Please Wait..."
263−msgstr "O kargañ. Gortozit, mar plij..."
264−
265−#: qml/Hud/Hud.qml:89
266−msgid "Speak Now..."
267−msgstr "Komzit bremañ..."
268−
269−#: qml/Hud/Hud.qml:94
270−msgid "Speaking..."
271−msgstr "O komz..."
272−
273−#: qml/Notifications/NotificationMenuItemFactory.qml:116
253+#: qml/Notifications/NotificationMenuItemFactory.qml:128
274254msgid "Show password"
275255msgstr "Diskouez ar ger-tremen"
276256
277−#: qml/Panel/ActiveCallHint.qml:77
257+#: qml/Panel/ActiveCallHint.qml:79
278258msgid "Tap to return to call..."
279259msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
280260
281−#: qml/Panel/ActiveCallHint.qml:90
261+#: qml/Panel/ActiveCallHint.qml:92
282262msgid "Conference"
283263msgstr "Kendiviz"
284264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:600
265+#: qml/Panel/Indicators/MenuItemFactory.qml:643
286266msgid "Nothing is playing"
287267msgstr "Ne lenner netra bremañ"
288268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:748
269+#: qml/Panel/Indicators/MenuItemFactory.qml:791
290270msgid "In queue…"
291271msgstr "El lostennad..."
292272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:752
273+#: qml/Panel/Indicators/MenuItemFactory.qml:795
294274msgid "Downloading"
295275msgstr "O pellgargañ"
296276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:754
277+#: qml/Panel/Indicators/MenuItemFactory.qml:797
298278msgid "Paused, tap to resume"
299279msgstr "Ehanet, touchit evit adkregiñ"
300280
301−#: qml/Panel/Indicators/MenuItemFactory.qml:756
281+#: qml/Panel/Indicators/MenuItemFactory.qml:799
302282msgid "Canceled"
303283msgstr "Nullet"
304284
305−#: qml/Panel/Indicators/MenuItemFactory.qml:758
285+#: qml/Panel/Indicators/MenuItemFactory.qml:801
306286msgid "Finished"
307287msgstr "Echu"
308288
309−#: qml/Panel/Indicators/MenuItemFactory.qml:760
289+#: qml/Panel/Indicators/MenuItemFactory.qml:803
310290msgid "Failed, tap to retry"
311291msgstr "C'hwitet, touchit evit adkregiñ"
312292
@@ -318,49 +298,49 @@ msgstr "Dibrennañ ar gartenn SIM"
318298msgid "Roaming"
319299msgstr "O kantren"
320300
321−#: qml/Shell.qml:346
301+#: qml/Shell.qml:367
302+#, qt-format
303+msgid "Enter %1"
304+msgstr "Merkañ %1"
305+
306+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
322307msgid "Enter passphrase"
323308msgstr "Merkañ ar frazenn-dremen"
324309
325−#: qml/Shell.qml:347
310+#: qml/Shell.qml:369
311+msgid "Enter passcode"
312+msgstr "Merkañ ar c'hod-tremen"
313+
314+#: qml/Shell.qml:370
315+#, qt-format
316+msgid "Sorry, incorrect %1"
317+msgstr "Siwazh, %1 direizh"
318+
319+#: qml/Shell.qml:371
326320msgid "Sorry, incorrect passphrase"
327321msgstr "Siwazh, frazenn-dremen direizh"
328322
329−#: qml/Shell.qml:348
323+#: qml/Shell.qml:372
330324msgid "Please re-enter"
331325msgstr "Adverkañ, mar plij"
332326
333−#: qml/Shell.qml:350
334−msgid "Enter passcode"
335−msgstr "Merkañ ar c'hod-tremen"
336−
337−#: qml/Shell.qml:351
327+#: qml/Shell.qml:373
338328msgid "Sorry, incorrect passcode"
339329msgstr "Digarezit, kod-tremen direizh"
340330
341−#: qml/Shell.qml:354
342−#, qt-format
343−msgid "Enter %1"
344−msgstr "Merkañ %1"
345−
346−#: qml/Shell.qml:355
347−#, qt-format
348−msgid "Sorry, incorrect %1"
349−msgstr "Siwazh, %1 direizh"
350−
351−#: qml/Shell.qml:390
331+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
352332msgid "Sorry, incorrect passphrase."
353333msgstr "Siwazh, frazenn-dremen direizh"
354334
355−#: qml/Shell.qml:391
335+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
356336msgid "Sorry, incorrect passcode."
357337msgstr "Siwazh, kod-tremen direizh"
358338
359−#: qml/Shell.qml:392
339+#: qml/Shell.qml:469
360340msgid "This will be your last attempt."
361341msgstr "Ho taol-esae diwezhañ e vo."
362342
363−#: qml/Shell.qml:394
343+#: qml/Shell.qml:471
364344msgid ""
365345"If passphrase is entered incorrectly, your phone will conduct a factory "
366346"reset and all personal data will be deleted."
@@ -368,7 +348,7 @@ msgstr ""
368348"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
369349"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
370350
371−#: qml/Shell.qml:395
351+#: qml/Shell.qml:472
372352msgid ""
373353"If passcode is entered incorrectly, your phone will conduct a factory reset "
374354"and all personal data will be deleted."
@@ -376,8 +356,214 @@ msgstr ""
376356"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
377357"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
378358
379−#~ msgid "Sorry, incorrect PIN"
380−#~ msgstr "Siwazh, kod PIN direizh"
359+#: qml/Wizard/Page.qml:89
360+msgid "Back"
361+msgstr "Distreiñ"
362+
363+#: qml/Wizard/Pages/10-welcome.qml:27
364+msgid "Hi!"
365+msgstr "Salud deoc'h !"
366+
367+#: qml/Wizard/Pages/10-welcome.qml:44
368+msgid "Welcome to your Ubuntu phone."
369+msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
370+
371+#: qml/Wizard/Pages/10-welcome.qml:52
372+msgid "Let’s get started."
373+msgstr "Krogomp ganti."
374+
375+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
376+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
377+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
378+#: qml/Wizard/Pages/passwd-set.qml:90
379+msgid "Continue"
380+msgstr "Kenderc'hel"
381+
382+#: qml/Wizard/Pages/20-sim.qml:25
383+msgid "Add a SIM card and restart your device"
384+msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
385+
386+#: qml/Wizard/Pages/20-sim.qml:55
387+msgid "Without it, you won’t be able to make calls or use text messaging."
388+msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
389+
390+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
391+msgid "Skip"
392+msgstr "Tremen hebiou"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:39
395+msgid "Lock security"
396+msgstr "Surentez ar prennañ"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:74
399+msgid "Please select how you’d like to unlock your phone."
400+msgstr ""
401+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:97
404+msgid "Swipe"
405+msgstr "Riklañ"
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:98
408+msgid "No security"
409+msgstr "Tamm surentez ebet"
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:100
412+msgid "Passcode"
413+msgstr "Kod-tremen"
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:101
416+msgid "4 digits only"
417+msgstr "4 sifr hepken"
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:103
420+msgid "Passphrase"
421+msgstr "Frazenn-dremen"
422+
423+#: qml/Wizard/Pages/30-passwd-type.qml:104
424+msgid "Numbers and letters"
425+msgstr "Sifroù ha lizherennoù"
426+
427+#: qml/Wizard/Pages/40-wifi.qml:28
428+msgid "Connect to Wi‑Fi"
429+msgstr "Kevreañ ouzh ar Wi-Fi"
430+
431+#: qml/Wizard/Pages/40-wifi.qml:147
432+msgid "Available networks…"
433+msgstr "Rouedadoù a c'haller kaout..."
434+
435+#: qml/Wizard/Pages/40-wifi.qml:148
436+msgid "No available networks."
437+msgstr "N'eus rouedad ebet da gaout."
438+
439+#: qml/Wizard/Pages/50-location.qml:27
440+msgid "Location"
441+msgstr "Lec'h"
442+
443+#: qml/Wizard/Pages/50-location.qml:62
444+msgid "Let the phone detect your location:"
445+msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
446+
447+#: qml/Wizard/Pages/50-location.qml:69
448+msgid "Using GPS only (less accurate)"
449+msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
450+
451+#: qml/Wizard/Pages/50-location.qml:86
452+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
453+msgstr ""
454+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
455+
456+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
457+#: qml/Wizard/Pages/50-location.qml:103
458+msgid ""
459+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
460+"conditions</a>."
461+msgstr ""
462+"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr "Tamm ebet"
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr "Gwellaat ho skiant-prenet"
476+
477+#: qml/Wizard/Pages/60-reporting.qml:36
478+msgid ""
479+"Your phone is set up to automatically report errors to Canonical and its "
480+"partners, the makers of the operating system."
481+msgstr ""
482+"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
483+"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
484+
485+#: qml/Wizard/Pages/60-reporting.qml:43
486+msgid ""
487+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
488+"Privacy</b>"
489+msgstr ""
490+"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
491+"dindan <b>Surentez &amp; Prevezded</b>"
492+
493+#: qml/Wizard/Pages/80-finished.qml:24
494+msgid "All done"
495+msgstr "Echu penn-da-benn"
496+
497+#: qml/Wizard/Pages/80-finished.qml:39
498+msgid "Nice work!"
499+msgstr "Gwellat labour !"
500+
501+#: qml/Wizard/Pages/80-finished.qml:46
502+msgid "Your phone is now ready to use."
503+msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
504+
505+#: qml/Wizard/Pages/80-finished.qml:53
506+msgid "Finish"
507+msgstr "Echuiñ"
508+
509+#: qml/Wizard/Pages/here-terms.qml:27
510+msgid "Terms & Conditions"
511+msgstr "Penndivizoù implij"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:49
514+msgid "Confirm passphrase"
515+msgstr "Kadarnaat ar frazenn-dremen"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:50
518+msgid "Confirm passcode"
519+msgstr "Kadarnaat ar c'hod-tremen"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:53
522+#: qml/Wizard/Pages/passwd-confirm.qml:54
523+msgid "Please try again."
524+msgstr "Esaeit en-dro, mar plij."
525+
526+#: qml/Wizard/Pages/passwd-set.qml:61
527+msgid "Choose your passcode"
528+msgstr "Choaz ho kod-tremen"
529+
530+#: qml/Wizard/Pages/passwd-set.qml:68
531+msgid "Passphrase must be 4 characters long"
532+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
533+
534+#: qml/Wizard/StackButton.qml:39
535+#, qt-format
536+msgid "〈 %1"
537+msgstr "〈 %1"
538+
539+#: qml/Wizard/StackButton.qml:42
540+#, qt-format
541+msgid "%1 〉"
542+msgstr "%1 〉"
543+
544+#~ msgid "Loading. Please Wait..."
545+#~ msgstr "O kargañ. Gortozit, mar plij..."
546+
547+#~ msgid "Speaking..."
548+#~ msgstr "O komz..."
549+
550+#~ msgid "Speak Now..."
551+#~ msgstr "Komzit bremañ..."
552+
553+#~ msgid "Confirm"
554+#~ msgstr "Kadarnaat"
555+
556+#~ msgid "Type or say a command"
557+#~ msgstr "Skrivit pe lavarit un urzhiad"
558+
559+#~ msgid "Done"
560+#~ msgstr "Graet eo"
561+
562+#~ msgid "All"
563+#~ msgstr "An holl anezho"
564+
565+#~ msgid "Favorites"
566+#~ msgstr "Gwellañ deuet"
381567
382−#~ msgid "Enter SIM PIN"
383−#~ msgstr "Ebarzhit kod PIN ar gartenn SIM"
568+#~ msgid "Manage Scopes"
569+#~ msgstr "Merañ ar c'hefluskerioù enklask"
po/bs.po+250−93
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Bosnian <bs@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -109,80 +109,88 @@ msgstr ""
109109
110110#: qml/Components/EdgeDemoOverlay.qml:151
111111msgid "Skip intro"
112−msgstr ""
112+msgstr "Preskoči uvod"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116−msgstr ""
116+msgstr "Desna ivica"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr ""
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124−msgstr ""
124+msgstr "Gornja ivica"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr ""
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132−msgstr ""
132+msgstr "Zatvori"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr ""
137137
138−#: qml/Components/EdgeDemo.qml:198
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr ""
141141
142−#: qml/Components/EdgeDemo.qml:199
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145
146−#: qml/Components/EdgeDemo.qml:226
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr ""
149149
150−#: qml/Components/EdgeDemo.qml:227
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
154154msgstr ""
155155
156−#: qml/Components/Lockscreen.qml:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157161msgid "Emergency Call"
158162msgstr ""
159163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161165msgid "OK"
162166msgstr ""
163167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165169msgid "See less"
166170msgstr ""
167171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169173msgid "See all"
170174msgstr ""
171175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173177#: qml/Panel/SearchIndicator.qml:27
174178msgid "Search"
175179msgstr ""
176180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178186msgid "Settings"
179187msgstr ""
180188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182190msgid "Remove from Favorites"
183191msgstr ""
184192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186194msgid "Add to Favorites"
187195msgstr ""
188196
@@ -214,87 +222,59 @@ msgstr ""
214222msgid "Release to refresh…"
215223msgstr ""
216224
217−#: qml/Dash/ScopesOverview.qml:206
218−msgid "Manage Scopes"
225+#: qml/Dash/ScopesList.qml:63
226+msgid "Manage"
219227msgstr ""
220228
221−#: qml/Dash/ScopesOverview.qml:428
222−msgid "Done"
229+#: qml/Dash/ScopesList.qml:107
230+msgid "Home"
223231msgstr ""
224232
225−#: qml/Dash/ScopesOverview.qml:454
226−msgid "Store"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverviewTab.qml:36
230−msgid "Favorites"
231−msgstr ""
232−
233−#: qml/Dash/ScopesOverviewTab.qml:54
234−msgid "All"
233+#: qml/Dash/ScopesList.qml:108
234+msgid "Also installed"
235235msgstr ""
236236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238238msgid "Unlock"
239239msgstr ""
240240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr ""
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr ""
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr ""
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr ""
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr ""
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262242msgid "Show password"
263243msgstr ""
264244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266246msgid "Tap to return to call..."
267247msgstr ""
268248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270250msgid "Conference"
271251msgstr ""
272252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274254msgid "Nothing is playing"
275255msgstr ""
276256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278258msgid "In queue…"
279259msgstr ""
280260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282262msgid "Downloading"
283263msgstr ""
284264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286266msgid "Paused, tap to resume"
287267msgstr ""
288268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290270msgid "Canceled"
291271msgstr ""
292272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294274msgid "Finished"
295275msgstr ""
296276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298278msgid "Failed, tap to retry"
299279msgstr ""
300280
@@ -306,56 +286,233 @@ msgstr ""
306286msgid "Roaming"
307287msgstr ""
308288
309−#: qml/Shell.qml:346
310−msgid "Enter passphrase"
289+#: qml/Shell.qml:367
290+#, qt-format
291+msgid "Enter %1"
311292msgstr ""
312293
313−#: qml/Shell.qml:347
314−msgid "Sorry, incorrect passphrase"
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
295+msgid "Enter passphrase"
315296msgstr ""
316297
317−#: qml/Shell.qml:348
318−msgid "Please re-enter"
298+#: qml/Shell.qml:369
299+msgid "Enter passcode"
319300msgstr ""
320301
321−#: qml/Shell.qml:350
322−msgid "Enter passcode"
302+#: qml/Shell.qml:370
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323305msgstr ""
324306
325−#: qml/Shell.qml:351
326−msgid "Sorry, incorrect passcode"
307+#: qml/Shell.qml:371
308+msgid "Sorry, incorrect passphrase"
327309msgstr ""
328310
329−#: qml/Shell.qml:354
330−#, qt-format
331−msgid "Enter %1"
311+#: qml/Shell.qml:372
312+msgid "Please re-enter"
332313msgstr ""
333314
334−#: qml/Shell.qml:355
335−#, qt-format
336−msgid "Sorry, incorrect %1"
315+#: qml/Shell.qml:373
316+msgid "Sorry, incorrect passcode"
337317msgstr ""
338318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340320msgid "Sorry, incorrect passphrase."
341321msgstr ""
342322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344324msgid "Sorry, incorrect passcode."
345325msgstr ""
346326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348328msgid "This will be your last attempt."
349329msgstr ""
350330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352332msgid ""
353333"If passphrase is entered incorrectly, your phone will conduct a factory "
354334"reset and all personal data will be deleted."
355335msgstr ""
356336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358338msgid ""
359339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360340"and all personal data will be deleted."
361341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
po/ca.po+277−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-07 10:51+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-10 09:22+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Enganxa la drecera"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116116msgid "Skip intro"
117117msgstr "Omet la introducció"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Vora dreta"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Vora superior"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Tanca"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145145"configuració"
146146
147−#: qml/Components/EdgeDemo.qml:198
147+#: qml/Components/EdgeDemo.qml:214
148148msgid "Left edge"
149149msgstr "Vora esquerra"
150150
151−#: qml/Components/EdgeDemo.qml:199
151+#: qml/Components/EdgeDemo.qml:215
152152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153153msgstr ""
154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155155"ràpidament a les aplicacions"
156156
157−#: qml/Components/EdgeDemo.qml:226
157+#: qml/Components/EdgeDemo.qml:242
158158msgid "Well done"
159159msgstr "Enhorabona!"
160160
161−#: qml/Components/EdgeDemo.qml:227
161+#: qml/Components/EdgeDemo.qml:243
162162msgid ""
163163"You have now mastered the edge gestures and can start using the "
164164"phone<br><br>Tap on the screen to start"
@@ -166,36 +166,44 @@ msgstr ""
166166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
167167"telèfon<br><br>Feu un toc a la pantalla per començar"
168168
169−#: qml/Components/Lockscreen.qml:220
169+#: qml/Components/Lockscreen.qml:238
170+msgid "Return to Call"
171+msgstr "Torna a la trucada"
172+
173+#: qml/Components/Lockscreen.qml:238
170174msgid "Emergency Call"
171175msgstr "Trucada d'emergència"
172176
173−#: qml/Components/Lockscreen.qml:252
177+#: qml/Components/Lockscreen.qml:270
174178msgid "OK"
175179msgstr "D'acord"
176180
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
178182msgid "See less"
179183msgstr "Mostra'n menys"
180184
181−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:431
182186msgid "See all"
183187msgstr "Mostra-ho tot"
184188
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
186190#: qml/Panel/SearchIndicator.qml:27
187191msgid "Search"
188192msgstr "Cerca"
189193
190−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:260
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:277
191199msgid "Settings"
192200msgstr "Paràmetres"
193201
194−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
195203msgid "Remove from Favorites"
196204msgstr "Suprimeix dels preferits"
197205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199207msgid "Add to Favorites"
200208msgstr "Afegeix als preferits"
201209
@@ -227,87 +235,59 @@ msgstr "Estireu per actualitzar..."
227235msgid "Release to refresh…"
228236msgstr "Deixeu anar per actualitzar..."
229237
230−#: qml/Dash/ScopesOverview.qml:206
231−msgid "Manage Scopes"
232−msgstr "Gestioneu les lents"
233−
234−#: qml/Dash/ScopesOverview.qml:428
235−msgid "Done"
236−msgstr "Fet"
237−
238−#: qml/Dash/ScopesOverview.qml:454
239−msgid "Store"
240−msgstr "Botiga"
238+#: qml/Dash/ScopesList.qml:63
239+msgid "Manage"
240+msgstr ""
241241
242−#: qml/Dash/ScopesOverviewTab.qml:36
243−msgid "Favorites"
244−msgstr "Preferides"
242+#: qml/Dash/ScopesList.qml:107
243+msgid "Home"
244+msgstr ""
245245
246−#: qml/Dash/ScopesOverviewTab.qml:54
247−msgid "All"
248−msgstr "Totes"
246+#: qml/Dash/ScopesList.qml:108
247+msgid "Also installed"
248+msgstr ""
249249
250−#: qml/Greeter/Greeter.qml:157
250+#: qml/Greeter/Greeter.qml:174
251251msgid "Unlock"
252252msgstr "Desbloca"
253253
254−#: qml/Hud/HudParametrizedActionsPage.qml:139
255−msgid "Confirm"
256−msgstr "Confirma"
257−
258−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
259−msgid "Type or say a command"
260−msgstr "Escriviu o pronuncieu una ordre"
261−
262−#: qml/Hud/Hud.qml:84
263−msgid "Loading. Please Wait..."
264−msgstr "S'està carregant. Espereu-vos un moment..."
265−
266−#: qml/Hud/Hud.qml:89
267−msgid "Speak Now..."
268−msgstr "Parleu..."
269−
270−#: qml/Hud/Hud.qml:94
271−msgid "Speaking..."
272−msgstr "S'està parlant..."
273−
274−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
275255msgid "Show password"
276256msgstr "Mostra la contrasenya"
277257
278−#: qml/Panel/ActiveCallHint.qml:77
258+#: qml/Panel/ActiveCallHint.qml:79
279259msgid "Tap to return to call..."
280260msgstr "Feu un toc per tornar a la trucada..."
281261
282−#: qml/Panel/ActiveCallHint.qml:90
262+#: qml/Panel/ActiveCallHint.qml:92
283263msgid "Conference"
284264msgstr "Conferència"
285265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:600
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
287267msgid "Nothing is playing"
288268msgstr "No s'està reproduint res"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:748
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
291271msgid "In queue…"
292272msgstr "A la cua..."
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:752
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
295275msgid "Downloading"
296276msgstr "S'està baixant"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:754
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
299279msgid "Paused, tap to resume"
300280msgstr "En pausa, feu un toc per continuar"
301281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:756
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
303283msgid "Canceled"
304284msgstr "S'ha cancel·lat"
305285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:758
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
307287msgid "Finished"
308288msgstr "S'ha finalitzat"
309289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:760
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
311291msgid "Failed, tap to retry"
312292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
313293
@@ -319,49 +299,49 @@ msgstr "Desbloca la SIM"
319299msgid "Roaming"
320300msgstr "Itinerància"
321301
322−#: qml/Shell.qml:346
302+#: qml/Shell.qml:367
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Introduïu: %1"
306+
307+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
323308msgid "Enter passphrase"
324309msgstr "Introduïu la contrasenya"
325310
326−#: qml/Shell.qml:347
311+#: qml/Shell.qml:369
312+msgid "Enter passcode"
313+msgstr "Introduïu el codi d'accés"
314+
315+#: qml/Shell.qml:370
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Incorrecte (%1)"
319+
320+#: qml/Shell.qml:371
327321msgid "Sorry, incorrect passphrase"
328322msgstr "La contrasenya no és correcta"
329323
330−#: qml/Shell.qml:348
324+#: qml/Shell.qml:372
331325msgid "Please re-enter"
332326msgstr "Torneu-ho a introduir"
333327
334−#: qml/Shell.qml:350
335−msgid "Enter passcode"
336−msgstr "Introduïu el codi d'accés"
337−
338−#: qml/Shell.qml:351
328+#: qml/Shell.qml:373
339329msgid "Sorry, incorrect passcode"
340330msgstr "El codi d'accés no és correcte"
341331
342−#: qml/Shell.qml:354
343−#, qt-format
344−msgid "Enter %1"
345−msgstr "Introduïu: %1"
346−
347−#: qml/Shell.qml:355
348−#, qt-format
349−msgid "Sorry, incorrect %1"
350−msgstr "Incorrecte (%1)"
351−
352−#: qml/Shell.qml:390
332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
353333msgid "Sorry, incorrect passphrase."
354334msgstr "La contrasenya és incorrecta"
355335
356−#: qml/Shell.qml:391
336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
357337msgid "Sorry, incorrect passcode."
358338msgstr "El codi d'accés no és correcte"
359339
360−#: qml/Shell.qml:392
340+#: qml/Shell.qml:469
361341msgid "This will be your last attempt."
362342msgstr "Aquest serà el darrer intent."
363343
364−#: qml/Shell.qml:394
344+#: qml/Shell.qml:471
365345msgid ""
366346"If passphrase is entered incorrectly, your phone will conduct a factory "
367347"reset and all personal data will be deleted."
@@ -370,7 +350,7 @@ msgstr ""
370350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
371351"personals."
372352
373−#: qml/Shell.qml:395
353+#: qml/Shell.qml:472
374354msgid ""
375355"If passcode is entered incorrectly, your phone will conduct a factory reset "
376356"and all personal data will be deleted."
@@ -379,8 +359,206 @@ msgstr ""
379359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
380360"personals."
381361
382−#~ msgid "Sorry, incorrect PIN"
383−#~ msgstr "El PIN no és correcte"
362+#: qml/Wizard/Page.qml:89
363+msgid "Back"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:27
367+msgid "Hi!"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:44
371+msgid "Welcome to your Ubuntu phone."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:52
375+msgid "Let’s get started."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
381+#: qml/Wizard/Pages/passwd-set.qml:90
382+msgid "Continue"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/20-sim.qml:25
386+msgid "Add a SIM card and restart your device"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/20-sim.qml:55
390+msgid "Without it, you won’t be able to make calls or use text messaging."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
394+msgid "Skip"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:39
398+msgid "Lock security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:74
402+msgid "Please select how you’d like to unlock your phone."
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:97
406+msgid "Swipe"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:98
410+msgid "No security"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:100
414+msgid "Passcode"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:101
418+msgid "4 digits only"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:103
422+msgid "Passphrase"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:104
426+msgid "Numbers and letters"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/40-wifi.qml:28
430+msgid "Connect to Wi‑Fi"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/40-wifi.qml:147
434+msgid "Available networks…"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:148
438+msgid "No available networks."
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:27
442+msgid "Location"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:62
446+msgid "Let the phone detect your location:"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:69
450+msgid "Using GPS only (less accurate)"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
456+
457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
458+#: qml/Wizard/Pages/50-location.qml:103
459+msgid ""
460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
461+"conditions</a>."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:36
477+msgid ""
478+"Your phone is set up to automatically report errors to Canonical and its "
479+"partners, the makers of the operating system."
480+msgstr ""
481+
482+#: qml/Wizard/Pages/60-reporting.qml:43
483+msgid ""
484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
485+"Privacy</b>"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:24
489+msgid "All done"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:39
493+msgid "Nice work!"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:46
497+msgid "Your phone is now ready to use."
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:53
501+msgid "Finish"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/here-terms.qml:27
505+msgid "Terms & Conditions"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:49
509+msgid "Confirm passphrase"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:50
513+msgid "Confirm passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:53
517+#: qml/Wizard/Pages/passwd-confirm.qml:54
518+msgid "Please try again."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/passwd-set.qml:61
522+msgid "Choose your passcode"
523+msgstr ""
524+
525+#: qml/Wizard/Pages/passwd-set.qml:68
526+msgid "Passphrase must be 4 characters long"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:39
530+#, qt-format
531+msgid "〈 %1"
532+msgstr ""
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr ""
538+
539+#~ msgid "Confirm"
540+#~ msgstr "Confirma"
541+
542+#~ msgid "Type or say a command"
543+#~ msgstr "Escriviu o pronuncieu una ordre"
544+
545+#~ msgid "Loading. Please Wait..."
546+#~ msgstr "S'està carregant. Espereu-vos un moment..."
547+
548+#~ msgid "Speak Now..."
549+#~ msgstr "Parleu..."
550+
551+#~ msgid "Speaking..."
552+#~ msgstr "S'està parlant..."
553+
554+#~ msgid "Done"
555+#~ msgstr "Fet"
556+
557+#~ msgid "Favorites"
558+#~ msgstr "Preferides"
559+
560+#~ msgid "All"
561+#~ msgstr "Totes"
384562
385−#~ msgid "Enter SIM PIN"
386−#~ msgstr "Introduïu el PIN de la targeta SIM"
563+#~ msgid "Manage Scopes"
564+#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+279−95
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-15 14:39+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-23 07:17+0000\n"
1212"Last-Translator: Pau Iranzo <Unknown>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-16 05:44+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Apega la drecera"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116116msgid "Skip intro"
117117msgstr "Omet la introducció"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Vora dreta"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Vora superior"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Tanca"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145145"configuració"
146146
147−#: qml/Components/EdgeDemo.qml:198
147+#: qml/Components/EdgeDemo.qml:214
148148msgid "Left edge"
149149msgstr "Vora esquerra"
150150
151−#: qml/Components/EdgeDemo.qml:199
151+#: qml/Components/EdgeDemo.qml:215
152152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153153msgstr ""
154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155155"ràpidament a les aplicacions"
156156
157−#: qml/Components/EdgeDemo.qml:226
157+#: qml/Components/EdgeDemo.qml:242
158158msgid "Well done"
159159msgstr "Enhorabona!"
160160
161−#: qml/Components/EdgeDemo.qml:227
161+#: qml/Components/EdgeDemo.qml:243
162162msgid ""
163163"You have now mastered the edge gestures and can start using the "
164164"phone<br><br>Tap on the screen to start"
@@ -166,36 +166,44 @@ msgstr ""
166166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "
167167"telèfon<br><br>Feu un toc a la pantalla per començar"
168168
169−#: qml/Components/Lockscreen.qml:220
169+#: qml/Components/Lockscreen.qml:238
170+msgid "Return to Call"
171+msgstr "Torna a la trucada"
172+
173+#: qml/Components/Lockscreen.qml:238
170174msgid "Emergency Call"
171175msgstr "Cridada d'emergència"
172176
173−#: qml/Components/Lockscreen.qml:252
177+#: qml/Components/Lockscreen.qml:270
174178msgid "OK"
175179msgstr "D'acord"
176180
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
178182msgid "See less"
179183msgstr "Mostra'n menys"
180184
181−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:431
182186msgid "See all"
183187msgstr "Mostra-ho tot"
184188
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
186190#: qml/Panel/SearchIndicator.qml:27
187191msgid "Search"
188192msgstr "Cerca"
189193
190−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:260
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:277
191199msgid "Settings"
192200msgstr "Paràmetres"
193201
194−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
195203msgid "Remove from Favorites"
196204msgstr "Suprimeix dels preferits"
197205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199207msgid "Add to Favorites"
200208msgstr "Afig als preferits"
201209
@@ -227,87 +235,59 @@ msgstr "Estireu per actualitzar..."
227235msgid "Release to refresh…"
228236msgstr "Deixeu anar per actualitzar..."
229237
230−#: qml/Dash/ScopesOverview.qml:206
231−msgid "Manage Scopes"
232−msgstr "Gestioneu les lents"
233−
234−#: qml/Dash/ScopesOverview.qml:428
235−msgid "Done"
236−msgstr "Fet"
237−
238−#: qml/Dash/ScopesOverview.qml:454
239−msgid "Store"
240−msgstr "Botiga"
238+#: qml/Dash/ScopesList.qml:63
239+msgid "Manage"
240+msgstr ""
241241
242−#: qml/Dash/ScopesOverviewTab.qml:36
243−msgid "Favorites"
244−msgstr "Preferides"
242+#: qml/Dash/ScopesList.qml:107
243+msgid "Home"
244+msgstr ""
245245
246−#: qml/Dash/ScopesOverviewTab.qml:54
247−msgid "All"
248−msgstr "Totes"
246+#: qml/Dash/ScopesList.qml:108
247+msgid "Also installed"
248+msgstr ""
249249
250−#: qml/Greeter/Greeter.qml:157
250+#: qml/Greeter/Greeter.qml:174
251251msgid "Unlock"
252252msgstr "Desbloca"
253253
254−#: qml/Hud/HudParametrizedActionsPage.qml:139
255−msgid "Confirm"
256−msgstr "Confirma"
257−
258−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
259−msgid "Type or say a command"
260−msgstr "Escriviu o pronuncieu una orde"
261−
262−#: qml/Hud/Hud.qml:84
263−msgid "Loading. Please Wait..."
264−msgstr "S'està carregant. Espereu-vos un moment..."
265−
266−#: qml/Hud/Hud.qml:89
267−msgid "Speak Now..."
268−msgstr "Parleu..."
269−
270−#: qml/Hud/Hud.qml:94
271−msgid "Speaking..."
272−msgstr "S'està parlant..."
273−
274−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
275255msgid "Show password"
276256msgstr "Mostra la contrasenya"
277257
278−#: qml/Panel/ActiveCallHint.qml:77
258+#: qml/Panel/ActiveCallHint.qml:79
279259msgid "Tap to return to call..."
280260msgstr "Feu un toc per tornar a la cridada..."
281261
282−#: qml/Panel/ActiveCallHint.qml:90
262+#: qml/Panel/ActiveCallHint.qml:92
283263msgid "Conference"
284264msgstr "Conferència"
285265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:600
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
287267msgid "Nothing is playing"
288268msgstr "No s'està reproduint res"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:748
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
291271msgid "In queue…"
292272msgstr "A la cua..."
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:752
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
295275msgid "Downloading"
296276msgstr "S'està baixant"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:754
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
299279msgid "Paused, tap to resume"
300280msgstr "En pausa, feu un toc per continuar"
301281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:756
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
303283msgid "Canceled"
304284msgstr "S'ha cancel·lat"
305285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:758
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
307287msgid "Finished"
308288msgstr "S'ha finalitzat"
309289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:760
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
311291msgid "Failed, tap to retry"
312292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
313293
@@ -319,49 +299,49 @@ msgstr "Desbloca la SIM"
319299msgid "Roaming"
320300msgstr "Itinerància"
321301
322−#: qml/Shell.qml:346
302+#: qml/Shell.qml:367
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Introduïu: %1"
306+
307+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
323308msgid "Enter passphrase"
324309msgstr "Introduïu la contrasenya"
325310
326−#: qml/Shell.qml:347
311+#: qml/Shell.qml:369
312+msgid "Enter passcode"
313+msgstr "Introduïu el codi d'accés"
314+
315+#: qml/Shell.qml:370
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Incorrecte (%1)"
319+
320+#: qml/Shell.qml:371
327321msgid "Sorry, incorrect passphrase"
328322msgstr "La contrasenya no és correcta"
329323
330−#: qml/Shell.qml:348
324+#: qml/Shell.qml:372
331325msgid "Please re-enter"
332326msgstr "Torneu-ho a introduir"
333327
334−#: qml/Shell.qml:350
335−msgid "Enter passcode"
336−msgstr "Introduïu el codi d'accés"
337−
338−#: qml/Shell.qml:351
328+#: qml/Shell.qml:373
339329msgid "Sorry, incorrect passcode"
340330msgstr "El codi d'accés no és correcte"
341331
342−#: qml/Shell.qml:354
343−#, qt-format
344−msgid "Enter %1"
345−msgstr "Introduïu: %1"
346−
347−#: qml/Shell.qml:355
348−#, qt-format
349−msgid "Sorry, incorrect %1"
350−msgstr "Incorrecte (%1)"
351−
352−#: qml/Shell.qml:390
332+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
353333msgid "Sorry, incorrect passphrase."
354334msgstr "La contrasenya és incorrecta"
355335
356−#: qml/Shell.qml:391
336+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
357337msgid "Sorry, incorrect passcode."
358338msgstr "El codi d'accés no és correcte"
359339
360−#: qml/Shell.qml:392
340+#: qml/Shell.qml:469
361341msgid "This will be your last attempt."
362342msgstr "Este serà el darrer intent."
363343
364−#: qml/Shell.qml:394
344+#: qml/Shell.qml:471
365345msgid ""
366346"If passphrase is entered incorrectly, your phone will conduct a factory "
367347"reset and all personal data will be deleted."
@@ -370,7 +350,7 @@ msgstr ""
370350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
371351"personals."
372352
373−#: qml/Shell.qml:395
353+#: qml/Shell.qml:472
374354msgid ""
375355"If passcode is entered incorrectly, your phone will conduct a factory reset "
376356"and all personal data will be deleted."
@@ -378,3 +358,207 @@ msgstr ""
378358"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
379359"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
380360"personals."
361+
362+#: qml/Wizard/Page.qml:89
363+msgid "Back"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:27
367+msgid "Hi!"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:44
371+msgid "Welcome to your Ubuntu phone."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:52
375+msgid "Let’s get started."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
381+#: qml/Wizard/Pages/passwd-set.qml:90
382+msgid "Continue"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/20-sim.qml:25
386+msgid "Add a SIM card and restart your device"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/20-sim.qml:55
390+msgid "Without it, you won’t be able to make calls or use text messaging."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
394+msgid "Skip"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:39
398+msgid "Lock security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:74
402+msgid "Please select how you’d like to unlock your phone."
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:97
406+msgid "Swipe"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:98
410+msgid "No security"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:100
414+msgid "Passcode"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:101
418+msgid "4 digits only"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:103
422+msgid "Passphrase"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:104
426+msgid "Numbers and letters"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/40-wifi.qml:28
430+msgid "Connect to Wi‑Fi"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/40-wifi.qml:147
434+msgid "Available networks…"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:148
438+msgid "No available networks."
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:27
442+msgid "Location"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:62
446+msgid "Let the phone detect your location:"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:69
450+msgid "Using GPS only (less accurate)"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
456+
457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
458+#: qml/Wizard/Pages/50-location.qml:103
459+msgid ""
460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
461+"conditions</a>."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:36
477+msgid ""
478+"Your phone is set up to automatically report errors to Canonical and its "
479+"partners, the makers of the operating system."
480+msgstr ""
481+
482+#: qml/Wizard/Pages/60-reporting.qml:43
483+msgid ""
484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
485+"Privacy</b>"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:24
489+msgid "All done"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:39
493+msgid "Nice work!"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:46
497+msgid "Your phone is now ready to use."
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:53
501+msgid "Finish"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/here-terms.qml:27
505+msgid "Terms & Conditions"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:49
509+msgid "Confirm passphrase"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:50
513+msgid "Confirm passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:53
517+#: qml/Wizard/Pages/passwd-confirm.qml:54
518+msgid "Please try again."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/passwd-set.qml:61
522+msgid "Choose your passcode"
523+msgstr ""
524+
525+#: qml/Wizard/Pages/passwd-set.qml:68
526+msgid "Passphrase must be 4 characters long"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:39
530+#, qt-format
531+msgid "〈 %1"
532+msgstr ""
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr ""
538+
539+#~ msgid "Manage Scopes"
540+#~ msgstr "Gestioneu les lents"
541+
542+#~ msgid "Done"
543+#~ msgstr "Fet"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Preferides"
547+
548+#~ msgid "All"
549+#~ msgstr "Totes"
550+
551+#~ msgid "Confirm"
552+#~ msgstr "Confirma"
553+
554+#~ msgid "Type or say a command"
555+#~ msgstr "Escriviu o pronuncieu una orde"
556+
557+#~ msgid "Loading. Please Wait..."
558+#~ msgstr "S'està carregant. Espereu-vos un moment..."
559+
560+#~ msgid "Speak Now..."
561+#~ msgstr "Parleu..."
562+
563+#~ msgid "Speaking..."
564+#~ msgstr "S'està parlant..."
po/ckb.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"
1212"Last-Translator: Aras <aras.noori@gmail.com>\n"
1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,78 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "پێشەکیی بپەڕێنە"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "لێواری ڕاست"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "لێواری سەرەوە"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "داخستن"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "لێواری چەپ"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "دەستخۆش"
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156160msgid "Emergency Call"
157161msgstr "هێڵی فریاگوزاری"
158162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160164msgid "OK"
161165msgstr ""
162166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164168msgid "See less"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168172msgid "See all"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172176#: qml/Panel/SearchIndicator.qml:27
173177msgid "Search"
174178msgstr "گەڕان"
175179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177185msgid "Settings"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181189msgid "Remove from Favorites"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Add to Favorites"
186194msgstr ""
187195
@@ -213,87 +221,59 @@ msgstr ""
213221msgid "Release to refresh…"
214222msgstr ""
215223
216−#: qml/Dash/ScopesOverview.qml:206
217−msgid "Manage Scopes"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
224+#: qml/Dash/ScopesList.qml:63
225+msgid "Manage"
226226msgstr ""
227227
228−#: qml/Dash/ScopesOverviewTab.qml:36
229−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:107
229+msgid "Home"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:54
233−msgid "All"
232+#: qml/Dash/ScopesList.qml:108
233+msgid "Also installed"
234234msgstr ""
235235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237237msgid "Unlock"
238238msgstr ""
239239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "پشتڕاستکردنەوە"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "فەرمانێک بێژە یان بنووسە"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "لە بارکردندایە. تکایە چاوەڕێ بکە..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "ئێستا قسە بکە"
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "قسە دەکات..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261241msgid "Show password"
262242msgstr "تێپەڕەوشە پیشان بدە"
263243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265245msgid "Tap to return to call..."
266246msgstr ""
267247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269249msgid "Conference"
270250msgstr ""
271251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273253msgid "Nothing is playing"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277257msgid "In queue…"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281261msgid "Downloading"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285265msgid "Paused, tap to resume"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289269msgid "Canceled"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293273msgid "Finished"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297277msgid "Failed, tap to retry"
298278msgstr ""
299279
@@ -305,56 +285,248 @@ msgstr ""
305285msgid "Roaming"
306286msgstr ""
307287
308−#: qml/Shell.qml:346
309−msgid "Enter passphrase"
288+#: qml/Shell.qml:367
289+#, qt-format
290+msgid "Enter %1"
310291msgstr ""
311292
312−#: qml/Shell.qml:347
313−msgid "Sorry, incorrect passphrase"
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
294+msgid "Enter passphrase"
314295msgstr ""
315296
316−#: qml/Shell.qml:348
317−msgid "Please re-enter"
297+#: qml/Shell.qml:369
298+msgid "Enter passcode"
318299msgstr ""
319300
320−#: qml/Shell.qml:350
321−msgid "Enter passcode"
301+#: qml/Shell.qml:370
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322304msgstr ""
323305
324−#: qml/Shell.qml:351
325−msgid "Sorry, incorrect passcode"
306+#: qml/Shell.qml:371
307+msgid "Sorry, incorrect passphrase"
326308msgstr ""
327309
328−#: qml/Shell.qml:354
329−#, qt-format
330−msgid "Enter %1"
310+#: qml/Shell.qml:372
311+msgid "Please re-enter"
331312msgstr ""
332313
333−#: qml/Shell.qml:355
334−#, qt-format
335−msgid "Sorry, incorrect %1"
314+#: qml/Shell.qml:373
315+msgid "Sorry, incorrect passcode"
336316msgstr ""
337317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339319msgid "Sorry, incorrect passphrase."
340320msgstr ""
341321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343323msgid "Sorry, incorrect passcode."
344324msgstr ""
345325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347327msgid "This will be your last attempt."
348328msgstr ""
349329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351331msgid ""
352332"If passphrase is entered incorrectly, your phone will conduct a factory "
353333"reset and all personal data will be deleted."
354334msgstr ""
355335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357337msgid ""
358338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359339"and all personal data will be deleted."
360340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Speaking..."
520+#~ msgstr "قسە دەکات..."
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "ئێستا قسە بکە"
524+
525+#~ msgid "Confirm"
526+#~ msgstr "پشتڕاستکردنەوە"
527+
528+#~ msgid "Type or say a command"
529+#~ msgstr "فەرمانێک بێژە یان بنووسە"
530+
531+#~ msgid "Loading. Please Wait..."
532+#~ msgstr "لە بارکردندایە. تکایە چاوەڕێ بکە..."
po/cs.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"
1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
1313"Language-Team: Czech <cs@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,78 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "Přeskočit intro"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Pravý okraj"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Horní okraj"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Uzavřít"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Levý okraj"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "Výborně"
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156160msgid "Emergency Call"
157161msgstr "Tísňové volání"
158162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160164msgid "OK"
161165msgstr ""
162166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164168msgid "See less"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168172msgid "See all"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172176#: qml/Panel/SearchIndicator.qml:27
173177msgid "Search"
174178msgstr "Hledat"
175179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177185msgid "Settings"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181189msgid "Remove from Favorites"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Add to Favorites"
186194msgstr ""
187195
@@ -213,87 +221,59 @@ msgstr ""
213221msgid "Release to refresh…"
214222msgstr ""
215223
216−#: qml/Dash/ScopesOverview.qml:206
217−msgid "Manage Scopes"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
224+#: qml/Dash/ScopesList.qml:63
225+msgid "Manage"
226226msgstr ""
227227
228−#: qml/Dash/ScopesOverviewTab.qml:36
229−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:107
229+msgid "Home"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:54
233−msgid "All"
232+#: qml/Dash/ScopesList.qml:108
233+msgid "Also installed"
234234msgstr ""
235235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237237msgid "Unlock"
238238msgstr ""
239239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "Potvrdit"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "Napište nebo řekněte příkaz"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "Načítám. Čekejte prosím..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "Mluvte..."
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "Mluvte..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261241msgid "Show password"
262242msgstr "Zobrazit heslo"
263243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265245msgid "Tap to return to call..."
266246msgstr ""
267247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269249msgid "Conference"
270250msgstr ""
271251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273253msgid "Nothing is playing"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277257msgid "In queue…"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281261msgid "Downloading"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285265msgid "Paused, tap to resume"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289269msgid "Canceled"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293273msgid "Finished"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297277msgid "Failed, tap to retry"
298278msgstr ""
299279
@@ -305,56 +285,248 @@ msgstr ""
305285msgid "Roaming"
306286msgstr ""
307287
308−#: qml/Shell.qml:346
309−msgid "Enter passphrase"
288+#: qml/Shell.qml:367
289+#, qt-format
290+msgid "Enter %1"
310291msgstr ""
311292
312−#: qml/Shell.qml:347
313−msgid "Sorry, incorrect passphrase"
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
294+msgid "Enter passphrase"
314295msgstr ""
315296
316−#: qml/Shell.qml:348
317−msgid "Please re-enter"
297+#: qml/Shell.qml:369
298+msgid "Enter passcode"
318299msgstr ""
319300
320−#: qml/Shell.qml:350
321−msgid "Enter passcode"
301+#: qml/Shell.qml:370
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322304msgstr ""
323305
324−#: qml/Shell.qml:351
325−msgid "Sorry, incorrect passcode"
306+#: qml/Shell.qml:371
307+msgid "Sorry, incorrect passphrase"
326308msgstr ""
327309
328−#: qml/Shell.qml:354
329−#, qt-format
330−msgid "Enter %1"
310+#: qml/Shell.qml:372
311+msgid "Please re-enter"
331312msgstr ""
332313
333−#: qml/Shell.qml:355
334−#, qt-format
335−msgid "Sorry, incorrect %1"
314+#: qml/Shell.qml:373
315+msgid "Sorry, incorrect passcode"
336316msgstr ""
337317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339319msgid "Sorry, incorrect passphrase."
340320msgstr ""
341321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343323msgid "Sorry, incorrect passcode."
344324msgstr ""
345325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347327msgid "This will be your last attempt."
348328msgstr ""
349329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351331msgid ""
352332"If passphrase is entered incorrectly, your phone will conduct a factory "
353333"reset and all personal data will be deleted."
354334msgstr ""
355335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357337msgid ""
358338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359339"and all personal data will be deleted."
360340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Loading. Please Wait..."
520+#~ msgstr "Načítám. Čekejte prosím..."
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "Mluvte..."
524+
525+#~ msgid "Confirm"
526+#~ msgstr "Potvrdit"
527+
528+#~ msgid "Speaking..."
529+#~ msgstr "Mluvte..."
530+
531+#~ msgid "Type or say a command"
532+#~ msgstr "Napište nebo řekněte příkaz"
po/da.po+261−89
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"
1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
1818"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr "Fastgør genvej"
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr "Gør genvej flytbar"
3434
@@ -111,43 +111,43 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr "Spring intro over"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr "Højre kant"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr "Øvre kant"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr "Luk"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr "Stryg op igen for at låse indstillingsskærmen"
137137
138−#: qml/Components/EdgeDemo.qml:198
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr "Venstre kant"
141141
142−#: qml/Components/EdgeDemo.qml:199
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
145145
146−#: qml/Components/EdgeDemo.qml:226
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr "Godt gjort"
149149
150−#: qml/Components/EdgeDemo.qml:227
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
@@ -155,36 +155,44 @@ msgstr ""
155155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
156156"på skærmen for at starte"
157157
158−#: qml/Components/Lockscreen.qml:220
158+#: qml/Components/Lockscreen.qml:238
159+msgid "Return to Call"
160+msgstr ""
161+
162+#: qml/Components/Lockscreen.qml:238
159163msgid "Emergency Call"
160164msgstr "Nødopkald"
161165
162−#: qml/Components/Lockscreen.qml:252
166+#: qml/Components/Lockscreen.qml:270
163167msgid "OK"
164168msgstr "O.k."
165169
166−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
167171msgid "See less"
168172msgstr "Vis mindre"
169173
170−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:431
171175msgid "See all"
172176msgstr "Se alle"
173177
174−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
175179#: qml/Panel/SearchIndicator.qml:27
176180msgid "Search"
177181msgstr "Søg"
178182
179−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:260
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:277
180188msgid "Settings"
181189msgstr ""
182190
183−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:284
184192msgid "Remove from Favorites"
185193msgstr ""
186194
187−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:284
188196msgid "Add to Favorites"
189197msgstr ""
190198
@@ -216,87 +224,59 @@ msgstr ""
216224msgid "Release to refresh…"
217225msgstr ""
218226
219−#: qml/Dash/ScopesOverview.qml:206
220−msgid "Manage Scopes"
221−msgstr ""
222−
223−#: qml/Dash/ScopesOverview.qml:428
224−msgid "Done"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:454
228−msgid "Store"
227+#: qml/Dash/ScopesList.qml:63
228+msgid "Manage"
229229msgstr ""
230230
231−#: qml/Dash/ScopesOverviewTab.qml:36
232−msgid "Favorites"
231+#: qml/Dash/ScopesList.qml:107
232+msgid "Home"
233233msgstr ""
234234
235−#: qml/Dash/ScopesOverviewTab.qml:54
236−msgid "All"
235+#: qml/Dash/ScopesList.qml:108
236+msgid "Also installed"
237237msgstr ""
238238
239−#: qml/Greeter/Greeter.qml:157
239+#: qml/Greeter/Greeter.qml:174
240240msgid "Unlock"
241241msgstr ""
242242
243−#: qml/Hud/HudParametrizedActionsPage.qml:139
244−msgid "Confirm"
245−msgstr "Bekræft"
246−
247−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248−msgid "Type or say a command"
249−msgstr "Skriv eller indtal en kommando"
250−
251−#: qml/Hud/Hud.qml:84
252−msgid "Loading. Please Wait..."
253−msgstr "Indlæser. Vent venligst..."
254−
255−#: qml/Hud/Hud.qml:89
256−msgid "Speak Now..."
257−msgstr "Tal nu..."
258−
259−#: qml/Hud/Hud.qml:94
260−msgid "Speaking..."
261−msgstr "Taler..."
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
264244msgid "Show password"
265245msgstr "Vis adgangskode"
266246
267−#: qml/Panel/ActiveCallHint.qml:77
247+#: qml/Panel/ActiveCallHint.qml:79
268248msgid "Tap to return to call..."
269249msgstr "Tryk for at besvare opkaldet..."
270250
271−#: qml/Panel/ActiveCallHint.qml:90
251+#: qml/Panel/ActiveCallHint.qml:92
272252msgid "Conference"
273253msgstr "Konference"
274254
275−#: qml/Panel/Indicators/MenuItemFactory.qml:600
255+#: qml/Panel/Indicators/MenuItemFactory.qml:643
276256msgid "Nothing is playing"
277257msgstr ""
278258
279−#: qml/Panel/Indicators/MenuItemFactory.qml:748
259+#: qml/Panel/Indicators/MenuItemFactory.qml:791
280260msgid "In queue…"
281261msgstr "I kø…"
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:752
263+#: qml/Panel/Indicators/MenuItemFactory.qml:795
284264msgid "Downloading"
285265msgstr "Henter"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:754
267+#: qml/Panel/Indicators/MenuItemFactory.qml:797
288268msgid "Paused, tap to resume"
289269msgstr "På pause; tryk for at fortsætte"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:756
271+#: qml/Panel/Indicators/MenuItemFactory.qml:799
292272msgid "Canceled"
293273msgstr "Annulleret"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:758
275+#: qml/Panel/Indicators/MenuItemFactory.qml:801
296276msgid "Finished"
297277msgstr "Færdig"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:760
279+#: qml/Panel/Indicators/MenuItemFactory.qml:803
300280msgid "Failed, tap to retry"
301281msgstr "Mislykkedes; tryk for at prøve igen"
302282
@@ -308,56 +288,248 @@ msgstr ""
308288msgid "Roaming"
309289msgstr ""
310290
311−#: qml/Shell.qml:346
312−msgid "Enter passphrase"
291+#: qml/Shell.qml:367
292+#, qt-format
293+msgid "Enter %1"
313294msgstr ""
314295
315−#: qml/Shell.qml:347
316−msgid "Sorry, incorrect passphrase"
296+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
297+msgid "Enter passphrase"
317298msgstr ""
318299
319−#: qml/Shell.qml:348
320−msgid "Please re-enter"
300+#: qml/Shell.qml:369
301+msgid "Enter passcode"
321302msgstr ""
322303
323−#: qml/Shell.qml:350
324−msgid "Enter passcode"
304+#: qml/Shell.qml:370
305+#, qt-format
306+msgid "Sorry, incorrect %1"
325307msgstr ""
326308
327−#: qml/Shell.qml:351
328−msgid "Sorry, incorrect passcode"
309+#: qml/Shell.qml:371
310+msgid "Sorry, incorrect passphrase"
329311msgstr ""
330312
331−#: qml/Shell.qml:354
332−#, qt-format
333−msgid "Enter %1"
313+#: qml/Shell.qml:372
314+msgid "Please re-enter"
334315msgstr ""
335316
336−#: qml/Shell.qml:355
337−#, qt-format
338−msgid "Sorry, incorrect %1"
317+#: qml/Shell.qml:373
318+msgid "Sorry, incorrect passcode"
339319msgstr ""
340320
341−#: qml/Shell.qml:390
321+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
342322msgid "Sorry, incorrect passphrase."
343323msgstr ""
344324
345−#: qml/Shell.qml:391
325+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
346326msgid "Sorry, incorrect passcode."
347327msgstr ""
348328
349−#: qml/Shell.qml:392
329+#: qml/Shell.qml:469
350330msgid "This will be your last attempt."
351331msgstr ""
352332
353−#: qml/Shell.qml:394
333+#: qml/Shell.qml:471
354334msgid ""
355335"If passphrase is entered incorrectly, your phone will conduct a factory "
356336"reset and all personal data will be deleted."
357337msgstr ""
358338
359−#: qml/Shell.qml:395
339+#: qml/Shell.qml:472
360340msgid ""
361341"If passcode is entered incorrectly, your phone will conduct a factory reset "
362342"and all personal data will be deleted."
363343msgstr ""
344+
345+#: qml/Wizard/Page.qml:89
346+msgid "Back"
347+msgstr ""
348+
349+#: qml/Wizard/Pages/10-welcome.qml:27
350+msgid "Hi!"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:44
354+msgid "Welcome to your Ubuntu phone."
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:52
358+msgid "Let’s get started."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
362+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
363+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
364+#: qml/Wizard/Pages/passwd-set.qml:90
365+msgid "Continue"
366+msgstr ""
367+
368+#: qml/Wizard/Pages/20-sim.qml:25
369+msgid "Add a SIM card and restart your device"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:55
373+msgid "Without it, you won’t be able to make calls or use text messaging."
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
377+msgid "Skip"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/30-passwd-type.qml:39
381+msgid "Lock security"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:74
385+msgid "Please select how you’d like to unlock your phone."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:97
389+msgid "Swipe"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:98
393+msgid "No security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:100
397+msgid "Passcode"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:101
401+msgid "4 digits only"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:103
405+msgid "Passphrase"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:104
409+msgid "Numbers and letters"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/40-wifi.qml:28
413+msgid "Connect to Wi‑Fi"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:147
417+msgid "Available networks…"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:148
421+msgid "No available networks."
422+msgstr ""
423+
424+#: qml/Wizard/Pages/50-location.qml:27
425+msgid "Location"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:62
429+msgid "Let the phone detect your location:"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:69
433+msgid "Using GPS only (less accurate)"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:86
437+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
438+msgstr ""
439+
440+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
441+#: qml/Wizard/Pages/50-location.qml:103
442+msgid ""
443+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
444+"conditions</a>."
445+msgstr ""
446+
447+#: qml/Wizard/Pages/50-location.qml:112
448+msgid "Not at all"
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:124
452+msgid "You can change your mind later in <b>System Settings</b>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/60-reporting.qml:24
456+msgid "Improving your experience"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:36
460+msgid ""
461+"Your phone is set up to automatically report errors to Canonical and its "
462+"partners, the makers of the operating system."
463+msgstr ""
464+
465+#: qml/Wizard/Pages/60-reporting.qml:43
466+msgid ""
467+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
468+"Privacy</b>"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/80-finished.qml:24
472+msgid "All done"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:39
476+msgid "Nice work!"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:46
480+msgid "Your phone is now ready to use."
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:53
484+msgid "Finish"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/here-terms.qml:27
488+msgid "Terms & Conditions"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/passwd-confirm.qml:49
492+msgid "Confirm passphrase"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:50
496+msgid "Confirm passcode"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:53
500+#: qml/Wizard/Pages/passwd-confirm.qml:54
501+msgid "Please try again."
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-set.qml:61
505+msgid "Choose your passcode"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:68
509+msgid "Passphrase must be 4 characters long"
510+msgstr ""
511+
512+#: qml/Wizard/StackButton.qml:39
513+#, qt-format
514+msgid "〈 %1"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:42
518+#, qt-format
519+msgid "%1 〉"
520+msgstr ""
521+
522+#~ msgid "Speaking..."
523+#~ msgstr "Taler..."
524+
525+#~ msgid "Confirm"
526+#~ msgstr "Bekræft"
527+
528+#~ msgid "Type or say a command"
529+#~ msgstr "Skriv eller indtal en kommando"
530+
531+#~ msgid "Loading. Please Wait..."
532+#~ msgstr "Indlæser. Vent venligst..."
533+
534+#~ msgid "Speak Now..."
535+#~ msgstr "Tal nu..."
po/de.po+281−97
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"
12−"Last-Translator: Alexander Dobetsberger <Unknown>\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-12 01:42+0000\n"
12+"Last-Translator: Niklas Wenzel <nikwen.developer@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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-22 06:17+0000\n"
19−"X-Generator: Launchpad (build 17203)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Passwort: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Verknüpfung anheften"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Verknüpfung entfernen"
3333
@@ -116,46 +116,46 @@ msgstr "Abbrechen"
116116msgid "Skip intro"
117117msgstr "Einführung überspringen"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Rechter Bildschirmrand"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
126126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128128msgid "Top edge"
129129msgstr "Oberer Bildschirmrand"
130130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132132msgid "Try swiping from the top edge to access the indicators"
133133msgstr ""
134134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
135135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137137msgid "Close"
138138msgstr "Schließen"
139139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141141msgid "Swipe up again to close the settings screen"
142142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
143143
144−#: qml/Components/EdgeDemo.qml:198
144+#: qml/Components/EdgeDemo.qml:214
145145msgid "Left edge"
146146msgstr "Linker Rand"
147147
148−#: qml/Components/EdgeDemo.qml:199
148+#: qml/Components/EdgeDemo.qml:215
149149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150150msgstr ""
151151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
152152"Schnellzugriff aufzurufen"
153153
154−#: qml/Components/EdgeDemo.qml:226
154+#: qml/Components/EdgeDemo.qml:242
155155msgid "Well done"
156156msgstr "Gut gemacht"
157157
158−#: qml/Components/EdgeDemo.qml:227
158+#: qml/Components/EdgeDemo.qml:243
159159msgid ""
160160"You have now mastered the edge gestures and can start using the "
161161"phone<br><br>Tap on the screen to start"
@@ -163,36 +163,44 @@ msgstr ""
163163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
164164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
165165
166−#: qml/Components/Lockscreen.qml:220
166+#: qml/Components/Lockscreen.qml:238
167+msgid "Return to Call"
168+msgstr "Zu Anruf zurückkehren"
169+
170+#: qml/Components/Lockscreen.qml:238
167171msgid "Emergency Call"
168172msgstr "Notruf"
169173
170−#: qml/Components/Lockscreen.qml:252
174+#: qml/Components/Lockscreen.qml:270
171175msgid "OK"
172176msgstr "OK"
173177
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
175179msgid "See less"
176180msgstr "Weniger ansehen"
177181
178−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:431
179183msgid "See all"
180184msgstr "Alle anzeigen"
181185
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
183187#: qml/Panel/SearchIndicator.qml:27
184188msgid "Search"
185189msgstr "Suchen"
186190
187−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:260
192+msgid "Store"
193+msgstr "Store"
194+
195+#: qml/Dash/PageHeader.qml:277
188196msgid "Settings"
189197msgstr "Einstellungen"
190198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192200msgid "Remove from Favorites"
193201msgstr "Aus den Favoriten entfernen"
194202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196204msgid "Add to Favorites"
197205msgstr "Zu Favoriten hinzufügen"
198206
@@ -224,87 +232,59 @@ msgstr "Zum Aktualisieren ziehen …"
224232msgid "Release to refresh…"
225233msgstr "Zum Aktualisieren loslassen …"
226234
227−#: qml/Dash/ScopesOverview.qml:206
228−msgid "Manage Scopes"
229−msgstr "Filter verwalten"
230−
231−#: qml/Dash/ScopesOverview.qml:428
232−msgid "Done"
233−msgstr "Erledigt"
234−
235−#: qml/Dash/ScopesOverview.qml:454
236−msgid "Store"
237−msgstr "Store"
235+#: qml/Dash/ScopesList.qml:63
236+msgid "Manage"
237+msgstr "Verwalten"
238238
239−#: qml/Dash/ScopesOverviewTab.qml:36
240−msgid "Favorites"
241−msgstr "Favoriten"
239+#: qml/Dash/ScopesList.qml:107
240+msgid "Home"
241+msgstr ""
242242
243−#: qml/Dash/ScopesOverviewTab.qml:54
244−msgid "All"
245−msgstr "Alle"
243+#: qml/Dash/ScopesList.qml:108
244+msgid "Also installed"
245+msgstr ""
246246
247−#: qml/Greeter/Greeter.qml:157
247+#: qml/Greeter/Greeter.qml:174
248248msgid "Unlock"
249249msgstr "Entsperren"
250250
251−#: qml/Hud/HudParametrizedActionsPage.qml:139
252−msgid "Confirm"
253−msgstr "Bestätigen"
254−
255−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
256−msgid "Type or say a command"
257−msgstr "Befehl eingeben oder sprechen"
258−
259−#: qml/Hud/Hud.qml:84
260−msgid "Loading. Please Wait..."
261−msgstr "Wird geladen. Bitte warten …"
262−
263−#: qml/Hud/Hud.qml:89
264−msgid "Speak Now..."
265−msgstr "Sprechen Sie jetzt …"
266−
267−#: qml/Hud/Hud.qml:94
268−msgid "Speaking..."
269−msgstr "Sprechen Sie …"
270−
271−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
272252msgid "Show password"
273253msgstr "Passwort anzeigen"
274254
275−#: qml/Panel/ActiveCallHint.qml:77
255+#: qml/Panel/ActiveCallHint.qml:79
276256msgid "Tap to return to call..."
277257msgstr "Tippen um zum Anruf zurückzugehen"
278258
279−#: qml/Panel/ActiveCallHint.qml:90
259+#: qml/Panel/ActiveCallHint.qml:92
280260msgid "Conference"
281261msgstr "Konferenz"
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:600
263+#: qml/Panel/Indicators/MenuItemFactory.qml:643
284264msgid "Nothing is playing"
285265msgstr "Nichts wird abgespielt"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:748
267+#: qml/Panel/Indicators/MenuItemFactory.qml:791
288268msgid "In queue…"
289269msgstr "In Warteschlange …"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:752
271+#: qml/Panel/Indicators/MenuItemFactory.qml:795
292272msgid "Downloading"
293273msgstr "Wird heruntergeladen"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:754
275+#: qml/Panel/Indicators/MenuItemFactory.qml:797
296276msgid "Paused, tap to resume"
297277msgstr "Pausiert, tippen Sie zum fortsetzen"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:756
279+#: qml/Panel/Indicators/MenuItemFactory.qml:799
300280msgid "Canceled"
301281msgstr "Abgebrochen"
302282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:758
283+#: qml/Panel/Indicators/MenuItemFactory.qml:801
304284msgid "Finished"
305285msgstr "Erledigt"
306286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:760
287+#: qml/Panel/Indicators/MenuItemFactory.qml:803
308288msgid "Failed, tap to retry"
309289msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
310290
@@ -316,49 +296,49 @@ msgstr "SIM-Karte entsperren"
316296msgid "Roaming"
317297msgstr "Roaming"
318298
319−#: qml/Shell.qml:346
299+#: qml/Shell.qml:367
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "%1 eingeben"
303+
304+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
320305msgid "Enter passphrase"
321306msgstr "Passwort eingeben"
322307
323−#: qml/Shell.qml:347
308+#: qml/Shell.qml:369
309+msgid "Enter passcode"
310+msgstr "PIN eingeben"
311+
312+#: qml/Shell.qml:370
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "%1 falsch"
316+
317+#: qml/Shell.qml:371
324318msgid "Sorry, incorrect passphrase"
325319msgstr "Das Passwort ist nicht korrekt"
326320
327−#: qml/Shell.qml:348
321+#: qml/Shell.qml:372
328322msgid "Please re-enter"
329323msgstr "Bitte erneut eingeben"
330324
331−#: qml/Shell.qml:350
332−msgid "Enter passcode"
333−msgstr "PIN eingeben"
334−
335−#: qml/Shell.qml:351
325+#: qml/Shell.qml:373
336326msgid "Sorry, incorrect passcode"
337327msgstr "Falsches Passwort"
338328
339−#: qml/Shell.qml:354
340−#, qt-format
341−msgid "Enter %1"
342−msgstr "%1 eingeben"
343−
344−#: qml/Shell.qml:355
345−#, qt-format
346−msgid "Sorry, incorrect %1"
347−msgstr "%1 falsch"
348−
349−#: qml/Shell.qml:390
329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
350330msgid "Sorry, incorrect passphrase."
351−msgstr "Falsches Passwort."
331+msgstr "Entschuldigung, falsches Passwort."
352332
353−#: qml/Shell.qml:391
333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
354334msgid "Sorry, incorrect passcode."
355335msgstr "Falsche PIN"
356336
357−#: qml/Shell.qml:392
337+#: qml/Shell.qml:469
358338msgid "This will be your last attempt."
359339msgstr "Dies ist Ihr letzter Versuch."
360340
361−#: qml/Shell.qml:394
341+#: qml/Shell.qml:471
362342msgid ""
363343"If passphrase is entered incorrectly, your phone will conduct a factory "
364344"reset and all personal data will be deleted."
@@ -366,10 +346,214 @@ msgstr ""
366346"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
367347"zurückgesetzt und alle Daten werden gelöscht."
368348
369−#: qml/Shell.qml:395
349+#: qml/Shell.qml:472
370350msgid ""
371351"If passcode is entered incorrectly, your phone will conduct a factory reset "
372352"and all personal data will be deleted."
373353msgstr ""
374354"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
375355"zurückgesetzt und alle Daten werden gelöscht."
356+
357+#: qml/Wizard/Page.qml:89
358+msgid "Back"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:27
362+msgid "Hi!"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:44
366+msgid "Welcome to your Ubuntu phone."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:52
370+msgid "Let’s get started."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376+#: qml/Wizard/Pages/passwd-set.qml:90
377+msgid "Continue"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:25
381+msgid "Add a SIM card and restart your device"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:55
385+msgid "Without it, you won’t be able to make calls or use text messaging."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
389+msgid "Skip"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:39
393+msgid "Lock security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:74
397+msgid "Please select how you’d like to unlock your phone."
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:97
401+msgid "Swipe"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:98
405+msgid "No security"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:100
409+msgid "Passcode"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:101
413+msgid "4 digits only"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:103
417+msgid "Passphrase"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:104
421+msgid "Numbers and letters"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:28
425+msgid "Connect to Wi‑Fi"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:147
429+msgid "Available networks…"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/40-wifi.qml:148
433+msgid "No available networks."
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:27
437+msgid "Location"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:62
441+msgid "Let the phone detect your location:"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:69
445+msgid "Using GPS only (less accurate)"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:86
449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450+msgstr ""
451+
452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453+#: qml/Wizard/Pages/50-location.qml:103
454+msgid ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+
477+#: qml/Wizard/Pages/60-reporting.qml:43
478+msgid ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr ""
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr ""
533+
534+#~ msgid "Confirm"
535+#~ msgstr "Bestätigen"
536+
537+#~ msgid "Loading. Please Wait..."
538+#~ msgstr "Wird geladen. Bitte warten …"
539+
540+#~ msgid "Speak Now..."
541+#~ msgstr "Sprechen Sie jetzt …"
542+
543+#~ msgid "Type or say a command"
544+#~ msgstr "Befehl eingeben oder sprechen"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Sprechen Sie …"
548+
549+#~ msgid "All"
550+#~ msgstr "Alle"
551+
552+#~ msgid "Done"
553+#~ msgstr "Erledigt"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favoriten"
557+
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Filter verwalten"
po/el.po+302−115
@@ -7,82 +7,86 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-21 12:06+0000\n"
12−"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-08 18:38+0000\n"
12+"Last-Translator: Efstathios Iosifidis <Unknown>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Κωδικός πρόσβασης: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Καρφίτσωμα συντόμευσης"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Ξεκαρφίτσωμα συντόμευσης"
3333
3434#: qml/Components/DelayedLockscreen.qml:47
3535msgid "Device Locked"
36−msgstr ""
36+msgstr "Κλειδωμένη συσκευή"
3737
3838#: qml/Components/DelayedLockscreen.qml:62
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
41+"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
42+"συνδεθείτε με λάθος κωδικό."
4143
4244#: qml/Components/DelayedLockscreen.qml:63
4345msgid "You have been locked out due to too many failed passcode attempts."
4446msgstr ""
47+"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
48+"συνδεθείτε με λάθος κωδικό."
4549
4650#: qml/Components/DelayedLockscreen.qml:72
4751#, qt-format
4852msgid "Please wait %1 minute and then try again…"
4953msgid_plural "Please wait %1 minutes and then try again…"
50−msgstr[0] ""
51−msgstr[1] ""
54+msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
55+msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
5256
5357#: qml/Components/Dialogs.qml:70
5458msgid "Log out"
55−msgstr ""
59+msgstr "Αποσύνδεση"
5660
5761#: qml/Components/Dialogs.qml:71
5862msgid "Are you sure you want to log out?"
59−msgstr ""
63+msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
6064
6165#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
6266#: qml/Components/Dialogs.qml:122
6367msgid "No"
64−msgstr ""
68+msgstr "Όχι"
6569
6670#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
6771#: qml/Components/Dialogs.qml:129
6872msgid "Yes"
69−msgstr ""
73+msgstr "Ναι"
7074
7175#: qml/Components/Dialogs.qml:94
7276msgid "Shut down"
73−msgstr ""
77+msgstr "Τερματισμός λειτουργίας"
7478
7579#: qml/Components/Dialogs.qml:95
7680msgid "Are you sure you want to shut down?"
77−msgstr ""
81+msgstr "Επιθυμείτε σίγουρα τερματισμό;"
7882
7983#: qml/Components/Dialogs.qml:119
8084msgid "Reboot"
81−msgstr ""
85+msgstr "Επανεκκίνηση"
8286
8387#: qml/Components/Dialogs.qml:120
8488msgid "Are you sure you want to reboot?"
85−msgstr ""
89+msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
8690
8791#: qml/Components/Dialogs.qml:144
8892msgid "Power"
@@ -93,6 +97,8 @@ msgid ""
9397"Are you sure you would like\n"
9498"to power off?"
9599msgstr ""
100+"Επιθυμείτε σίγουρα τον\n"
101+"τερματισμό λειτουργίας;"
96102
97103#: qml/Components/Dialogs.qml:147
98104msgid "Power off"
@@ -100,7 +106,7 @@ msgstr "Τερματισμός"
100106
101107#: qml/Components/Dialogs.qml:157
102108msgid "Restart"
103−msgstr ""
109+msgstr "Επανεκκίνηση"
104110
105111#: qml/Components/Dialogs.qml:167
106112msgid "Cancel"
@@ -110,45 +116,45 @@ msgstr "Ακύρωση"
110116msgid "Skip intro"
111117msgstr "Παράλειψη εισαγωγής"
112118
113−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
114120msgid "Right edge"
115121msgstr "Δεξί άκρο"
116122
117−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
118124msgid "Try swiping from the right edge to unlock the phone"
119125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
120126
121−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
122128msgid "Top edge"
123129msgstr "Πάνω άκρο"
124130
125−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
126132msgid "Try swiping from the top edge to access the indicators"
127133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
128134
129−#: qml/Components/EdgeDemo.qml:170
135+#: qml/Components/EdgeDemo.qml:183
130136msgid "Close"
131137msgstr "Κλείσιμο"
132138
133−#: qml/Components/EdgeDemo.qml:171
139+#: qml/Components/EdgeDemo.qml:184
134140msgid "Swipe up again to close the settings screen"
135141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
136142
137−#: qml/Components/EdgeDemo.qml:198
143+#: qml/Components/EdgeDemo.qml:214
138144msgid "Left edge"
139145msgstr "Αριστερό άκρο"
140146
141−#: qml/Components/EdgeDemo.qml:199
147+#: qml/Components/EdgeDemo.qml:215
142148msgid "Swipe from the left to reveal the launcher for quick access to apps"
143149msgstr ""
144150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
145151"στις εφαρμογές"
146152
147−#: qml/Components/EdgeDemo.qml:226
153+#: qml/Components/EdgeDemo.qml:242
148154msgid "Well done"
149155msgstr "Συγχαρητήρια"
150156
151−#: qml/Components/EdgeDemo.qml:227
157+#: qml/Components/EdgeDemo.qml:243
152158msgid ""
153159"You have now mastered the edge gestures and can start using the "
154160"phone<br><br>Tap on the screen to start"
@@ -156,38 +162,46 @@ msgstr ""
156162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
157163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
158164
159−#: qml/Components/Lockscreen.qml:220
165+#: qml/Components/Lockscreen.qml:238
166+msgid "Return to Call"
167+msgstr "Επιστροφή στην κλήση"
168+
169+#: qml/Components/Lockscreen.qml:238
160170msgid "Emergency Call"
161171msgstr "Κλήση έκτακτης ανάγκης"
162172
163−#: qml/Components/Lockscreen.qml:252
173+#: qml/Components/Lockscreen.qml:270
164174msgid "OK"
165175msgstr "OK"
166176
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
177+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168178msgid "See less"
169179msgstr "Λιγότερα"
170180
171−#: qml/Dash/GenericScopeView.qml:434
181+#: qml/Dash/GenericScopeView.qml:431
172182msgid "See all"
173183msgstr "Εμφάνιση όλων"
174184
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
185+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176186#: qml/Panel/SearchIndicator.qml:27
177187msgid "Search"
178188msgstr "Αναζήτηση"
179189
180−#: qml/Dash/PageHeader.qml:268
190+#: qml/Dash/PageHeader.qml:260
191+msgid "Store"
192+msgstr "Κατάστημα"
193+
194+#: qml/Dash/PageHeader.qml:277
181195msgid "Settings"
182−msgstr ""
196+msgstr "Ρυθμίσεις"
183197
184−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
185199msgid "Remove from Favorites"
186−msgstr ""
200+msgstr "Αφαίρεση από τα αγαπημένα"
187201
188−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:284
189203msgid "Add to Favorites"
190−msgstr ""
204+msgstr "Προσθήκη στα αγαπημένα"
191205
192206#: qml/Dash/Previews/PreviewActionCombo.qml:35
193207msgid "More..."
@@ -217,87 +231,59 @@ msgstr ""
217231msgid "Release to refresh…"
218232msgstr ""
219233
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
234+#: qml/Dash/ScopesList.qml:63
235+msgid "Manage"
222236msgstr ""
223237
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Ολοκληρώθηκε"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Κατάστημα"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Αγαπημένα"
235−
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "Όλα"
239−
240−#: qml/Greeter/Greeter.qml:157
241−msgid "Unlock"
238+#: qml/Dash/ScopesList.qml:107
239+msgid "Home"
242240msgstr ""
243241
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Επιβεβαίωση"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Πληκτρολογήστε ή πείτε μια εντολή"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Μιλήστε τώρα..."
242+#: qml/Dash/ScopesList.qml:108
243+msgid "Also installed"
244+msgstr ""
259245
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Ομιλία..."
246+#: qml/Greeter/Greeter.qml:174
247+msgid "Unlock"
248+msgstr "Ξεκλείδωμα"
263249
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
250+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265251msgid "Show password"
266252msgstr "Εμφάνιση κωδικού"
267253
268−#: qml/Panel/ActiveCallHint.qml:77
254+#: qml/Panel/ActiveCallHint.qml:79
269255msgid "Tap to return to call..."
270256msgstr "Πατήστε για να γυρίσετε στην κλήση..."
271257
272−#: qml/Panel/ActiveCallHint.qml:90
258+#: qml/Panel/ActiveCallHint.qml:92
273259msgid "Conference"
274260msgstr "Συνδιάσκεψη"
275261
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
262+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277263msgid "Nothing is playing"
278−msgstr ""
264+msgstr "Δεν αναπαράγεται τίποτα"
279265
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
266+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281267msgid "In queue…"
282268msgstr "Στην ουρά..."
283269
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
270+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285271msgid "Downloading"
286272msgstr "Λήψη σε εξέλιξη"
287273
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
274+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289275msgid "Paused, tap to resume"
290276msgstr "Σταματημένο, αγγίξτε για συνέχιση"
291277
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
278+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293279msgid "Canceled"
294280msgstr "Ακυρώθηκε"
295281
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
282+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297283msgid "Finished"
298284msgstr "Ολοκληρώθηκε"
299285
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
286+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301287msgid "Failed, tap to retry"
302288msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
303289
@@ -309,56 +295,257 @@ msgstr "Ξεκλείδωμα SIM"
309295msgid "Roaming"
310296msgstr "Περιαγωγή"
311297
312−#: qml/Shell.qml:346
298+#: qml/Shell.qml:367
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Εισάγετε %1"
302+
303+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313304msgid "Enter passphrase"
314−msgstr ""
305+msgstr "Εισαγωγή συνθηματικού"
306+
307+#: qml/Shell.qml:369
308+msgid "Enter passcode"
309+msgstr "Εισαγωγή κωδικού"
315310
316−#: qml/Shell.qml:347
311+#: qml/Shell.qml:370
312+#, qt-format
313+msgid "Sorry, incorrect %1"
314+msgstr "Συγνώμη, μη έγκυρο %1"
315+
316+#: qml/Shell.qml:371
317317msgid "Sorry, incorrect passphrase"
318−msgstr ""
318+msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
319319
320−#: qml/Shell.qml:348
320+#: qml/Shell.qml:372
321321msgid "Please re-enter"
322−msgstr ""
322+msgstr "Παρακαλώ πληκτρολογήστε ξανά"
323323
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr ""
327−
328−#: qml/Shell.qml:351
324+#: qml/Shell.qml:373
329325msgid "Sorry, incorrect passcode"
330326msgstr ""
331327
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr ""
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr ""
341−
342−#: qml/Shell.qml:390
328+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343329msgid "Sorry, incorrect passphrase."
344330msgstr ""
345331
346−#: qml/Shell.qml:391
332+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347333msgid "Sorry, incorrect passcode."
348334msgstr ""
349335
350−#: qml/Shell.qml:392
336+#: qml/Shell.qml:469
351337msgid "This will be your last attempt."
352338msgstr ""
353339
354−#: qml/Shell.qml:394
340+#: qml/Shell.qml:471
355341msgid ""
356342"If passphrase is entered incorrectly, your phone will conduct a factory "
357343"reset and all personal data will be deleted."
358344msgstr ""
359345
360−#: qml/Shell.qml:395
346+#: qml/Shell.qml:472
361347msgid ""
362348"If passcode is entered incorrectly, your phone will conduct a factory reset "
363349"and all personal data will be deleted."
364350msgstr ""
351+
352+#: qml/Wizard/Page.qml:89
353+msgid "Back"
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr ""
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+
383+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384+msgid "Skip"
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:39
388+msgid "Lock security"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:74
392+msgid "Please select how you’d like to unlock your phone."
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:97
396+msgid "Swipe"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:98
400+msgid "No security"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:100
404+msgid "Passcode"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:101
408+msgid "4 digits only"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:103
412+msgid "Passphrase"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:104
416+msgid "Numbers and letters"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:28
420+msgid "Connect to Wi‑Fi"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:147
424+msgid "Available networks…"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/40-wifi.qml:148
428+msgid "No available networks."
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:27
432+msgid "Location"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:62
436+msgid "Let the phone detect your location:"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:69
440+msgid "Using GPS only (less accurate)"
441+msgstr ""
442+
443+#: qml/Wizard/Pages/50-location.qml:86
444+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
445+msgstr ""
446+
447+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
448+#: qml/Wizard/Pages/50-location.qml:103
449+msgid ""
450+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
451+"conditions</a>."
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:112
455+msgid "Not at all"
456+msgstr ""
457+
458+#: qml/Wizard/Pages/50-location.qml:124
459+msgid "You can change your mind later in <b>System Settings</b>."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:24
463+msgid "Improving your experience"
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:36
467+msgid ""
468+"Your phone is set up to automatically report errors to Canonical and its "
469+"partners, the makers of the operating system."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/60-reporting.qml:43
473+msgid ""
474+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
475+"Privacy</b>"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:24
479+msgid "All done"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:39
483+msgid "Nice work!"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:46
487+msgid "Your phone is now ready to use."
488+msgstr ""
489+
490+#: qml/Wizard/Pages/80-finished.qml:53
491+msgid "Finish"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/here-terms.qml:27
495+msgid "Terms & Conditions"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:49
499+msgid "Confirm passphrase"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:50
503+msgid "Confirm passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:53
507+#: qml/Wizard/Pages/passwd-confirm.qml:54
508+msgid "Please try again."
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-set.qml:61
512+msgid "Choose your passcode"
513+msgstr ""
514+
515+#: qml/Wizard/Pages/passwd-set.qml:68
516+msgid "Passphrase must be 4 characters long"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:39
520+#, qt-format
521+msgid "〈 %1"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:42
525+#, qt-format
526+msgid "%1 〉"
527+msgstr ""
528+
529+#~ msgid "Confirm"
530+#~ msgstr "Επιβεβαίωση"
531+
532+#~ msgid "Type or say a command"
533+#~ msgstr "Πληκτρολογήστε ή πείτε μια εντολή"
534+
535+#~ msgid "Speak Now..."
536+#~ msgstr "Μιλήστε τώρα..."
537+
538+#~ msgid "Speaking..."
539+#~ msgstr "Ομιλία..."
540+
541+#~ msgid "Loading. Please Wait..."
542+#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
543+
544+#~ msgid "All"
545+#~ msgstr "Όλα"
546+
547+#~ msgid "Favorites"
548+#~ msgstr "Αγαπημένα"
549+
550+#~ msgid "Done"
551+#~ msgstr "Ολοκληρώθηκε"
po/en_AU.po+278−94
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-10-12 09:41+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-13 06:15+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Right edge"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Top edge"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:198
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Left edge"
142142
143−#: qml/Components/EdgeDemo.qml:199
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Well done"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,36 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr "Emergency Call"
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr "OK"
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr "See less"
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr "See all"
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "Search"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr "Settings"
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr "Remove from Favourites"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr "Add to Favourites"
191199
@@ -217,87 +225,59 @@ msgstr "Pull to refresh…"
217225msgid "Release to refresh…"
218226msgstr "Release to refresh…"
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
222−msgstr "Manage Scopes"
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Done"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Store"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
230+msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Favourites"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234+msgstr ""
235235
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "All"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238+msgstr ""
239239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr "Unlock"
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirm"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Type or say a command"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Loading. Please Wait..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Speak Now..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Speaking..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "Show password"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr "Tap to return to call..."
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr "Conference"
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr "Nothing is playing"
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr "In queue…"
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr "Downloading"
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr "Paused, tap to resume"
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr "Cancelled"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr "Finished"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr "Failed, tap to retry"
303283
@@ -309,49 +289,49 @@ msgstr "Unlock SIM"
309289msgid "Roaming"
310290msgstr "Roaming"
311291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Enter %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313298msgid "Enter passphrase"
314299msgstr "Enter passphrase"
315300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Enter passcode"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sorry, incorrect %1"
309+
310+#: qml/Shell.qml:371
317311msgid "Sorry, incorrect passphrase"
318312msgstr "Sorry, incorrect passphrase"
319313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321315msgid "Please re-enter"
322316msgstr "Please re-enter"
323317
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr "Enter passcode"
327−
328−#: qml/Shell.qml:351
318+#: qml/Shell.qml:373
329319msgid "Sorry, incorrect passcode"
330320msgstr "Sorry, incorrect passcode"
331321
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Enter %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sorry, incorrect %1"
341−
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr "Sorry, incorrect passphrase."
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr "Sorry, incorrect passcode."
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr "This will be your last attempt."
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
@@ -359,10 +339,214 @@ msgstr ""
359339"If passphrase is entered incorrectly, your phone will conduct a factory "
360340"reset and all personal data will be deleted."
361341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363343msgid ""
364344"If passcode is entered incorrectly, your phone will conduct a factory reset "
365345"and all personal data will be deleted."
366346msgstr ""
367347"If passcode is entered incorrectly, your phone will conduct a factory reset "
368348"and all personal data will be deleted."
349+
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
527+#~ msgid "Confirm"
528+#~ msgstr "Confirm"
529+
530+#~ msgid "Type or say a command"
531+#~ msgstr "Type or say a command"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "Loading. Please Wait..."
535+
536+#~ msgid "Speak Now..."
537+#~ msgstr "Speak Now..."
538+
539+#~ msgid "Speaking..."
540+#~ msgstr "Speaking..."
541+
542+#~ msgid "All"
543+#~ msgstr "All"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Favourites"
547+
548+#~ msgid "Done"
549+#~ msgstr "Done"
550+
551+#~ msgid "Manage Scopes"
552+#~ msgstr "Manage Scopes"
po/en_GB.po+277−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-03 12:46+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-05 18:59+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Right edge"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Top edge"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:198
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Left edge"
142142
143−#: qml/Components/EdgeDemo.qml:199
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Well done"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,36 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "Return to Call"
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr "Emergency Call"
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr "OK"
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr "See less"
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr "See all"
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "Search"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr "Settings"
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr "Remove from Favourites"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr "Add to Favourites"
191199
@@ -217,87 +225,59 @@ msgstr "Pull to refresh…"
217225msgid "Release to refresh…"
218226msgstr "Release to refresh…"
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
222−msgstr "Manage Scopes"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
230+msgstr "Manage"
223231
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Done"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234+msgstr "Home"
227235
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Store"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Favourites"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238+msgstr "Also installed"
235239
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "All"
239−
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr "Unlock"
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirm"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Type or say a command"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Loading. Please Wait..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Speak Now..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Speaking..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "Show password"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr "Tap to return to call..."
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr "Conference"
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr "Nothing is playing"
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr "In queue…"
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr "Downloading"
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr "Paused, tap to resume"
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr "Cancelled"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr "Finished"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr "Failed, tap to retry"
303283
@@ -309,49 +289,49 @@ msgstr "Unlock SIM"
309289msgid "Roaming"
310290msgstr "Roaming"
311291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Enter %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313298msgid "Enter passphrase"
314299msgstr "Enter passphrase"
315300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Enter passcode"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sorry, incorrect %1"
309+
310+#: qml/Shell.qml:371
317311msgid "Sorry, incorrect passphrase"
318312msgstr "Sorry, incorrect passphrase"
319313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321315msgid "Please re-enter"
322316msgstr "Please re-enter"
323317
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr "Enter passcode"
327−
328−#: qml/Shell.qml:351
318+#: qml/Shell.qml:373
329319msgid "Sorry, incorrect passcode"
330320msgstr "Sorry, incorrect passcode"
331321
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Enter %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sorry, incorrect %1"
341−
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr "Sorry, incorrect passphrase."
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr "Sorry, incorrect passcode."
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr "This will be your last attempt."
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
@@ -359,7 +339,7 @@ msgstr ""
359339"If passphrase is entered incorrectly, your phone will conduct a factory "
360340"reset and all personal data will be deleted."
361341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363343msgid ""
364344"If passcode is entered incorrectly, your phone will conduct a factory reset "
365345"and all personal data will be deleted."
@@ -367,8 +347,206 @@ msgstr ""
367347"If passcode is entered incorrectly, your phone will conduct a factory reset "
368348"and all personal data will be deleted."
369349
370−#~ msgid "Sorry, incorrect PIN"
371−#~ msgstr "Sorry, incorrect PIN"
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
527+#~ msgid "Confirm"
528+#~ msgstr "Confirm"
529+
530+#~ msgid "Type or say a command"
531+#~ msgstr "Type or say a command"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "Loading. Please Wait..."
535+
536+#~ msgid "Speak Now..."
537+#~ msgstr "Speak Now..."
538+
539+#~ msgid "Speaking..."
540+#~ msgstr "Speaking..."
541+
542+#~ msgid "All"
543+#~ msgstr "All"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Favourites"
547+
548+#~ msgid "Done"
549+#~ msgstr "Done"
372550
373−#~ msgid "Enter SIM PIN"
374−#~ msgstr "Enter SIM PIN"
551+#~ msgid "Manage Scopes"
552+#~ msgstr "Manage Scopes"
po/eo.po+246−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Esperanto <eo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,78 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr ""
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr ""
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr ""
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156160msgid "Emergency Call"
157161msgstr ""
158162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160164msgid "OK"
161165msgstr ""
162166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164168msgid "See less"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168172msgid "See all"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172176#: qml/Panel/SearchIndicator.qml:27
173177msgid "Search"
174178msgstr ""
175179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177185msgid "Settings"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181189msgid "Remove from Favorites"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Add to Favorites"
186194msgstr ""
187195
@@ -213,87 +221,59 @@ msgstr ""
213221msgid "Release to refresh…"
214222msgstr ""
215223
216−#: qml/Dash/ScopesOverview.qml:206
217−msgid "Manage Scopes"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
224+#: qml/Dash/ScopesList.qml:63
225+msgid "Manage"
226226msgstr ""
227227
228−#: qml/Dash/ScopesOverviewTab.qml:36
229−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:107
229+msgid "Home"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:54
233−msgid "All"
232+#: qml/Dash/ScopesList.qml:108
233+msgid "Also installed"
234234msgstr ""
235235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237237msgid "Unlock"
238238msgstr ""
239239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr ""
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr ""
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr ""
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr ""
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr ""
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261241msgid "Show password"
262242msgstr ""
263243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265245msgid "Tap to return to call..."
266246msgstr ""
267247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269249msgid "Conference"
270250msgstr ""
271251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273253msgid "Nothing is playing"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277257msgid "In queue…"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281261msgid "Downloading"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285265msgid "Paused, tap to resume"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289269msgid "Canceled"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293273msgid "Finished"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297277msgid "Failed, tap to retry"
298278msgstr ""
299279
@@ -305,56 +285,233 @@ msgstr ""
305285msgid "Roaming"
306286msgstr ""
307287
308−#: qml/Shell.qml:346
309−msgid "Enter passphrase"
288+#: qml/Shell.qml:367
289+#, qt-format
290+msgid "Enter %1"
310291msgstr ""
311292
312−#: qml/Shell.qml:347
313−msgid "Sorry, incorrect passphrase"
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
294+msgid "Enter passphrase"
314295msgstr ""
315296
316−#: qml/Shell.qml:348
317−msgid "Please re-enter"
297+#: qml/Shell.qml:369
298+msgid "Enter passcode"
318299msgstr ""
319300
320−#: qml/Shell.qml:350
321−msgid "Enter passcode"
301+#: qml/Shell.qml:370
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322304msgstr ""
323305
324−#: qml/Shell.qml:351
325−msgid "Sorry, incorrect passcode"
306+#: qml/Shell.qml:371
307+msgid "Sorry, incorrect passphrase"
326308msgstr ""
327309
328−#: qml/Shell.qml:354
329−#, qt-format
330−msgid "Enter %1"
310+#: qml/Shell.qml:372
311+msgid "Please re-enter"
331312msgstr ""
332313
333−#: qml/Shell.qml:355
334−#, qt-format
335−msgid "Sorry, incorrect %1"
314+#: qml/Shell.qml:373
315+msgid "Sorry, incorrect passcode"
336316msgstr ""
337317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339319msgid "Sorry, incorrect passphrase."
340320msgstr ""
341321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343323msgid "Sorry, incorrect passcode."
344324msgstr ""
345325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347327msgid "This will be your last attempt."
348328msgstr ""
349329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351331msgid ""
352332"If passphrase is entered incorrectly, your phone will conduct a factory "
353333"reset and all personal data will be deleted."
354334msgstr ""
355335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357337msgid ""
358338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359339"and all personal data will be deleted."
360340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
po/es.po+278−100
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-09 07:43+0000\n"
12−"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-08 08:01+0000\n"
12+"Last-Translator: Paco Molinero <paco@byasl.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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-10 05:23+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Anclar"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
@@ -116,46 +116,46 @@ msgstr "Cancelar"
116116msgid "Skip intro"
117117msgstr "Omitir la introducción"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Borde derecho"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
126126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128128msgid "Top edge"
129129msgstr "Borde superior"
130130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132132msgid "Try swiping from the top edge to access the indicators"
133133msgstr ""
134134"Deslice el dedo desde el borde superior para acceder a los indicadores"
135135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137137msgid "Close"
138138msgstr "Cerrar"
139139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141141msgid "Swipe up again to close the settings screen"
142142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
143143
144−#: qml/Components/EdgeDemo.qml:198
144+#: qml/Components/EdgeDemo.qml:214
145145msgid "Left edge"
146146msgstr "Borde izquierdo"
147147
148−#: qml/Components/EdgeDemo.qml:199
148+#: qml/Components/EdgeDemo.qml:215
149149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150150msgstr ""
151151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
152152"rápidamente a las aplicaciones"
153153
154−#: qml/Components/EdgeDemo.qml:226
154+#: qml/Components/EdgeDemo.qml:242
155155msgid "Well done"
156156msgstr "Bien hecho"
157157
158−#: qml/Components/EdgeDemo.qml:227
158+#: qml/Components/EdgeDemo.qml:243
159159msgid ""
160160"You have now mastered the edge gestures and can start using the "
161161"phone<br><br>Tap on the screen to start"
@@ -163,36 +163,44 @@ msgstr ""
163163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
164164"la pantalla para comenzar"
165165
166−#: qml/Components/Lockscreen.qml:220
166+#: qml/Components/Lockscreen.qml:238
167+msgid "Return to Call"
168+msgstr "Volver a la llamada"
169+
170+#: qml/Components/Lockscreen.qml:238
167171msgid "Emergency Call"
168172msgstr "Llamada de emergencia"
169173
170−#: qml/Components/Lockscreen.qml:252
174+#: qml/Components/Lockscreen.qml:270
171175msgid "OK"
172176msgstr "Aceptar"
173177
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
175179msgid "See less"
176180msgstr "Ver menos"
177181
178−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:431
179183msgid "See all"
180184msgstr "Ver todo"
181185
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
183187#: qml/Panel/SearchIndicator.qml:27
184188msgid "Search"
185189msgstr "Buscar"
186190
187−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:260
192+msgid "Store"
193+msgstr "Tienda"
194+
195+#: qml/Dash/PageHeader.qml:277
188196msgid "Settings"
189197msgstr "Configuración"
190198
191−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:284
192200msgid "Remove from Favorites"
193201msgstr "Quitar de favoritos"
194202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196204msgid "Add to Favorites"
197205msgstr "Añadir a favoritos"
198206
@@ -224,87 +232,59 @@ msgstr "Deslice para actualizar…"
224232msgid "Release to refresh…"
225233msgstr "Suelte para actualizar…"
226234
227−#: qml/Dash/ScopesOverview.qml:206
228−msgid "Manage Scopes"
229−msgstr "Administrar ámbitos"
230−
231−#: qml/Dash/ScopesOverview.qml:428
232−msgid "Done"
233−msgstr "Hecho"
234−
235−#: qml/Dash/ScopesOverview.qml:454
236−msgid "Store"
237−msgstr "Tienda"
235+#: qml/Dash/ScopesList.qml:63
236+msgid "Manage"
237+msgstr ""
238238
239−#: qml/Dash/ScopesOverviewTab.qml:36
240−msgid "Favorites"
241−msgstr "Favoritos"
239+#: qml/Dash/ScopesList.qml:107
240+msgid "Home"
241+msgstr ""
242242
243−#: qml/Dash/ScopesOverviewTab.qml:54
244−msgid "All"
245−msgstr "Todo"
243+#: qml/Dash/ScopesList.qml:108
244+msgid "Also installed"
245+msgstr ""
246246
247−#: qml/Greeter/Greeter.qml:157
247+#: qml/Greeter/Greeter.qml:174
248248msgid "Unlock"
249249msgstr "Desbloquear"
250250
251−#: qml/Hud/HudParametrizedActionsPage.qml:139
252−msgid "Confirm"
253−msgstr "Confirmar"
254−
255−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
256−msgid "Type or say a command"
257−msgstr "Escriba o diga una orden"
258−
259−#: qml/Hud/Hud.qml:84
260−msgid "Loading. Please Wait..."
261−msgstr "Cargando, espere…"
262−
263−#: qml/Hud/Hud.qml:89
264−msgid "Speak Now..."
265−msgstr "Hable ahora…"
266−
267−#: qml/Hud/Hud.qml:94
268−msgid "Speaking..."
269−msgstr "Hablando…"
270−
271−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
272252msgid "Show password"
273253msgstr "Mostrar contraseña"
274254
275−#: qml/Panel/ActiveCallHint.qml:77
255+#: qml/Panel/ActiveCallHint.qml:79
276256msgid "Tap to return to call..."
277257msgstr "Toque para volver a llamar..."
278258
279−#: qml/Panel/ActiveCallHint.qml:90
259+#: qml/Panel/ActiveCallHint.qml:92
280260msgid "Conference"
281261msgstr "Conferencia"
282262
283−#: qml/Panel/Indicators/MenuItemFactory.qml:600
263+#: qml/Panel/Indicators/MenuItemFactory.qml:643
284264msgid "Nothing is playing"
285265msgstr "Ningún contenido en reproducción"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:748
267+#: qml/Panel/Indicators/MenuItemFactory.qml:791
288268msgid "In queue…"
289269msgstr "En espera…"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:752
271+#: qml/Panel/Indicators/MenuItemFactory.qml:795
292272msgid "Downloading"
293273msgstr "Descargando"
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:754
275+#: qml/Panel/Indicators/MenuItemFactory.qml:797
296276msgid "Paused, tap to resume"
297277msgstr "Pausado, toque para reanudar"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:756
279+#: qml/Panel/Indicators/MenuItemFactory.qml:799
300280msgid "Canceled"
301281msgstr "Cancelado"
302282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:758
283+#: qml/Panel/Indicators/MenuItemFactory.qml:801
304284msgid "Finished"
305285msgstr "Finalizado"
306286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:760
287+#: qml/Panel/Indicators/MenuItemFactory.qml:803
308288msgid "Failed, tap to retry"
309289msgstr "Falló, toque para reintentar"
310290
@@ -316,49 +296,49 @@ msgstr "Desbloquear SIM"
316296msgid "Roaming"
317297msgstr "Itinerancia"
318298
319−#: qml/Shell.qml:346
299+#: qml/Shell.qml:367
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "Introduzca %1"
303+
304+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
320305msgid "Enter passphrase"
321306msgstr "Introduzca la contraseña"
322307
323−#: qml/Shell.qml:347
308+#: qml/Shell.qml:369
309+msgid "Enter passcode"
310+msgstr "Introduzca el código"
311+
312+#: qml/Shell.qml:370
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "Incorrecto (%1)"
316+
317+#: qml/Shell.qml:371
324318msgid "Sorry, incorrect passphrase"
325319msgstr "La contraseña es incorrecta"
326320
327−#: qml/Shell.qml:348
321+#: qml/Shell.qml:372
328322msgid "Please re-enter"
329323msgstr "Reintroduzca"
330324
331−#: qml/Shell.qml:350
332−msgid "Enter passcode"
333−msgstr "Introduzca el código"
334−
335−#: qml/Shell.qml:351
325+#: qml/Shell.qml:373
336326msgid "Sorry, incorrect passcode"
337327msgstr "El código es incorrecto"
338328
339−#: qml/Shell.qml:354
340−#, qt-format
341−msgid "Enter %1"
342−msgstr "Introduzca %1"
343−
344−#: qml/Shell.qml:355
345−#, qt-format
346−msgid "Sorry, incorrect %1"
347−msgstr "Incorrecto (%1)"
348−
349−#: qml/Shell.qml:390
329+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
350330msgid "Sorry, incorrect passphrase."
351331msgstr "La contraseña es incorrecta."
352332
353−#: qml/Shell.qml:391
333+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
354334msgid "Sorry, incorrect passcode."
355335msgstr "Código de acceso incorrecto."
356336
357−#: qml/Shell.qml:392
337+#: qml/Shell.qml:469
358338msgid "This will be your last attempt."
359339msgstr "Este será su último intento."
360340
361−#: qml/Shell.qml:394
341+#: qml/Shell.qml:471
362342msgid ""
363343"If passphrase is entered incorrectly, your phone will conduct a factory "
364344"reset and all personal data will be deleted."
@@ -366,7 +346,7 @@ msgstr ""
366346"Si se introduce la frase incorrectamente, el teléfono volverá a la "
367347"configuración de fábrica y se perderán todos los datos personales."
368348
369−#: qml/Shell.qml:395
349+#: qml/Shell.qml:472
370350msgid ""
371351"If passcode is entered incorrectly, your phone will conduct a factory reset "
372352"and all personal data will be deleted."
@@ -374,8 +354,206 @@ msgstr ""
374354"Si se introduce el código incorrectamente, el teléfono volverá a la "
375355"configuración de fábrica y se perderán todos los datos personales."
376356
377−#~ msgid "Enter SIM PIN"
378−#~ msgstr "Escriba el PIN de la SIM"
357+#: qml/Wizard/Page.qml:89
358+msgid "Back"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:27
362+msgid "Hi!"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:44
366+msgid "Welcome to your Ubuntu phone."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:52
370+msgid "Let’s get started."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376+#: qml/Wizard/Pages/passwd-set.qml:90
377+msgid "Continue"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:25
381+msgid "Add a SIM card and restart your device"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:55
385+msgid "Without it, you won’t be able to make calls or use text messaging."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
389+msgid "Skip"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:39
393+msgid "Lock security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:74
397+msgid "Please select how you’d like to unlock your phone."
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:97
401+msgid "Swipe"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:98
405+msgid "No security"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:100
409+msgid "Passcode"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:101
413+msgid "4 digits only"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:103
417+msgid "Passphrase"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:104
421+msgid "Numbers and letters"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:28
425+msgid "Connect to Wi‑Fi"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:147
429+msgid "Available networks…"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/40-wifi.qml:148
433+msgid "No available networks."
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:27
437+msgid "Location"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:62
441+msgid "Let the phone detect your location:"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:69
445+msgid "Using GPS only (less accurate)"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:86
449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450+msgstr ""
451+
452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453+#: qml/Wizard/Pages/50-location.qml:103
454+msgid ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+
477+#: qml/Wizard/Pages/60-reporting.qml:43
478+msgid ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr ""
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr ""
533+
534+#~ msgid "Confirm"
535+#~ msgstr "Confirmar"
536+
537+#~ msgid "Type or say a command"
538+#~ msgstr "Escriba o diga una orden"
539+
540+#~ msgid "Loading. Please Wait..."
541+#~ msgstr "Cargando, espere…"
542+
543+#~ msgid "Speak Now..."
544+#~ msgstr "Hable ahora…"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Hablando…"
548+
549+#~ msgid "All"
550+#~ msgstr "Todo"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "Done"
556+#~ msgstr "Hecho"
379557
380−#~ msgid "Sorry, incorrect PIN"
381−#~ msgstr "El PIN es incorrecto"
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Administrar Scopes"
po/eu.po+280−102
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-07 19:21+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-08 14:44+0000\n"
1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
1313"Language-Team: Basque <eu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Pasahitza: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Ainguratu lasterbidea"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Askatu lasterbidea"
3333
@@ -113,46 +113,46 @@ msgstr "Utzi"
113113msgid "Skip intro"
114114msgstr "Saltatu aurkezpena"
115115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117117msgid "Right edge"
118118msgstr "Eskuineko ertza"
119119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121121msgid "Try swiping from the right edge to unlock the phone"
122122msgstr ""
123123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Goiko ertza"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Itxi"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
140140
141−#: qml/Components/EdgeDemo.qml:198
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Ezkerreko ertza"
144144
145−#: qml/Components/EdgeDemo.qml:199
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr ""
148148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
149149"izateko"
150150
151−#: qml/Components/EdgeDemo.qml:226
151+#: qml/Components/EdgeDemo.qml:242
152152msgid "Well done"
153153msgstr "Bikain"
154154
155−#: qml/Components/EdgeDemo.qml:227
155+#: qml/Components/EdgeDemo.qml:243
156156msgid ""
157157"You have now mastered the edge gestures and can start using the "
158158"phone<br><br>Tap on the screen to start"
@@ -160,36 +160,44 @@ msgstr ""
160160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
161161"zaitezke<br><br>Sakatu pantailan hasteko"
162162
163−#: qml/Components/Lockscreen.qml:220
163+#: qml/Components/Lockscreen.qml:238
164+msgid "Return to Call"
165+msgstr "Itzuli deira"
166+
167+#: qml/Components/Lockscreen.qml:238
164168msgid "Emergency Call"
165169msgstr "Larrialdi-deia"
166170
167−#: qml/Components/Lockscreen.qml:252
171+#: qml/Components/Lockscreen.qml:270
168172msgid "OK"
169173msgstr "Ados"
170174
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
175+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
172176msgid "See less"
173177msgstr "Ikusi gutxiago"
174178
175−#: qml/Dash/GenericScopeView.qml:434
179+#: qml/Dash/GenericScopeView.qml:431
176180msgid "See all"
177181msgstr "Ikusi guztiak"
178182
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
183+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
180184#: qml/Panel/SearchIndicator.qml:27
181185msgid "Search"
182186msgstr "Bilatu"
183187
184−#: qml/Dash/PageHeader.qml:268
188+#: qml/Dash/PageHeader.qml:260
189+msgid "Store"
190+msgstr "Denda"
191+
192+#: qml/Dash/PageHeader.qml:277
185193msgid "Settings"
186194msgstr "Ezarpenak"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Remove from Favorites"
190198msgstr "Kendu gogokoetatik"
191199
192−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:284
193201msgid "Add to Favorites"
194202msgstr "Gehitu gogokoetara"
195203
@@ -221,87 +229,59 @@ msgstr "Tiratu freskatzeko…"
221229msgid "Release to refresh…"
222230msgstr "Askatu freskatzeko…"
223231
224−#: qml/Dash/ScopesOverview.qml:206
225−msgid "Manage Scopes"
226−msgstr "Kudeatu eremuak"
227−
228−#: qml/Dash/ScopesOverview.qml:428
229−msgid "Done"
230−msgstr "Eginda"
231−
232−#: qml/Dash/ScopesOverview.qml:454
233−msgid "Store"
234−msgstr "Denda"
232+#: qml/Dash/ScopesList.qml:63
233+msgid "Manage"
234+msgstr ""
235235
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Gogokoak"
236+#: qml/Dash/ScopesList.qml:107
237+msgid "Home"
238+msgstr ""
239239
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "Guztiak"
240+#: qml/Dash/ScopesList.qml:108
241+msgid "Also installed"
242+msgstr ""
243243
244−#: qml/Greeter/Greeter.qml:157
244+#: qml/Greeter/Greeter.qml:174
245245msgid "Unlock"
246246msgstr "Desblokeatu"
247247
248−#: qml/Hud/HudParametrizedActionsPage.qml:139
249−msgid "Confirm"
250−msgstr "Berretsi"
251−
252−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
253−msgid "Type or say a command"
254−msgstr "Idatzi edo esan agindu bat"
255−
256−#: qml/Hud/Hud.qml:84
257−msgid "Loading. Please Wait..."
258−msgstr "Kargatzen. Itxaron, mesedez..."
259−
260−#: qml/Hud/Hud.qml:89
261−msgid "Speak Now..."
262−msgstr "Hitz egin orain..."
263−
264−#: qml/Hud/Hud.qml:94
265−msgid "Speaking..."
266−msgstr "Hitz egiten..."
267−
268−#: qml/Notifications/NotificationMenuItemFactory.qml:116
248+#: qml/Notifications/NotificationMenuItemFactory.qml:128
269249msgid "Show password"
270250msgstr "Erakutsi pasahitza"
271251
272−#: qml/Panel/ActiveCallHint.qml:77
252+#: qml/Panel/ActiveCallHint.qml:79
273253msgid "Tap to return to call..."
274254msgstr "Sakatu deira itzultzeko..."
275255
276−#: qml/Panel/ActiveCallHint.qml:90
256+#: qml/Panel/ActiveCallHint.qml:92
277257msgid "Conference"
278258msgstr "Konferentzia"
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:600
260+#: qml/Panel/Indicators/MenuItemFactory.qml:643
281261msgid "Nothing is playing"
282262msgstr "Ez dago ezer erreproduzitzen"
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:748
264+#: qml/Panel/Indicators/MenuItemFactory.qml:791
285265msgid "In queue…"
286266msgstr "Ilaran..."
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:752
268+#: qml/Panel/Indicators/MenuItemFactory.qml:795
289269msgid "Downloading"
290270msgstr "Deskargatzen"
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:754
272+#: qml/Panel/Indicators/MenuItemFactory.qml:797
293273msgid "Paused, tap to resume"
294274msgstr "Pausatuta, sakatu jarraitzeko"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:756
276+#: qml/Panel/Indicators/MenuItemFactory.qml:799
297277msgid "Canceled"
298278msgstr "Utzita"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:758
280+#: qml/Panel/Indicators/MenuItemFactory.qml:801
301281msgid "Finished"
302282msgstr "Amaituta"
303283
304−#: qml/Panel/Indicators/MenuItemFactory.qml:760
284+#: qml/Panel/Indicators/MenuItemFactory.qml:803
305285msgid "Failed, tap to retry"
306286msgstr "Huts egin du, sakatu berriro saiatzeko"
307287
@@ -313,49 +293,49 @@ msgstr "Desblokeatu SIMa"
313293msgid "Roaming"
314294msgstr "Ibiltaritza"
315295
316−#: qml/Shell.qml:346
296+#: qml/Shell.qml:367
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Sartu %1"
300+
301+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
317302msgid "Enter passphrase"
318303msgstr "Sartu pasaesaldia"
319304
320−#: qml/Shell.qml:347
305+#: qml/Shell.qml:369
306+msgid "Enter passcode"
307+msgstr "Sartu pasakodea"
308+
309+#: qml/Shell.qml:370
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sentitzen dugu, %1 okerra da"
313+
314+#: qml/Shell.qml:371
321315msgid "Sorry, incorrect passphrase"
322316msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
323317
324−#: qml/Shell.qml:348
318+#: qml/Shell.qml:372
325319msgid "Please re-enter"
326320msgstr "Errepikatu"
327321
328−#: qml/Shell.qml:350
329−msgid "Enter passcode"
330−msgstr "Sartu pasakodea"
331−
332−#: qml/Shell.qml:351
322+#: qml/Shell.qml:373
333323msgid "Sorry, incorrect passcode"
334−msgstr "Sentitzen dugu, pasakodea okerrekoa da"
335−
336−#: qml/Shell.qml:354
337−#, qt-format
338−msgid "Enter %1"
339−msgstr "Sartu %1"
324+msgstr "Sentitzen dugu, pasakodea okerra da"
340325
341−#: qml/Shell.qml:355
342−#, qt-format
343−msgid "Sorry, incorrect %1"
344−msgstr "Sentitzen dugu, %1 okerrekoa da"
345−
346−#: qml/Shell.qml:390
326+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
347327msgid "Sorry, incorrect passphrase."
348−msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
328+msgstr "Sentitzen dugu, pasaesaldia okerra da."
349329
350−#: qml/Shell.qml:391
330+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
351331msgid "Sorry, incorrect passcode."
352−msgstr "Sentitzen dugu, pasakodea okerrekoa da."
332+msgstr "Sentitzen dugu, pasakodea okerra da."
353333
354−#: qml/Shell.qml:392
334+#: qml/Shell.qml:469
355335msgid "This will be your last attempt."
356336msgstr "Hau duzu azken saiakera."
357337
358−#: qml/Shell.qml:394
338+#: qml/Shell.qml:471
359339msgid ""
360340"If passphrase is entered incorrectly, your phone will conduct a factory "
361341"reset and all personal data will be deleted."
@@ -363,7 +343,7 @@ msgstr ""
363343"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
364344"berrezarri eta datu pertsonal guztiak ezabatuko dira."
365345
366−#: qml/Shell.qml:395
346+#: qml/Shell.qml:472
367347msgid ""
368348"If passcode is entered incorrectly, your phone will conduct a factory reset "
369349"and all personal data will be deleted."
@@ -371,8 +351,206 @@ msgstr ""
371351"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
372352"berrezarri eta datu pertsonal guztiak ezabatuko dira."
373353
374−#~ msgid "Sorry, incorrect PIN"
375−#~ msgstr "Sentitzen dugu, PINa okerrekoa da"
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr ""
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:112
457+msgid "Not at all"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/50-location.qml:124
461+msgid "You can change your mind later in <b>System Settings</b>."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:24
465+msgid "Improving your experience"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/60-reporting.qml:36
469+msgid ""
470+"Your phone is set up to automatically report errors to Canonical and its "
471+"partners, the makers of the operating system."
472+msgstr ""
473+
474+#: qml/Wizard/Pages/60-reporting.qml:43
475+msgid ""
476+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
477+"Privacy</b>"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:24
481+msgid "All done"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:39
485+msgid "Nice work!"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:46
489+msgid "Your phone is now ready to use."
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:53
493+msgid "Finish"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/here-terms.qml:27
497+msgid "Terms & Conditions"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:49
501+msgid "Confirm passphrase"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:50
505+msgid "Confirm passcode"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:53
509+#: qml/Wizard/Pages/passwd-confirm.qml:54
510+msgid "Please try again."
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:61
514+msgid "Choose your passcode"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/passwd-set.qml:68
518+msgid "Passphrase must be 4 characters long"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:39
522+#, qt-format
523+msgid "〈 %1"
524+msgstr ""
525+
526+#: qml/Wizard/StackButton.qml:42
527+#, qt-format
528+msgid "%1 〉"
529+msgstr ""
530+
531+#~ msgid "Type or say a command"
532+#~ msgstr "Idatzi edo esan agindu bat"
533+
534+#~ msgid "Speak Now..."
535+#~ msgstr "Hitz egin orain..."
536+
537+#~ msgid "Loading. Please Wait..."
538+#~ msgstr "Kargatzen. Itxaron, mesedez..."
539+
540+#~ msgid "Speaking..."
541+#~ msgstr "Hitz egiten..."
542+
543+#~ msgid "Done"
544+#~ msgstr "Eginda"
545+
546+#~ msgid "All"
547+#~ msgstr "Guztiak"
548+
549+#~ msgid "Favorites"
550+#~ msgstr "Gogokoak"
551+
552+#~ msgid "Confirm"
553+#~ msgstr "Berretsi"
376554
377−#~ msgid "Enter SIM PIN"
378−#~ msgstr "Sartu SIMaren PINa"
555+#~ msgid "Manage Scopes"
556+#~ msgstr "Kudeatu eremuak"
po/fa.po+279−95
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-11 23:41+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-10 12:53+0000\n"
1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
1313"Language-Team: Persian <fa@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-10-12 06:55+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "گذرواژه: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "سنجاق کردن میانبر"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "برداشتن سنجاق میانبر"
3333
@@ -112,43 +112,43 @@ msgstr "لغو"
112112msgid "Skip intro"
113113msgstr "پرش از مقدّمه"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "لبه‌ی راست"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "لبه‌ی بالا"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "بستن"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
138138
139−#: qml/Components/EdgeDemo.qml:198
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "لبه‌ی چپ"
142142
143−#: qml/Components/EdgeDemo.qml:199
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "عالی بود"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,36 +156,44 @@ msgstr ""
156156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
157157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "بازگشت به تماس"
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr "تماس اضطراری"
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr "قبول"
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr "کم‌تر ببینید"
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr "دیدن همه"
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "جست‌وجو"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "فروشگاه"
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr "تنظیمات"
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr "برداشتن از برگزیده‌ها"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr "افزودن به برگزیده‌ها"
191199
@@ -217,87 +225,59 @@ msgstr "برای تازه‌سازی بکشید…"
217225msgid "Release to refresh…"
218226msgstr "برای تازه‌سازی رها کنید…"
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
222−msgstr "مدیریت حوزه‌ها"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
230+msgstr "مدیریت"
223231
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "انجام شد"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234+msgstr "خانه"
227235
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "فروشگاه"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "برگزیده‌ها"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238+msgstr "هم‌چنین نصب شده"
235239
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "همه"
239−
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr "بازکردن قفل"
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "تأیید"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "دستوری را بنویسید یا بگویید"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "در حال بار کردن. لطفاً صبر کنید…"
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "اکنون صحبت کنید…"
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "در حال صحبت کردن…"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "نمایش گذرواژه"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr "برای بازگشت به تماس ضربه بزنید…"
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr "کنفرانس"
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr "هیچ چیزی در حال پخش نیست"
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr "در صف…"
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr "در حال بارگیری"
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr "مکث شد، برای از سر گیری ضربه بزنید"
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr "لغو شد"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr "پایان یافت"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
303283
@@ -309,49 +289,49 @@ msgstr "باز کردن قفل سیم‌کارت"
309289msgid "Roaming"
310290msgstr "رومینگ"
311291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "%1 را وارد کنید"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313298msgid "Enter passphrase"
314299msgstr "عبارت‌عبور را وارد کنید"
315300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "رمزعبور را وارد کنید"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "متأسّفیم، %1 نادرست بود"
309+
310+#: qml/Shell.qml:371
317311msgid "Sorry, incorrect passphrase"
318312msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
319313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321315msgid "Please re-enter"
322316msgstr "لطفاً دوباره وارد کنید"
323317
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr "رمزعبور را وارد کنید"
327−
328−#: qml/Shell.qml:351
318+#: qml/Shell.qml:373
329319msgid "Sorry, incorrect passcode"
330320msgstr "متأسّفیم، رمزعبور نادرست بود"
331321
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "%1 را وارد کنید"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "متأسّفیم، %1 نادرست بود"
341−
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr "متأسّفیم، عبارت‌عبور نادرست است."
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr "متأسّفیم، رمزعبور نادرست است."
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr "این آخرین تلاش شما خواهد بود."
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
@@ -359,10 +339,214 @@ msgstr ""
359339"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
360340"اطّلاعات شخصی حذف خواهند شد."
361341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363343msgid ""
364344"If passcode is entered incorrectly, your phone will conduct a factory reset "
365345"and all personal data will be deleted."
366346msgstr ""
367347"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
368348"اطّلاعات شخصی حذف خواهند شد."
349+
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
527+#~ msgid "Type or say a command"
528+#~ msgstr "دستوری را بنویسید یا بگویید"
529+
530+#~ msgid "Confirm"
531+#~ msgstr "تأیید"
532+
533+#~ msgid "Loading. Please Wait..."
534+#~ msgstr "در حال بار کردن. لطفاً صبر کنید…"
535+
536+#~ msgid "Speaking..."
537+#~ msgstr "در حال صحبت کردن…"
538+
539+#~ msgid "Speak Now..."
540+#~ msgstr "اکنون صحبت کنید…"
541+
542+#~ msgid "All"
543+#~ msgstr "همه"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "برگزیده‌ها"
547+
548+#~ msgid "Done"
549+#~ msgstr "انجام شد"
550+
551+#~ msgid "Manage Scopes"
552+#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+284−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-07 13:10+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-14 15:37+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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-15 06:34+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Salasana: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Kiinnitä pikakuvake"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Poista pikakuvakkeen kiinnitys"
3333
@@ -114,43 +114,43 @@ msgstr "Peru"
114114msgid "Skip intro"
115115msgstr "Ohita esittely"
116116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118118msgid "Right edge"
119119msgstr "Oikea reuna"
120120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122122msgid "Try swiping from the right edge to unlock the phone"
123123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Yläreuna"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Sulje"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
140140
141−#: qml/Components/EdgeDemo.qml:198
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Vasen reuna"
144144
145−#: qml/Components/EdgeDemo.qml:199
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
148148
149−#: qml/Components/EdgeDemo.qml:226
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Hyvin tehty"
152152
153−#: qml/Components/EdgeDemo.qml:227
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,36 +158,44 @@ msgstr ""
158158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
159159"käytön<br><br>Napauta näyttöä aloittaaksesi"
160160
161−#: qml/Components/Lockscreen.qml:220
161+#: qml/Components/Lockscreen.qml:238
162+msgid "Return to Call"
163+msgstr "Palaa puheluun"
164+
165+#: qml/Components/Lockscreen.qml:238
162166msgid "Emergency Call"
163167msgstr "Hätäpuhelu"
164168
165−#: qml/Components/Lockscreen.qml:252
169+#: qml/Components/Lockscreen.qml:270
166170msgid "OK"
167171msgstr "OK"
168172
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
170174msgid "See less"
171175msgstr "Näytä vähemmän"
172176
173−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:431
174178msgid "See all"
175179msgstr "Näytä kaikki"
176180
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
178182#: qml/Panel/SearchIndicator.qml:27
179183msgid "Search"
180184msgstr "Hae"
181185
182−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:260
187+msgid "Store"
188+msgstr "Kauppa"
189+
190+#: qml/Dash/PageHeader.qml:277
183191msgid "Settings"
184192msgstr "Asetukset"
185193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187195msgid "Remove from Favorites"
188196msgstr "Poista suosikeista"
189197
190−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
191199msgid "Add to Favorites"
192200msgstr "Lisää suosikkeihin"
193201
@@ -219,87 +227,59 @@ msgstr "Vedä päivittääksesi…"
219227msgid "Release to refresh…"
220228msgstr "Vapauta päivittääksesi…"
221229
222−#: qml/Dash/ScopesOverview.qml:206
223−msgid "Manage Scopes"
224−msgstr "Näkymien hallinta"
225−
226−#: qml/Dash/ScopesOverview.qml:428
227−msgid "Done"
228−msgstr "Valmis"
229−
230−#: qml/Dash/ScopesOverview.qml:454
231−msgid "Store"
232−msgstr "Kauppa"
230+#: qml/Dash/ScopesList.qml:63
231+msgid "Manage"
232+msgstr "Hallitse"
233233
234−#: qml/Dash/ScopesOverviewTab.qml:36
235−msgid "Favorites"
236−msgstr "Suosikit"
234+#: qml/Dash/ScopesList.qml:107
235+msgid "Home"
236+msgstr "Koti"
237237
238−#: qml/Dash/ScopesOverviewTab.qml:54
239−msgid "All"
240−msgstr "Kaikki"
238+#: qml/Dash/ScopesList.qml:108
239+msgid "Also installed"
240+msgstr "Myös asennettu"
241241
242−#: qml/Greeter/Greeter.qml:157
242+#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
244244msgstr "Avaa lukitus"
245245
246−#: qml/Hud/HudParametrizedActionsPage.qml:139
247−msgid "Confirm"
248−msgstr "Hyväksy"
249−
250−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
251−msgid "Type or say a command"
252−msgstr "Kirjoita tai sano komento"
253−
254−#: qml/Hud/Hud.qml:84
255−msgid "Loading. Please Wait..."
256−msgstr "Ladataan, pieni hetki..."
257−
258−#: qml/Hud/Hud.qml:89
259−msgid "Speak Now..."
260−msgstr "Puhu nyt..."
261−
262−#: qml/Hud/Hud.qml:94
263−msgid "Speaking..."
264−msgstr "Puhutaan..."
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
267247msgid "Show password"
268248msgstr "Näytä salasana"
269249
270−#: qml/Panel/ActiveCallHint.qml:77
250+#: qml/Panel/ActiveCallHint.qml:79
271251msgid "Tap to return to call..."
272252msgstr "Napauta palataksesi puheluun..."
273253
274−#: qml/Panel/ActiveCallHint.qml:90
254+#: qml/Panel/ActiveCallHint.qml:92
275255msgid "Conference"
276256msgstr "Ryhmäpuhelu"
277257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:600
258+#: qml/Panel/Indicators/MenuItemFactory.qml:643
279259msgid "Nothing is playing"
280260msgstr "Mitään ei toisteta juuri nyt"
281261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:748
262+#: qml/Panel/Indicators/MenuItemFactory.qml:791
283263msgid "In queue…"
284264msgstr "Jonossa…"
285265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:752
266+#: qml/Panel/Indicators/MenuItemFactory.qml:795
287267msgid "Downloading"
288268msgstr "Ladataan"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:754
270+#: qml/Panel/Indicators/MenuItemFactory.qml:797
291271msgid "Paused, tap to resume"
292272msgstr "Keskeytetty, napauta palauttaaksesi"
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:756
274+#: qml/Panel/Indicators/MenuItemFactory.qml:799
295275msgid "Canceled"
296276msgstr "Peruttu"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:758
278+#: qml/Panel/Indicators/MenuItemFactory.qml:801
299279msgid "Finished"
300280msgstr "Valmistunut"
301281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:760
282+#: qml/Panel/Indicators/MenuItemFactory.qml:803
303283msgid "Failed, tap to retry"
304284msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
305285
@@ -311,49 +291,49 @@ msgstr "Avaa SIM-kortin lukitus"
311291msgid "Roaming"
312292msgstr "Verkkovierailu"
313293
314−#: qml/Shell.qml:346
294+#: qml/Shell.qml:367
295+#, qt-format
296+msgid "Enter %1"
297+msgstr "Anna %1"
298+
299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
315300msgid "Enter passphrase"
316301msgstr "Anna tunnuslause"
317302
318−#: qml/Shell.qml:347
303+#: qml/Shell.qml:369
304+msgid "Enter passcode"
305+msgstr "Anna suojakoodi"
306+
307+#: qml/Shell.qml:370
308+#, qt-format
309+msgid "Sorry, incorrect %1"
310+msgstr "Väärä %1"
311+
312+#: qml/Shell.qml:371
319313msgid "Sorry, incorrect passphrase"
320314msgstr "Virheellinen tunnuslause"
321315
322−#: qml/Shell.qml:348
316+#: qml/Shell.qml:372
323317msgid "Please re-enter"
324318msgstr "Anna uudelleen"
325319
326−#: qml/Shell.qml:350
327−msgid "Enter passcode"
328−msgstr "Anna suojakoodi"
329−
330−#: qml/Shell.qml:351
320+#: qml/Shell.qml:373
331321msgid "Sorry, incorrect passcode"
332322msgstr "Väärä suojakoodi"
333323
334−#: qml/Shell.qml:354
335−#, qt-format
336−msgid "Enter %1"
337−msgstr "Anna %1"
338−
339−#: qml/Shell.qml:355
340−#, qt-format
341−msgid "Sorry, incorrect %1"
342−msgstr "Väärä %1"
343−
344−#: qml/Shell.qml:390
324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
345325msgid "Sorry, incorrect passphrase."
346326msgstr "Virheellinen tunnuslause."
347327
348−#: qml/Shell.qml:391
328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
349329msgid "Sorry, incorrect passcode."
350330msgstr "Virheellinen suojakoodi."
351331
352−#: qml/Shell.qml:392
332+#: qml/Shell.qml:469
353333msgid "This will be your last attempt."
354334msgstr "Tämä on viimeinen yritys."
355335
356−#: qml/Shell.qml:394
336+#: qml/Shell.qml:471
357337msgid ""
358338"If passphrase is entered incorrectly, your phone will conduct a factory "
359339"reset and all personal data will be deleted."
@@ -361,7 +341,7 @@ msgstr ""
361341"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
362342"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
363343
364−#: qml/Shell.qml:395
344+#: qml/Shell.qml:472
365345msgid ""
366346"If passcode is entered incorrectly, your phone will conduct a factory reset "
367347"and all personal data will be deleted."
@@ -369,8 +349,213 @@ msgstr ""
369349"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
370350"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
371351
372−#~ msgid "Sorry, incorrect PIN"
373−#~ msgstr "Väärä PIN-koodi"
352+#: qml/Wizard/Page.qml:89
353+msgid "Back"
354+msgstr "Takaisin"
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr "Hei!"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr "Tervetuloa Ubuntu-puhelimen pariin."
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr "Aloitetaanpa."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr "Jatka"
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+"Ilman sitä et voi soittaa tai vastaanottaa puheluja tai käyttää "
383+"tekstiviestejä."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Ohita"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lukitusturva"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Valitse puhelimen lukituksen avaustapa."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Pyyhkäisy"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "Ei suojausta"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Suojakoodi"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "Vain 4 numeroa"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Salasana"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numerot ja kirjaimet"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Yhdistä wifi-verkkoon"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Käytettävissä olevat verkot…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "Ei käytettävissä olevia verkkoja."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Sijainti"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Salli puhelimen havaita sijaintisi:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Vain GPS:llä (epätarkempi)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "GPS:llä, wifi- ja matkapuhelinverkon tiedoin (suositeltu)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"Valitsemalla tämän hyväksyt Nokia HERE -palvelun <a href='#'>käyttöehdot</a>."
456+
457+#: qml/Wizard/Pages/50-location.qml:112
458+msgid "Not at all"
459+msgstr "Ei mitään"
460+
461+#: qml/Wizard/Pages/50-location.qml:124
462+msgid "You can change your mind later in <b>System Settings</b>."
463+msgstr "Voit vaihtaa valintaasi myöhemmin <b>Järjestelmän asetuksissa</b>."
464+
465+#: qml/Wizard/Pages/60-reporting.qml:24
466+msgid "Improving your experience"
467+msgstr "Käyttökokemuksen parantaminen"
468+
469+#: qml/Wizard/Pages/60-reporting.qml:36
470+msgid ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
473+msgstr ""
474+"Puhelimesi on asetettu ilmoittamaan virheistä automaattisesti Canonicalille "
475+"ja partnereille, eli käyttöjärjestelmän kehittäjille."
476+
477+#: qml/Wizard/Pages/60-reporting.qml:43
478+msgid ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
481+msgstr ""
482+"Tämä on mahdollista poistaa käytöstä <b>Järjestelmän asetukset</b> -osion "
483+"kohdasta <b>Turvallisuus ja yksityisyys</b>"
484+
485+#: qml/Wizard/Pages/80-finished.qml:24
486+msgid "All done"
487+msgstr "Kaikki valmiina"
488+
489+#: qml/Wizard/Pages/80-finished.qml:39
490+msgid "Nice work!"
491+msgstr "Hyvä!"
492+
493+#: qml/Wizard/Pages/80-finished.qml:46
494+msgid "Your phone is now ready to use."
495+msgstr "Puhelimesi on nyt valmis käytettäväksi."
496+
497+#: qml/Wizard/Pages/80-finished.qml:53
498+msgid "Finish"
499+msgstr "Valmis"
500+
501+#: qml/Wizard/Pages/here-terms.qml:27
502+msgid "Terms & Conditions"
503+msgstr "Käyttöehdot"
504+
505+#: qml/Wizard/Pages/passwd-confirm.qml:49
506+msgid "Confirm passphrase"
507+msgstr "Vahvista salasana"
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:50
510+msgid "Confirm passcode"
511+msgstr "Vahvista suojakoodi"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:53
514+#: qml/Wizard/Pages/passwd-confirm.qml:54
515+msgid "Please try again."
516+msgstr "Yritä uudelleen."
517+
518+#: qml/Wizard/Pages/passwd-set.qml:61
519+msgid "Choose your passcode"
520+msgstr "Valitse suojakoodi"
521+
522+#: qml/Wizard/Pages/passwd-set.qml:68
523+msgid "Passphrase must be 4 characters long"
524+msgstr "Salasanan tulee olla neljä merkkiä pitkä"
525+
526+#: qml/Wizard/StackButton.qml:39
527+#, qt-format
528+msgid "〈 %1"
529+msgstr "〈 %1"
530+
531+#: qml/Wizard/StackButton.qml:42
532+#, qt-format
533+msgid "%1 〉"
534+msgstr "%1 〉"
535+
536+#~ msgid "Confirm"
537+#~ msgstr "Hyväksy"
538+
539+#~ msgid "Type or say a command"
540+#~ msgstr "Kirjoita tai sano komento"
541+
542+#~ msgid "Speak Now..."
543+#~ msgstr "Puhu nyt..."
544+
545+#~ msgid "Speaking..."
546+#~ msgstr "Puhutaan..."
547+
548+#~ msgid "Loading. Please Wait..."
549+#~ msgstr "Ladataan, pieni hetki..."
550+
551+#~ msgid "All"
552+#~ msgstr "Kaikki"
553+
554+#~ msgid "Favorites"
555+#~ msgstr "Suosikit"
556+
557+#~ msgid "Done"
558+#~ msgstr "Valmis"
374559
375−#~ msgid "Enter SIM PIN"
376−#~ msgstr "Anna SIM-kortin PIN-koodi"
560+#~ msgid "Manage Scopes"
561+#~ msgstr "Näkymien hallinta"
po/fo.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-01-14 20:08+0000\n"
1212"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
1313"Language-Team: Faroese <fo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,78 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr ""
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Høgra kant"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Topp kantur"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156160msgid "Emergency Call"
157161msgstr ""
158162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160164msgid "OK"
161165msgstr ""
162166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164168msgid "See less"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168172msgid "See all"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172176#: qml/Panel/SearchIndicator.qml:27
173177msgid "Search"
174178msgstr "Leita"
175179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177185msgid "Settings"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181189msgid "Remove from Favorites"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Add to Favorites"
186194msgstr ""
187195
@@ -213,87 +221,59 @@ msgstr ""
213221msgid "Release to refresh…"
214222msgstr ""
215223
216−#: qml/Dash/ScopesOverview.qml:206
217−msgid "Manage Scopes"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
224+#: qml/Dash/ScopesList.qml:63
225+msgid "Manage"
226226msgstr ""
227227
228−#: qml/Dash/ScopesOverviewTab.qml:36
229−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:107
229+msgid "Home"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:54
233−msgid "All"
232+#: qml/Dash/ScopesList.qml:108
233+msgid "Also installed"
234234msgstr ""
235235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237237msgid "Unlock"
238238msgstr ""
239239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr "Vátta"
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr "Skriva ella sig eini stýriboð"
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "Løðar. Vinarliga bíða..."
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "Snakka nú..."
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "Snakkar..."
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261241msgid "Show password"
262242msgstr ""
263243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265245msgid "Tap to return to call..."
266246msgstr ""
267247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269249msgid "Conference"
270250msgstr ""
271251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273253msgid "Nothing is playing"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277257msgid "In queue…"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281261msgid "Downloading"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285265msgid "Paused, tap to resume"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289269msgid "Canceled"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293273msgid "Finished"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297277msgid "Failed, tap to retry"
298278msgstr ""
299279
@@ -305,56 +285,248 @@ msgstr ""
305285msgid "Roaming"
306286msgstr ""
307287
308−#: qml/Shell.qml:346
309−msgid "Enter passphrase"
288+#: qml/Shell.qml:367
289+#, qt-format
290+msgid "Enter %1"
310291msgstr ""
311292
312−#: qml/Shell.qml:347
313−msgid "Sorry, incorrect passphrase"
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
294+msgid "Enter passphrase"
314295msgstr ""
315296
316−#: qml/Shell.qml:348
317−msgid "Please re-enter"
297+#: qml/Shell.qml:369
298+msgid "Enter passcode"
318299msgstr ""
319300
320−#: qml/Shell.qml:350
321−msgid "Enter passcode"
301+#: qml/Shell.qml:370
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322304msgstr ""
323305
324−#: qml/Shell.qml:351
325−msgid "Sorry, incorrect passcode"
306+#: qml/Shell.qml:371
307+msgid "Sorry, incorrect passphrase"
326308msgstr ""
327309
328−#: qml/Shell.qml:354
329−#, qt-format
330−msgid "Enter %1"
310+#: qml/Shell.qml:372
311+msgid "Please re-enter"
331312msgstr ""
332313
333−#: qml/Shell.qml:355
334−#, qt-format
335−msgid "Sorry, incorrect %1"
314+#: qml/Shell.qml:373
315+msgid "Sorry, incorrect passcode"
336316msgstr ""
337317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339319msgid "Sorry, incorrect passphrase."
340320msgstr ""
341321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343323msgid "Sorry, incorrect passcode."
344324msgstr ""
345325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347327msgid "This will be your last attempt."
348328msgstr ""
349329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351331msgid ""
352332"If passphrase is entered incorrectly, your phone will conduct a factory "
353333"reset and all personal data will be deleted."
354334msgstr ""
355335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357337msgid ""
358338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359339"and all personal data will be deleted."
360340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Confirm"
520+#~ msgstr "Vátta"
521+
522+#~ msgid "Type or say a command"
523+#~ msgstr "Skriva ella sig eini stýriboð"
524+
525+#~ msgid "Loading. Please Wait..."
526+#~ msgstr "Løðar. Vinarliga bíða..."
527+
528+#~ msgid "Speak Now..."
529+#~ msgstr "Snakka nú..."
530+
531+#~ msgid "Speaking..."
532+#~ msgstr "Snakkar..."
po/fr.po+278−100
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-09 19:00+0000\n"
12−"Last-Translator: Anne <anneonyme017@gmail.com>\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-10 22:01+0000\n"
12+"Last-Translator: Jean Marc <Unknown>\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"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-10 05:23+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Mot de passe : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Épingler le raccourci"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Détacher le raccourci"
3333
@@ -116,50 +116,50 @@ msgstr "Annuler"
116116msgid "Skip intro"
117117msgstr "Passer l'intro"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Bord droit"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Bord supérieur"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
136136"indicateurs."
137137
138−#: qml/Components/EdgeDemo.qml:170
138+#: qml/Components/EdgeDemo.qml:183
139139msgid "Close"
140140msgstr "Fermer"
141141
142−#: qml/Components/EdgeDemo.qml:171
142+#: qml/Components/EdgeDemo.qml:184
143143msgid "Swipe up again to close the settings screen"
144144msgstr ""
145145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
146146"l'écran des paramètres"
147147
148−#: qml/Components/EdgeDemo.qml:198
148+#: qml/Components/EdgeDemo.qml:214
149149msgid "Left edge"
150150msgstr "Bord gauche"
151151
152−#: qml/Components/EdgeDemo.qml:199
152+#: qml/Components/EdgeDemo.qml:215
153153msgid "Swipe from the left to reveal the launcher for quick access to apps"
154154msgstr ""
155155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
156156"d'applications."
157157
158−#: qml/Components/EdgeDemo.qml:226
158+#: qml/Components/EdgeDemo.qml:242
159159msgid "Well done"
160160msgstr "Félicitations"
161161
162−#: qml/Components/EdgeDemo.qml:227
162+#: qml/Components/EdgeDemo.qml:243
163163msgid ""
164164"You have now mastered the edge gestures and can start using the "
165165"phone<br><br>Tap on the screen to start"
@@ -167,36 +167,44 @@ msgstr ""
167167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
168168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
169169
170−#: qml/Components/Lockscreen.qml:220
170+#: qml/Components/Lockscreen.qml:238
171+msgid "Return to Call"
172+msgstr "Retourner à l'appel"
173+
174+#: qml/Components/Lockscreen.qml:238
171175msgid "Emergency Call"
172176msgstr "Appel d'urgence"
173177
174−#: qml/Components/Lockscreen.qml:252
178+#: qml/Components/Lockscreen.qml:270
175179msgid "OK"
176180msgstr "OK"
177181
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
182+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
179183msgid "See less"
180184msgstr "Voir moins"
181185
182−#: qml/Dash/GenericScopeView.qml:434
186+#: qml/Dash/GenericScopeView.qml:431
183187msgid "See all"
184188msgstr "Tout voir"
185189
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
190+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
187191#: qml/Panel/SearchIndicator.qml:27
188192msgid "Search"
189193msgstr "Rechercher"
190194
191−#: qml/Dash/PageHeader.qml:268
195+#: qml/Dash/PageHeader.qml:260
196+msgid "Store"
197+msgstr "Logithèque"
198+
199+#: qml/Dash/PageHeader.qml:277
192200msgid "Settings"
193201msgstr "Paramètres"
194202
195−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:284
196204msgid "Remove from Favorites"
197205msgstr "Retirer des favoris"
198206
199−#: qml/Dash/PageHeader.qml:275
207+#: qml/Dash/PageHeader.qml:284
200208msgid "Add to Favorites"
201209msgstr "Ajouter aux favoris"
202210
@@ -228,87 +236,59 @@ msgstr "Tirer pour actualiser..."
228236msgid "Release to refresh…"
229237msgstr "Relâcher pour actualiser..."
230238
231−#: qml/Dash/ScopesOverview.qml:206
232−msgid "Manage Scopes"
233−msgstr "Gérer les moteurs de recherche"
234−
235−#: qml/Dash/ScopesOverview.qml:428
236−msgid "Done"
237−msgstr "Terminé"
238−
239−#: qml/Dash/ScopesOverview.qml:454
240−msgid "Store"
241−msgstr "Logithèque"
239+#: qml/Dash/ScopesList.qml:63
240+msgid "Manage"
241+msgstr ""
242242
243−#: qml/Dash/ScopesOverviewTab.qml:36
244−msgid "Favorites"
245−msgstr "Favorites"
243+#: qml/Dash/ScopesList.qml:107
244+msgid "Home"
245+msgstr ""
246246
247−#: qml/Dash/ScopesOverviewTab.qml:54
248−msgid "All"
249−msgstr "Toutes"
247+#: qml/Dash/ScopesList.qml:108
248+msgid "Also installed"
249+msgstr "Également installées"
250250
251−#: qml/Greeter/Greeter.qml:157
251+#: qml/Greeter/Greeter.qml:174
252252msgid "Unlock"
253253msgstr "Déverrouiller"
254254
255−#: qml/Hud/HudParametrizedActionsPage.qml:139
256−msgid "Confirm"
257−msgstr "Confirmez"
258−
259−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
260−msgid "Type or say a command"
261−msgstr "Rédigez ou dictez une commande"
262−
263−#: qml/Hud/Hud.qml:84
264−msgid "Loading. Please Wait..."
265−msgstr "Chargement. Veuillez patienter…"
266−
267−#: qml/Hud/Hud.qml:89
268−msgid "Speak Now..."
269−msgstr "Parlez maintenant…"
270−
271−#: qml/Hud/Hud.qml:94
272−msgid "Speaking..."
273−msgstr "En cours d'écoute..."
274−
275−#: qml/Notifications/NotificationMenuItemFactory.qml:116
255+#: qml/Notifications/NotificationMenuItemFactory.qml:128
276256msgid "Show password"
277257msgstr "Afficher le mot de passe"
278258
279−#: qml/Panel/ActiveCallHint.qml:77
259+#: qml/Panel/ActiveCallHint.qml:79
280260msgid "Tap to return to call..."
281261msgstr "Appuyez pour revenir à l'appel…"
282262
283−#: qml/Panel/ActiveCallHint.qml:90
263+#: qml/Panel/ActiveCallHint.qml:92
284264msgid "Conference"
285265msgstr "Conférence"
286266
287−#: qml/Panel/Indicators/MenuItemFactory.qml:600
267+#: qml/Panel/Indicators/MenuItemFactory.qml:643
288268msgid "Nothing is playing"
289269msgstr "Rien n'est en cours de lecture"
290270
291−#: qml/Panel/Indicators/MenuItemFactory.qml:748
271+#: qml/Panel/Indicators/MenuItemFactory.qml:791
292272msgid "In queue…"
293273msgstr "Dans la file d'attente..."
294274
295−#: qml/Panel/Indicators/MenuItemFactory.qml:752
275+#: qml/Panel/Indicators/MenuItemFactory.qml:795
296276msgid "Downloading"
297277msgstr "Téléchargement en cours"
298278
299−#: qml/Panel/Indicators/MenuItemFactory.qml:754
279+#: qml/Panel/Indicators/MenuItemFactory.qml:797
300280msgid "Paused, tap to resume"
301281msgstr "En pause, appuyez pour reprendre"
302282
303−#: qml/Panel/Indicators/MenuItemFactory.qml:756
283+#: qml/Panel/Indicators/MenuItemFactory.qml:799
304284msgid "Canceled"
305285msgstr "Annulé"
306286
307−#: qml/Panel/Indicators/MenuItemFactory.qml:758
287+#: qml/Panel/Indicators/MenuItemFactory.qml:801
308288msgid "Finished"
309289msgstr "Terminé"
310290
311−#: qml/Panel/Indicators/MenuItemFactory.qml:760
291+#: qml/Panel/Indicators/MenuItemFactory.qml:803
312292msgid "Failed, tap to retry"
313293msgstr "Échec, appuyez pour réessayer"
314294
@@ -320,49 +300,49 @@ msgstr "Déverrouiller la carte SIM"
320300msgid "Roaming"
321301msgstr "Roaming"
322302
323−#: qml/Shell.qml:346
303+#: qml/Shell.qml:367
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "Saisissez %1"
307+
308+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
324309msgid "Enter passphrase"
325310msgstr "Saisissez la phrase de passe"
326311
327−#: qml/Shell.qml:347
312+#: qml/Shell.qml:369
313+msgid "Enter passcode"
314+msgstr "Saisissez le mot de passe"
315+
316+#: qml/Shell.qml:370
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "Désolé, %1 incorrect"
320+
321+#: qml/Shell.qml:371
328322msgid "Sorry, incorrect passphrase"
329323msgstr "Désolé, phrase secrète incorrecte"
330324
331−#: qml/Shell.qml:348
325+#: qml/Shell.qml:372
332326msgid "Please re-enter"
333327msgstr "Veuillez ressaisir"
334328
335−#: qml/Shell.qml:350
336−msgid "Enter passcode"
337−msgstr "Saisissez le mot de passe"
338−
339−#: qml/Shell.qml:351
329+#: qml/Shell.qml:373
340330msgid "Sorry, incorrect passcode"
341331msgstr "Désolé, code incorrect"
342332
343−#: qml/Shell.qml:354
344−#, qt-format
345−msgid "Enter %1"
346−msgstr "Saisissez %1"
347−
348−#: qml/Shell.qml:355
349−#, qt-format
350−msgid "Sorry, incorrect %1"
351−msgstr "Désolé, %1 incorrect"
352−
353−#: qml/Shell.qml:390
333+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
354334msgid "Sorry, incorrect passphrase."
355335msgstr "Désolé, phrase secrète incorrecte."
356336
357−#: qml/Shell.qml:391
337+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
358338msgid "Sorry, incorrect passcode."
359339msgstr "Désolé, code incorrect."
360340
361−#: qml/Shell.qml:392
341+#: qml/Shell.qml:469
362342msgid "This will be your last attempt."
363343msgstr "Ceci sera votre dernière tentative."
364344
365−#: qml/Shell.qml:394
345+#: qml/Shell.qml:471
366346msgid ""
367347"If passphrase is entered incorrectly, your phone will conduct a factory "
368348"reset and all personal data will be deleted."
@@ -371,7 +351,7 @@ msgstr ""
371351"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
372352"personnelles seront supprimées."
373353
374−#: qml/Shell.qml:395
354+#: qml/Shell.qml:472
375355msgid ""
376356"If passcode is entered incorrectly, your phone will conduct a factory reset "
377357"and all personal data will be deleted."
@@ -380,8 +360,206 @@ msgstr ""
380360"réinitialisation aux paramètres d'usine et toutes les données personnelles "
381361"seront supprimées."
382362
383−#~ msgid "Sorry, incorrect PIN"
384−#~ msgstr "Désolé, code PIN incorrect"
363+#: qml/Wizard/Page.qml:89
364+msgid "Back"
365+msgstr ""
366+
367+#: qml/Wizard/Pages/10-welcome.qml:27
368+msgid "Hi!"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/10-welcome.qml:44
372+msgid "Welcome to your Ubuntu phone."
373+msgstr ""
374+
375+#: qml/Wizard/Pages/10-welcome.qml:52
376+msgid "Let’s get started."
377+msgstr ""
378+
379+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
380+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
381+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
382+#: qml/Wizard/Pages/passwd-set.qml:90
383+msgid "Continue"
384+msgstr ""
385+
386+#: qml/Wizard/Pages/20-sim.qml:25
387+msgid "Add a SIM card and restart your device"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/20-sim.qml:55
391+msgid "Without it, you won’t be able to make calls or use text messaging."
392+msgstr ""
393+
394+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
395+msgid "Skip"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:39
399+msgid "Lock security"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:74
403+msgid "Please select how you’d like to unlock your phone."
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:97
407+msgid "Swipe"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:98
411+msgid "No security"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:100
415+msgid "Passcode"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:101
419+msgid "4 digits only"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/30-passwd-type.qml:103
423+msgid "Passphrase"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/30-passwd-type.qml:104
427+msgid "Numbers and letters"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/40-wifi.qml:28
431+msgid "Connect to Wi‑Fi"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/40-wifi.qml:147
435+msgid "Available networks…"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/40-wifi.qml:148
439+msgid "No available networks."
440+msgstr ""
441+
442+#: qml/Wizard/Pages/50-location.qml:27
443+msgid "Location"
444+msgstr ""
445+
446+#: qml/Wizard/Pages/50-location.qml:62
447+msgid "Let the phone detect your location:"
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:69
451+msgid "Using GPS only (less accurate)"
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:86
455+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
456+msgstr ""
457+
458+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
459+#: qml/Wizard/Pages/50-location.qml:103
460+msgid ""
461+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
462+"conditions</a>."
463+msgstr ""
464+
465+#: qml/Wizard/Pages/50-location.qml:112
466+msgid "Not at all"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/50-location.qml:124
470+msgid "You can change your mind later in <b>System Settings</b>."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/60-reporting.qml:36
478+msgid ""
479+"Your phone is set up to automatically report errors to Canonical and its "
480+"partners, the makers of the operating system."
481+msgstr ""
482+
483+#: qml/Wizard/Pages/60-reporting.qml:43
484+msgid ""
485+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
486+"Privacy</b>"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/80-finished.qml:24
490+msgid "All done"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/80-finished.qml:39
494+msgid "Nice work!"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/80-finished.qml:46
498+msgid "Your phone is now ready to use."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/80-finished.qml:53
502+msgid "Finish"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/here-terms.qml:27
506+msgid "Terms & Conditions"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:49
510+msgid "Confirm passphrase"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:50
514+msgid "Confirm passcode"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:53
518+#: qml/Wizard/Pages/passwd-confirm.qml:54
519+msgid "Please try again."
520+msgstr ""
521+
522+#: qml/Wizard/Pages/passwd-set.qml:61
523+msgid "Choose your passcode"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/passwd-set.qml:68
527+msgid "Passphrase must be 4 characters long"
528+msgstr ""
529+
530+#: qml/Wizard/StackButton.qml:39
531+#, qt-format
532+msgid "〈 %1"
533+msgstr ""
534+
535+#: qml/Wizard/StackButton.qml:42
536+#, qt-format
537+msgid "%1 〉"
538+msgstr ""
539+
540+#~ msgid "Speaking..."
541+#~ msgstr "En cours d'écoute..."
542+
543+#~ msgid "Loading. Please Wait..."
544+#~ msgstr "Chargement. Veuillez patienter…"
545+
546+#~ msgid "Confirm"
547+#~ msgstr "Confirmez"
548+
549+#~ msgid "Type or say a command"
550+#~ msgstr "Rédigez ou dictez une commande"
551+
552+#~ msgid "Speak Now..."
553+#~ msgstr "Parlez maintenant…"
554+
555+#~ msgid "All"
556+#~ msgstr "Toutes"
557+
558+#~ msgid "Done"
559+#~ msgstr "Terminé"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Favorites"
385563
386−#~ msgid "Enter SIM PIN"
387−#~ msgstr "Entrez le code PIN de la SIM"
564+#~ msgid "Manage Scopes"
565+#~ msgstr "Gérer les moteurs de recherche"
po/gd.po+277−99
@@ -7,8 +7,8 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-09 18:09+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-11-09 08:18+0000\n"
1212"Last-Translator: GunChleoc <Unknown>\n"
1313"Language-Team: Fòram na Gàidhlig\n"
1414"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
1818"(n > 2 && n < 20) ? 2 : 3;\n"
19−"X-Launchpad-Export-Date: 2014-10-10 05:23+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121"Language: gd\n"
2222
2323#: plugins/LightDM/Greeter.cpp:130
@@ -25,11 +25,11 @@ msgid "Password: "
2525msgstr "Facal-faire: "
2626
2727#: plugins/Unity/Launcher/launcheritem.cpp:45
28−#: plugins/Unity/Launcher/launcheritem.cpp:91
28+#: plugins/Unity/Launcher/launcheritem.cpp:100
2929msgid "Pin shortcut"
3030msgstr "Prìnich ath-ghoirid"
3131
32−#: plugins/Unity/Launcher/launcheritem.cpp:91
32+#: plugins/Unity/Launcher/launcheritem.cpp:100
3333msgid "Unpin shortcut"
3434msgstr "Neo-phrìnich an ath-ghoirid"
3535
@@ -120,49 +120,49 @@ msgstr "Sguir dheth"
120120msgid "Skip intro"
121121msgstr "Gearr leum thairis air an ro-ràdh"
122122
123−#: qml/Components/EdgeDemo.qml:112
123+#: qml/Components/EdgeDemo.qml:125
124124msgid "Right edge"
125125msgstr "An oir dheas"
126126
127−#: qml/Components/EdgeDemo.qml:113
127+#: qml/Components/EdgeDemo.qml:126
128128msgid "Try swiping from the right edge to unlock the phone"
129129msgstr ""
130130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
131131"far an fhòn"
132132
133−#: qml/Components/EdgeDemo.qml:144
133+#: qml/Components/EdgeDemo.qml:157
134134msgid "Top edge"
135135msgstr "An oir aig a' bharr"
136136
137−#: qml/Components/EdgeDemo.qml:145
137+#: qml/Components/EdgeDemo.qml:158
138138msgid "Try swiping from the top edge to access the indicators"
139139msgstr ""
140140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
141141"fhaighinn air na taisbeanairean"
142142
143−#: qml/Components/EdgeDemo.qml:170
143+#: qml/Components/EdgeDemo.qml:183
144144msgid "Close"
145145msgstr "Dùin"
146146
147−#: qml/Components/EdgeDemo.qml:171
147+#: qml/Components/EdgeDemo.qml:184
148148msgid "Swipe up again to close the settings screen"
149149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
150150
151−#: qml/Components/EdgeDemo.qml:198
151+#: qml/Components/EdgeDemo.qml:214
152152msgid "Left edge"
153153msgstr "An oir chlì"
154154
155−#: qml/Components/EdgeDemo.qml:199
155+#: qml/Components/EdgeDemo.qml:215
156156msgid "Swipe from the left to reveal the launcher for quick access to apps"
157157msgstr ""
158158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
159159"luath air na h-aplacaidean"
160160
161−#: qml/Components/EdgeDemo.qml:226
161+#: qml/Components/EdgeDemo.qml:242
162162msgid "Well done"
163163msgstr "Gasta!"
164164
165−#: qml/Components/EdgeDemo.qml:227
165+#: qml/Components/EdgeDemo.qml:243
166166msgid ""
167167"You have now mastered the edge gestures and can start using the "
168168"phone<br><br>Tap on the screen to start"
@@ -170,36 +170,44 @@ msgstr ""
170170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
171171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
172172
173−#: qml/Components/Lockscreen.qml:220
173+#: qml/Components/Lockscreen.qml:238
174+msgid "Return to Call"
175+msgstr "Till dhan ghairm"
176+
177+#: qml/Components/Lockscreen.qml:238
174178msgid "Emergency Call"
175179msgstr "Gairm èiginn"
176180
177−#: qml/Components/Lockscreen.qml:252
181+#: qml/Components/Lockscreen.qml:270
178182msgid "OK"
179183msgstr "Ceart ma-thà"
180184
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
185+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
182186msgid "See less"
183187msgstr "Seall nas lugha"
184188
185−#: qml/Dash/GenericScopeView.qml:434
189+#: qml/Dash/GenericScopeView.qml:431
186190msgid "See all"
187191msgstr "Seall na h-uile"
188192
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
193+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
190194#: qml/Panel/SearchIndicator.qml:27
191195msgid "Search"
192196msgstr "Lorg"
193197
194−#: qml/Dash/PageHeader.qml:268
198+#: qml/Dash/PageHeader.qml:260
199+msgid "Store"
200+msgstr "Am bùth"
201+
202+#: qml/Dash/PageHeader.qml:277
195203msgid "Settings"
196204msgstr "Roghainnean"
197205
198−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:284
199207msgid "Remove from Favorites"
200208msgstr "Thoir air falbh o na h-annsachdan"
201209
202−#: qml/Dash/PageHeader.qml:275
210+#: qml/Dash/PageHeader.qml:284
203211msgid "Add to Favorites"
204212msgstr "Cuir ris na h-annsachdan"
205213
@@ -231,87 +239,59 @@ msgstr "Tarraing airson ath-nuadhachadh…"
231239msgid "Release to refresh…"
232240msgstr "Leig às airson ath-nuadhachadh…"
233241
234−#: qml/Dash/ScopesOverview.qml:206
235−msgid "Manage Scopes"
236−msgstr "Stiùirich na sgòpaichean"
237−
238−#: qml/Dash/ScopesOverview.qml:428
239−msgid "Done"
240−msgstr "Deiseil"
241−
242−#: qml/Dash/ScopesOverview.qml:454
243−msgid "Store"
244−msgstr "Am bùth"
242+#: qml/Dash/ScopesList.qml:63
243+msgid "Manage"
244+msgstr ""
245245
246−#: qml/Dash/ScopesOverviewTab.qml:36
247−msgid "Favorites"
248−msgstr "Annsachdan"
246+#: qml/Dash/ScopesList.qml:107
247+msgid "Home"
248+msgstr ""
249249
250−#: qml/Dash/ScopesOverviewTab.qml:54
251−msgid "All"
252−msgstr "Na h-uile"
250+#: qml/Dash/ScopesList.qml:108
251+msgid "Also installed"
252+msgstr ""
253253
254−#: qml/Greeter/Greeter.qml:157
254+#: qml/Greeter/Greeter.qml:174
255255msgid "Unlock"
256256msgstr "Thoir a' ghlas dheth"
257257
258−#: qml/Hud/HudParametrizedActionsPage.qml:139
259−msgid "Confirm"
260−msgstr "Dearbhaich"
261−
262−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
263−msgid "Type or say a command"
264−msgstr "Sgrìobh no can àithne"
265−
266−#: qml/Hud/Hud.qml:84
267−msgid "Loading. Please Wait..."
268−msgstr "'Ga luchdadh, fuirich ort..."
269−
270−#: qml/Hud/Hud.qml:89
271−msgid "Speak Now..."
272−msgstr "Can rud a-nis..."
273−
274−#: qml/Hud/Hud.qml:94
275−msgid "Speaking..."
276−msgstr "A' bruidhinn..."
277−
278−#: qml/Notifications/NotificationMenuItemFactory.qml:116
258+#: qml/Notifications/NotificationMenuItemFactory.qml:128
279259msgid "Show password"
280260msgstr "Seall am facal-faire"
281261
282−#: qml/Panel/ActiveCallHint.qml:77
262+#: qml/Panel/ActiveCallHint.qml:79
283263msgid "Tap to return to call..."
284264msgstr "Gnog gus tilleadh dhan ghairm..."
285265
286−#: qml/Panel/ActiveCallHint.qml:90
266+#: qml/Panel/ActiveCallHint.qml:92
287267msgid "Conference"
288268msgstr "Gairm co-labhairt"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:600
270+#: qml/Panel/Indicators/MenuItemFactory.qml:643
291271msgid "Nothing is playing"
292272msgstr "Chan eil dad 'ga chluich"
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:748
274+#: qml/Panel/Indicators/MenuItemFactory.qml:791
295275msgid "In queue…"
296276msgstr "Air a' chiudha…"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:752
278+#: qml/Panel/Indicators/MenuItemFactory.qml:795
299279msgid "Downloading"
300280msgstr "'Ga luchdadh a-nuas"
301281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:754
282+#: qml/Panel/Indicators/MenuItemFactory.qml:797
303283msgid "Paused, tap to resume"
304284msgstr "'Na stad, thoir gnogag gus leantainn air"
305285
306−#: qml/Panel/Indicators/MenuItemFactory.qml:756
286+#: qml/Panel/Indicators/MenuItemFactory.qml:799
307287msgid "Canceled"
308288msgstr "Air a sgur dheth"
309289
310−#: qml/Panel/Indicators/MenuItemFactory.qml:758
290+#: qml/Panel/Indicators/MenuItemFactory.qml:801
311291msgid "Finished"
312292msgstr "Coileanta"
313293
314−#: qml/Panel/Indicators/MenuItemFactory.qml:760
294+#: qml/Panel/Indicators/MenuItemFactory.qml:803
315295msgid "Failed, tap to retry"
316296msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
317297
@@ -323,49 +303,49 @@ msgstr "Thoir a' ghlas far an SIM"
323303msgid "Roaming"
324304msgstr "Air fàrsan"
325305
326−#: qml/Shell.qml:346
306+#: qml/Shell.qml:367
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Cuir a-steach %1"
310+
311+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
327312msgid "Enter passphrase"
328313msgstr "Cuir abairt-fhaire a-steach"
329314
330−#: qml/Shell.qml:347
315+#: qml/Shell.qml:369
316+msgid "Enter passcode"
317+msgstr "Cuir còd-faire a-steach"
318+
319+#: qml/Shell.qml:370
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Duilich ach tha a' %1 cearr"
323+
324+#: qml/Shell.qml:371
331325msgid "Sorry, incorrect passphrase"
332326msgstr "Duilich ach tha an abairt-fhaire cearr"
333327
334−#: qml/Shell.qml:348
328+#: qml/Shell.qml:372
335329msgid "Please re-enter"
336330msgstr "Cuir a-steach e a-rithist"
337331
338−#: qml/Shell.qml:350
339−msgid "Enter passcode"
340−msgstr "Cuir còd-faire a-steach"
341−
342−#: qml/Shell.qml:351
332+#: qml/Shell.qml:373
343333msgid "Sorry, incorrect passcode"
344334msgstr "Duilich ach tha an còd-faire cearr"
345335
346−#: qml/Shell.qml:354
347−#, qt-format
348−msgid "Enter %1"
349−msgstr "Cuir a-steach %1"
350−
351−#: qml/Shell.qml:355
352−#, qt-format
353−msgid "Sorry, incorrect %1"
354−msgstr "Duilich ach tha a' %1 cearr"
355−
356−#: qml/Shell.qml:390
336+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
357337msgid "Sorry, incorrect passphrase."
358338msgstr "Duilich ach tha an abairt-fhaire cearr."
359339
360−#: qml/Shell.qml:391
340+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
361341msgid "Sorry, incorrect passcode."
362342msgstr "Duilich ach tha an còd-faire cearr."
363343
364−#: qml/Shell.qml:392
344+#: qml/Shell.qml:469
365345msgid "This will be your last attempt."
366346msgstr "Seo an oidhirp mu dheireadh agad."
367347
368−#: qml/Shell.qml:394
348+#: qml/Shell.qml:471
369349msgid ""
370350"If passphrase is entered incorrectly, your phone will conduct a factory "
371351"reset and all personal data will be deleted."
@@ -374,7 +354,7 @@ msgstr ""
374354"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
375355"pearsanta a sguabadh às."
376356
377−#: qml/Shell.qml:395
357+#: qml/Shell.qml:472
378358msgid ""
379359"If passcode is entered incorrectly, your phone will conduct a factory reset "
380360"and all personal data will be deleted."
@@ -383,8 +363,206 @@ msgstr ""
383363"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
384364"a sguabadh às."
385365
386−#~ msgid "Enter SIM PIN"
387−#~ msgstr "Cuir a-steach PIN an t-SIM"
366+#: qml/Wizard/Page.qml:89
367+msgid "Back"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:27
371+msgid "Hi!"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:44
375+msgid "Welcome to your Ubuntu phone."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:52
379+msgid "Let’s get started."
380+msgstr ""
381+
382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385+#: qml/Wizard/Pages/passwd-set.qml:90
386+msgid "Continue"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/20-sim.qml:25
390+msgid "Add a SIM card and restart your device"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:55
394+msgid "Without it, you won’t be able to make calls or use text messaging."
395+msgstr ""
396+
397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
398+msgid "Skip"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:39
402+msgid "Lock security"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:74
406+msgid "Please select how you’d like to unlock your phone."
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:97
410+msgid "Swipe"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:98
414+msgid "No security"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:100
418+msgid "Passcode"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:101
422+msgid "4 digits only"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:103
426+msgid "Passphrase"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:104
430+msgid "Numbers and letters"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/40-wifi.qml:28
434+msgid "Connect to Wi‑Fi"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:147
438+msgid "Available networks…"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/40-wifi.qml:148
442+msgid "No available networks."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:27
446+msgid "Location"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:62
450+msgid "Let the phone detect your location:"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:69
454+msgid "Using GPS only (less accurate)"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/50-location.qml:86
458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459+msgstr ""
460+
461+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
462+#: qml/Wizard/Pages/50-location.qml:103
463+msgid ""
464+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
465+"conditions</a>."
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:112
469+msgid "Not at all"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/50-location.qml:124
473+msgid "You can change your mind later in <b>System Settings</b>."
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:24
477+msgid "Improving your experience"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/60-reporting.qml:36
481+msgid ""
482+"Your phone is set up to automatically report errors to Canonical and its "
483+"partners, the makers of the operating system."
484+msgstr ""
485+
486+#: qml/Wizard/Pages/60-reporting.qml:43
487+msgid ""
488+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
489+"Privacy</b>"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:24
493+msgid "All done"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:39
497+msgid "Nice work!"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:46
501+msgid "Your phone is now ready to use."
502+msgstr ""
503+
504+#: qml/Wizard/Pages/80-finished.qml:53
505+msgid "Finish"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/here-terms.qml:27
509+msgid "Terms & Conditions"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:49
513+msgid "Confirm passphrase"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:50
517+msgid "Confirm passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:53
521+#: qml/Wizard/Pages/passwd-confirm.qml:54
522+msgid "Please try again."
523+msgstr ""
524+
525+#: qml/Wizard/Pages/passwd-set.qml:61
526+msgid "Choose your passcode"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/passwd-set.qml:68
530+msgid "Passphrase must be 4 characters long"
531+msgstr ""
532+
533+#: qml/Wizard/StackButton.qml:39
534+#, qt-format
535+msgid "〈 %1"
536+msgstr ""
537+
538+#: qml/Wizard/StackButton.qml:42
539+#, qt-format
540+msgid "%1 〉"
541+msgstr ""
542+
543+#~ msgid "Confirm"
544+#~ msgstr "Dearbhaich"
545+
546+#~ msgid "Loading. Please Wait..."
547+#~ msgstr "'Ga luchdadh, fuirich ort..."
548+
549+#~ msgid "Type or say a command"
550+#~ msgstr "Sgrìobh no can àithne"
551+
552+#~ msgid "Speaking..."
553+#~ msgstr "A' bruidhinn..."
554+
555+#~ msgid "Speak Now..."
556+#~ msgstr "Can rud a-nis..."
557+
558+#~ msgid "All"
559+#~ msgstr "Na h-uile"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Annsachdan"
563+
564+#~ msgid "Done"
565+#~ msgstr "Deiseil"
388566
389−#~ msgid "Sorry, incorrect PIN"
390−#~ msgstr "Duilich ach tha a' PIN cearr"
567+#~ msgid "Manage Scopes"
568+#~ msgstr "Stiùirich na sgòpaichean"
po/gl.po+284−99
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-07 10:01+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-13 10:46+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-14 06:14+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasinal : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Fixar o atallo"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Eliminar o atallo"
3333
@@ -110,45 +110,45 @@ msgstr "Cancelar"
110110msgid "Skip intro"
111111msgstr "Saltar introdución"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Bordo dereito"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Bordo superior"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Pechar"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Bordo esquerdo"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
145145"aplicativos"
146146
147−#: qml/Components/EdgeDemo.qml:226
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Ben feito!"
150150
151−#: qml/Components/EdgeDemo.qml:227
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,36 +156,44 @@ msgstr ""
156156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
157157"teléfono<br><br>Toque na pantalla para comezar"
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr "Volver á chamada"
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr "Chamada de emerxencia"
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr "Aceptar"
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr "Ver menos"
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr "Ver todo"
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "Buscar"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Tenda"
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr "Axustes"
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr "Eliminar dos favoritos"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr "Engadir aos favoritos"
191199
@@ -217,87 +225,59 @@ msgstr "Tirar para actualizar..."
217225msgid "Release to refresh…"
218226msgstr "Soltar para actualizar"
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
222−msgstr "Xestionar os Ámbitos"
223−
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Feito"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Tenda"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
230+msgstr "Xestionar"
231231
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Favoritos"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234+msgstr "Inicio"
235235
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "Todos"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238+msgstr "Tamén instalado"
239239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr "Desbloquear"
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Confirmar"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Escriba ou diga unha orde"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Cargando, agarde…"
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Fale agora…"
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Falando…"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "Mostrar contrasinal"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr "Toque para volver a chamar..."
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr "Conferencia"
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr "Non hai nada en reprodución"
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr "Na cola..."
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr "Descargando"
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr "Detido, toque para continuar"
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr "Cancelado"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr "Rematado"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr "Fallou, toque para reintentar"
303283
@@ -309,49 +289,49 @@ msgstr "Desbloquear a SIM"
309289msgid "Roaming"
310290msgstr "Itinerancia"
311291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Introducir %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313298msgid "Enter passphrase"
314299msgstr "Introduza a frase secreta"
315300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Introduza a clave"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Sentímolo, %1 non coincide"
309+
310+#: qml/Shell.qml:371
317311msgid "Sorry, incorrect passphrase"
318312msgstr "Sentímolo a frase é incorrecta"
319313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321315msgid "Please re-enter"
322316msgstr "Introducir de novo"
323317
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr "Introduza a clave"
327−
328−#: qml/Shell.qml:351
318+#: qml/Shell.qml:373
329319msgid "Sorry, incorrect passcode"
330320msgstr "Sentímolo, a clave é incorrecta"
331321
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Introducir %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Sentímolo, %1 non coincide"
341−
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr "Sentímolo a frase é incorrecta."
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr "Sentímolo, a clave é incorrecta."
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr "Este será o seu último intento."
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
@@ -359,7 +339,7 @@ msgstr ""
359339"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
360340"valores de fábrica e perderá todos os datos persoais."
361341
362−#: qml/Shell.qml:395
342+#: qml/Shell.qml:472
363343msgid ""
364344"If passcode is entered incorrectly, your phone will conduct a factory reset "
365345"and all personal data will be deleted."
@@ -367,8 +347,213 @@ msgstr ""
367347"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
368348"fábrica e perderá todos os datos persoais."
369349
370−#~ msgid "Sorry, incorrect PIN"
371−#~ msgstr "Sentímolo, o PIN é incorrecto"
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr "Volver"
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr "Boas!"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr "Benvido/a ao seu teléfono Ubuntu."
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr "Comezamos."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr "Continuar"
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."
381+
382+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
383+msgid "Skip"
384+msgstr "Saltar"
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:39
387+msgid "Lock security"
388+msgstr "Seguranza do bloqueo"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:74
391+msgid "Please select how you’d like to unlock your phone."
392+msgstr "Por favor, seleccione a forma de desbloquear o teléfono."
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:97
395+msgid "Swipe"
396+msgstr "Esvarar o dedo"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:98
399+msgid "No security"
400+msgstr "Sen seguranza"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:100
403+msgid "Passcode"
404+msgstr "Clave"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:101
407+msgid "4 digits only"
408+msgstr "Só 4 díxitos"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:103
411+msgid "Passphrase"
412+msgstr "Frase secreta"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:104
415+msgid "Numbers and letters"
416+msgstr "Números e letras"
417+
418+#: qml/Wizard/Pages/40-wifi.qml:28
419+msgid "Connect to Wi‑Fi"
420+msgstr "Conectar a unha wifi"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:147
423+msgid "Available networks…"
424+msgstr "Redes dispoñíbeis..."
425+
426+#: qml/Wizard/Pages/40-wifi.qml:148
427+msgid "No available networks."
428+msgstr "Non hai redes dispoñíbeis."
429+
430+#: qml/Wizard/Pages/50-location.qml:27
431+msgid "Location"
432+msgstr "Localización"
433+
434+#: qml/Wizard/Pages/50-location.qml:62
435+msgid "Let the phone detect your location:"
436+msgstr "Permitir ao teléfono detectar a localizacón:"
437+
438+#: qml/Wizard/Pages/50-location.qml:69
439+msgid "Using GPS only (less accurate)"
440+msgstr "Usar só GPS (menos exacta)"
441+
442+#: qml/Wizard/Pages/50-location.qml:86
443+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
444+msgstr "Usar GPS, wifi anónimo e información da rede móbil (recomendado)"
445+
446+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
447+#: qml/Wizard/Pages/50-location.qml:103
448+msgid ""
449+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
450+"conditions</a>."
451+msgstr ""
452+"Seleccionando esta opción acepta os <a href='#'>termos e condicións</a> do "
453+"HERE de Nokia."
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr "De ningún xeito"
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr "Pode cambialo máis tarde nos <b>Axustes do sistema</b>."
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr "Mellorando a súa experiencia"
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+"O teléfono configurouse para informar dos erros automaticamente a Canonical "
473+"e os seus socios, os creadores do sistema operativo."
474+
475+#: qml/Wizard/Pages/60-reporting.qml:43
476+msgid ""
477+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
478+"Privacy</b>"
479+msgstr ""
480+"Pode desactivalo nos <b>Axustes do sistema</b> en <b>Seguranza e "
481+"privacidade</b>"
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr "Rematado"
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr "Bo traballo!"
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr "Xa ten o teléfono listo para o seu uso."
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr "Rematar"
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr "Termos e condicións"
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr "Confirmar a frase secreta"
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr "Confirmar a clave"
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr "Ténteo de novo."
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr "Escolla unha clave"
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr "A frase secreta debe ter 4 caracteres"
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr "〈 %1"
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr "%1 〉"
533+
534+#~ msgid "Confirm"
535+#~ msgstr "Confirmar"
536+
537+#~ msgid "Type or say a command"
538+#~ msgstr "Escriba ou diga unha orde"
539+
540+#~ msgid "Speak Now..."
541+#~ msgstr "Fale agora…"
542+
543+#~ msgid "Speaking..."
544+#~ msgstr "Falando…"
545+
546+#~ msgid "Loading. Please Wait..."
547+#~ msgstr "Cargando, agarde…"
548+
549+#~ msgid "All"
550+#~ msgstr "Todos"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "Done"
556+#~ msgstr "Feito"
372557
373−#~ msgid "Enter SIM PIN"
374−#~ msgstr "Introduza o PIN da SIM"
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Xestionar os Ámbitos"
po/he.po+273−92
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-08-23 14:19+0000\n"
1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
1313"Language-Team: Hebrew <he@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "ססמה: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "הצמדת קיצור דרך"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "הפרדת קיצור הדרך"
3333
@@ -110,43 +110,43 @@ msgstr "ביטול"
110110msgid "Skip intro"
111111msgstr "לדלג על הפתיחה"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "שול ימני"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "השול העליון"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "סגירה"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "שול שמאלי"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "כל הכבוד"
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
@@ -154,36 +154,44 @@ msgstr ""
154154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
155155"לגעת במסך כדי להתחיל"
156156
157−#: qml/Components/Lockscreen.qml:220
157+#: qml/Components/Lockscreen.qml:238
158+msgid "Return to Call"
159+msgstr ""
160+
161+#: qml/Components/Lockscreen.qml:238
158162msgid "Emergency Call"
159163msgstr "שיחת חירום"
160164
161−#: qml/Components/Lockscreen.qml:252
165+#: qml/Components/Lockscreen.qml:270
162166msgid "OK"
163167msgstr "אישור"
164168
165−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
169+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
166170msgid "See less"
167171msgstr "לראות פחות"
168172
169−#: qml/Dash/GenericScopeView.qml:434
173+#: qml/Dash/GenericScopeView.qml:431
170174msgid "See all"
171175msgstr "להציג הכול"
172176
173−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
174178#: qml/Panel/SearchIndicator.qml:27
175179msgid "Search"
176180msgstr "חיפוש"
177181
178−#: qml/Dash/PageHeader.qml:268
182+#: qml/Dash/PageHeader.qml:260
183+msgid "Store"
184+msgstr "אחסון"
185+
186+#: qml/Dash/PageHeader.qml:277
179187msgid "Settings"
180188msgstr ""
181189
182−#: qml/Dash/PageHeader.qml:275
190+#: qml/Dash/PageHeader.qml:284
183191msgid "Remove from Favorites"
184192msgstr ""
185193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187195msgid "Add to Favorites"
188196msgstr ""
189197
@@ -215,87 +223,59 @@ msgstr ""
215223msgid "Release to refresh…"
216224msgstr ""
217225
218−#: qml/Dash/ScopesOverview.qml:206
219−msgid "Manage Scopes"
226+#: qml/Dash/ScopesList.qml:63
227+msgid "Manage"
220228msgstr ""
221229
222−#: qml/Dash/ScopesOverview.qml:428
223−msgid "Done"
224−msgstr "סיימתי"
225−
226−#: qml/Dash/ScopesOverview.qml:454
227−msgid "Store"
228−msgstr "אחסון"
229−
230−#: qml/Dash/ScopesOverviewTab.qml:36
231−msgid "Favorites"
232−msgstr "מועדפים"
230+#: qml/Dash/ScopesList.qml:107
231+msgid "Home"
232+msgstr ""
233233
234−#: qml/Dash/ScopesOverviewTab.qml:54
235−msgid "All"
236−msgstr "הכול"
234+#: qml/Dash/ScopesList.qml:108
235+msgid "Also installed"
236+msgstr ""
237237
238−#: qml/Greeter/Greeter.qml:157
238+#: qml/Greeter/Greeter.qml:174
239239msgid "Unlock"
240240msgstr ""
241241
242−#: qml/Hud/HudParametrizedActionsPage.qml:139
243−msgid "Confirm"
244−msgstr "אישור"
245−
246−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
247−msgid "Type or say a command"
248−msgstr "ניתן להקליד או לומר פקודה"
249−
250−#: qml/Hud/Hud.qml:84
251−msgid "Loading. Please Wait..."
252−msgstr "בטעינה. נא להמתין..."
253−
254−#: qml/Hud/Hud.qml:89
255−msgid "Speak Now..."
256−msgstr "יש לדבר כעת..."
257−
258−#: qml/Hud/Hud.qml:94
259−msgid "Speaking..."
260−msgstr "הדיבור מושמע…"
261−
262−#: qml/Notifications/NotificationMenuItemFactory.qml:116
242+#: qml/Notifications/NotificationMenuItemFactory.qml:128
263243msgid "Show password"
264244msgstr "הצגת הססמה"
265245
266−#: qml/Panel/ActiveCallHint.qml:77
246+#: qml/Panel/ActiveCallHint.qml:79
267247msgid "Tap to return to call..."
268248msgstr "יש לגעת כדי להחזיר שיחה…"
269249
270−#: qml/Panel/ActiveCallHint.qml:90
250+#: qml/Panel/ActiveCallHint.qml:92
271251msgid "Conference"
272252msgstr "ועידה"
273253
274−#: qml/Panel/Indicators/MenuItemFactory.qml:600
254+#: qml/Panel/Indicators/MenuItemFactory.qml:643
275255msgid "Nothing is playing"
276256msgstr ""
277257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:748
258+#: qml/Panel/Indicators/MenuItemFactory.qml:791
279259msgid "In queue…"
280260msgstr "בתור…"
281261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:752
262+#: qml/Panel/Indicators/MenuItemFactory.qml:795
283263msgid "Downloading"
284264msgstr "בהורדה"
285265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:754
266+#: qml/Panel/Indicators/MenuItemFactory.qml:797
287267msgid "Paused, tap to resume"
288268msgstr "מושהה, יש לגעת כדי להמשיך"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:756
270+#: qml/Panel/Indicators/MenuItemFactory.qml:799
291271msgid "Canceled"
292272msgstr "בוטל"
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:758
274+#: qml/Panel/Indicators/MenuItemFactory.qml:801
295275msgid "Finished"
296276msgstr "הושלם"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:760
278+#: qml/Panel/Indicators/MenuItemFactory.qml:803
299279msgid "Failed, tap to retry"
300280msgstr "נכשל, יש לגעת כדי לנסות שוב"
301281
@@ -307,56 +287,257 @@ msgstr ""
307287msgid "Roaming"
308288msgstr "נדידה"
309289
310−#: qml/Shell.qml:346
311−msgid "Enter passphrase"
290+#: qml/Shell.qml:367
291+#, qt-format
292+msgid "Enter %1"
312293msgstr ""
313294
314−#: qml/Shell.qml:347
315−msgid "Sorry, incorrect passphrase"
316−msgstr "מילת הצופן שגויה, עמך הסליחה."
317−
318−#: qml/Shell.qml:348
319−msgid "Please re-enter"
295+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
296+msgid "Enter passphrase"
320297msgstr ""
321298
322−#: qml/Shell.qml:350
299+#: qml/Shell.qml:369
323300msgid "Enter passcode"
324301msgstr ""
325302
326−#: qml/Shell.qml:351
327−msgid "Sorry, incorrect passcode"
303+#: qml/Shell.qml:370
304+#, qt-format
305+msgid "Sorry, incorrect %1"
328306msgstr ""
329307
330−#: qml/Shell.qml:354
331−#, qt-format
332−msgid "Enter %1"
308+#: qml/Shell.qml:371
309+msgid "Sorry, incorrect passphrase"
310+msgstr "מילת הצופן שגויה, עמך הסליחה."
311+
312+#: qml/Shell.qml:372
313+msgid "Please re-enter"
333314msgstr ""
334315
335−#: qml/Shell.qml:355
336−#, qt-format
337−msgid "Sorry, incorrect %1"
316+#: qml/Shell.qml:373
317+msgid "Sorry, incorrect passcode"
338318msgstr ""
339319
340−#: qml/Shell.qml:390
320+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
341321msgid "Sorry, incorrect passphrase."
342322msgstr "מילת הצופן שגויה, עמך הסליחה."
343323
344−#: qml/Shell.qml:391
324+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
345325msgid "Sorry, incorrect passcode."
346326msgstr "הצופן שגוי, עם הסליחה."
347327
348−#: qml/Shell.qml:392
328+#: qml/Shell.qml:469
349329msgid "This will be your last attempt."
350330msgstr "זה יהיה הניסיון האחרון שלך."
351331
352−#: qml/Shell.qml:394
332+#: qml/Shell.qml:471
353333msgid ""
354334"If passphrase is entered incorrectly, your phone will conduct a factory "
355335"reset and all personal data will be deleted."
356336msgstr ""
357337
358−#: qml/Shell.qml:395
338+#: qml/Shell.qml:472
359339msgid ""
360340"If passcode is entered incorrectly, your phone will conduct a factory reset "
361341"and all personal data will be deleted."
362342msgstr ""
343+
344+#: qml/Wizard/Page.qml:89
345+msgid "Back"
346+msgstr ""
347+
348+#: qml/Wizard/Pages/10-welcome.qml:27
349+msgid "Hi!"
350+msgstr ""
351+
352+#: qml/Wizard/Pages/10-welcome.qml:44
353+msgid "Welcome to your Ubuntu phone."
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:52
357+msgid "Let’s get started."
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
361+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
362+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
363+#: qml/Wizard/Pages/passwd-set.qml:90
364+msgid "Continue"
365+msgstr ""
366+
367+#: qml/Wizard/Pages/20-sim.qml:25
368+msgid "Add a SIM card and restart your device"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/20-sim.qml:55
372+msgid "Without it, you won’t be able to make calls or use text messaging."
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
376+msgid "Skip"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/30-passwd-type.qml:39
380+msgid "Lock security"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/30-passwd-type.qml:74
384+msgid "Please select how you’d like to unlock your phone."
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:97
388+msgid "Swipe"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:98
392+msgid "No security"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:100
396+msgid "Passcode"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:101
400+msgid "4 digits only"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:103
404+msgid "Passphrase"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:104
408+msgid "Numbers and letters"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/40-wifi.qml:28
412+msgid "Connect to Wi‑Fi"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/40-wifi.qml:147
416+msgid "Available networks…"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:148
420+msgid "No available networks."
421+msgstr ""
422+
423+#: qml/Wizard/Pages/50-location.qml:27
424+msgid "Location"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/50-location.qml:62
428+msgid "Let the phone detect your location:"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:69
432+msgid "Using GPS only (less accurate)"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:86
436+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
437+msgstr ""
438+
439+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
440+#: qml/Wizard/Pages/50-location.qml:103
441+msgid ""
442+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
443+"conditions</a>."
444+msgstr ""
445+
446+#: qml/Wizard/Pages/50-location.qml:112
447+msgid "Not at all"
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:124
451+msgid "You can change your mind later in <b>System Settings</b>."
452+msgstr ""
453+
454+#: qml/Wizard/Pages/60-reporting.qml:24
455+msgid "Improving your experience"
456+msgstr ""
457+
458+#: qml/Wizard/Pages/60-reporting.qml:36
459+msgid ""
460+"Your phone is set up to automatically report errors to Canonical and its "
461+"partners, the makers of the operating system."
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:43
465+msgid ""
466+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
467+"Privacy</b>"
468+msgstr ""
469+
470+#: qml/Wizard/Pages/80-finished.qml:24
471+msgid "All done"
472+msgstr ""
473+
474+#: qml/Wizard/Pages/80-finished.qml:39
475+msgid "Nice work!"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:46
479+msgid "Your phone is now ready to use."
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:53
483+msgid "Finish"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/here-terms.qml:27
487+msgid "Terms & Conditions"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/passwd-confirm.qml:49
491+msgid "Confirm passphrase"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/passwd-confirm.qml:50
495+msgid "Confirm passcode"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:53
499+#: qml/Wizard/Pages/passwd-confirm.qml:54
500+msgid "Please try again."
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-set.qml:61
504+msgid "Choose your passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-set.qml:68
508+msgid "Passphrase must be 4 characters long"
509+msgstr ""
510+
511+#: qml/Wizard/StackButton.qml:39
512+#, qt-format
513+msgid "〈 %1"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:42
517+#, qt-format
518+msgid "%1 〉"
519+msgstr ""
520+
521+#~ msgid "Confirm"
522+#~ msgstr "אישור"
523+
524+#~ msgid "Type or say a command"
525+#~ msgstr "ניתן להקליד או לומר פקודה"
526+
527+#~ msgid "Loading. Please Wait..."
528+#~ msgstr "בטעינה. נא להמתין..."
529+
530+#~ msgid "Speak Now..."
531+#~ msgstr "יש לדבר כעת..."
532+
533+#~ msgid "Speaking..."
534+#~ msgstr "הדיבור מושמע…"
535+
536+#~ msgid "Done"
537+#~ msgstr "סיימתי"
538+
539+#~ msgid "All"
540+#~ msgstr "הכול"
541+
542+#~ msgid "Favorites"
543+#~ msgstr "מועדפים"
po/hi.po+255−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-01-15 01:49+0000\n"
1212"Last-Translator: Siddhanathan S. <Unknown>\n"
1313"Language-Team: Hindi <hi@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -110,78 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "परिचय छोड़"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "दायाँ किनारा"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "ऊपर किनारे"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "बंद करें"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:198
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "बायाँ किनारा"
140140
141−#: qml/Components/EdgeDemo.qml:199
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:226
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "शाबाश"
148148
149−#: qml/Components/EdgeDemo.qml:227
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:220
155+#: qml/Components/Lockscreen.qml:238
156+msgid "Return to Call"
157+msgstr ""
158+
159+#: qml/Components/Lockscreen.qml:238
156160msgid "Emergency Call"
157161msgstr "आपातकालीन कॉल"
158162
159−#: qml/Components/Lockscreen.qml:252
163+#: qml/Components/Lockscreen.qml:270
160164msgid "OK"
161165msgstr ""
162166
163−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
164168msgid "See less"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:431
168172msgid "See all"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
172176#: qml/Panel/SearchIndicator.qml:27
173177msgid "Search"
174178msgstr "खोजें"
175179
176−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:260
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:277
177185msgid "Settings"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:284
181189msgid "Remove from Favorites"
182190msgstr ""
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Add to Favorites"
186194msgstr ""
187195
@@ -213,87 +221,59 @@ msgstr ""
213221msgid "Release to refresh…"
214222msgstr ""
215223
216−#: qml/Dash/ScopesOverview.qml:206
217−msgid "Manage Scopes"
218−msgstr ""
219−
220−#: qml/Dash/ScopesOverview.qml:428
221−msgid "Done"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:454
225−msgid "Store"
224+#: qml/Dash/ScopesList.qml:63
225+msgid "Manage"
226226msgstr ""
227227
228−#: qml/Dash/ScopesOverviewTab.qml:36
229−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:107
229+msgid "Home"
230230msgstr ""
231231
232−#: qml/Dash/ScopesOverviewTab.qml:54
233−msgid "All"
232+#: qml/Dash/ScopesList.qml:108
233+msgid "Also installed"
234234msgstr ""
235235
236−#: qml/Greeter/Greeter.qml:157
236+#: qml/Greeter/Greeter.qml:174
237237msgid "Unlock"
238238msgstr ""
239239
240−#: qml/Hud/HudParametrizedActionsPage.qml:139
241−msgid "Confirm"
242−msgstr ""
243−
244−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
245−msgid "Type or say a command"
246−msgstr ""
247−
248−#: qml/Hud/Hud.qml:84
249−msgid "Loading. Please Wait..."
250−msgstr "काम कर रहा है | कृपया प्रतीक्षा करे |"
251−
252−#: qml/Hud/Hud.qml:89
253−msgid "Speak Now..."
254−msgstr "अब बात करें"
255−
256−#: qml/Hud/Hud.qml:94
257−msgid "Speaking..."
258−msgstr "अब बोल रहे हैं"
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
261241msgid "Show password"
262242msgstr ""
263243
264−#: qml/Panel/ActiveCallHint.qml:77
244+#: qml/Panel/ActiveCallHint.qml:79
265245msgid "Tap to return to call..."
266246msgstr ""
267247
268−#: qml/Panel/ActiveCallHint.qml:90
248+#: qml/Panel/ActiveCallHint.qml:92
269249msgid "Conference"
270250msgstr ""
271251
272−#: qml/Panel/Indicators/MenuItemFactory.qml:600
252+#: qml/Panel/Indicators/MenuItemFactory.qml:643
273253msgid "Nothing is playing"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:748
256+#: qml/Panel/Indicators/MenuItemFactory.qml:791
277257msgid "In queue…"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:752
260+#: qml/Panel/Indicators/MenuItemFactory.qml:795
281261msgid "Downloading"
282262msgstr ""
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:754
264+#: qml/Panel/Indicators/MenuItemFactory.qml:797
285265msgid "Paused, tap to resume"
286266msgstr ""
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:756
268+#: qml/Panel/Indicators/MenuItemFactory.qml:799
289269msgid "Canceled"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:758
272+#: qml/Panel/Indicators/MenuItemFactory.qml:801
293273msgid "Finished"
294274msgstr ""
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:760
276+#: qml/Panel/Indicators/MenuItemFactory.qml:803
297277msgid "Failed, tap to retry"
298278msgstr ""
299279
@@ -305,56 +285,242 @@ msgstr ""
305285msgid "Roaming"
306286msgstr ""
307287
308−#: qml/Shell.qml:346
309−msgid "Enter passphrase"
288+#: qml/Shell.qml:367
289+#, qt-format
290+msgid "Enter %1"
310291msgstr ""
311292
312−#: qml/Shell.qml:347
313−msgid "Sorry, incorrect passphrase"
293+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
294+msgid "Enter passphrase"
314295msgstr ""
315296
316−#: qml/Shell.qml:348
317−msgid "Please re-enter"
297+#: qml/Shell.qml:369
298+msgid "Enter passcode"
318299msgstr ""
319300
320−#: qml/Shell.qml:350
321−msgid "Enter passcode"
301+#: qml/Shell.qml:370
302+#, qt-format
303+msgid "Sorry, incorrect %1"
322304msgstr ""
323305
324−#: qml/Shell.qml:351
325−msgid "Sorry, incorrect passcode"
306+#: qml/Shell.qml:371
307+msgid "Sorry, incorrect passphrase"
326308msgstr ""
327309
328−#: qml/Shell.qml:354
329−#, qt-format
330−msgid "Enter %1"
310+#: qml/Shell.qml:372
311+msgid "Please re-enter"
331312msgstr ""
332313
333−#: qml/Shell.qml:355
334−#, qt-format
335−msgid "Sorry, incorrect %1"
314+#: qml/Shell.qml:373
315+msgid "Sorry, incorrect passcode"
336316msgstr ""
337317
338−#: qml/Shell.qml:390
318+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
339319msgid "Sorry, incorrect passphrase."
340320msgstr ""
341321
342−#: qml/Shell.qml:391
322+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
343323msgid "Sorry, incorrect passcode."
344324msgstr ""
345325
346−#: qml/Shell.qml:392
326+#: qml/Shell.qml:469
347327msgid "This will be your last attempt."
348328msgstr ""
349329
350−#: qml/Shell.qml:394
330+#: qml/Shell.qml:471
351331msgid ""
352332"If passphrase is entered incorrectly, your phone will conduct a factory "
353333"reset and all personal data will be deleted."
354334msgstr ""
355335
356−#: qml/Shell.qml:395
336+#: qml/Shell.qml:472
357337msgid ""
358338"If passcode is entered incorrectly, your phone will conduct a factory reset "
359339"and all personal data will be deleted."
360340msgstr ""
341+
342+#: qml/Wizard/Page.qml:89
343+msgid "Back"
344+msgstr ""
345+
346+#: qml/Wizard/Pages/10-welcome.qml:27
347+msgid "Hi!"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:44
351+msgid "Welcome to your Ubuntu phone."
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:52
355+msgid "Let’s get started."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
359+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
360+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
361+#: qml/Wizard/Pages/passwd-set.qml:90
362+msgid "Continue"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/20-sim.qml:25
366+msgid "Add a SIM card and restart your device"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:55
370+msgid "Without it, you won’t be able to make calls or use text messaging."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
374+msgid "Skip"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/30-passwd-type.qml:39
378+msgid "Lock security"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:74
382+msgid "Please select how you’d like to unlock your phone."
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:97
386+msgid "Swipe"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:98
390+msgid "No security"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:100
394+msgid "Passcode"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:101
398+msgid "4 digits only"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:103
402+msgid "Passphrase"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:104
406+msgid "Numbers and letters"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/40-wifi.qml:28
410+msgid "Connect to Wi‑Fi"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:147
414+msgid "Available networks…"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:148
418+msgid "No available networks."
419+msgstr ""
420+
421+#: qml/Wizard/Pages/50-location.qml:27
422+msgid "Location"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:62
426+msgid "Let the phone detect your location:"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:69
430+msgid "Using GPS only (less accurate)"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:86
434+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
435+msgstr ""
436+
437+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
438+#: qml/Wizard/Pages/50-location.qml:103
439+msgid ""
440+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
441+"conditions</a>."
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:112
445+msgid "Not at all"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:124
449+msgid "You can change your mind later in <b>System Settings</b>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/60-reporting.qml:24
453+msgid "Improving your experience"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:36
457+msgid ""
458+"Your phone is set up to automatically report errors to Canonical and its "
459+"partners, the makers of the operating system."
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:43
463+msgid ""
464+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
465+"Privacy</b>"
466+msgstr ""
467+
468+#: qml/Wizard/Pages/80-finished.qml:24
469+msgid "All done"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:39
473+msgid "Nice work!"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:46
477+msgid "Your phone is now ready to use."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:53
481+msgid "Finish"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/here-terms.qml:27
485+msgid "Terms & Conditions"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/passwd-confirm.qml:49
489+msgid "Confirm passphrase"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:50
493+msgid "Confirm passcode"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:53
497+#: qml/Wizard/Pages/passwd-confirm.qml:54
498+msgid "Please try again."
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-set.qml:61
502+msgid "Choose your passcode"
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:68
506+msgid "Passphrase must be 4 characters long"
507+msgstr ""
508+
509+#: qml/Wizard/StackButton.qml:39
510+#, qt-format
511+msgid "〈 %1"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:42
515+#, qt-format
516+msgid "%1 〉"
517+msgstr ""
518+
519+#~ msgid "Speaking..."
520+#~ msgstr "अब बोल रहे हैं"
521+
522+#~ msgid "Speak Now..."
523+#~ msgstr "अब बात करें"
524+
525+#~ msgid "Loading. Please Wait..."
526+#~ msgstr "काम कर रहा है | कृपया प्रतीक्षा करे |"
po/hr.po+261−89
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"
1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
1313"Language-Team: Croatian <hr@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20−"X-Generator: Launchpad (build 17196)\n"
19+"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20+"X-Generator: Launchpad (build 17286)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -111,78 +111,86 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr ""
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr ""
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr ""
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr ""
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr ""
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr ""
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr ""
137137
138−#: qml/Components/EdgeDemo.qml:198
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr ""
141141
142−#: qml/Components/EdgeDemo.qml:199
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145
146−#: qml/Components/EdgeDemo.qml:226
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr ""
149149
150−#: qml/Components/EdgeDemo.qml:227
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
154154msgstr ""
155155
156−#: qml/Components/Lockscreen.qml:220
156+#: qml/Components/Lockscreen.qml:238
157+msgid "Return to Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:238
157161msgid "Emergency Call"
158162msgstr ""
159163
160−#: qml/Components/Lockscreen.qml:252
164+#: qml/Components/Lockscreen.qml:270
161165msgid "OK"
162166msgstr ""
163167
164−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
165169msgid "See less"
166170msgstr ""
167171
168−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:431
169173msgid "See all"
170174msgstr ""
171175
172−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
173177#: qml/Panel/SearchIndicator.qml:27
174178msgid "Search"
175179msgstr "Pretraživanje"
176180
177−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:260
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:277
178186msgid "Settings"
179187msgstr ""
180188
181−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:284
182190msgid "Remove from Favorites"
183191msgstr ""
184192
185−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:284
186194msgid "Add to Favorites"
187195msgstr ""
188196
@@ -214,87 +222,59 @@ msgstr ""
214222msgid "Release to refresh…"
215223msgstr ""
216224
217−#: qml/Dash/ScopesOverview.qml:206
218−msgid "Manage Scopes"
219−msgstr ""
220−
221−#: qml/Dash/ScopesOverview.qml:428
222−msgid "Done"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:454
226−msgid "Store"
225+#: qml/Dash/ScopesList.qml:63
226+msgid "Manage"
227227msgstr ""
228228
229−#: qml/Dash/ScopesOverviewTab.qml:36
230−msgid "Favorites"
229+#: qml/Dash/ScopesList.qml:107
230+msgid "Home"
231231msgstr ""
232232
233−#: qml/Dash/ScopesOverviewTab.qml:54
234−msgid "All"
233+#: qml/Dash/ScopesList.qml:108
234+msgid "Also installed"
235235msgstr ""
236236
237−#: qml/Greeter/Greeter.qml:157
237+#: qml/Greeter/Greeter.qml:174
238238msgid "Unlock"
239239msgstr ""
240240
241−#: qml/Hud/HudParametrizedActionsPage.qml:139
242−msgid "Confirm"
243−msgstr "Potvrdi"
244−
245−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246−msgid "Type or say a command"
247−msgstr "Upišite ili izgovorite naredbu"
248−
249−#: qml/Hud/Hud.qml:84
250−msgid "Loading. Please Wait..."
251−msgstr "Učitavanje. Molim pričekajte..."
252−
253−#: qml/Hud/Hud.qml:89
254−msgid "Speak Now..."
255−msgstr "Recite..."
256−
257−#: qml/Hud/Hud.qml:94
258−msgid "Speaking..."
259−msgstr "Govor..."
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
262242msgid "Show password"
263243msgstr ""
264244
265−#: qml/Panel/ActiveCallHint.qml:77
245+#: qml/Panel/ActiveCallHint.qml:79
266246msgid "Tap to return to call..."
267247msgstr ""
268248
269−#: qml/Panel/ActiveCallHint.qml:90
249+#: qml/Panel/ActiveCallHint.qml:92
270250msgid "Conference"
271251msgstr ""
272252
273−#: qml/Panel/Indicators/MenuItemFactory.qml:600
253+#: qml/Panel/Indicators/MenuItemFactory.qml:643
274254msgid "Nothing is playing"
275255msgstr ""
276256
277−#: qml/Panel/Indicators/MenuItemFactory.qml:748
257+#: qml/Panel/Indicators/MenuItemFactory.qml:791
278258msgid "In queue…"
279259msgstr ""
280260
281−#: qml/Panel/Indicators/MenuItemFactory.qml:752
261+#: qml/Panel/Indicators/MenuItemFactory.qml:795
282262msgid "Downloading"
283263msgstr ""
284264
285−#: qml/Panel/Indicators/MenuItemFactory.qml:754
265+#: qml/Panel/Indicators/MenuItemFactory.qml:797
286266msgid "Paused, tap to resume"
287267msgstr ""
288268
289−#: qml/Panel/Indicators/MenuItemFactory.qml:756
269+#: qml/Panel/Indicators/MenuItemFactory.qml:799
290270msgid "Canceled"
291271msgstr ""
292272
293−#: qml/Panel/Indicators/MenuItemFactory.qml:758
273+#: qml/Panel/Indicators/MenuItemFactory.qml:801
294274msgid "Finished"
295275msgstr ""
296276
297−#: qml/Panel/Indicators/MenuItemFactory.qml:760
277+#: qml/Panel/Indicators/MenuItemFactory.qml:803
298278msgid "Failed, tap to retry"
299279msgstr ""
300280
@@ -306,56 +286,248 @@ msgstr ""
306286msgid "Roaming"
307287msgstr ""
308288
309−#: qml/Shell.qml:346
310−msgid "Enter passphrase"
289+#: qml/Shell.qml:367
290+#, qt-format
291+msgid "Enter %1"
311292msgstr ""
312293
313−#: qml/Shell.qml:347
314−msgid "Sorry, incorrect passphrase"
294+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
295+msgid "Enter passphrase"
315296msgstr ""
316297
317−#: qml/Shell.qml:348
318−msgid "Please re-enter"
298+#: qml/Shell.qml:369
299+msgid "Enter passcode"
319300msgstr ""
320301
321−#: qml/Shell.qml:350
322−msgid "Enter passcode"
302+#: qml/Shell.qml:370
303+#, qt-format
304+msgid "Sorry, incorrect %1"
323305msgstr ""
324306
325−#: qml/Shell.qml:351
326−msgid "Sorry, incorrect passcode"
307+#: qml/Shell.qml:371
308+msgid "Sorry, incorrect passphrase"
327309msgstr ""
328310
329−#: qml/Shell.qml:354
330−#, qt-format
331−msgid "Enter %1"
311+#: qml/Shell.qml:372
312+msgid "Please re-enter"
332313msgstr ""
333314
334−#: qml/Shell.qml:355
335−#, qt-format
336−msgid "Sorry, incorrect %1"
315+#: qml/Shell.qml:373
316+msgid "Sorry, incorrect passcode"
337317msgstr ""
338318
339−#: qml/Shell.qml:390
319+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
340320msgid "Sorry, incorrect passphrase."
341321msgstr ""
342322
343−#: qml/Shell.qml:391
323+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
344324msgid "Sorry, incorrect passcode."
345325msgstr ""
346326
347−#: qml/Shell.qml:392
327+#: qml/Shell.qml:469
348328msgid "This will be your last attempt."
349329msgstr ""
350330
351−#: qml/Shell.qml:394
331+#: qml/Shell.qml:471
352332msgid ""
353333"If passphrase is entered incorrectly, your phone will conduct a factory "
354334"reset and all personal data will be deleted."
355335msgstr ""
356336
357−#: qml/Shell.qml:395
337+#: qml/Shell.qml:472
358338msgid ""
359339"If passcode is entered incorrectly, your phone will conduct a factory reset "
360340"and all personal data will be deleted."
361341msgstr ""
342+
343+#: qml/Wizard/Page.qml:89
344+msgid "Back"
345+msgstr ""
346+
347+#: qml/Wizard/Pages/10-welcome.qml:27
348+msgid "Hi!"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:44
352+msgid "Welcome to your Ubuntu phone."
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:52
356+msgid "Let’s get started."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
360+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
361+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
362+#: qml/Wizard/Pages/passwd-set.qml:90
363+msgid "Continue"
364+msgstr ""
365+
366+#: qml/Wizard/Pages/20-sim.qml:25
367+msgid "Add a SIM card and restart your device"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:55
371+msgid "Without it, you won’t be able to make calls or use text messaging."
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
375+msgid "Skip"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/30-passwd-type.qml:39
379+msgid "Lock security"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:74
383+msgid "Please select how you’d like to unlock your phone."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:97
387+msgid "Swipe"
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:98
391+msgid "No security"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:100
395+msgid "Passcode"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:101
399+msgid "4 digits only"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:103
403+msgid "Passphrase"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:104
407+msgid "Numbers and letters"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/40-wifi.qml:28
411+msgid "Connect to Wi‑Fi"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:147
415+msgid "Available networks…"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:148
419+msgid "No available networks."
420+msgstr ""
421+
422+#: qml/Wizard/Pages/50-location.qml:27
423+msgid "Location"
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:62
427+msgid "Let the phone detect your location:"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:69
431+msgid "Using GPS only (less accurate)"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:86
435+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
436+msgstr ""
437+
438+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
439+#: qml/Wizard/Pages/50-location.qml:103
440+msgid ""
441+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
442+"conditions</a>."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:112
446+msgid "Not at all"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:124
450+msgid "You can change your mind later in <b>System Settings</b>."
451+msgstr ""
452+
453+#: qml/Wizard/Pages/60-reporting.qml:24
454+msgid "Improving your experience"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:36
458+msgid ""
459+"Your phone is set up to automatically report errors to Canonical and its "
460+"partners, the makers of the operating system."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:43
464+msgid ""
465+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
466+"Privacy</b>"
467+msgstr ""
468+
469+#: qml/Wizard/Pages/80-finished.qml:24
470+msgid "All done"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:39
474+msgid "Nice work!"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:46
478+msgid "Your phone is now ready to use."
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:53
482+msgid "Finish"
483+msgstr ""
484+
485+#: qml/Wizard/Pages/here-terms.qml:27
486+msgid "Terms & Conditions"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/passwd-confirm.qml:49
490+msgid "Confirm passphrase"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:50
494+msgid "Confirm passcode"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:53
498+#: qml/Wizard/Pages/passwd-confirm.qml:54
499+msgid "Please try again."
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-set.qml:61
503+msgid "Choose your passcode"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:68
507+msgid "Passphrase must be 4 characters long"
508+msgstr ""
509+
510+#: qml/Wizard/StackButton.qml:39
511+#, qt-format
512+msgid "〈 %1"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:42
516+#, qt-format
517+msgid "%1 〉"
518+msgstr ""
519+
520+#~ msgid "Confirm"
521+#~ msgstr "Potvrdi"
522+
523+#~ msgid "Type or say a command"
524+#~ msgstr "Upišite ili izgovorite naredbu"
525+
526+#~ msgid "Loading. Please Wait..."
527+#~ msgstr "Učitavanje. Molim pričekajte..."
528+
529+#~ msgid "Speak Now..."
530+#~ msgstr "Recite..."
531+
532+#~ msgid "Speaking..."
533+#~ msgstr "Govor..."
po/hu.po+287−95
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-10-11 10:50+0000\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11+"PO-Revision-Date: 2014-12-15 15:26+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\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"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-10-12 06:55+0000\n"
19−"X-Generator: Launchpad (build 17196)\n"
18+"X-Launchpad-Export-Date: 2014-12-16 07:34+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Jelszó: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Indító rögzítése"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Indító feloldása"
3333
@@ -112,45 +112,45 @@ msgstr "Mégse"
112112msgid "Skip intro"
113113msgstr "A bemutató kihagyása"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Jobb szél"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Felső szél"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Bezárás"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
138138
139−#: qml/Components/EdgeDemo.qml:198
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Bal szél"
142142
143−#: qml/Components/EdgeDemo.qml:199
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr ""
146146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
147147"eléréséhez"
148148
149−#: qml/Components/EdgeDemo.qml:226
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Rendben"
152152
153−#: qml/Components/EdgeDemo.qml:227
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,36 +158,44 @@ msgstr ""
158158"Elsajátította a gesztusokat, és megkezdheti a telefon "
159159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
160160
161−#: qml/Components/Lockscreen.qml:220
161+#: qml/Components/Lockscreen.qml:238
162+msgid "Return to Call"
163+msgstr "Vissza a híváshoz"
164+
165+#: qml/Components/Lockscreen.qml:238
162166msgid "Emergency Call"
163167msgstr "Vészhívás"
164168
165−#: qml/Components/Lockscreen.qml:252
169+#: qml/Components/Lockscreen.qml:270
166170msgid "OK"
167171msgstr "Ok"
168172
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
170174msgid "See less"
171175msgstr "Kevesebb"
172176
173−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:431
174178msgid "See all"
175179msgstr "Összes megtekintése"
176180
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
178182#: qml/Panel/SearchIndicator.qml:27
179183msgid "Search"
180184msgstr "Keresés"
181185
182−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:260
187+msgid "Store"
188+msgstr "Áruház"
189+
190+#: qml/Dash/PageHeader.qml:277
183191msgid "Settings"
184192msgstr "Beállítások"
185193
186−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:284
187195msgid "Remove from Favorites"
188196msgstr "Eltávolítás a kedvencek közül"
189197
190−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:284
191199msgid "Add to Favorites"
192200msgstr "Hozzáadás a kedvencekhez"
193201
@@ -219,87 +227,59 @@ msgstr "Húzza a frissítéshez…"
219227msgid "Release to refresh…"
220228msgstr "Engedje el a frissítéshez…"
221229
222−#: qml/Dash/ScopesOverview.qml:206
223−msgid "Manage Scopes"
224−msgstr "Lencsék kezelése"
225−
226−#: qml/Dash/ScopesOverview.qml:428
227−msgid "Done"
228−msgstr "Kész"
229−
230−#: qml/Dash/ScopesOverview.qml:454
231−msgid "Store"
232−msgstr "Áruház"
230+#: qml/Dash/ScopesList.qml:63
231+msgid "Manage"
232+msgstr ""
233233
234−#: qml/Dash/ScopesOverviewTab.qml:36
235−msgid "Favorites"
236−msgstr "Kedvencek"
234+#: qml/Dash/ScopesList.qml:107
235+msgid "Home"
236+msgstr ""
237237
238−#: qml/Dash/ScopesOverviewTab.qml:54
239−msgid "All"
240−msgstr "Összes"
238+#: qml/Dash/ScopesList.qml:108
239+msgid "Also installed"
240+msgstr "Szintén telepítve"
241241
242−#: qml/Greeter/Greeter.qml:157
242+#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
244244msgstr "Feloldás"
245245
246−#: qml/Hud/HudParametrizedActionsPage.qml:139
247−msgid "Confirm"
248−msgstr "Megerősítés"
249−
250−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
251−msgid "Type or say a command"
252−msgstr "Írjon be vagy mondjon ki egy parancsot"
253−
254−#: qml/Hud/Hud.qml:84
255−msgid "Loading. Please Wait..."
256−msgstr "Betöltés, kis türelmet…"
257−
258−#: qml/Hud/Hud.qml:89
259−msgid "Speak Now..."
260−msgstr "Most beszéljen…"
261−
262−#: qml/Hud/Hud.qml:94
263−msgid "Speaking..."
264−msgstr "Beszéd…"
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
267247msgid "Show password"
268248msgstr "Jelszó megjelenítése"
269249
270−#: qml/Panel/ActiveCallHint.qml:77
250+#: qml/Panel/ActiveCallHint.qml:79
271251msgid "Tap to return to call..."
272252msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
273253
274−#: qml/Panel/ActiveCallHint.qml:90
254+#: qml/Panel/ActiveCallHint.qml:92
275255msgid "Conference"
276256msgstr "Konferencia"
277257
278−#: qml/Panel/Indicators/MenuItemFactory.qml:600
258+#: qml/Panel/Indicators/MenuItemFactory.qml:643
279259msgid "Nothing is playing"
280260msgstr "Nincs lejátszás"
281261
282−#: qml/Panel/Indicators/MenuItemFactory.qml:748
262+#: qml/Panel/Indicators/MenuItemFactory.qml:791
283263msgid "In queue…"
284264msgstr "Sorban…"
285265
286−#: qml/Panel/Indicators/MenuItemFactory.qml:752
266+#: qml/Panel/Indicators/MenuItemFactory.qml:795
287267msgid "Downloading"
288268msgstr "Letöltés"
289269
290−#: qml/Panel/Indicators/MenuItemFactory.qml:754
270+#: qml/Panel/Indicators/MenuItemFactory.qml:797
291271msgid "Paused, tap to resume"
292272msgstr "Szüneteltetve, koppintson a folytatáshoz"
293273
294−#: qml/Panel/Indicators/MenuItemFactory.qml:756
274+#: qml/Panel/Indicators/MenuItemFactory.qml:799
295275msgid "Canceled"
296276msgstr "Megszakítva"
297277
298−#: qml/Panel/Indicators/MenuItemFactory.qml:758
278+#: qml/Panel/Indicators/MenuItemFactory.qml:801
299279msgid "Finished"
300280msgstr "Befejeződött"
301281
302−#: qml/Panel/Indicators/MenuItemFactory.qml:760
282+#: qml/Panel/Indicators/MenuItemFactory.qml:803
303283msgid "Failed, tap to retry"
304284msgstr "Sikertelen, koppintson az újrapróbáláshoz"
305285
@@ -311,49 +291,49 @@ msgstr "SIM feloldása"
311291msgid "Roaming"
312292msgstr "Barangolás"
313293
314−#: qml/Shell.qml:346
294+#: qml/Shell.qml:367
295+#, qt-format
296+msgid "Enter %1"
297+msgstr "Adja meg: %1"
298+
299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
315300msgid "Enter passphrase"
316301msgstr "Jelmondat megadása"
317302
318−#: qml/Shell.qml:347
303+#: qml/Shell.qml:369
304+msgid "Enter passcode"
305+msgstr "Jelkód megadása"
306+
307+#: qml/Shell.qml:370
308+#, qt-format
309+msgid "Sorry, incorrect %1"
310+msgstr "Sajnáljuk, helytelen %1"
311+
312+#: qml/Shell.qml:371
319313msgid "Sorry, incorrect passphrase"
320314msgstr "Sajnáljuk, helytelen jelmondat"
321315
322−#: qml/Shell.qml:348
316+#: qml/Shell.qml:372
323317msgid "Please re-enter"
324318msgstr "Kérjük próbálja újra"
325319
326−#: qml/Shell.qml:350
327−msgid "Enter passcode"
328−msgstr "Jelkód megadása"
329−
330−#: qml/Shell.qml:351
320+#: qml/Shell.qml:373
331321msgid "Sorry, incorrect passcode"
332322msgstr "Sajnáljuk, helytelen jelkód"
333323
334−#: qml/Shell.qml:354
335−#, qt-format
336−msgid "Enter %1"
337−msgstr "Adja meg: %1"
338−
339−#: qml/Shell.qml:355
340−#, qt-format
341−msgid "Sorry, incorrect %1"
342−msgstr "Sajnáljuk, helytelen %1"
343−
344−#: qml/Shell.qml:390
324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
345325msgid "Sorry, incorrect passphrase."
346326msgstr "Sajnáljuk, helytelen jelmondat."
347327
348−#: qml/Shell.qml:391
328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
349329msgid "Sorry, incorrect passcode."
350330msgstr "Sajnáljuk, helytelen jelkód."
351331
352−#: qml/Shell.qml:392
332+#: qml/Shell.qml:469
353333msgid "This will be your last attempt."
354334msgstr "Ez az utolsó próbálkozási lehetősége."
355335
356−#: qml/Shell.qml:394
336+#: qml/Shell.qml:471
357337msgid ""
358338"If passphrase is entered incorrectly, your phone will conduct a factory "
359339"reset and all personal data will be deleted."
@@ -361,10 +341,222 @@ msgstr ""
361341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
362342"beállításokat és törli minden személyes adatát."
363343
364−#: qml/Shell.qml:395
344+#: qml/Shell.qml:472
365345msgid ""
366346"If passcode is entered incorrectly, your phone will conduct a factory reset "
367347"and all personal data will be deleted."
368348msgstr ""
369349"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
370350"beállításokat és törli minden személyes adatát."
351+
352+#: qml/Wizard/Page.qml:89
353+msgid "Back"
354+msgstr "Vissza"
355+
356+#: qml/Wizard/Pages/10-welcome.qml:27
357+msgid "Hi!"
358+msgstr "Üdv!"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:44
361+msgid "Welcome to your Ubuntu phone."
362+msgstr "Üdvözöljük az Ubuntu telefonos változatában."
363+
364+#: qml/Wizard/Pages/10-welcome.qml:52
365+msgid "Let’s get started."
366+msgstr "Kezdjünk is bele."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371+#: qml/Wizard/Pages/passwd-set.qml:90
372+msgid "Continue"
373+msgstr "Folytatás"
374+
375+#: qml/Wizard/Pages/20-sim.qml:25
376+msgid "Add a SIM card and restart your device"
377+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
378+
379+#: qml/Wizard/Pages/20-sim.qml:55
380+msgid "Without it, you won’t be able to make calls or use text messaging."
381+msgstr ""
382+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
383+"üzeneteket."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Kihagyás"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Képernyőzárolás"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Csúsztatás"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "Nem biztonságos"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Jelkód"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 számjegy"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Jelmondat"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Betűk és számok"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Csatlakozás Wi-Fi hálózathoz"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Elérhető hálózatok…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "Nincsenek elérhető hálózatok."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Tartózkodási hely"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Csak GPS használata (kevésbé pontos)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
456+"feltételeit</a>."
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr ""
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Javítson az élményen"
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
476+"Canonical, és annak partnerei felé."
477+
478+#: qml/Wizard/Pages/60-reporting.qml:43
479+msgid ""
480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
481+"Privacy</b>"
482+msgstr ""
483+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
484+"és adatvédelem</b> alatt"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "Készen van"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Szép munka!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "A telefonja készen áll a használatra."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Befejezés"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Felhasználási feltételek"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Jelmondat megerősítése"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Jelkód megerősítése"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Próbálja újra."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Jelkód kiválasztása"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
526+
527+#: qml/Wizard/StackButton.qml:39
528+#, qt-format
529+msgid "〈 %1"
530+msgstr "〈 %1"
531+
532+#: qml/Wizard/StackButton.qml:42
533+#, qt-format
534+msgid "%1 〉"
535+msgstr "%1 〉"
536+
537+#~ msgid "Confirm"
538+#~ msgstr "Megerősítés"
539+
540+#~ msgid "Type or say a command"
541+#~ msgstr "Írjon be vagy mondjon ki egy parancsot"
542+
543+#~ msgid "Loading. Please Wait..."
544+#~ msgstr "Betöltés, kis türelmet…"
545+
546+#~ msgid "Speaking..."
547+#~ msgstr "Beszéd…"
548+
549+#~ msgid "Speak Now..."
550+#~ msgstr "Most beszéljen…"
551+
552+#~ msgid "All"
553+#~ msgstr "Összes"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Kedvencek"
557+
558+#~ msgid "Done"
559+#~ msgstr "Kész"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Lencsék kezelése"
po/hy.po+274−93
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-10-07 11:37+0300\n"
10+"POT-Creation-Date: 2014-12-10 10:55+0100\n"
1111"PO-Revision-Date: 2014-10-28 06:34+0000\n"
1212"Last-Translator: Vahan Harutyunyan <Unknown>\n"
1313"Language-Team: Armenian <hy@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-10-29 07:27+0000\n"
19−"X-Generator: Launchpad (build 17203)\n"
18+"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19+"X-Generator: Launchpad (build 17286)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Գաղտնաբառ: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Փակցնել պիտակը"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Հեռացնել պիտակը"
3333
@@ -114,78 +114,86 @@ msgstr "Չեղյալ համարել"
114114msgid "Skip intro"
115115msgstr "Բաց թողնել ներածությունը"
116116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118118msgid "Right edge"
119119msgstr "Աջ եզրը"
120120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122122msgid "Try swiping from the right edge to unlock the phone"
123123msgstr ""
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Վերին եզրը"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Փակել"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:198
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Ձախ եզրը"
144144
145−#: qml/Components/EdgeDemo.qml:199
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:226
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Լավ է"
152152
153−#: qml/Components/EdgeDemo.qml:227
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:220
159+#: qml/Components/Lockscreen.qml:238
160+msgid "Return to Call"
161+msgstr ""
162+
163+#: qml/Components/Lockscreen.qml:238
160164msgid "Emergency Call"
161165msgstr ""
162166
163−#: qml/Components/Lockscreen.qml:252
167+#: qml/Components/Lockscreen.qml:270
164168msgid "OK"
165169msgstr ""
166170
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
168172msgid "See less"
169173msgstr ""
170174
171−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:431
172176msgid "See all"
173177msgstr "Տեսնել բոլորը"
174178
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
176180#: qml/Panel/SearchIndicator.qml:27
177181msgid "Search"
178182msgstr "Որոնում"
179183
180−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:260
185+msgid "Store"
186+msgstr "Խանութ"
187+
188+#: qml/Dash/PageHeader.qml:277
181189msgid "Settings"
182190msgstr "Կարգավորումներ"
183191
184−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:284
185193msgid "Remove from Favorites"
186194msgstr "Հեռացնել ընտրյալների ցուցակից"
187195
188−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:284
189197msgid "Add to Favorites"
190198msgstr "Ավելացնել ընտրյալների ցուցակում"
191199
@@ -217,87 +225,59 @@ msgstr ""
217225msgid "Release to refresh…"
218226msgstr ""
219227
220−#: qml/Dash/ScopesOverview.qml:206
221−msgid "Manage Scopes"
228+#: qml/Dash/ScopesList.qml:63
229+msgid "Manage"
222230msgstr ""
223231
224−#: qml/Dash/ScopesOverview.qml:428
225−msgid "Done"
226−msgstr "Կատարված է"
227−
228−#: qml/Dash/ScopesOverview.qml:454
229−msgid "Store"
230−msgstr "Խանութ"
231−
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
234−msgstr "Նախընտրելի"
232+#: qml/Dash/ScopesList.qml:107
233+msgid "Home"
234+msgstr ""
235235
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
238−msgstr "Բոլորը"
236+#: qml/Dash/ScopesList.qml:108
237+msgid "Also installed"
238+msgstr ""
239239
240−#: qml/Greeter/Greeter.qml:157
240+#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
242242msgstr "Ապաբլոկավորել"
243243
244−#: qml/Hud/HudParametrizedActionsPage.qml:139
245−msgid "Confirm"
246−msgstr "Հաստատել"
247−
248−#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
249−msgid "Type or say a command"
250−msgstr "Գրիր կամ ասա կոմմենտը"
251−
252−#: qml/Hud/Hud.qml:84
253−msgid "Loading. Please Wait..."
254−msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
255−
256−#: qml/Hud/Hud.qml:89
257−msgid "Speak Now..."
258−msgstr "Հիմա խոսեք..."
259−
260−#: qml/Hud/Hud.qml:94
261−msgid "Speaking..."
262−msgstr "Խոսում եմ..."
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
265245msgid "Show password"
266246msgstr "Ցույց տալ գաղտնաբառը"
267247
268−#: qml/Panel/ActiveCallHint.qml:77
248+#: qml/Panel/ActiveCallHint.qml:79
269249msgid "Tap to return to call..."
270250msgstr ""
271251
272−#: qml/Panel/ActiveCallHint.qml:90
252+#: qml/Panel/ActiveCallHint.qml:92
273253msgid "Conference"
274254msgstr ""
275255
276−#: qml/Panel/Indicators/MenuItemFactory.qml:600
256+#: qml/Panel/Indicators/MenuItemFactory.qml:643
277257msgid "Nothing is playing"
278258msgstr ""
279259
280−#: qml/Panel/Indicators/MenuItemFactory.qml:748
260+#: qml/Panel/Indicators/MenuItemFactory.qml:791
281261msgid "In queue…"
282262msgstr "Հերթում..."
283263
284−#: qml/Panel/Indicators/MenuItemFactory.qml:752
264+#: qml/Panel/Indicators/MenuItemFactory.qml:795
285265msgid "Downloading"
286266msgstr "Ներբեռնում"
287267
288−#: qml/Panel/Indicators/MenuItemFactory.qml:754
268+#: qml/Panel/Indicators/MenuItemFactory.qml:797
289269msgid "Paused, tap to resume"
290270msgstr ""
291271
292−#: qml/Panel/Indicators/MenuItemFactory.qml:756
272+#: qml/Panel/Indicators/MenuItemFactory.qml:799
293273msgid "Canceled"
294274msgstr "Չեղյալ է համարված"
295275
296−#: qml/Panel/Indicators/MenuItemFactory.qml:758
276+#: qml/Panel/Indicators/MenuItemFactory.qml:801
297277msgid "Finished"
298278msgstr "Ավարտված է"
299279
300−#: qml/Panel/Indicators/MenuItemFactory.qml:760
280+#: qml/Panel/Indicators/MenuItemFactory.qml:803
301281msgid "Failed, tap to retry"
302282msgstr ""
303283
@@ -309,56 +289,257 @@ msgstr "Ապաբլոկավորել SIM-ը"
309289msgid "Roaming"
310290msgstr "Ռոումինգ"
311291
312−#: qml/Shell.qml:346
292+#: qml/Shell.qml:367
293+#, qt-format
294+msgid "Enter %1"
295+msgstr "Մուտքագրեք %1"
296+
297+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
313298msgid "Enter passphrase"
314299msgstr "Մուտքագրե՛ք անցաբառը"
315300
316−#: qml/Shell.qml:347
301+#: qml/Shell.qml:369
302+msgid "Enter passcode"
303+msgstr "Մոտքագրեք ծածկագիրը"
304+
305+#: qml/Shell.qml:370
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr "Ներեցեք, սխալ %1"
309+
310+#: qml/Shell.qml:371
317311msgid "Sorry, incorrect passphrase"
318312msgstr "Ներեցեք, սխալ անցաբառ է"
319313
320−#: qml/Shell.qml:348
314+#: qml/Shell.qml:372
321315msgid "Please re-enter"
322316msgstr "Խնդրում ենք նորից մուտքագրել"
323317
324−#: qml/Shell.qml:350
325−msgid "Enter passcode"
326−msgstr "Մոտքագրեք ծածկագիրը"
327−
328−#: qml/Shell.qml:351
318+#: qml/Shell.qml:373
329319msgid "Sorry, incorrect passcode"
330320msgstr "Ներեցեք, սխալ ծածկագիր է"
331321
332−#: qml/Shell.qml:354
333−#, qt-format
334−msgid "Enter %1"
335−msgstr "Մուտքագրեք %1"
336−
337−#: qml/Shell.qml:355
338−#, qt-format
339−msgid "Sorry, incorrect %1"
340−msgstr "Ներեցեք, սխալ %1"
341−
342−#: qml/Shell.qml:390
322+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
343323msgid "Sorry, incorrect passphrase."
344324msgstr "Ներեցեք, սխալ անցաբառ է"
345325
346−#: qml/Shell.qml:391
326+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
347327msgid "Sorry, incorrect passcode."
348328msgstr "Ներեցեք, սխալ ծածկագիր է:"
349329
350−#: qml/Shell.qml:392
330+#: qml/Shell.qml:469
351331msgid "This will be your last attempt."
352332msgstr "Սա կլինի ձեր վերջին փորձը"
353333
354−#: qml/Shell.qml:394
334+#: qml/Shell.qml:471
355335msgid ""
356336"If passphrase is entered incorrectly, your phone will conduct a factory "
357337"reset and all personal data will be deleted."
358338msgstr ""
359339
360−#: qml/Shell.qml:395
340+#: qml/Shell.qml:472
361341msgid ""
362342"If passcode is entered incorrectly, your phone will conduct a factory reset "
363343"and all personal data will be deleted."
364344msgstr ""
345+
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
523+#~ msgid "Confirm"
524+#~ msgstr "Հաստատել"
525+
526+#~ msgid "Type or say a command"
527+#~ msgstr "Գրիր կամ ասա կոմմենտը"
528+
529+#~ msgid "Speaking..."
530+#~ msgstr "Խոսում եմ..."
531+
532+#~ msgid "Favorites"
533+#~ msgstr "Նախընտրելի"
534+
535+#~ msgid "Done"
536+#~ msgstr "Կատարված է"
537+
538+#~ msgid "Loading. Please Wait..."
539+#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
540+
541+#~ msgid "Speak Now..."
542+#~ msgstr "Հիմա խոսեք..."
543+
544+#~ msgid "All"
545+#~ msgstr "Բոլորը"
po/id.po+334−141

This diff is too big to show here.

po/is.po+283−101

This diff is too big to show here.

po/it.po+288−106

This diff is too big to show here.

po/ja.po+286−109

This diff is too big to show here.

po/km.po+272−97

This diff is too big to show here.

po/kn.po+261−89

This diff is too big to show here.

po/ko.po+276−98

This diff is too big to show here.

po/ku.po+272−97

This diff is too big to show here.

po/ky.po+261−89

This diff is too big to show here.

po/lo.po+255−89

This diff is too big to show here.

po/lt.po+261−89

This diff is too big to show here.

po/lv.po+272−94

This diff is too big to show here.

po/ml.po+261−89

This diff is too big to show here.

po/mr.po+246−89

This diff is too big to show here.

po/ms.po+325−133

This diff is too big to show here.

po/my.po+261−89

This diff is too big to show here.

po/nb.po+278−100

This diff is too big to show here.

po/nl.po+278−100

This diff is too big to show here.

po/pa.po+246−89

This diff is too big to show here.

po/pl.po+261−89

This diff is too big to show here.

po/pt.po+289−110

This diff is too big to show here.

po/pt_BR.po+276−98

This diff is too big to show here.

po/ro.po+277−99

This diff is too big to show here.

po/ru.po+290−107

This diff is too big to show here.

po/shn.po+246−89

This diff is too big to show here.

po/si.po+246−89

This diff is too big to show here.

po/sl.po+274−99

This diff is too big to show here.

po/sq.po+246−89

This diff is too big to show here.

po/sr.po+272−97

This diff is too big to show here.

po/sv.po+276−98

This diff is too big to show here.

po/sw.po+249−89

This diff is too big to show here.

po/ta.po+261−89

This diff is too big to show here.

po/te.po+258−89

This diff is too big to show here.

po/th.po+246−89

This diff is too big to show here.

po/tr.po+265−93

This diff is too big to show here.

po/ug.po+276−98

This diff is too big to show here.

po/uk.po+281−99

This diff is too big to show here.

po/unity8.pot+244−87

This diff is too big to show here.

po/update-unity-pot+1

This diff is too big to show here.

po/vi.po+246−89

This diff is too big to show here.

po/xh.po+246−89

This diff is too big to show here.

po/zh_CN.po+275−94

This diff is too big to show here.

po/zh_HK.po+261−89

This diff is too big to show here.

po/zh_TW.po+279−98

This diff is too big to show here.

qml/CMakeLists.txt+2−2

This diff is too big to show here.

qml/Components/Dialogs.qml+77−87

This diff is too big to show here.

qml/Components/DragHandle.qml+10−2

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+11−5

This diff is too big to show here.

qml/Components/Lockscreen.qml+15

This diff is too big to show here.

qml/Hud/ToolBarIcon.qml → qml/Components/PanelState/PanelState.qmlrenamed+9−12

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/ResponsiveFlowView.qmldeleted−74

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qml+1

This diff is too big to show here.

qml/Components/ScreenGrabber.qmlnew file+72

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.cpp → qml/Components/ShellDialog.qmlrenamed+15−17

This diff is too big to show here.

qml/Components/Showable.qml+13

This diff is too big to show here.

qml/Components/VolumeKeyFilter.qmlnew file+63

This diff is too big to show here.

qml/Components/WindowControlButtons.qmlnew file+60

This diff is too big to show here.

qml/Dash/CardCarousel.qml+1

This diff is too big to show here.

qml/Dash/CardGrid.qml+1−2

This diff is too big to show here.

qml/Dash/CardHorizontalList.qml+1

This diff is too big to show here.

qml/Dash/CardTool.qml+1−1

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qml+1−1

This diff is too big to show here.

qml/Dash/Dash.qml+103−133

This diff is too big to show here.

qml/Dash/DashContent.qml+13−1

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+28−23

This diff is too big to show here.

qml/Dash/DashRenderer.qml+2−4

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+47−24

This diff is too big to show here.

qml/Dash/PageHeader.qml+20−4

This diff is too big to show here.

qml/Dash/Previews/PreviewActions.qml+2−1

This diff is too big to show here.

qml/Dash/Previews/PreviewPayments.qml+1−1

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qml+1

This diff is too big to show here.

qml/Dash/ScopeListView.qml+4−2

This diff is too big to show here.

qml/Dash/ScopesList.qmlnew file+131

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmlnew file+176

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmlnew file+107

This diff is too big to show here.

qml/Dash/ScopesOverview.qmldeleted−575

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qmldeleted−56

This diff is too big to show here.

qml/Dash/ScopesOverviewFavorites.qmldeleted−73

This diff is too big to show here.

qml/Dash/ScopesOverviewTab.qmldeleted−74

This diff is too big to show here.

qml/Greeter/Clock.qml+10

This diff is too big to show here.

qml/Greeter/Greeter.qml+92−83

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+6−18

This diff is too big to show here.

qml/Greeter/Infographics.qml+20−18

This diff is too big to show here.

qml/Greeter/LoginList.qml−1

This diff is too big to show here.

qml/Hud/Hud.qmldeleted−496

This diff is too big to show here.

qml/Hud/HudParametrizedActionsPage.qmldeleted−179

This diff is too big to show here.

qml/Hud/Result.qmldeleted−84

This diff is too big to show here.

qml/Hud/ResultList.qmldeleted−106

This diff is too big to show here.

qml/Hud/SearchBar.qmldeleted−100

This diff is too big to show here.

qml/Hud/ShowingAnimation.qmldeleted−54

This diff is too big to show here.

qml/Hud/SliderLabel.qmldeleted−76

This diff is too big to show here.

qml/Hud/SoundAmplitudeDelegate.qmldeleted−52

This diff is too big to show here.

qml/Hud/SoundAmplitudeVisual.qmldeleted−146

This diff is too big to show here.

qml/Hud/graphics/divider@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/divider@20.scideleted−5

This diff is too big to show here.

qml/Hud/graphics/help@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_bg@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlearrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/hud_handlebar@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_arrow@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_clear@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/icon_search@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/microphone@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/popup_triangle@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/settings@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/undo@20.pngdeleted

Binary file not shown.

qml/Hud/graphics/view-fullscreen@20.pngdeleted

Binary file not shown.

qml/Launcher/Launcher.qml+37−19

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+51−23

This diff is too big to show here.

qml/Launcher/graphics/quicklist_tooltip@30.png

Binary file not shown.

qml/Notifications/Notification.qml+30−102

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qml+20−2

This diff is too big to show here.

qml/Notifications/OptionToggle.qmlnew file+123

This diff is too big to show here.

qml/Notifications/ShapedIcon.qml+1−1

This diff is too big to show here.

qml/Notifications/SwipeToAct.qmlnew file+309

This diff is too big to show here.

qml/Panel/IndicatorItem.qml+1−2

This diff is too big to show here.

qml/Panel/IndicatorPage.qml+12−1

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+36−8

This diff is too big to show here.

qml/Panel/IndicatorsBar.qml+29−20

This diff is too big to show here.

qml/Panel/Panel.qml+17−2

This diff is too big to show here.

qml/Shell.qml+117−64

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+1

This diff is too big to show here.

qml/Stages/DecoratedWindow.qmlnew file+60

This diff is too big to show here.

qml/Stages/DesktopStage.qmlnew file+175

This diff is too big to show here.

qml/Stages/PhoneStage.qml+19−35

This diff is too big to show here.

qml/Stages/SessionContainer.qml+4

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+20−3

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+1

This diff is too big to show here.

qml/Stages/TabletStage.qml+7−16

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qml+10−3

This diff is too big to show here.

qml/Stages/WindowDecoration.qmlnew file+65

This diff is too big to show here.

qml/Wizard/CheckableSetting.qmlnew file+84

This diff is too big to show here.

qml/Wizard/Page.qmlnew file+108

This diff is too big to show here.

qml/Wizard/Pages.qmlnew file+136

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qmlnew file+99

This diff is too big to show here.

qml/Wizard/Pages/20-sim.qmlnew file+73

This diff is too big to show here.

qml/Wizard/Pages/30-passwd-type.qmlnew file+135

This diff is too big to show here.

qml/Wizard/Pages/40-wifi.qmlnew file+201

This diff is too big to show here.

qml/Wizard/Pages/50-location.qmlnew file+150

This diff is too big to show here.

qml/Wizard/Pages/60-reporting.qmlnew file+54

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qmlnew file+57

This diff is too big to show here.

qml/Wizard/Pages/data/meet_ubuntu_simcard@30.pngnew file

Binary file not shown.

qml/Wizard/Pages/here-terms.qmlnew file+121

This diff is too big to show here.

qml/Wizard/Pages/passwd-confirm.qmlnew file+86

This diff is too big to show here.

qml/Wizard/Pages/passwd-set.qmlnew file+94

This diff is too big to show here.

qml/Wizard/StackButton.qmlnew file+47

This diff is too big to show here.

qml/Wizard/Wizard.qmlnew file+55

This diff is too big to show here.

qml/graphics/applicationIcons/dash@18.png → qml/graphics/applicationIcons/dash.pngrenamed

Binary file not shown.

src/CMakeLists.txt+4−1

This diff is too big to show here.

src/CachingNetworkManagerFactory.cpp+2−11

This diff is too big to show here.

src/CachingNetworkManagerFactory.h+2−6

This diff is too big to show here.

src/Dash/CMakeLists.txt+1−1

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+1−1

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+23−9

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/hud.pydeleted−94

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.py−13

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py−3

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/disabled_test_hud.pydeleted−225

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.py+10−47

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py−51

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+37−1

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+20

This diff is too big to show here.

tests/mocks/CMakeLists.txt+2−1

This diff is too big to show here.

tests/mocks/HudClient/CMakeLists.txtdeleted−38

This diff is too big to show here.

tests/mocks/HudClient/HudClient.qmltypesdeleted−113

This diff is too big to show here.

tests/mocks/HudClient/fake_libhud_client.cppdeleted−247

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.cppdeleted−93

This diff is too big to show here.

tests/mocks/HudClient/libhud_client_stub.hdeleted−64

This diff is too big to show here.

tests/mocks/HudClient/qmldirdeleted−3

This diff is too big to show here.

tests/mocks/MeeGo/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Unity/Notifications/notification.js → tests/mocks/MeeGo/QOfono/MockOfonoManager.qmlrenamed+7−7

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qmlnew file+42

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.cppnew file+54

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.hnew file+52

This diff is too big to show here.

plugins/HudClient/plugin.cpp → tests/mocks/MeeGo/QOfono/plugin.cpprenamed+12−15

This diff is too big to show here.

plugins/HudClient/plugin.h → tests/mocks/MeeGo/QOfono/plugin.hrenamed+6−6

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldirnew file+4

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+12

This diff is too big to show here.

tests/mocks/QMenuModel/dbus-enums.hnew file+52

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+3

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txtnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qmlnew file+23

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cppnew file+28

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.hnew file+42

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cppnew file+26

This diff is too big to show here.

tests/mocks/HudClient/fake_hud_plugin.h → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hrenamed+6−6

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+7

This diff is too big to show here.

tests/mocks/Unity/Application/Session.h+1−1

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+2−6

This diff is too big to show here.

tests/mocks/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+5

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+3

This diff is too big to show here.

tests/mocks/Unity/Notifications/CMakeLists.txt+15−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cppnew file+72

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.hnew file+51

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationTypes.cppnew file+26

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationTypes.hnew file+36

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.cppnew file+31

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.hnew file+35

This diff is too big to show here.

tests/mocks/Unity/Notifications/qmldir+2−1

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.cpp+1−1

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cpp+2−7

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cpp+70−4

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.h+9−3

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cpp+77−11

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.h+18−3

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txtnew file+12

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cppnew file+39

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.hnew file+47

This diff is too big to show here.

tests/mocks/Wizard/Wizard.qmltypesnew file+36

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cppnew file+35

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.hnew file+32

This diff is too big to show here.

tests/mocks/Wizard/qmldirnew file+3

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.res+4−4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.res+2−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res+10−10

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.res+3−4

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res+10−10

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.res+1−1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.res+2−3

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.qml+1

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qml+1

This diff is too big to show here.

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qmlnew file+56

This diff is too big to show here.

tests/plugins/Dash/tst_ScopeStyle.qml+1−1

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qml+1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+6

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+2

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchDispatcher.cpp+59

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.cpp+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.h+1

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+14−2

This diff is too big to show here.

tests/plugins/Utils/qsortfilterproxymodeltest.cpp+1−1

This diff is too big to show here.

tests/plugins/Wizard/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/plugins/Wizard/tst_pagelist.cppnew file+154

This diff is too big to show here.

tests/plugins/Wizard/tst_system.cppnew file+124

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+4−3

This diff is too big to show here.

tests/qmltests/Components/tst_Dialogs.qmlnew file+104

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+4

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.qml+43−8

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qmlnew file+69

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveFlowView.qmldeleted−191

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml−22

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+240−145

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+13−6

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+4−2

This diff is too big to show here.

tests/qmltests/Dash/tst_PreviewListView.qml+2−2

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qml+15−15

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qml+163−32

This diff is too big to show here.

tests/qmltests/Hud/tst_Hud.qmldeleted−239

This diff is too big to show here.

tests/qmltests/Hud/tst_Result.qmldeleted−98

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+46−11

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+506−552

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qmlnew file+286

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qmlnew file+276

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+17−1

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorPage.qml+54−9

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorsBar.qml+27−2

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorsMenu.qml+3−3

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+5−10

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+41−6

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qml+35

This diff is too big to show here.

tests/qmltests/Stages/tst_SpreadDelegate.qml+11−5

This diff is too big to show here.

tests/qmltests/Wizard/licenses/en_US.htmlnew file+1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_CA.htmlnew file+1

This diff is too big to show here.

tests/qmltests/Wizard/licenses/fr_FR.htmlnew file+1

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qmlnew file+479

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+8−11

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+86

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml+18−14

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+11−7

This diff is too big to show here.