on xenial help sign in
revert to mainline
commit1318fcb2b38aaa4bdc10fc4bcf72928b533a7816 authorhandsome_feng <445865575@qq.com> dateThu 23 Apr 2015, 09:00 (12 years ago) parent61e488d075a6fa
431 files changed+35352−15695
CMakeLists.txt+13−5 CODING+6−6 cmake/modules/QmlTest.cmake+1−1 cmake/modules/autopilot.cmake−8 data/CMakeLists.txt+3−1 com.canonical.Unity8.gschema.xml → data/com.canonical.Unity8.gschema.xml data/indicators-client.desktop.in+9 data/unity-mock-indicator-service.conf+7 debian/changelog+323−15 debian/control+14−17 debian/indicators-client.install+1 debian/rules+2−2 debian/unity8-common.install+1−1 debian/unity8-fake-env.install+2 debian/unity8-private.install+3−2 debian/unity8.install+3−2 include/paths.h.in+1−6 plugins/AccountsService/AccountsService.cpp+263−61 plugins/AccountsService/AccountsService.h+9−9 plugins/AccountsService/AccountsService.qmltypes+3 plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+30−2 plugins/AccountsService/AccountsServiceDBusAdaptor.h+16 plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−2 plugins/CMakeLists.txt+1 plugins/Dash/CardAttributes.qml+2 plugins/Dash/CardCreator.js+4 plugins/Dash/Dash.qmltypes+17−1 plugins/Dash/listviewwithpageheader.cpp+7−8 plugins/Greeter/CMakeLists.txt+6 plugins/Greeter/Unity/CMakeLists.txt+1 plugins/Greeter/Unity/Launcher/CMakeLists.txt+38 plugins/Greeter/Unity/Launcher/Launcher.qmltypes+182 plugins/Greeter/Unity/Launcher/launcheritem.cpp+171 plugins/Greeter/Unity/Launcher/launcheritem.h+74 plugins/Greeter/Unity/Launcher/launchermodelas.cpp+277 plugins/Greeter/Unity/Launcher/launchermodelas.h+75 plugins/Greeter/Unity/Launcher/plugin.cpp+46 plugins/Greeter/Unity/Launcher/plugin.h+32 plugins/Greeter/Unity/Launcher/qmldir+3 plugins/Greeter/Unity/Launcher/quicklistentry.cpp+56 plugins/Greeter/Unity/Launcher/quicklistentry.h+43 plugins/Greeter/Unity/Launcher/quicklistmodel.cpp+70 plugins/Greeter/Unity/Launcher/quicklistmodel.h+55 plugins/LightDM/LightDM.qmltypes+2−2 plugins/LightDM/liblightdm/Greeter.h−2 plugins/ScreenGrabber/ScreenGrabber.qmltypes+1−1 plugins/ScreenGrabber/screengrabber.cpp+1−1 plugins/Ubuntu/Gestures/Gestures.qmltypes+15−1 plugins/Unity/Indicators/Indicators.qmltypes+10−38 plugins/Unity/Indicators/indicator.cpp+23−8 plugins/Unity/Indicators/indicator.h+5−1 plugins/Unity/Indicators/indicatorsmanager.cpp+17−3 plugins/Unity/Indicators/indicatorsmanager.h+6−1 plugins/Unity/Indicators/indicatorsmodel.cpp+25−2 plugins/Unity/Indicators/indicatorsmodel.h+6−1 plugins/Unity/Indicators/modelactionrootstate.cpp+4−2 plugins/Unity/Indicators/unitymenumodelcache.cpp+8−11 plugins/Unity/Indicators/unitymenumodelcache.h+2−2 plugins/Unity/Launcher/CMakeLists.txt+3−1 plugins/Unity/Launcher/Launcher.qmltypes+3 plugins/Unity/Launcher/asadapter.cpp+60 tests/mocks/Unity/Notifications/MockNotificationTypes.h → plugins/Unity/Launcher/asadapter.h+24−14 plugins/Unity/Launcher/gsettings.cpp+8−1 plugins/Unity/Launcher/gsettings.h+1 plugins/Unity/Launcher/launchermodel.cpp+27−7 plugins/Unity/Launcher/launchermodel.h+5 plugins/Unity/Session/Session.qmltypes+5−1 plugins/Unity/Session/dbusunitysessionservice.cpp+60 plugins/Unity/Session/dbusunitysessionservice.h+28−3 plugins/Unity/Session/plugin.cpp+1 plugins/Utils/CMakeLists.txt+4−1 plugins/Utils/Utils.qmltypes+60−41 plugins/Utils/constants.cpp+27 plugins/Utils/constants.h+43 plugins/Utils/inputwatcher.cpp+118 plugins/Utils/inputwatcher.h+58 plugins/Utils/plugin.cpp+20 plugins/Utils/windowstatestorage.cpp+117 plugins/Utils/windowstatestorage.h+42 plugins/Wizard/Wizard.qmltypes−3 po/am.po+271−143 po/ar.po+219−123 po/ast.po+308−181 po/az.po+250−139 po/be.po+276−156 po/bg.po+221−128 po/br.po+268−148 po/bs.po+188−118 po/ca.po+284−164 po/ca@valencia.po+325−196 po/ce.po+579 po/ckb.po+211−120 po/cs.po+211−120 po/da.po+280−167 po/de.po+280−159 po/el.po+321−182 po/en_AU.po+260−140 po/en_GB.po+270−142 po/eo.po+176−118 po/es.po+270−150 po/eu.po+275−155 po/fa.po+266−146 po/fi.po+262−142 po/fo.po+186−119 po/fr.po+282−154 po/gd.po+319−188 po/gl.po+270−150 po/gv.po+649 po/he.po+230−128 po/hi.po+198−119 po/hr.po+180−119 po/hu.po+263−143 po/hy.po+242−139 po/id.po+265−145 po/is.po+266−146 po/it.po+278−150 po/ja.po+262−142 po/km.po+265−145 po/kn.po+180−119 po/ko.po+315−187 po/ku.po+257−140 po/ky.po+180−119 po/lo.po+186−119 po/lt.po+213−122 po/lv.po+317−195 po/ml.po+213−122 po/mr.po+207−119 po/ms.po+265−145 po/my.po+198−119 po/nb.po+272−144 po/nl.po+266−144 po/oc.po+178−120 po/or.po+579 po/pa.po+315−210 po/pl.po+334−199 po/pt.po+292−167 po/pt_BR.po+312−181 po/ro.po+267−147 po/ru.po+266−146 po/shn.po+176−118 po/si.po+176−118 po/sk.po+579 po/sl.po+276−148 po/sq.po+195−119 po/sr.po+323−193 po/sv.po+277−157 po/sw.po+183−119 po/ta.po+213−122 po/te.po+204−119 po/th.po+176−118 po/tr.po+277−157 po/ug.po+265−145 po/uk.po+276−148 po/unity8.pot+189−126 po/update-unity-pot+1 po/vi.po+176−118 po/xh.po+176−118 po/zh_CN.po+224−122 po/zh_HK.po+216−120 po/zh_TW.po+307−186 qml/CMakeLists.txt+3−2 qml/Components/DelayedLockscreen.qml+3−1 qml/Components/Dialogs.qml+32−33 qml/Components/EdgeDemo.qml−254 qml/Components/EdgeDemoOverlay.qml−273 qml/Components/Lockscreen.qml+14−7 qml/Components/PassphraseLockscreen.qml+7−7 qml/Components/PhysicalKeysMapper.qml+113 qml/Components/PinLockscreen.qml+156−145 qml/Components/PinPadButton.qml+3−2 qml/Components/VolumeKeyFilter.qml−63 qml/Dash/Dash.qml+35−23 qml/Dash/DashBackground.qml+2 qml/Dash/DashContent.qml+1−7 qml/Dash/GenericScopeView.qml+14−9 qml/Dash/PageHeader.qml+5−3 qml/Dash/Previews/Preview.qml+1 qml/Dash/Previews/PreviewImageGallery.qml+25−6 qml/Dash/Previews/PreviewOverlay.qml+77−26 qml/Dash/Previews/PreviewTable.qml+2−3 qml/Dash/Previews/PreviewZoomableImage.qml+3−3 qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−1 qml/Dash/ScopesListCategoryItem.qml+1 qml/Greeter/CoverPage.qml+216 qml/Greeter/Greeter.qml+330−147 qml/Greeter/GreeterContent.qml−162 qml/Greeter/Infographics.qml+1 qml/Greeter/LoginList.qml+67−85 qml/Greeter/NarrowView.qml+170 qml/Greeter/WideView.qml+134 qml/Launcher/Launcher.qml+52−9 qml/Launcher/LauncherPanel.qml+12−8 qml/Notifications/Notification.qml+36−6 qml/Notifications/Notifications.qml+2−6 qml/Notifications/SwipeToAct.qml+178−247 qml/Notifications/grip-large.svg+150 qml/Panel/IndicatorItem.qml+2 qml/Panel/Indicators/MenuItemFactory.qml+48−52 qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1 qml/Panel/Indicators/client/IndicatorsList.qml+2−2 qml/Panel/IndicatorsMenu.qml+20 qml/Panel/Panel.qml+7−4 qml/Panel/SearchIndicator.qml−82 qml/Shell.qml+136−403 qml/Stages/ApplicationWindow.qml+19−3 qml/Stages/DecoratedWindow.qml+5−4 qml/Stages/DesktopStage.qml+17−5 qml/Stages/PhoneStage.qml+68−34 qml/Stages/SessionContainer.qml+22−7 qml/Stages/SpreadDelegate.qml+2−1 qml/Stages/SurfaceContainer.qml+17−28 qml/Stages/TabletStage.qml+14 qml/Stages/TransformedSpreadDelegate.qml+27−21 qml/Stages/TransformedTabletSpreadDelegate.qml+1−1 qml/Stages/WindowDecoration.qml+1 qml/Stages/WindowMoveResizeArea.qml+36−25 qml/Tutorial/Arrow.qml+56 qml/Tutorial/Slider.qml+123 tests/mocks/MeeGo/QOfono/MockOfonoManager.qml → qml/Tutorial/Tick.qml+11−5 qml/Tutorial/Tutorial.qml+85 qml/Tutorial/TutorialBottom.qml+104 qml/Tutorial/TutorialBottomFinish.qml+41 qml/Tutorial/TutorialContent.qml+125 qml/Tutorial/TutorialLeft.qml+91 qml/Tutorial/TutorialLeftFinish.qml+41 qml/Tutorial/TutorialPage.qml+245 qml/Tutorial/TutorialRight.qml+223 qml/Tutorial/graphics/camera.png qml/Tutorial/graphics/chevron.png qml/Tutorial/graphics/dialer.png qml/Tutorial/graphics/facebook.png qml/Tutorial/graphics/gallery.png qml/Tutorial/graphics/tick.png qml/Wizard/Page.qml+1−1 qml/Wizard/Pages.qml+14−1 qml/Wizard/Pages/20-sim.qml+5−1 qml/Wizard/Pages/30-passwd-type.qml+6−6 qml/Wizard/Wizard.qml+6−1 run.sh+1−1 src/ApplicationArguments.h+2−3 src/CMakeLists.txt+1 src/Dash/main.cpp+3−3 src/MouseTouchAdaptor.cpp+40−4 src/MouseTouchAdaptor.h+18−5 src/Panel/Indicators/client/CMakeLists.txt−2 src/UnityCommandLineParser.cpp+118 src/UnityCommandLineParser.h+50 src/main.cpp+10−45 tests/autopilot/setup.py+2−2 tests/autopilot/unity8/application_lifecycle/tests/__init__.py+2−2 tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+4−10 tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+2−2 tests/autopilot/unity8/fixture_setup.py+52−5 tests/autopilot/unity8/greeter/__init__.py tests/autopilot/unity8/greeter/tests/__init__.py+28 tests/autopilot/unity8/greeter/tests/test_args.py+54 tests/autopilot/unity8/indicators/__init__.py+92−12 tests/autopilot/unity8/indicators/tests/__init__.py+12−2 tests/autopilot/unity8/indicators/tests/test_action_latency.py+235 tests/autopilot/unity8/indicators/tests/test_display_indicator.py+3−4 tests/autopilot/unity8/indicators/tests/test_indicators.py+4−6 tests/autopilot/unity8/process_helpers.py+49−23 tests/autopilot/unity8/shell/__init__.py+3−2 tests/autopilot/unity8/shell/emulators/__init__.py+3−3 tests/autopilot/unity8/shell/emulators/create_interactive_notification.py+2−3 tests/autopilot/unity8/shell/emulators/dash.py+19−15 tests/autopilot/unity8/shell/emulators/edges_demo.py−140 tests/autopilot/unity8/shell/emulators/greeter.py+18−3 tests/autopilot/unity8/shell/emulators/main_window.py+17−6 tests/autopilot/unity8/shell/emulators/tutorial.py+73 tests/autopilot/unity8/shell/fixture_setup.py+8−8 tests/autopilot/unity8/shell/tests/__init__.py+18−32 tests/autopilot/unity8/shell/tests/test_edges_demo.py−51 tests/autopilot/unity8/shell/tests/test_emulators.py+8−6 tests/autopilot/unity8/shell/tests/test_lock_screen.py+20−29 tests/autopilot/unity8/shell/tests/test_notifications.py+49−27 tests/autopilot/unity8/shell/tests/test_system_integration.py+5−3 tests/autopilot/unity8/shell/tests/test_tutorial.py+57 tests/autopilot/unity8/shell/tests/test_upstart.py+4−9 tests/mocks/AccountsService/AccountsService.qmltypes+3 tests/mocks/CMakeLists.txt+1 tests/mocks/GSettings.1.0/fake_gsettings.cpp+58−22 tests/mocks/GSettings.1.0/fake_gsettings.h+16−6 tests/mocks/GSettings.1.0/plugin.cpp−6 tests/mocks/LightDM/CMakeLists.txt+2−5 tests/mocks/LightDM/LightDM.qmltypes+33−13 tests/mocks/LightDM/liblightdm/Greeter.h−2 tests/mocks/MeeGo/QOfono/CMakeLists.txt+1 tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+12−2 tests/mocks/MeeGo/QOfono/MockQOfono.cpp+41−5 tests/mocks/MeeGo/QOfono/MockQOfono.h+12−3 tests/mocks/MeeGo/QOfono/MockQOfonoManager.cpp+66 tests/mocks/MeeGo/QOfono/MockQOfonoManager.h+49 tests/mocks/MeeGo/QOfono/QOfono.qmltypes+30 tests/mocks/MeeGo/QOfono/plugin.cpp+3−1 tests/mocks/MeeGo/QOfono/qmldir−1 tests/mocks/QMenuModel/QMenuModel.qmltypes+33 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypes+10 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypes+39 tests/mocks/Unity/Application/Application.qmltypes+42 tests/mocks/Unity/Application/ApplicationManager.cpp−19 tests/mocks/Unity/Application/ApplicationManager.h+3−33 tests/mocks/Unity/Application/MirSurfaceItem.cpp+6 tests/mocks/Unity/Application/MirSurfaceItem.h+5 tests/mocks/Unity/Application/MirSurfaceItem.qml+16−1 tests/mocks/Unity/CMakeLists.txt+1−1 tests/mocks/Unity/Indicators/CMakeLists.txt+1−3 tests/mocks/Unity/Indicators/Indicators.qmltypes+7−33 tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp+13−1 tests/mocks/Unity/Indicators/fakeindicatorsmodel.h+6 tests/mocks/Unity/Launcher/CMakeLists.txt+2−1 tests/mocks/Unity/Launcher/Launcher.qmltypes+3 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+10 tests/mocks/Unity/Launcher/MockLauncherModel.h+3 tests/mocks/Unity/Notifications/CMakeLists.txt+2−1 tests/mocks/Unity/Notifications/MockActionModel.cpp+7−5 tests/mocks/Unity/Notifications/MockActionModel.h+4−2 tests/mocks/Unity/Notifications/MockNotification.cpp+182 tests/mocks/Unity/Notifications/MockNotification.h+95 tests/mocks/Unity/Notifications/MockNotificationModel.cpp+172 tests/mocks/Unity/Notifications/MockNotificationModel.h+72 tests/mocks/Unity/Notifications/Notifications.qmltypes+139 tests/mocks/Unity/Notifications/plugin.cpp+5−3 tests/mocks/Unity/Notifications/plugin.h+1−2 tests/mocks/Unity/Unity.qmltypes+21 tests/mocks/Unity/fake_previewmodel.cpp+15−1 tests/mocks/Unity/fake_previewmodel.h+7−1 tests/mocks/Unity/fake_previewstack.cpp+2−2 tests/mocks/Unity/fake_previewstack.h+3−1 tests/mocks/Unity/fake_previewwidgetmodel.cpp+11 tests/mocks/Unity/fake_scope.cpp+18−7 tests/mocks/Unity/fake_scope.h+4−2 tests/mocks/Unity/fake_scopes.cpp+12 tests/mocks/Unity/fake_scopes.h+5 tests/mocks/Unity/fake_scopesoverview.cpp+1 tests/mocks/Wizard/Wizard.qmltypes+4−3 tests/mocks/data/unity/indicators/com.canonical.indicator.mock+10 tests/mocks/indicator-service/CMakeLists.txt+20 tests/mocks/indicator-service/mock-indicator-service.c+261 tests/mocks/libusermetrics/ColorTheme.h+2−1 tests/mocks/libusermetrics/UserMetrics.cpp+8 tests/plugins/AccountsService/AccountsServer.cpp+23−7 tests/plugins/AccountsService/AccountsServer.h+11−1 tests/plugins/AccountsService/CMakeLists.txt+8 tests/plugins/AccountsService/PropertiesServer.cpp+43−6 tests/plugins/AccountsService/PropertiesServer.h+8−1 tests/plugins/AccountsService/client.cpp+186−7 tests/plugins/AccountsService/interfaces.xml+21 tests/plugins/AccountsService/server.cpp+11−6 tests/plugins/CMakeLists.txt+1 tests/plugins/Dash/cardcreator/2.res+1 tests/plugins/Dash/cardcreator/3.res+1 tests/plugins/Dash/cardcreator/4.res+1 tests/plugins/Dash/cardcreator/5.res+1 tests/plugins/Dash/cardcreator/6.res+2 tests/plugins/Dash/cardcreator/7.res+1 tests/plugins/Dash/listviewwithpageheadertest.cpp+11 tests/plugins/Greeter/CMakeLists.txt+1 tests/plugins/Greeter/Unity/CMakeLists.txt+1 tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cpp+48 tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.h+53 tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+56 tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+169 tests/plugins/LightDM/CMakeLists.txt+17−4 tests/plugins/LightDM/usersmodel.cpp+84 tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+9 tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+7 tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp+30−7 tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+6−5 tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp+2−2 tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.cpp+42 tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.h+47 tests/plugins/Unity/Launcher/CMakeLists.txt+4−2 tests/plugins/Unity/Launcher/launchermodeltest.cpp+122−1 tests/plugins/Unity/Session/sessionbackendtest.cpp+82−10 tests/qmltests/CMakeLists.txt+8−6 tests/qmltests/Components/tst_Dialogs.qml+4−2 tests/qmltests/Components/tst_EdgeDemoOverlay.qml−123 tests/qmltests/Components/tst_Lockscreen.qml+26 tests/qmltests/Components/tst_PhysicalKeysMapper.qml+131 tests/qmltests/Components/tst_ZoomableImage.qml+7 tests/qmltests/Dash/Previews/tst_Preview.qml+29 tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+15−4 tests/qmltests/Dash/tst_Dash.qml+138−1 tests/qmltests/Dash/tst_GenericScopeView.qml+2−2 tests/qmltests/Dash/tst_PreviewListView.qml+1−1 tests/qmltests/Greeter/TestView.qml+99 tests/qmltests/Greeter/tst_Greeter.qml+487 tests/qmltests/Greeter/tst_MultiGreeter.qml−475 tests/qmltests/Greeter/tst_NarrowView.qml+522 tests/qmltests/Greeter/tst_SingleGreeter.qml−244 tests/qmltests/Greeter/tst_WideView.qml+526 tests/qmltests/Launcher/tst_Launcher.qml+127−23 tests/mocks/Unity/Notifications/MockNotificationTypes.cpp → tests/qmltests/Notifications/Notification.qml+11−6 tests/qmltests/Notifications/tst_Notifications.qml+279−213 tests/qmltests/Notifications/tst_OptionToggle.qml+11−6 tests/qmltests/Notifications/tst_SwipeToAct.qml+4 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+5−1 tests/qmltests/Panel/tst_Panel.qml+147−4 tests/qmltests/Panel/tst_SearchIndicator.qml−61 tests/qmltests/Stages/ApplicationCheckBox.qml+64 tests/qmltests/Stages/RecursingChildSessionControl.qml+3 tests/qmltests/Stages/tst_ApplicationWindow.qml+6−1 tests/qmltests/Stages/tst_DesktopStage.qml+201 tests/qmltests/Stages/tst_PhoneStage.qml+5−1 tests/qmltests/Stages/tst_SessionContainer.qml+14−7 tests/qmltests/Stages/tst_SurfaceContainer.qml+32−5 tests/qmltests/Stages/tst_TabletStage.qml+154 tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+117−18 tests/qmltests/Tutorial/tst_Tutorial.qml+366 tests/qmltests/Wizard/tst_Wizard.qml+66−6 tests/qmltests/tst_Shell.qml+498−94 tests/qmltests/tst_ShellWithPin.qml+113−48 tests/qmltests/tst_TabletShell.qml−314 tests/uqmlscene/ActiveFocusLogger.cpp+48 tests/uqmlscene/ActiveFocusLogger.h+37 tests/uqmlscene/CMakeLists.txt+1−1 tests/uqmlscene/main.cpp+13−4 tests/utils/modules/Unity/Test/CMakeLists.txt+3 tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+43 tests/utils/modules/Unity/Test/Test.qmltypes+1 tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1 tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+4−1 tests/utils/modules/Unity/Test/UnityTestCase.qml+42−17 tests/utils/modules/Unity/Test/plugin.cpp+15−2 tests/utils/modules/Unity/Test/qmldir+1 tests/utils/modules/Unity/Test/testutil.cpp+2−2 tests/utils/modules/Unity/Test/testutil.h+1−1 tools/registry-tracker.cpp+2
CMakeLists.txt+13−5
@@ -54,6 +54,7 @@ find_package(Qt5Quick 5.2 REQUIRED)
5454find_package(Qt5Gui 5.2 REQUIRED)
5555find_package(Qt5DBus 5.2 REQUIRED)
5656find_package(Qt5Concurrent 5.2 REQUIRED)
57+find_package(Qt5Sql 5.2 REQUIRED)
5758
5859# Standard install paths
5960include(GNUInstallDirs)
@@ -97,10 +98,6 @@ add_definitions(-DQT_NO_KEYWORDS)
9798# Save a few container detach and conversions
9899add_definitions(-DQT_STRICT_ITERATORS)
99100
100−# Tests
101−include(CTest)
102−enable_testing()
103−
104101# Autopilot tests
105102include(autopilot)
106103declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
@@ -108,6 +105,8 @@ declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
108105set(SHELL_APP unity8)
109106set(DASH_APP unity8-dash)
110107set(SCOPE_TOOL unity-scope-tool)
108+set(INDICATORS_CLIENT_APP indicators-client)
109+set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
111110
112111include_directories(
113112 ${CMAKE_SOURCE_DIR}/include
@@ -120,7 +119,16 @@ add_subdirectory(libs)
120119add_subdirectory(src)
121120add_subdirectory(tools)
122121add_subdirectory(qml)
123−add_subdirectory(tests)
122+
123+# Tests
124+if (NOT NO_TESTS)
125+ include(CTest)
126+ enable_testing()
127+ add_subdirectory(tests)
128+else()
129+ message(STATUS "Tests disabled")
130+endif()
131+
124132add_subdirectory(plugins)
125133
126134#
CODING+6−6
@@ -24,7 +24,7 @@ $ ./build.sh --setup
2424
2525 this will:
2626 - install the required dependencies to build, as well as run on the desktop
27− - it should also install unity-scope-home and unity-lens-application which
27+ - it should also install unity-scope-home and unity-lens-application which
2828 are technically "recommends", not strict dependencies
2929
3030build Unity 8
@@ -104,8 +104,8 @@ Notes
104104 - it's unsafe - anyone can connect to your device
105105 - with TCP the Nexus 10 doesn't drop the adb connection when locking
106106 the screen
107−- exporting ANDROID_SERIAL=$your_device_serial or
108− ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
107+- exporting ANDROID_SERIAL=$your_device_serial or
108+ ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about
109109 multiple devices
110110- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh
111111 to not use adb forwarding - useful if you use multiple devices
@@ -186,12 +186,12 @@ $ make install
186186
187187To see the list of existing autopilot tests you can do
188188
189−$ PYTHONPATH=../tests/autopilot autopilot list unity8
189+$ PYTHONPATH=../tests/autopilot autopilot3 list unity8
190190
191191And then run a single test with
192192
193−$ PYTHONPATH=../tests/autopilot autopilot run unity8.some.very.long.test.name
193+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8.some.very.long.test.name
194194
195195or run them all with
196196
197−$ PYTHONPATH=../tests/autopilot autopilot run unity8
197+$ PYTHONPATH=../tests/autopilot autopilot3 run unity8
cmake/modules/QmlTest.cmake+1−1
@@ -28,7 +28,7 @@ endif()
2828
2929set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
3030
31−set(test_env UNITY_TESTING=1)
31+set(test_env LC_ALL=C UNITY_TESTING=1)
3232
3333macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
3434 set(options NO_ADD_TEST NO_TARGETS)
cmake/modules/autopilot.cmake−8
@@ -13,12 +13,4 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)
1313
1414 add_dependencies(autopilot autopilot-${TEST_NAME})
1515
16− add_custom_target(autopilot2-${TEST_NAME}
17− COMMAND UNITY_TESTING=1 LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}
18− WORKING_DIRECTORY ${WORKING_DIR}
19− DEPENDS fake_install
20− )
21−
22− add_dependencies(autopilot autopilot2-${TEST_NAME})
23−
2416endfunction()
data/CMakeLists.txt+3−1
@@ -1,13 +1,15 @@
11# generate desktop files
22configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
33configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
4+configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)
45
56# install desktop files
67install(FILES
78 ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop
89 ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop
10+ ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop
911 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
1012 )
1113
12−# install url dispatcher files
14+install(FILES com.canonical.Unity8.gschema.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
1315install(FILES unity8-dash.url-dispatcher DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
com.canonical.Unity8.gschema.xml → data/com.canonical.Unity8.gschema.xmlrenamed

The content is the same.

data/indicators-client.desktop.innew file+9
@@ -0,0 +1,9 @@
1+[Desktop Entry]
2+Type=Application
3+Name=Indicators Client
4+Comment=Application for testing the Indicators system
5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/indicators-client
6+Terminal=false
7+Icon=
8+NoDisplay=false
9+X-Ubuntu-Touch=true
data/unity-mock-indicator-service.confnew file+7
@@ -0,0 +1,7 @@
1+description "Unity Shell v8 Mock Indicator"
2+author "Nick Dedekind <nick.dedekind@canonical.com>"
3+
4+respawn
5+respawn limit 2 10
6+
7+exec ${BINARY:-unity-mock-indicator-service} $ARGS
debian/changelog+323−15
@@ -1,31 +1,339 @@
1−unity8 (8.02+15.04.20150205-0ubuntu1) vivid; urgency=medium
1+unity8 (8.02+15.04.20150422-0ubuntu1) vivid; urgency=medium
2+
3+ [ Albert Astals Cid ]
4+ * Compile with Qt 5.5 (LP: #1437238)
5+ * Different way of top aligning labels when the other one in the row
6+ is multiline (LP: #1442085)
7+ * make pot_file
28
39 [ Andrea Cimitan ]
4− * Fix continue button in wifi wizard page, adds qml-module-
5− qtsysteminfo as unity8 dep (LP: #1363400)
6− * Background needs to be specified to be visible in horizontal cards
7− (LP: #1411748)
10+ * Set sourceSize for DashBackground.qml Image
811
912 [ CI Train Bot ]
10− * Resync trunk
13+ * New rebuild forced.
14+ * Resync trunk. added: po/sk.po
15+
16+ [ Daniel d'Andrada ]
17+ * Move handling of command line options to a separate class
18+ * Refactor tst_PhysicalKeysMapper.qml
19+
20+ [ Leo Arias ]
21+ * For autopilot tests, use the device simulation scenarios from the
22+ toolkit.
23+
24+ [ Leonardo Arias Fonseca ]
25+ * For autopilot tests, use the device simulation scenarios from the
26+ toolkit.
27+
28+ [ Michael Zanetti ]
29+ * Make sure dnd mode is ended properly when drag gesture is cancelled
30+ (LP: #1444949)
31+
32+ [ Michał Sawicz ]
33+ * Fix flake8 warnings (LP: #1444170)
34+ * Move mock indicator service to unity8-fake-env, as it's a binary-
35+ dependent package.
36+
37+ [ Nick Dedekind ]
38+ * Use asynchronous dbus requests for property updates. (LP: #1436982)
39+
40+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 22 Apr 2015 14:46:31 +0000
41+
42+unity8 (8.02+15.04.20150409.1-0ubuntu1) vivid; urgency=medium
43+
44+ [ Albert Astals Cid ]
45+ * Focus the shutdown dialog (LP: #1417991)
46+ * Make url-dispatching scope activation when the dash is not on the
47+ main scopes (LP: #1364306)
48+ * We use autopilot3 now
49+
50+ [ CI Train Bot ]
51+ * New rebuild forced.
52+ * Resync trunk. added: po/or.po
53+
54+ [ Daniel d'Andrada ]
55+ * Make tst_PreviewListView and tst_GenericScopeView work in out-of-
56+ source builds
57+ * MouseArea that shows the indicators panel should cover the
58+ indicators bar only (LP: #1439318)
59+ * Surface gets active focus also with mouse clicks
60+
61+ [ Josh Arenson ]
62+ * Add a mode option to unity8 for selecting greeter mode in the future
63+ * Remove PkgConfig include from Launcher plugin to fix cross-compile
64+ (LP: #1437702)
65+
66+ [ Leo Arias ]
67+ * Fixed the check for string in the lock screen test. (LP: #1434518)
68+
69+ [ Michael Terry ]
70+ * Make sure the edge tutorial is destroyed when we receive a call
71+ during the wizard. (LP: #1436349)
72+ * Skip parts of the edge tutorial that require a touch device (like
73+ spread and bottom edge). (LP: #1434712)
74+
75+ [ Michael Zanetti ]
76+ * Don't hide stages just because they're empty (LP: #1439615)
77+ * [Launcher] fix bug where an item would disappear even though the app
78+ is running (LP: #1438172)
79+
80+ [ Nick Dedekind ]
81+ * Fixed autopilot test failures related to udev input failure for
82+ power button.
83+ * Made improvements for laggy indicator backends (lp#1390136). (LP:
84+ #1390136)
85+
86+ [ Pete Woods ]
87+ * GPS only goes active when the Dash is in the foreground (LP:
88+ #1434379)
89+
90+ [ handsome_feng<445865575@qq.com> ]
91+ * Modified the wrong time format in ScreenGrabber (LP: #1436006)
92+
93+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 09 Apr 2015 14:01:11 +0000
94+
95+unity8 (8.02+15.04.20150320-0ubuntu1) vivid; urgency=medium
96+
97+ [ Albert Astals Cid ]
98+ * Fix regression making pan not possible in Zoomable Image (LP:
99+ #1433506)
100+ * Make sure m_firstVisibleIndex is correctly set after processing
101+ changeSet.removes (LP: #1433056)
102+ * make pot_file
103+
104+ [ Daniel d'Andrada ]
105+ * Don't show the rotating rect in "make tryFoo".
106+
107+ [ Michael Zanetti ]
108+ * make pinlockscreen adjust better to larger displays
109+
110+ -- CI Train Bot <ci-train-bot@canonical.com> Fri, 20 Mar 2015 11:56:41 +0000
111+
112+unity8 (8.02+15.04.20150318-0ubuntu1) vivid; urgency=medium
113+
114+ [ Albert Astals Cid ]
115+ * Add some context to tr calls (LP: #1431497)
116+ * Require binaries and .pc files we call from code
117+ * Test: More stubborn flick to the end
118+
119+ [ Andrea Cimitan ]
120+ * Refactor PreviewOverlay to fix weird zoom out/in animations when
121+ previewing images from the Previews
122+
123+ [ CI Train Bot ]
124+ * Resync trunk.
125+
126+ [ Charles Kerr ]
127+ * Re-enable a rotation lock test now that the bug that broke that test
128+ has been fixed. (LP: #1410915)
129+
130+ [ Daniel d'Andrada ]
131+ * Darkened area behind indicators menu should eat input until it fully
132+ disappears (LP: #1417967)
133+ * DesktopStage - fix focus switch when user taps on window (LP:
134+ #1431325)
135+ * Fix warnings when launching tutorial
136+ * Make MouseTouchAdaptor controllable from within QML
137+ * Make tst_Shell absorb tst_TabletShell
138+
139+ [ Leo Arias ]
140+ * Changed the autopilot dependencies so they do not require qt4. (LP:
141+ #1429158)
142+ * Drop the support for python2 in autopilot tests. (LP: #1429163)
143+ * Stop using the deprecated toolkit emulators namespace in autopilot
144+ tests. (LP: #1341681)
145+
146+ [ Michael Terry ]
147+ * Don't close wizard & edge tutorial when the unity8-dash closes (LP:
148+ #1425484)
149+ * Don't let the wizard sit indefinitely, waiting for a wizard page to
150+ finish preparing itself. (LP: #1425737)
151+ * Fix two broken qmluitest files by waiting for everything to settle
152+ before starting the tests.
153+ * Only call unlockAllModems once the wizard is done. (LP: #1425161)
154+ (LP: #1425161)
155+ * When we are locking the user out from too many login failures,
156+ notice when time passes even if the device is suspended. (LP:
157+ #1396817) (LP: #1396817)
158+
159+ [ Michael Zanetti ]
160+ * Add a mouse area to the indicators panel so we can open them by
161+ clicking. (LP: #1417650)
162+ * fix launcher not reacting to first click when revealed by mouse
163+ hover, add tests
164+ * performance improvements (LP: #1430233, #1425087)
11165
12166 [ Michał Sawicz ]
13− * Add workaround for gcc ICE.
167+ * Remove the activity indicator from tests
168+ * Use targets instead of custom ld arguments for linking
169+
170+ [ Mirco Müller ]
171+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-
172+ decision notifications according to new design-spec.
173+ * Updated the visuals of the SwipeToAct-widget for incoming-call snap-
174+ decision notifications according to new design-spec.
175+
176+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 18 Mar 2015 10:19:06 +0000
177+
178+unity8 (8.02+15.04.20150302-0ubuntu2) vivid; urgency=medium
179+
180+ * No-change rebuild against Qt 5.4.1.
181+
182+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 11 Mar 2015 10:27:23 +0200
183+
184+unity8 (8.02+15.04.20150302-0ubuntu1) vivid; urgency=medium
14185
15186 [ Albert Astals ]
16− * Implement proper updateRanges for horizontal items (i.e. Carousel,
17− Horizontal List)
187+ * Don't precache items that are outisde the 1.5*height buffering area
188+ (LP: #1410131)
189+
190+ [ Albert Astals Cid ]
191+ * Don't precache items that are outisde the 1.5*height buffering area
192+ (LP: #1410131)
193+
194+ [ Chris Townsend ]
195+ * Add a wrapper for handling the
196+ /org/gnome/SessionManager/EndSessionDialog DBus object used by
197+ indicator-session. This allows indicator-session to properly talk to
198+ the Unity 8 session management functions. (LP: #1392187)
199+ * Allow for proper logout session management. This uses the
200+ EndSession() Upstart DBus method on the current session bus. (LP:
201+ #1360316)
202+ * Make the Unity 8 session dialogs behave in the same fashion as Unity
203+ 7. From indicator-session: Clicking "Log Out" will now present a
204+ dialog to "Lock", "Log Out", or "Cancel". Clicking "Shut Down" will
205+ now present a dialog to "Reboot", "Shut Down", or "Cancel". (LP:
206+ #1416074)
207+
208+ [ Daniel d'Andrada ]
209+ * Add NO_TESTS cmake option to skip tests and therefore speed up
210+ builds
211+ * Remove enums and properties that doesn't exist in the real
212+ ApplicationManager
213+ * Stabilize some Shell qml tests
214+
215+ [ Josh Arenson ]
216+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:
217+ #1390393)
218+
219+ [ Michael Terry ]
220+ * Make the draggable part of the right edge (during the tutorial) a
221+ constant size, instead of having it grow and shrink as the spread
222+ peeks out from the side.
223+
224+ [ Michał Sawicz ]
225+ * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:
226+ #1390393)
227+
228+ [ Robert Bruce Park ]
229+ * Launchpad automatic translations update.
230+
231+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 02 Mar 2015 12:11:21 +0000
232+
233+unity8 (8.02+15.04.20150226-0ubuntu1) vivid; urgency=medium
234+
235+ [ CI Train Bot ]
236+ * New rebuild forced.
237+
238+ [ Pete Woods ]
239+ * Only set scopes active when the screen is on (LP: #1422879)
240+
241+ -- CI Train Bot <ci-train-bot@canonical.com> Thu, 26 Feb 2015 19:39:54 +0000
242+
243+unity8 (8.02+15.04.20150224-0ubuntu1) vivid; urgency=medium
244+
245+ [ Albert Astals Cid ]
246+ * Dash manage hint should not be visible in previews+test (LP:
247+ #1422260)
248+ * Do not declare the hostname property twice
249+ * Fix some warnings in Mock Notifications
250+ * Make qmluittests pass with Qt 5.4
251+ * Preserve the aspect ratio for the card attribute images (LP:
252+ #1411751)
253+ * Update qmltypes
254+
255+ [ Andrea Cimitan ]
256+ * Add maximumLineCount for subtitle label in cards (LP: #1414870)
257+
258+ [ Michael Terry ]
259+ * Move the gschema file to data/ and install it via cmake, not dpkg.
260+ * Refactor the greeter code to be more compartmented and isolatable.
261+ * Silence a couple qml warnings. (LP: #1423286)
262+ * Wait for libqofono to finish initializing before we decide whether
263+ to skip the wizard's SIM page or not.
264+
265+ [ Michael Zanetti ]
266+ * enable revealing the launcher by hitting the left edge using the
267+ mouse
268+
269+ [ Ying-Chun Liu ]
270+ * Add Autopilot Notification helper.
271+
272+ -- CI Train Bot <ci-train-bot@canonical.com> Tue, 24 Feb 2015 10:17:16 +0000
273+
274+unity8 (8.02+15.04.20150216.1-0ubuntu1) vivid; urgency=medium
275+
276+ [ Andrea Cimitan ]
277+ * Fix temp scopes opening temp scopes, correctly close previously
278+ opened temp scope with its preview (LP: #1410337)
279+ * Set sourcesize for scopes images in manage dash
280+
281+ [ CI Train Bot ]
282+ * Resync trunk
283+
284+ [ Albert Astals Cid ]
285+ * Test for bug #1316660 (LP: #1316660)
286+ * Hardcode tranlsation for internal.location field (LP: #1393438)
287+ * Make sure the height it's the height it will have
288+
289+ [ Michael Zanetti ]
290+ * Cleanup cmake warning about missing Qt5Sql module
291+
292+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 16 Feb 2015 13:14:26 +0000
293+
294+unity8 (8.02+15.04.20150211-0ubuntu2) vivid; urgency=medium
295+
296+ * No-change rebuild against Qt 5.4.0.
297+
298+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 13 Feb 2015 15:17:18 +0200
299+
300+unity8 (8.02+15.04.20150211-0ubuntu1) vivid; urgency=medium
18301
19302 [ Michael Terry ]
20− * Don't accept multiple "Finish" clicks during the last step of the
21− wizard
303+ * Redesign tutorial to match latest spec (just removing obsolete pages
304+ and redesigning look, no new pages yet)
305+ * Add new right-edge and bottom-edge screens to the first-boot edge
306+ tutorial (LP: #1383297)
307+ * Support switching the indicator profile on the fly, as the greeter
308+ appears and disappears. (But don't use it yet, not until the
309+ settings panel to control this is in place.)
310+ * Clip the infographic to its bounding box, instead of letting it
311+ bleed past the welcome page (visible when dragging the welcome page
312+ to the side).
313+
314+ [ Michael Zanetti ]
315+ * Add an AccountService based launcher model to be used with split
316+ greeter
317+ * Launcher fixes for windowed mode
318+ * save and restore window size and position
319+ * Fix resizing windows when making it smaller than minSize and then
320+ larger again.
321+
322+ [ handsome_feng<445865575@qq.com> ]
323+ * makes the header fully reveal when tapping the search icon. (LP:
324+ #1379327)
325+
326+ [ Mirco Müller ]
327+ * Allow swipe-to-dismiss for contracted snap-decision notifications,
328+ interactive notifications and ephemeral notifications. (LP:
329+ #1355422, #1334855)
22330
23331 [ Daniel d'Andrada ]
24− * Unify all liblightdm mocks
25− * Ensure the greeter password field is not covered by the keyboard
26− * Don't show() the lockscreen if it's already being shown
332+ * Make indicators bar eat all events
333+ * Improve Launcher tests, making them more reliable
334+ * Tapping on a surface gives it active focus
27335
28− -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Feb 2015 10:30:13 +0000
336+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 11 Feb 2015 17:13:16 +0000
29337
30338unity8 (8.02+15.04.20150123.3-0ubuntu1) vivid; urgency=low
31339
debian/control+14−17
@@ -6,14 +6,14 @@ Build-Depends: cmake,
66 dbus-test-runner,
77 debhelper (>= 9),
88 doxyqml,
9− graphviz,
10− gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
119# We rely on C++11 features, and to prevent from ABI breaks
1210# in libstdc++ causing us issues, we explicitly select a G++
1311# version. To allow cross-compiling to work, we also must
1412# append :native to g++-4.9 so we don't try to run armhf g++
1513# on an x86 CPU for eaxmple, when cross-compiling.
1614 g++-4.9:native,
15+ graphviz,
16+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1717 libconnectivity-qt1-dev,
1818 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1919 libgl1-mesa-dri,
@@ -27,14 +27,12 @@ Build-Depends: cmake,
2727 libqmenumodel-dev (>= 0.2.9),
2828 libqt5xmlpatterns5-dev,
2929 libsystemsettings-dev,
30− libunity-api-dev (>= 7.94),
30+ libunity-api-dev (>= 7.96),
3131 libusermetricsoutput1-dev,
3232 libxcb1-dev,
3333 pkg-config,
34− python-setuptools,
3534 python3-all:any,
3635 python3-setuptools,
37− python:any (>= 2.7),
3836 qml-module-qt-labs-folderlistmodel,
3937 qml-module-qtquick-layouts,
4038 qml-module-qtquick-xmllistmodel,
@@ -49,7 +47,7 @@ Build-Depends: cmake,
4947 qtdeclarative5-dev-tools,
5048 qtdeclarative5-private-dev (>= 5.2.1),
5149 qtdeclarative5-qtmultimedia-plugin,
52− qtdeclarative5-ubuntu-settings-components (>= 0.5),
50+ qtdeclarative5-ubuntu-settings-components (>= 0.6),
5351 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
5452 qtdeclarative5-ubuntu-web-plugin,
5553 ttf-ubuntu-font-family,
@@ -78,6 +76,9 @@ Depends: unity8-common (= ${source:Version}),
7876 unity8-private (= ${binary:Version}),
7977 ${misc:Depends},
8078 ${shlibs:Depends},
79+# We do call pkg-config libunity-scopes from the code
80+ pkg-config,
81+ libunity-scopes-dev,
8182Description: Development tool for Unity scopes
8283 This package contains the development tool for new generation Unity scopes, based
8384 on Unity8.
@@ -118,7 +119,7 @@ Description: Unity 8 shell
118119Package: unity8-common
119120Architecture: all
120121Depends: qml-module-qtquick-layouts,
121− qtdeclarative5-ubuntu-settings-components (>= 0.4),
122+ qtdeclarative5-ubuntu-settings-components (>= 0.6),
122123 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
123124 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
124125 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
@@ -126,7 +127,7 @@ Depends: qml-module-qtquick-layouts,
126127 unity-application-impl-4,
127128 unity-notifications-impl-3,
128129 unity-plugin-scopes | unity-scopes-impl,
129− unity-scopes-impl-4,
130+ unity-scopes-impl-6,
130131 unity8-fake-env | unity-application-impl,
131132 ${misc:Depends},
132133Breaks: unity8 (<< 7.86),
@@ -139,20 +140,16 @@ Description: Unity 8 shell (common files)
139140
140141Package: unity8-autopilot
141142Architecture: all
142−Depends: gir1.2-glib-2.0,
143+Depends: autopilot-qt5 (>= 1.4),
144+ gir1.2-glib-2.0,
143145 gir1.2-notify-0.7,
144− libautopilot-qt (>= 1.4),
145146 libqt5test5,
146147 libqt5widgets5,
147− python-autopilot,
148− python-evdev,
149− python-fixtures,
150− python-gi,
151− python-mock,
152148 python3-autopilot,
153149 python3-evdev,
154150 python3-fixtures,
155151 python3-gi,
152+ qttestability-autopilot (>= 1.4),
156153 ubuntu-ui-toolkit-autopilot,
157154 unity-scope-click,
158155 unity8 (= ${source:Version}),
@@ -160,7 +157,6 @@ Depends: gir1.2-glib-2.0,
160157 url-dispatcher-tools,
161158 ${misc:Depends},
162159 ${python3:Depends},
163− ${python:Depends},
164160 ${shlibs:Depends},
165161Description: Test package for Unity 8 shell
166162 Autopilot tests for the unity8 package
@@ -173,6 +169,7 @@ Depends: ${misc:Depends},
173169 ${shlibs:Depends},
174170Provides: unity-application-impl,
175171 unity-application-impl-4,
172+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
176173Description: Fake environment for running Unity 8 shell
177174 Provides fake implementations of some QML modules used by Unity 8 shell
178175 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
@@ -184,8 +181,8 @@ Pre-Depends: ${misc:Pre-Depends},
184181Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
185182 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
186183 libhardware2,
187− unity-schemas (>= 7.3.1+14.10.20140915),
188184 pay-service,
185+ unity-schemas (>= 7.3.1+14.10.20140915),
189186 ${misc:Depends},
190187 ${shlibs:Depends},
191188Provides: unity-launcher-impl,
debian/indicators-client.install+1
@@ -1 +1,2 @@
11/usr/bin/indicators-client
2+usr/share/applications/indicators-client.desktop
debian/rules+2−2
@@ -14,7 +14,7 @@ export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
1414export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
1515
1616%:
17− dh $@ --parallel --fail-missing --with python2,python3
17+ dh $@ --parallel --fail-missing --with python3
1818
1919override_dh_auto_clean:
2020 dh_auto_clean
@@ -32,7 +32,7 @@ override_dh_auto_build:
3232override_dh_install:
3333 # install autopilot tests
3434 cd tests/autopilot; \
35− set -ex; for python in $(shell pyversions -r) $(shell py3versions -r); do \
35+ set -ex; for python in $(shell py3versions -r); do \
3636 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
3737 done; \
3838 cd $(CURDIR)
debian/unity8-common.install+1−1
@@ -1,7 +1,7 @@
1+usr/share/glib-2.0/schemas
12usr/share/locale
23usr/share/unity8/Components
34usr/share/unity8/Dash
45usr/share/unity8/Notifications
56usr/share/unity8/graphics
6−com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/
77var/lib/polkit-1/localauthority/10-vendor.d
debian/unity8-fake-env.install+2
@@ -1,3 +1,5 @@
1+data/unity-mock-indicator-service.conf usr/share/upstart/sessions/
2+usr/bin/unity-mock-indicator-service
13usr/lib/*/unity8/qml/mocks
24usr/lib/*/unity8/qml/nonmirplugins
35usr/lib/*/unity8/qml/scopefakes
debian/unity8-private.install+3−2
@@ -1,15 +1,16 @@
11usr/lib/*/libunity8-private.*
2+usr/lib/*/unity8/libUbuntuGestures*
23usr/lib/*/unity8/qml/AccountsService
34usr/lib/*/unity8/qml/Dash
5+usr/lib/*/unity8/qml/Greeter
46usr/lib/*/unity8/qml/LightDM
57usr/lib/*/unity8/qml/Lights
68usr/lib/*/unity8/qml/Powerd
7−usr/lib/*/unity8/qml/SessionBroadcast
89usr/lib/*/unity8/qml/ScreenGrabber
10+usr/lib/*/unity8/qml/SessionBroadcast
911usr/lib/*/unity8/qml/Ubuntu
1012usr/lib/*/unity8/qml/Unity
1113usr/lib/*/unity8/qml/Utils
1214usr/lib/*/unity8/qml/Wizard
13−usr/lib/*/unity8/libUbuntuGestures*
1415usr/share/accountsservice/interfaces
1516usr/share/dbus-1/interfaces
debian/unity8.install+3−2
@@ -1,14 +1,15 @@
1−data/unity8.conf usr/share/upstart/sessions/
21data/unity8-dash.conf usr/share/upstart/sessions/
32data/unity8-filewatcher.conf usr/share/upstart/sessions/
3+data/unity8.conf usr/share/upstart/sessions/
44usr/bin/unity8
55usr/bin/unity8-dash
6−usr/share/applications/unity8.desktop
76usr/share/applications/unity8-dash.desktop
7+usr/share/applications/unity8.desktop
88usr/share/unity8/Greeter
99usr/share/unity8/Launcher
1010usr/share/unity8/Panel
1111usr/share/unity8/Shell.qml
1212usr/share/unity8/Stages
13+usr/share/unity8/Tutorial
1314usr/share/unity8/Wizard
1415usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
include/paths.h.in+1−6
@@ -92,12 +92,7 @@ inline QString mockPluginsDir() {
9292
9393inline QStringList shellDataDirs() {
9494 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
95− if (!isRunningInstalled()) {
96− if (getenv("UNITY_TEST_ENV")==nullptr) {
97− dirs.prepend("@CMAKE_BINARY_DIR@/share");
98− }
99− }
100− else {
95+ if (isRunningInstalled()) {
10196 // append so by default we use xdg files.
10297 dirs.append(qmlDirectory());
10398 }
plugins/AccountsService/AccountsService.cpp+263−61
@@ -21,6 +21,7 @@
2121
2222#include <QFile>
2323#include <QStringList>
24+#include <QDebug>
2425
2526AccountsService::AccountsService(QObject* parent)
2627 : QObject(parent),
@@ -56,15 +57,15 @@ void AccountsService::setUser(const QString &user)
5657 m_user = user;
5758 Q_EMIT userChanged();
5859
59− updateDemoEdges();
60− updateEnableLauncherWhileLocked();
61− updateEnableIndicatorsWhileLocked();
62− updateBackgroundFile();
63− updateStatsWelcomeScreen();
64− updatePasswordDisplayHint();
65− updateFailedLogins();
66− updateHereEnabled();
67− updateHereLicensePath();
60+ updateDemoEdges(false);
61+ updateEnableLauncherWhileLocked(false);
62+ updateEnableIndicatorsWhileLocked(false);
63+ updateBackgroundFile(false);
64+ updateStatsWelcomeScreen(false);
65+ updatePasswordDisplayHint(false);
66+ updateFailedLogins(false);
67+ updateHereEnabled(false);
68+ updateHereLicensePath(false);
6869}
6970
7071bool AccountsService::demoEdges() const
@@ -74,8 +75,12 @@ bool AccountsService::demoEdges() const
7475
7576void AccountsService::setDemoEdges(bool demoEdges)
7677{
77− m_demoEdges = demoEdges;
78− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
78+ if (m_demoEdges != demoEdges) {
79+ m_demoEdges = demoEdges;
80+ m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
81+
82+ Q_EMIT demoEdgesChanged();
83+ }
7984}
8085
8186bool AccountsService::enableLauncherWhileLocked() const
@@ -110,7 +115,12 @@ bool AccountsService::hereEnabled() const
110115
111116void AccountsService::setHereEnabled(bool enabled)
112117{
113− m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
118+ if (m_hereEnabled != enabled) {
119+ m_hereEnabled = enabled;
120+ m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
121+
122+ Q_EMIT hereEnabledChanged();
123+ }
114124}
115125
116126QString AccountsService::hereLicensePath() const
@@ -123,88 +133,276 @@ bool AccountsService::hereLicensePathValid() const
123133 return !m_hereLicensePath.isNull();
124134}
125135
126−void AccountsService::updateDemoEdges()
136+void AccountsService::updateDemoEdges(bool async)
127137{
128− auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
129− if (m_demoEdges != demoEdges) {
130− m_demoEdges = demoEdges;
131− Q_EMIT demoEdgesChanged();
138+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
139+ "com.canonical.unity.AccountsService",
140+ "demo-edges");
141+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
142+
143+ connect(watcher, &QDBusPendingCallWatcher::finished,
144+ this, [this](QDBusPendingCallWatcher* watcher) {
145+
146+ QDBusPendingReply<QDBusVariant> reply = *watcher;
147+ if (reply.isError()) {
148+ qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
149+ watcher->deleteLater();
150+ return;
151+ }
152+
153+ auto demoEdges = reply.value().variant().toBool();
154+ if (m_demoEdges != demoEdges) {
155+ m_demoEdges = demoEdges;
156+ Q_EMIT demoEdgesChanged();
157+ }
158+ watcher->deleteLater();
159+ });
160+ if (!async) {
161+ watcher->waitForFinished();
162+ delete watcher;
132163 }
133164}
134165
135−void AccountsService::updateEnableLauncherWhileLocked()
166+void AccountsService::updateEnableLauncherWhileLocked(bool async)
136167{
137− auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();
138− if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
139− m_enableLauncherWhileLocked = enableLauncherWhileLocked;
140− Q_EMIT enableLauncherWhileLockedChanged();
168+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
169+ "com.ubuntu.AccountsService.SecurityPrivacy",
170+ "EnableLauncherWhileLocked");
171+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
172+
173+ connect(watcher, &QDBusPendingCallWatcher::finished,
174+ this, [this](QDBusPendingCallWatcher* watcher) {
175+
176+ QDBusPendingReply<QDBusVariant> reply = *watcher;
177+ if (reply.isError()) {
178+ qWarning() << "Failed to get 'EnableLauncherWhileLocked' property - " << reply.error().message();
179+ watcher->deleteLater();
180+ return;
181+ }
182+
183+ auto enableLauncherWhileLocked = reply.value().variant().toBool();
184+ if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
185+ m_enableLauncherWhileLocked = enableLauncherWhileLocked;
186+ Q_EMIT enableLauncherWhileLockedChanged();
187+ }
188+ watcher->deleteLater();
189+ });
190+ if (!async) {
191+ watcher->waitForFinished();
192+ delete watcher;
141193 }
142194}
143195
144−void AccountsService::updateEnableIndicatorsWhileLocked()
196+void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
145197{
146− auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();
147− if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
148− m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
149− Q_EMIT enableIndicatorsWhileLockedChanged();
198+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
199+ "com.ubuntu.AccountsService.SecurityPrivacy",
200+ "EnableIndicatorsWhileLocked");
201+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
202+
203+ connect(watcher, &QDBusPendingCallWatcher::finished,
204+ this, [this](QDBusPendingCallWatcher* watcher) {
205+
206+ QDBusPendingReply<QDBusVariant> reply = *watcher;
207+ if (reply.isError()) {
208+ qWarning() << "Failed to get 'EnableIndicatorsWhileLocked' property - " << reply.error().message();
209+ watcher->deleteLater();
210+ return;
211+ }
212+
213+ auto enableIndicatorsWhileLocked = reply.value().variant().toBool();
214+ if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
215+ m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
216+ Q_EMIT enableIndicatorsWhileLockedChanged();
217+ }
218+ watcher->deleteLater();
219+ });
220+ if (!async) {
221+ watcher->waitForFinished();
222+ delete watcher;
150223 }
151224}
152225
153−void AccountsService::updateBackgroundFile()
226+void AccountsService::updateBackgroundFile(bool async)
154227{
155− auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
156− if (m_backgroundFile != backgroundFile) {
157− m_backgroundFile = backgroundFile;
158− Q_EMIT backgroundFileChanged();
228+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
229+ "org.freedesktop.Accounts.User",
230+ "BackgroundFile");
231+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
232+
233+ connect(watcher, &QDBusPendingCallWatcher::finished,
234+ this, [this](QDBusPendingCallWatcher* watcher) {
235+
236+ QDBusPendingReply<QDBusVariant> reply = *watcher;
237+ if (reply.isError()) {
238+ qWarning() << "Failed to get 'BackgroundFile' property - " << reply.error().message();
239+ watcher->deleteLater();
240+ return;
241+ }
242+
243+ auto backgroundFile = reply.value().variant().toString();
244+ if (m_backgroundFile != backgroundFile) {
245+ m_backgroundFile = backgroundFile;
246+ Q_EMIT backgroundFileChanged();
247+ }
248+ watcher->deleteLater();
249+ });
250+ if (!async) {
251+ watcher->waitForFinished();
252+ delete watcher;
159253 }
160254}
161255
162−void AccountsService::updateStatsWelcomeScreen()
256+void AccountsService::updateStatsWelcomeScreen(bool async)
163257{
164− bool statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();
165− if (m_statsWelcomeScreen != statsWelcomeScreen) {
166− m_statsWelcomeScreen = statsWelcomeScreen;
167− Q_EMIT statsWelcomeScreenChanged();
258+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
259+ "com.ubuntu.touch.AccountsService.SecurityPrivacy",
260+ "StatsWelcomeScreen");
261+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
262+
263+ connect(watcher, &QDBusPendingCallWatcher::finished,
264+ this, [this](QDBusPendingCallWatcher* watcher) {
265+
266+ QDBusPendingReply<QDBusVariant> reply = *watcher;
267+ if (reply.isError()) {
268+ qWarning() << "Failed to get 'StatsWelcomeScreen' property - " << reply.error().message();
269+ watcher->deleteLater();
270+ return;
271+ }
272+
273+ auto statsWelcomeScreen = reply.value().variant().toBool();
274+ if (m_statsWelcomeScreen != statsWelcomeScreen) {
275+ m_statsWelcomeScreen = statsWelcomeScreen;
276+ Q_EMIT statsWelcomeScreenChanged();
277+ }
278+ watcher->deleteLater();
279+ });
280+ if (!async) {
281+ watcher->waitForFinished();
282+ delete watcher;
168283 }
169284}
170285
171−void AccountsService::updatePasswordDisplayHint()
286+void AccountsService::updatePasswordDisplayHint(bool async)
172287{
173− PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "PasswordDisplayHint").toInt();
174− if (m_passwordDisplayHint != passwordDisplayHint) {
175− m_passwordDisplayHint = passwordDisplayHint;
176− Q_EMIT passwordDisplayHintChanged();
288+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
289+ "com.ubuntu.AccountsService.SecurityPrivacy",
290+ "PasswordDisplayHint");
291+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
292+
293+ connect(watcher, &QDBusPendingCallWatcher::finished,
294+ this, [this](QDBusPendingCallWatcher* watcher) {
295+
296+ QDBusPendingReply<QDBusVariant> reply = *watcher;
297+ if (reply.isError()) {
298+ qWarning() << "Failed to get 'PasswordDisplayHint' property - " << reply.error().message();
299+ watcher->deleteLater();
300+ return;
301+ }
302+
303+ PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)reply.value().variant().toInt();
304+ if (m_passwordDisplayHint != passwordDisplayHint) {
305+ m_passwordDisplayHint = passwordDisplayHint;
306+ Q_EMIT passwordDisplayHintChanged();
307+ }
308+ watcher->deleteLater();
309+ });
310+ if (!async) {
311+ watcher->waitForFinished();
312+ delete watcher;
177313 }
178314}
179315
180−void AccountsService::updateFailedLogins()
316+void AccountsService::updateFailedLogins(bool async)
181317{
182− uint failedLogins = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins").toUInt();
183− if (m_failedLogins != failedLogins) {
184− m_failedLogins = failedLogins;
185− Q_EMIT failedLoginsChanged();
318+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
319+ "com.canonical.unity.AccountsService.Private",
320+ "FailedLogins");
321+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
322+
323+ connect(watcher, &QDBusPendingCallWatcher::finished,
324+ this, [this](QDBusPendingCallWatcher* watcher) {
325+
326+ QDBusPendingReply<QDBusVariant> reply = *watcher;
327+ if (reply.isError()) {
328+ qWarning() << "Failed to get 'FailedLogins' property - " << reply.error().message();
329+ watcher->deleteLater();
330+ return;
331+ }
332+
333+ uint failedLogins = reply.value().variant().toUInt();
334+ if (m_failedLogins != failedLogins) {
335+ m_failedLogins = failedLogins;
336+ Q_EMIT failedLoginsChanged();
337+ }
338+ watcher->deleteLater();
339+ });
340+ if (!async) {
341+ watcher->waitForFinished();
342+ delete watcher;
186343 }
187344}
188345
189−void AccountsService::updateHereEnabled()
346+void AccountsService::updateHereEnabled(bool async)
190347{
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();
348+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
349+ "com.ubuntu.location.providers.here.AccountsService",
350+ "LicenseAccepted");
351+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
352+
353+ connect(watcher, &QDBusPendingCallWatcher::finished,
354+ this, [this](QDBusPendingCallWatcher* watcher) {
355+
356+ QDBusPendingReply<QDBusVariant> reply = *watcher;
357+ if (reply.isError()) {
358+ qWarning() << "Failed to get 'LicenseAccepted' property - " << reply.error().message();
359+ watcher->deleteLater();
360+ return;
361+ }
362+
363+ auto hereEnabled = reply.value().variant().toBool();
364+ if (m_hereEnabled != hereEnabled) {
365+ m_hereEnabled = hereEnabled;
366+ Q_EMIT hereEnabledChanged();
367+ }
368+ watcher->deleteLater();
369+ });
370+ if (!async) {
371+ watcher->waitForFinished();
372+ delete watcher;
195373 }
196374}
197375
198−void AccountsService::updateHereLicensePath()
376+void AccountsService::updateHereLicensePath(bool async)
199377{
200− QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();
378+ QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
379+ "com.ubuntu.location.providers.here.AccountsService",
380+ "LicenseBasePath");
381+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
382+
383+ connect(watcher, &QDBusPendingCallWatcher::finished,
384+ this, [this](QDBusPendingCallWatcher* watcher) {
385+
386+ QDBusPendingReply<QDBusVariant> reply = *watcher;
387+ if (reply.isError()) {
388+ qWarning() << "Failed to get 'LicenseBasePath' property - " << reply.error().message();
389+ watcher->deleteLater();
390+ return;
391+ }
201392
202− if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
203− hereLicensePath = "";
393+ auto hereLicensePath = reply.value().variant().toString();
394+ if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
395+ hereLicensePath = "";
204396
205− if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
206− m_hereLicensePath = hereLicensePath;
207− Q_EMIT hereLicensePathChanged();
397+ if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
398+ m_hereLicensePath = hereLicensePath;
399+ Q_EMIT hereLicensePathChanged();
400+ }
401+ watcher->deleteLater();
402+ });
403+ if (!async) {
404+ watcher->waitForFinished();
405+ delete watcher;
208406 }
209407}
210408
@@ -215,8 +413,12 @@ uint AccountsService::failedLogins() const
215413
216414void AccountsService::setFailedLogins(uint failedLogins)
217415{
218− m_failedLogins = failedLogins;
219− m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);
416+ if (m_failedLogins != failedLogins) {
417+ m_failedLogins = failedLogins;
418+ m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService.Private", "FailedLogins", failedLogins);
419+
420+ Q_EMIT failedLoginsChanged();
421+ }
220422}
221423
222424void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
plugins/AccountsService/AccountsService.h+9−9
@@ -107,15 +107,15 @@ private Q_SLOTS:
107107 void maybeChanged(const QString &user);
108108
109109private:
110− void updateDemoEdges();
111− void updateEnableLauncherWhileLocked();
112− void updateEnableIndicatorsWhileLocked();
113− void updateBackgroundFile();
114− void updateStatsWelcomeScreen();
115− void updatePasswordDisplayHint();
116− void updateFailedLogins();
117− void updateHereEnabled();
118− void updateHereLicensePath();
110+ void updateDemoEdges(bool async = true);
111+ void updateEnableLauncherWhileLocked(bool async = true);
112+ void updateEnableIndicatorsWhileLocked(bool async = true);
113+ void updateBackgroundFile(bool async = true);
114+ void updateStatsWelcomeScreen(bool async = true);
115+ void updatePasswordDisplayHint(bool async = true);
116+ void updateFailedLogins(bool async = true);
117+ void updateHereEnabled(bool async = true);
118+ void updateHereLicensePath(bool async = true);
119119
120120 AccountsServiceDBusAdaptor *m_service;
121121 QString m_user;
plugins/AccountsService/AccountsService.qmltypes+3
@@ -29,5 +29,8 @@ Module {
2929 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
3030 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
3131 Property { name: "failedLogins"; type: "uint" }
32+ Property { name: "hereEnabled"; type: "bool" }
33+ Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
34+ Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
3235 }
3336}
plugins/AccountsService/AccountsServiceDBusAdaptor.cpp+30−2
@@ -25,7 +25,8 @@
2525AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)
2626 : QObject(parent),
2727 m_accountsManager(nullptr),
28− m_users()
28+ m_users(),
29+ m_ignoreNextChanged(false)
2930{
3031 QDBusConnection connection = QDBusConnection::SM_BUSNAME();
3132 QDBusConnectionInterface *interface = connection.interface();
@@ -48,6 +49,15 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const
4849 return QVariant();
4950}
5051
52+QDBusPendingReply<QDBusVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync(const QString &user, const QString &interface, const QString &property)
53+{
54+ QDBusInterface *iface = getUserInterface(user);
55+ if (iface != nullptr && iface->isValid()) {
56+ return iface->asyncCall("Get", interface, property);
57+ }
58+ return QDBusPendingReply<QVariant>(QDBusMessage::createError(QDBusError::Other, "Invalid Interface"));
59+}
60+
5161void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
5262{
5363 QDBusInterface *iface = getUserInterface(user);
@@ -57,6 +67,16 @@ void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QStr
5767 }
5868}
5969
70+QDBusPendingCall AccountsServiceDBusAdaptor::setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value)
71+{
72+ QDBusInterface *iface = getUserInterface(user);
73+ if (iface != nullptr && iface->isValid()) {
74+ // The value needs to be carefully wrapped
75+ return iface->asyncCall("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
76+ }
77+ return QDBusPendingCall::fromCompletedCall(QDBusMessage::createError(QDBusError::Other, "Invalid Interface"));
78+}
79+
6080void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
6181{
6282 // Merge changed and invalidated together
@@ -66,11 +86,19 @@ void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface,
6686 combined.removeDuplicates();
6787
6888 Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
89+
90+ // In case a non-builtin property changes, we're getting propertiesChanged *and* changed
91+ // As the generic changed requires asking back over DBus, it's quite slow to process.
92+ // We don't want to trigger that when we know it's not a built-in property change.
93+ m_ignoreNextChanged = true;
6994}
7095
7196void AccountsServiceDBusAdaptor::maybeChangedSlot()
7297{
73− Q_EMIT maybeChanged(getUserForPath(message().path()));
98+ if (!m_ignoreNextChanged) {
99+ Q_EMIT maybeChanged(getUserForPath(message().path()));
100+ }
101+ m_ignoreNextChanged = false;
74102}
75103
76104QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
plugins/AccountsService/AccountsServiceDBusAdaptor.h+16
@@ -19,8 +19,10 @@
1919#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
2020#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
2121
22+#include <QDBusArgument>
2223#include <QDBusContext>
2324#include <QDBusInterface>
25+#include <QDBusPendingReply>
2426#include <QMap>
2527#include <QObject>
2628#include <QString>
@@ -33,7 +35,19 @@ public:
3335 explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
3436
3537 Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);
38+ Q_INVOKABLE QDBusPendingReply<QDBusVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);
39+
40+ template <typename T>
41+ inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {
42+ QVariant variant = getUserProperty(user, interface, property);
43+ if (variant.isValid() && variant.canConvert<QDBusArgument>()) {
44+ return qdbus_cast<T>(variant.value<QDBusArgument>());
45+ }
46+ return T();
47+ }
48+
3649 Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
50+ Q_INVOKABLE QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
3751
3852Q_SIGNALS:
3953 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -49,6 +63,8 @@ private:
4963
5064 QDBusInterface *m_accountsManager;
5165 QMap<QString, QDBusInterface *> m_users;
66+
67+ bool m_ignoreNextChanged;
5268};
5369
5470#endif
plugins/AccountsService/com.canonical.unity.AccountsService.xml+1−2
@@ -14,8 +14,7 @@
1414 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
1515 </property>
1616
17− <!-- Should have been named LauncherItems, sorry folks. -mterry -->
18− <property name="launcher-items" type="aa{sv}" access="readwrite">
17+ <property name="LauncherItems" type="aa{sv}" access="readwrite">
1918 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
2019 </property>
2120
plugins/CMakeLists.txt+1
@@ -12,6 +12,7 @@ macro(add_unity8_plugin PLUGIN VERSION PATH)
1212endmacro()
1313
1414add_subdirectory(AccountsService)
15+add_subdirectory(Greeter)
1516add_subdirectory(LightDM)
1617add_subdirectory(Lights)
1718add_subdirectory(Dash)
plugins/Dash/CardAttributes.qml+2
@@ -49,6 +49,8 @@ GridLayout {
4949 Icon {
5050 id: icon
5151 height: units.gu(2)
52+ // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
53+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
5254 source: "icon" in modelData && modelData["icon"] || ""
5355 color: grid.color
5456 }
plugins/Dash/CardCreator.js+4
@@ -224,6 +224,8 @@ var kTitleLabelCode = 'Label { \n\
224224
225225// %1 is used as extra anchors of emblemIcon
226226// %2 is used as color of emblemIcon
227+// FIXME The width code is a
228+// Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
227229var kEmblemIconCode = 'Icon { \n\
228230 id: emblemIcon; \n\
229231 objectName: "emblemIcon"; \n\
@@ -235,6 +237,7 @@ var kEmblemIconCode = 'Icon { \n\
235237 source: cardData && cardData["emblem"] || ""; \n\
236238 color: %2; \n\
237239 height: source != "" ? titleLabel.font.pixelSize : 0; \n\
240+ width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth; \n\
238241 }\n';
239242
240243// %1 is used as anchors of touchdown effect
@@ -255,6 +258,7 @@ var kSubtitleLabelCode = 'Label { \n\
255258 anchors { %1 } \n\
256259 anchors.topMargin: units.dp(2); \n\
257260 elide: Text.ElideRight; \n\
261+ maximumLineCount: 1; \n\
258262 fontSize: "x-small"; \n\
259263 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
260264 color: %2; \n\
plugins/Dash/Dash.qmltypes+17−1
@@ -15,9 +15,25 @@ Module {
1515 Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
1616 Property { name: "columnSpacing"; type: "double" }
1717 Property { name: "rowSpacing"; type: "double" }
18+ Property { name: "cacheBuffer"; type: "int" }
1819 Property { name: "displayMarginBeginning"; type: "double" }
1920 Property { name: "displayMarginEnd"; type: "double" }
2021 }
22+ Component {
23+ name: "CroppedImageSizer"
24+ prototype: "QObject"
25+ exports: ["Dash/CroppedImageSizer 0.1"]
26+ exportMetaObjectRevisions: [0]
27+ Property { name: "source"; type: "QUrl" }
28+ Property { name: "width"; type: "double" }
29+ Property { name: "height"; type: "double" }
30+ Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
31+ Signal { name: "inputParamsChanged" }
32+ Method {
33+ name: "setImageSize"
34+ Parameter { name: "imageSize"; type: "QSize" }
35+ }
36+ }
2137 Component {
2238 name: "HorizontalJournal"
2339 defaultProperty: "data"
@@ -40,7 +56,7 @@ Module {
4056 Property { name: "forceNoClip"; type: "bool" }
4157 Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }
4258 Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }
43− Property { name: "cacheBuffer"; type: "double" }
59+ Property { name: "cacheBuffer"; type: "int" }
4460 Signal { name: "headerChanged" }
4561 Method { name: "positionAtBeginning" }
4662 Method { name: "showHeader" }
plugins/Dash/listviewwithpageheader.cpp+7−8
@@ -973,14 +973,13 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
973973 }
974974 if (growDown) {
975975 adjustMinYExtent();
976− } else if (remove.index <= m_firstVisibleIndex) {
977− if (!m_visibleItems.isEmpty()) {
978− // We removed the first item that is the one that positions the rest
979− // position the new first item correctly
980− m_visibleItems.first()->setY(oldFirstValidIndexPos);
981− } else {
982− m_firstVisibleIndex = -1;
983− }
976+ } else if (remove.index <= m_firstVisibleIndex && !m_visibleItems.isEmpty()) {
977+ m_visibleItems.first()->setY(oldFirstValidIndexPos);
978+ }
979+ if (m_visibleItems.isEmpty()) {
980+ m_firstVisibleIndex = -1;
981+ } else {
982+ m_firstVisibleIndex -= qMax(0, m_firstVisibleIndex - remove.index);
984983 }
985984 } else if (remove.index + remove.count <= m_firstVisibleIndex) {
986985 m_firstVisibleIndex -= remove.count;
plugins/Greeter/CMakeLists.txtnew file+6
@@ -0,0 +1,6 @@
1+macro(add_unity8_greeter_plugin PLUGIN VERSION PATH)
2+ export_qmlfiles(${PLUGIN} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})
3+ export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} DESTINATION ${SHELL_INSTALL_QML}/Greeter TARGET_PREFIX Greeter ${ARGN})
4+endmacro()
5+
6+add_subdirectory(Unity)
plugins/Greeter/Unity/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(Launcher)
plugins/Greeter/Unity/Launcher/CMakeLists.txtnew file+38
@@ -0,0 +1,38 @@
1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
2+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
3+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4+
5+add_definitions(-DSM_BUSNAME=systemBus)
6+
7+include_directories(
8+ ${CMAKE_CURRENT_SOURCE_DIR}
9+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService
10+ ${GSETTINGS_QT_INCLUDE_DIRS}
11+ ${libunity8-private_SOURCE_DIR}
12+)
13+
14+set(QMLLAUNCHERPLUGINAS_SRC
15+ plugin.cpp
16+ launchermodelas.cpp
17+ launcheritem.cpp
18+ quicklistmodel.cpp
19+ quicklistentry.cpp
20+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
21+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
22+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
23+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
24+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
25+ )
26+
27+add_library(UnityLauncherAS-qml MODULE
28+ ${QMLLAUNCHERPLUGINAS_SRC}
29+ )
30+
31+target_link_libraries(UnityLauncherAS-qml
32+ unity8-private
33+ ${GSETTINGS_QT_LDFLAGS}
34+ )
35+
36+qt5_use_modules(UnityLauncherAS-qml DBus Qml Gui)
37+
38+add_unity8_greeter_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncherAS-qml)
plugins/Greeter/Unity/Launcher/Launcher.qmltypesnew file+182
@@ -0,0 +1,182 @@
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 Unity.Launcher 0.1 plugins/Greeter'
8+
9+Module {
10+ Component {
11+ name: "LauncherItem"
12+ prototype: "unity::shell::launcher::LauncherItemInterface"
13+ exports: ["Unity.Launcher/LauncherItem 0.1"]
14+ isCreatable: false
15+ exportMetaObjectRevisions: [0]
16+ }
17+ Component {
18+ name: "LauncherModel"
19+ prototype: "unity::shell::launcher::LauncherModelInterface"
20+ exports: ["Unity.Launcher/LauncherModel 0.1"]
21+ isCreatable: false
22+ isSingleton: true
23+ exportMetaObjectRevisions: [0]
24+ Method {
25+ name: "requestRemove"
26+ Parameter { name: "appId"; type: "string" }
27+ }
28+ Method { name: "refresh" }
29+ Method {
30+ name: "get"
31+ type: "unity::shell::launcher::LauncherItemInterface*"
32+ Parameter { name: "index"; type: "int" }
33+ }
34+ Method {
35+ name: "move"
36+ Parameter { name: "oldIndex"; type: "int" }
37+ Parameter { name: "newIndex"; type: "int" }
38+ }
39+ Method {
40+ name: "pin"
41+ Parameter { name: "appId"; type: "string" }
42+ Parameter { name: "index"; type: "int" }
43+ }
44+ Method {
45+ name: "pin"
46+ Parameter { name: "appId"; type: "string" }
47+ }
48+ Method {
49+ name: "quickListActionInvoked"
50+ Parameter { name: "appId"; type: "string" }
51+ Parameter { name: "actionIndex"; type: "int" }
52+ }
53+ Method {
54+ name: "setUser"
55+ Parameter { name: "username"; type: "string" }
56+ }
57+ Method {
58+ name: "getUrlForAppId"
59+ type: "string"
60+ Parameter { name: "appId"; type: "string" }
61+ }
62+ }
63+ Component {
64+ name: "QuickListModel"
65+ prototype: "unity::shell::launcher::QuickListModelInterface"
66+ exports: ["Unity.Launcher/QuickListModel 0.1"]
67+ isCreatable: false
68+ exportMetaObjectRevisions: [0]
69+ }
70+ Component {
71+ name: "unity::shell::launcher::LauncherItemInterface"
72+ prototype: "QObject"
73+ exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
74+ isCreatable: false
75+ exportMetaObjectRevisions: [0]
76+ Property { name: "appId"; type: "string"; isReadonly: true }
77+ Property { name: "name"; type: "string"; isReadonly: true }
78+ Property { name: "icon"; type: "string"; isReadonly: true }
79+ Property { name: "pinned"; type: "bool"; isReadonly: true }
80+ Property { name: "running"; type: "bool"; isReadonly: true }
81+ Property { name: "recent"; type: "bool"; isReadonly: true }
82+ Property { name: "progress"; type: "int"; isReadonly: true }
83+ Property { name: "count"; type: "int"; isReadonly: true }
84+ Property { name: "countVisible"; type: "bool"; isReadonly: true }
85+ Property { name: "focused"; type: "bool"; isReadonly: true }
86+ Property {
87+ name: "quickList"
88+ type: "unity::shell::launcher::QuickListModelInterface"
89+ isReadonly: true
90+ isPointer: true
91+ }
92+ Signal {
93+ name: "nameChanged"
94+ Parameter { name: "name"; type: "string" }
95+ }
96+ Signal {
97+ name: "iconChanged"
98+ Parameter { name: "icon"; type: "string" }
99+ }
100+ Signal {
101+ name: "pinnedChanged"
102+ Parameter { name: "pinned"; type: "bool" }
103+ }
104+ Signal {
105+ name: "runningChanged"
106+ Parameter { name: "running"; type: "bool" }
107+ }
108+ Signal {
109+ name: "recentChanged"
110+ Parameter { name: "running"; type: "bool" }
111+ }
112+ Signal {
113+ name: "progressChanged"
114+ Parameter { name: "progress"; type: "int" }
115+ }
116+ Signal {
117+ name: "countChanged"
118+ Parameter { name: "count"; type: "int" }
119+ }
120+ Signal {
121+ name: "countVisibleChanged"
122+ Parameter { name: "countVisible"; type: "bool" }
123+ }
124+ Signal {
125+ name: "focusedChanged"
126+ Parameter { name: "focused"; type: "bool" }
127+ }
128+ }
129+ Component {
130+ name: "unity::shell::launcher::LauncherModelInterface"
131+ prototype: "QAbstractListModel"
132+ exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
133+ isCreatable: false
134+ exportMetaObjectRevisions: [0]
135+ Property {
136+ name: "applicationManager"
137+ type: "unity::shell::application::ApplicationManagerInterface"
138+ isPointer: true
139+ }
140+ Property { name: "onlyPinned"; type: "bool" }
141+ Signal { name: "hint" }
142+ Method {
143+ name: "move"
144+ Parameter { name: "oldIndex"; type: "int" }
145+ Parameter { name: "newIndex"; type: "int" }
146+ }
147+ Method {
148+ name: "get"
149+ type: "unity::shell::launcher::LauncherItemInterface*"
150+ Parameter { name: "index"; type: "int" }
151+ }
152+ Method {
153+ name: "pin"
154+ Parameter { name: "appId"; type: "string" }
155+ Parameter { name: "index"; type: "int" }
156+ }
157+ Method {
158+ name: "pin"
159+ Parameter { name: "appId"; type: "string" }
160+ }
161+ Method {
162+ name: "requestRemove"
163+ Parameter { name: "appId"; type: "string" }
164+ }
165+ Method {
166+ name: "quickListActionInvoked"
167+ Parameter { name: "appId"; type: "string" }
168+ Parameter { name: "actionIndex"; type: "int" }
169+ }
170+ Method {
171+ name: "setUser"
172+ Parameter { name: "username"; type: "string" }
173+ }
174+ }
175+ Component {
176+ name: "unity::shell::launcher::QuickListModelInterface"
177+ prototype: "QAbstractListModel"
178+ exports: ["Unity.Launcher/QuickListInterface 0.1"]
179+ isCreatable: false
180+ exportMetaObjectRevisions: [0]
181+ }
182+}
plugins/Greeter/Unity/Launcher/launcheritem.cppnew file+171
@@ -0,0 +1,171 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "launcheritem.h"
18+#include "quicklistmodel.h"
19+
20+#include <libintl.h>
21+
22+LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :
23+ LauncherItemInterface(parent),
24+ m_appId(appId),
25+ m_name(name),
26+ m_icon(icon),
27+ m_pinned(false),
28+ m_running(false),
29+ m_recent(false),
30+ m_progress(-1),
31+ m_count(0),
32+ m_countVisible(false),
33+ m_focused(false),
34+ m_quickList(new QuickListModel(this))
35+{
36+ QuickListEntry nameAction;
37+ nameAction.setActionId("launch_item");
38+ nameAction.setText(m_name);
39+ m_quickList->appendAction(nameAction);
40+}
41+
42+QString LauncherItem::appId() const
43+{
44+ return m_appId;
45+}
46+
47+QString LauncherItem::name() const
48+{
49+ return m_name;
50+}
51+
52+void LauncherItem::setName(const QString &name)
53+{
54+ if (m_name != name) {
55+ m_name = name;
56+ QuickListEntry entry;
57+ entry.setActionId("launch_item");
58+ entry.setText(m_name);
59+ m_quickList->updateAction(entry);
60+ Q_EMIT nameChanged(name);
61+ }
62+}
63+
64+QString LauncherItem::icon() const
65+{
66+ return m_icon;
67+}
68+
69+void LauncherItem::setIcon(const QString &icon)
70+{
71+ if (m_icon != icon) {
72+ m_icon = icon;
73+ Q_EMIT iconChanged(icon);
74+ }
75+}
76+
77+bool LauncherItem::pinned() const
78+{
79+ return m_pinned;
80+}
81+
82+void LauncherItem::setPinned(bool pinned)
83+{
84+ if (m_pinned != pinned) {
85+ m_pinned = pinned;
86+ Q_EMIT pinnedChanged(pinned);
87+ }
88+}
89+
90+bool LauncherItem::running() const
91+{
92+ return m_running;
93+}
94+
95+void LauncherItem::setRunning(bool running)
96+{
97+ if (m_running != running) {
98+ m_running = running;
99+ Q_EMIT runningChanged(running);
100+ }
101+}
102+
103+bool LauncherItem::recent() const
104+{
105+ return m_recent;
106+}
107+
108+void LauncherItem::setRecent(bool recent)
109+{
110+ if (m_recent != recent) {
111+ m_recent = recent;
112+ Q_EMIT recentChanged(recent);
113+ }
114+}
115+
116+int LauncherItem::progress() const
117+{
118+ return m_progress;
119+}
120+
121+void LauncherItem::setProgress(int progress)
122+{
123+ if (m_progress != progress) {
124+ m_progress = progress;
125+ Q_EMIT progressChanged(progress);
126+ }
127+}
128+
129+int LauncherItem::count() const
130+{
131+ return m_count;
132+}
133+
134+void LauncherItem::setCount(int count)
135+{
136+ if (m_count != count) {
137+ m_count = count;
138+ Q_EMIT countChanged(count);
139+ }
140+}
141+
142+bool LauncherItem::countVisible() const
143+{
144+ return m_countVisible;
145+}
146+
147+void LauncherItem::setCountVisible(bool countVisible)
148+{
149+ if (m_countVisible != countVisible) {
150+ m_countVisible = countVisible;
151+ Q_EMIT countVisibleChanged(countVisible);
152+ }
153+}
154+
155+bool LauncherItem::focused() const
156+{
157+ return m_focused;
158+}
159+
160+void LauncherItem::setFocused(bool focused)
161+{
162+ if (m_focused != focused) {
163+ m_focused = focused;
164+ Q_EMIT focusedChanged(focused);
165+ }
166+}
167+
168+unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
169+{
170+ return m_quickList;
171+}
plugins/Greeter/Unity/Launcher/launcheritem.hnew file+74
@@ -0,0 +1,74 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef LAUNCHERITEM_H
18+#define LAUNCHERITEM_H
19+
20+#include "quicklistmodel.h"
21+
22+#include <unity/shell/launcher/LauncherItemInterface.h>
23+
24+class QuickListModel;
25+
26+using namespace unity::shell::launcher;
27+
28+class LauncherItem: public LauncherItemInterface
29+{
30+ Q_OBJECT
31+public:
32+ LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
33+
34+ QString appId() const override;
35+ QString name() const override;
36+ QString icon() const override;
37+ bool pinned() const override;
38+ bool running() const override;
39+ bool recent() const override;
40+ int progress() const override;
41+ int count() const override;
42+ bool countVisible() const override;
43+ bool focused() const override;
44+
45+ unity::shell::launcher::QuickListModelInterface *quickList() const override;
46+
47+private:
48+ void setName(const QString &name);
49+ void setIcon(const QString &icon);
50+ void setPinned(bool pinned);
51+ void setRunning(bool running);
52+ void setRecent(bool recent);
53+ void setProgress(int progress);
54+ void setCount(int count);
55+ void setCountVisible(bool countVisible);
56+ void setFocused(bool focused);
57+
58+private:
59+ QString m_appId;
60+ QString m_name;
61+ QString m_icon;
62+ bool m_pinned;
63+ bool m_running;
64+ bool m_recent;
65+ int m_progress;
66+ int m_count;
67+ bool m_countVisible;
68+ bool m_focused;
69+ QuickListModel *m_quickList;
70+
71+ friend class LauncherModel;
72+};
73+
74+#endif // LAUNCHERITEM_H
plugins/Greeter/Unity/Launcher/launchermodelas.cppnew file+277
@@ -0,0 +1,277 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "launchermodelas.h"
18+#include "launcheritem.h"
19+#include "AccountsServiceDBusAdaptor.h"
20+#include <unity/shell/application/ApplicationInfoInterface.h>
21+
22+#include <QDesktopServices>
23+#include <QDebug>
24+#include <QDBusArgument>
25+
26+using namespace unity::shell::application;
27+
28+LauncherModel::LauncherModel(QObject *parent):
29+ LauncherModelInterface(parent),
30+ m_accounts(new AccountsServiceDBusAdaptor(this)),
31+ m_onlyPinned(true)
32+{
33+ connect(m_accounts, &AccountsServiceDBusAdaptor::propertiesChanged, this, &LauncherModel::propertiesChanged);
34+ refresh();
35+}
36+
37+LauncherModel::~LauncherModel()
38+{
39+ while (!m_list.empty()) {
40+ m_list.takeFirst()->deleteLater();
41+ }
42+}
43+
44+int LauncherModel::rowCount(const QModelIndex &parent) const
45+{
46+ Q_UNUSED(parent)
47+ return m_list.count();
48+}
49+
50+QVariant LauncherModel::data(const QModelIndex &index, int role) const
51+{
52+ LauncherItem *item = m_list.at(index.row());
53+ switch(role) {
54+ case RoleAppId:
55+ return item->appId();
56+ case RoleName:
57+ return item->name();
58+ case RoleIcon:
59+ return item->icon();
60+ case RolePinned:
61+ return item->pinned();
62+ case RoleCount:
63+ return item->count();
64+ case RoleCountVisible:
65+ return item->countVisible();
66+ case RoleProgress:
67+ return item->progress();
68+ case RoleFocused:
69+ return item->focused();
70+ }
71+
72+ return QVariant();
73+}
74+
75+unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
76+{
77+ if (index < 0 || index >= m_list.count()) {
78+ return 0;
79+ }
80+ return m_list.at(index);
81+}
82+
83+void LauncherModel::move(int oldIndex, int newIndex)
84+{
85+ Q_UNUSED(oldIndex)
86+ Q_UNUSED(newIndex)
87+ qWarning() << "This is a read only implementation. Cannot move items.";
88+}
89+
90+void LauncherModel::pin(const QString &appId, int index)
91+{
92+ Q_UNUSED(appId)
93+ Q_UNUSED(index)
94+ qWarning() << "This is a read only implementation. Cannot pin items";
95+}
96+
97+void LauncherModel::requestRemove(const QString &appId)
98+{
99+ Q_UNUSED(appId)
100+ qWarning() << "This is a read only implementation. Cannot remove items";
101+}
102+
103+void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
104+{
105+ int index = findApplication(appId);
106+ if (index < 0) {
107+ return;
108+ }
109+
110+ LauncherItem *item = m_list.at(index);
111+ QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
112+ if (model) {
113+ QString actionId = model->get(actionIndex).actionId();
114+
115+ // Check if this is one of the launcher actions we handle ourselves
116+ if (actionId == "launch_item") {
117+ QDesktopServices::openUrl(getUrlForAppId(appId));
118+
119+ // Nope, we don't know this action, let the backend forward it to the application
120+ } else {
121+ // TODO: forward quicklist action to app, possibly via m_dbusIface
122+ }
123+ }
124+}
125+
126+void LauncherModel::setUser(const QString &username)
127+{
128+ if (m_user != username) {
129+ m_user = username;
130+ refresh();
131+ }
132+}
133+
134+QString LauncherModel::getUrlForAppId(const QString &appId) const
135+{
136+ // appId is either an appId or a legacy app name. Let's find out which
137+ if (appId.isEmpty()) {
138+ return QString();
139+ }
140+
141+ if (!appId.contains("_")) {
142+ return "application:///" + appId + ".desktop";
143+ }
144+
145+ QStringList parts = appId.split('_');
146+ QString package = parts.value(0);
147+ QString app = parts.value(1, "first-listed-app");
148+ return "appid://" + package + "/" + app + "/current-user-version";
149+}
150+
151+ApplicationManagerInterface *LauncherModel::applicationManager() const
152+{
153+ return nullptr;
154+}
155+
156+void LauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager)
157+{
158+ Q_UNUSED(appManager)
159+ qWarning() << "This plugin syncs all its states from AccountsService. Not using ApplicationManager.";
160+ return;
161+}
162+
163+bool LauncherModel::onlyPinned() const
164+{
165+ return m_onlyPinned;
166+}
167+
168+void LauncherModel::setOnlyPinned(bool onlyPinned)
169+{
170+ if (m_onlyPinned != onlyPinned) {
171+ m_onlyPinned = onlyPinned;
172+ Q_EMIT onlyPinnedChanged();
173+ refresh();
174+ }
175+}
176+
177+int LauncherModel::findApplication(const QString &appId)
178+{
179+ for (int i = 0; i < m_list.count(); ++i) {
180+ LauncherItem *item = m_list.at(i);
181+ if (item->appId() == appId) {
182+ return i;
183+ }
184+ }
185+ return -1;
186+}
187+
188+typedef QList<QVariantMap> VariantMapList;
189+void LauncherModel::refresh()
190+{
191+ QList<QVariantMap> items;
192+
193+ if (m_accounts && !m_user.isEmpty()) {
194+ items = m_accounts->getUserProperty<VariantMapList>(m_user, "com.canonical.unity.AccountsService", "LauncherItems");
195+ }
196+
197+ // First walk through all the existing items and see if we need to remove something
198+ QList<LauncherItem*> toBeRemoved;
199+
200+ Q_FOREACH (LauncherItem* item, m_list) {
201+ bool found = false;
202+ Q_FOREACH(const QVariant &asItem, items) {
203+ if (asItem.toMap().value("id").toString() == item->appId()) {
204+ // Only keep and update it if we either show unpinned or it is pinned
205+ if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {
206+ found = true;
207+ item->setName(asItem.toMap().value("name").toString());
208+ item->setIcon(asItem.toMap().value("icon").toString());
209+ item->setCount(asItem.toMap().value("count").toInt());
210+ item->setCountVisible(asItem.toMap().value("countVisible").toBool());
211+ int idx = m_list.indexOf(item);
212+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
213+ }
214+ break;
215+ }
216+ }
217+ if (!found) {
218+ toBeRemoved.append(item);
219+ }
220+ }
221+
222+ Q_FOREACH (LauncherItem* item, toBeRemoved) {
223+ int idx = m_list.indexOf(item);
224+ beginRemoveRows(QModelIndex(), idx, idx);
225+ m_list.takeAt(idx)->deleteLater();
226+ endRemoveRows();
227+ }
228+
229+ // Now walk through list and see if we need to add something
230+ int skipped = 0;
231+ for (int asIndex = 0; asIndex < items.count(); ++asIndex) {
232+ QVariant entry = items.at(asIndex);
233+
234+ if (m_onlyPinned && !entry.toMap().value("pinned").toBool()) {
235+ // Skipping it as we only show pinned and it is not
236+ skipped++;
237+ continue;
238+ }
239+ int newPosition = asIndex - skipped;
240+
241+ int itemIndex = -1;
242+ for (int i = 0; i < m_list.count(); ++i) {
243+ if (m_list.at(i)->appId() == entry.toMap().value("id").toString()) {
244+ itemIndex = i;
245+ break;
246+ }
247+ }
248+
249+ if (itemIndex == -1) {
250+ // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
251+ LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),
252+ entry.toMap().value("name").toString(),
253+ entry.toMap().value("icon").toString(),
254+ this);
255+ item->setPinned(true);
256+ item->setCount(entry.toMap().value("count").toInt());
257+ item->setCountVisible(entry.toMap().value("countVisible").toBool());
258+ beginInsertRows(QModelIndex(), newPosition, newPosition);
259+ m_list.insert(newPosition, item);
260+ endInsertRows();
261+ } else if (itemIndex != newPosition) {
262+ // The item is already there, but it is in a different place than in the settings.
263+ // Move it to the addedIndex
264+ beginMoveRows(QModelIndex(), itemIndex, itemIndex, QModelIndex(), newPosition);
265+ m_list.move(itemIndex, newPosition);
266+ endMoveRows();
267+ }
268+ }
269+}
270+
271+void LauncherModel::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
272+{
273+ if (user != m_user || interface != "com.canonical.unity.AccountsService" || !changed.contains("LauncherItems")) {
274+ return;
275+ }
276+ refresh();
277+}
plugins/Greeter/Unity/Launcher/launchermodelas.hnew file+75
@@ -0,0 +1,75 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef LAUNCHERMODEL_H
18+#define LAUNCHERMODEL_H
19+
20+#include <unity/shell/launcher/LauncherModelInterface.h>
21+#include <unity/shell/application/ApplicationManagerInterface.h>
22+
23+#include <QAbstractListModel>
24+
25+class LauncherItem;
26+class GSettings;
27+class AccountsServiceDBusAdaptor;
28+
29+using namespace unity::shell::launcher;
30+using namespace unity::shell::application;
31+
32+class LauncherModel: public LauncherModelInterface
33+{
34+ Q_OBJECT
35+
36+public:
37+ LauncherModel(QObject *parent = 0);
38+ ~LauncherModel();
39+
40+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
41+
42+ QVariant data(const QModelIndex &index, int role) const;
43+
44+ Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
45+ Q_INVOKABLE void move(int oldIndex, int newIndex);
46+ Q_INVOKABLE void pin(const QString &appId, int index = -1);
47+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
48+ Q_INVOKABLE void setUser(const QString &username);
49+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
50+
51+ unity::shell::application::ApplicationManagerInterface* applicationManager() const;
52+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
53+
54+ bool onlyPinned() const override;
55+ void setOnlyPinned(bool onlyPinned) override;
56+
57+ int findApplication(const QString &appId);
58+
59+public Q_SLOTS:
60+ void requestRemove(const QString &appId) override;
61+ Q_INVOKABLE void refresh();
62+
63+private Q_SLOTS:
64+ void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
65+
66+private:
67+ QString m_user;
68+ QList<LauncherItem*> m_list;
69+ AccountsServiceDBusAdaptor *m_accounts;
70+ bool m_onlyPinned;
71+
72+ friend class LauncherModelASTest;
73+};
74+
75+#endif // LAUNCHERMODEL_H
plugins/Greeter/Unity/Launcher/plugin.cppnew file+46
@@ -0,0 +1,46 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+// Qt
18+#include <QtQml/qqml.h>
19+
20+// self
21+#include "plugin.h"
22+
23+// local
24+#include "launchermodelas.h"
25+#include "launcheritem.h"
26+
27+
28+using namespace unity::shell::launcher;
29+
30+static QObject* modelProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
31+{
32+ return new LauncherModel();
33+}
34+
35+void UnityLauncherPlugin::registerTypes(const char *uri)
36+{
37+ Q_ASSERT(uri == QLatin1String("Unity.Launcher"));
38+
39+ qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
40+ qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
41+ qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListInterface", "Abstract Interface. Cannot be instantiated.");
42+
43+ qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
44+ qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
45+ qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", "Can't create a QuickListModel in QML. Get them from the LauncherItems.");
46+}
plugins/Greeter/Unity/Launcher/plugin.hnew file+32
@@ -0,0 +1,32 @@
1+/*
2+ * Copyright (C) 2014-2015 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 UNITY_LAUNCHER_PLUGIN_H
18+#define UNITY_LAUNCHER_PLUGIN_H
19+
20+#include <QtQml/QQmlEngine>
21+#include <QtQml/QQmlExtensionPlugin>
22+
23+class UnityLauncherPlugin : 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/Greeter/Unity/Launcher/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Unity.Launcher
2+plugin UnityLauncherAS-qml
3+typeinfo Launcher.qmltypes
plugins/Greeter/Unity/Launcher/quicklistentry.cppnew file+56
@@ -0,0 +1,56 @@
1+/* Copyright (C) 2014-2015 Canonical, Ltd.
2+ *
3+ * This program is free software; you can redistribute it and/or modify
4+ * it under the terms of the GNU General Public License as published by
5+ * the Free Software Foundation; version 3.
6+ *
7+ * This program is distributed in the hope that it will be useful,
8+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
9+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+ * GNU General Public License for more details.
11+ *
12+ * You should have received a copy of the GNU General Public License
13+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
14+ */
15+
16+#include "quicklistentry.h"
17+
18+QuickListEntry::QuickListEntry()
19+{
20+
21+}
22+
23+QString QuickListEntry::actionId() const
24+{
25+ return m_actionId;
26+}
27+
28+void QuickListEntry::setActionId(const QString &actionId)
29+{
30+ m_actionId = actionId;
31+}
32+
33+QString QuickListEntry::text() const
34+{
35+ return m_text;
36+}
37+
38+void QuickListEntry::setText(const QString &text)
39+{
40+ m_text = text;
41+}
42+
43+QString QuickListEntry::icon() const
44+{
45+ return m_icon;
46+}
47+
48+void QuickListEntry::setIcon(const QString &icon)
49+{
50+ m_icon = icon;
51+}
52+
53+bool QuickListEntry::clickable() const
54+{
55+ return !m_actionId.isEmpty();
56+}
plugins/Greeter/Unity/Launcher/quicklistentry.hnew file+43
@@ -0,0 +1,43 @@
1+/* Copyright (C) 2014-2015 Canonical, Ltd.
2+ *
3+ * This program is free software; you can redistribute it and/or modify
4+ * it under the terms of the GNU General Public License as published by
5+ * the Free Software Foundation; version 3.
6+ *
7+ * This program is distributed in the hope that it will be useful,
8+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
9+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+ * GNU General Public License for more details.
11+ *
12+ * You should have received a copy of the GNU General Public License
13+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
14+ */
15+
16+#ifndef QUICKLISTENTRY_H
17+#define QUICKLISTENTRY_H
18+
19+#include <QString>
20+
21+class QuickListEntry
22+{
23+public:
24+ QuickListEntry();
25+
26+ QString actionId() const;
27+ void setActionId(const QString &actionId);
28+
29+ QString text() const;
30+ void setText(const QString &text);
31+
32+ QString icon() const;
33+ void setIcon(const QString &icon);
34+
35+ bool clickable() const;
36+
37+private:
38+ QString m_actionId;
39+ QString m_text;
40+ QString m_icon;
41+};
42+
43+#endif // QUICKLISTENTRY
plugins/Greeter/Unity/Launcher/quicklistmodel.cppnew file+70
@@ -0,0 +1,70 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "quicklistmodel.h"
18+
19+QuickListModel::QuickListModel(QObject *parent) :
20+ QuickListModelInterface(parent)
21+{
22+
23+}
24+
25+QuickListModel::~QuickListModel()
26+{
27+
28+}
29+
30+void QuickListModel::appendAction(const QuickListEntry &entry)
31+{
32+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
33+ m_list.append(entry);
34+ endInsertRows();
35+}
36+
37+void QuickListModel::updateAction(const QuickListEntry &entry)
38+{
39+ for (int i = 0; i < m_list.count(); ++i) {
40+ if (m_list.at(i).actionId() == entry.actionId()) {
41+ m_list.replace(i, entry);
42+ Q_EMIT dataChanged(index(i), index(i));
43+ return;
44+ }
45+ }
46+}
47+
48+QuickListEntry QuickListModel::get(int index) const
49+{
50+ return m_list.at(index);
51+}
52+
53+int QuickListModel::rowCount(const QModelIndex &index) const
54+{
55+ Q_UNUSED(index)
56+ return m_list.count();
57+}
58+
59+QVariant QuickListModel::data(const QModelIndex &index, int role) const
60+{
61+ switch (role) {
62+ case RoleLabel:
63+ return m_list.at(index.row()).text();
64+ case RoleIcon:
65+ return m_list.at(index.row()).icon();
66+ case RoleClickable:
67+ return m_list.at(index.row()).clickable();
68+ }
69+ return QVariant();
70+}
plugins/Greeter/Unity/Launcher/quicklistmodel.hnew file+55
@@ -0,0 +1,55 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef QUICKLISTMODEL_H
18+#define QUICKLISTMODEL_H
19+
20+#include "quicklistentry.h"
21+
22+#include <unity/shell/launcher/QuickListModelInterface.h>
23+
24+using namespace unity::shell::launcher;
25+
26+class QuickListModel: public QuickListModelInterface
27+{
28+ Q_OBJECT
29+
30+public:
31+ explicit QuickListModel(QObject *parent = 0);
32+
33+ ~QuickListModel();
34+
35+ void appendAction(const QuickListEntry &entry);
36+
37+ /**
38+ * @brief Update an existing action
39+ * @param entry The new, updated entry
40+ *
41+ * This will only do something if entry.actionId is found in the model.
42+ * To add a new entry, use appendAction().
43+ */
44+ void updateAction(const QuickListEntry &entry);
45+
46+ QuickListEntry get(int index) const;
47+
48+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
49+ QVariant data(const QModelIndex &index, int role) const;
50+
51+private:
52+ QList<QuickListEntry> m_list;
53+};
54+
55+#endif // QUICKLISTMODEL_H
plugins/LightDM/LightDM.qmltypes+2−2
@@ -114,7 +114,7 @@ Module {
114114 Method { name: "invalidate" }
115115 }
116116 Component {
117− name: "QSortFilterProxyModelQML"
117+ name: "UnitySortFilterProxyModelQML"
118118 prototype: "QSortFilterProxyModel"
119119 Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
120120 Property { name: "totalCount"; type: "int"; isReadonly: true }
@@ -242,7 +242,7 @@ Module {
242242 }
243243 Component {
244244 name: "UsersModel"
245− prototype: "QSortFilterProxyModelQML"
245+ prototype: "UnitySortFilterProxyModelQML"
246246 exports: ["LightDM/Users 0.1"]
247247 isCreatable: false
248248 isSingleton: true
plugins/LightDM/liblightdm/Greeter.h−2
@@ -47,8 +47,6 @@ class Q_DECL_EXPORT Greeter : public QObject
4747 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
4848 Q_PROPERTY(bool locked READ lockHint CONSTANT)
4949
50− Q_PROPERTY(QString hostname READ hostname CONSTANT)
51−
5250 Q_ENUMS(PromptType MessageType)
5351
5452public:
plugins/ScreenGrabber/ScreenGrabber.qmltypes+1−1
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
44// It is used for QML tooling purposes only.
55//
66// This file was auto-generated by:
7−// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'
7+// 'qmlplugindump -notrelocatable ScreenGrabber 0.1 plugins'
88
99Module {
1010 Component {
plugins/ScreenGrabber/screengrabber.cpp+1−1
@@ -81,7 +81,7 @@ void ScreenGrabber::captureAndSave()
8181QString ScreenGrabber::makeFileName()
8282{
8383 QString fileName(fileNamePrefix);
84− fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));
84+ fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));
8585 fileName.append(".");
8686 fileName.append(getFormat());
8787 return fileName;
plugins/Ubuntu/Gestures/Gestures.qmltypes+15−1
@@ -33,7 +33,8 @@ Module {
3333 "Rightwards": 0,
3434 "Leftwards": 1,
3535 "Downwards": 2,
36− "Upwards": 3
36+ "Upwards": 3,
37+ "Horizontal": 4
3738 }
3839 }
3940 Method {
@@ -151,4 +152,17 @@ Module {
151152 exportMetaObjectRevisions: [0]
152153 Signal { name: "pressedOutside" }
153154 }
155+ Component {
156+ name: "TouchGate"
157+ defaultProperty: "data"
158+ prototype: "QQuickItem"
159+ exports: ["Ubuntu.Gestures/TouchGate 0.1"]
160+ exportMetaObjectRevisions: [0]
161+ Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
162+ Signal {
163+ name: "targetItemChanged"
164+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
165+ }
166+ Signal { name: "pressed" }
167+ }
154168}
plugins/Unity/Indicators/Indicators.qmltypes+10−38
@@ -55,10 +55,15 @@ Module {
5555 exports: ["Unity.Indicators/IndicatorsManager 0.1"]
5656 exportMetaObjectRevisions: [0]
5757 Property { name: "loaded"; type: "bool"; isReadonly: true }
58+ Property { name: "profile"; type: "string" }
5859 Signal {
5960 name: "loadedChanged"
6061 Parameter { type: "bool" }
6162 }
63+ Signal {
64+ name: "profileChanged"
65+ Parameter { type: "string" }
66+ }
6267 Signal {
6368 name: "indicatorLoaded"
6469 Parameter { name: "indicator_name"; type: "string" }
@@ -67,10 +72,7 @@ Module {
6772 name: "indicatorAboutToBeUnloaded"
6873 Parameter { name: "indicator_name"; type: "string" }
6974 }
70− Method {
71− name: "load"
72− Parameter { name: "profile"; type: "string" }
73− }
75+ Method { name: "load" }
7476 Method { name: "unload" }
7577 }
7678 Component {
@@ -79,14 +81,12 @@ Module {
7981 exports: ["Unity.Indicators/IndicatorsModel 0.1"]
8082 exportMetaObjectRevisions: [0]
8183 Property { name: "count"; type: "int"; isReadonly: true }
84+ Property { name: "profile"; type: "string" }
8285 Signal {
8386 name: "indicatorDataChanged"
8487 Parameter { name: "data"; type: "QVariant" }
8588 }
86− Method {
87− name: "load"
88− Parameter { name: "profile"; type: "string" }
89− }
89+ Method { name: "load" }
9090 Method { name: "unload" }
9191 Method {
9292 name: "data"
@@ -106,8 +106,7 @@ Module {
106106 values: {
107107 "Identifier": 0,
108108 "Position": 1,
109− "IndicatorProperties": 2,
110− "IsVisible": 3
109+ "IndicatorProperties": 2
111110 }
112111 }
113112 }
@@ -200,12 +199,6 @@ Module {
200199 }
201200 }
202201 }
203− Component {
204− name: "QAbstractProxyModel"
205− prototype: "QAbstractItemModel"
206− Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
207− }
208− Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
209202 Component {
210203 name: "RootStateObject"
211204 prototype: "QObject"
@@ -215,7 +208,7 @@ Module {
215208 Property { name: "rightLabel"; type: "string"; isReadonly: true }
216209 Property { name: "icons"; type: "QStringList"; isReadonly: true }
217210 Property { name: "accessibleName"; type: "string"; isReadonly: true }
218− Property { name: "visible"; type: "bool"; isReadonly: true }
211+ Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }
219212 Signal { name: "updated" }
220213 }
221214 Component {
@@ -268,25 +261,4 @@ Module {
268261 }
269262 Method { name: "pop"; type: "UnityMenuModel*" }
270263 }
271− Component {
272− name: "VisibleIndicatorsModel"
273− prototype: "QIdentityProxyModel"
274− exports: ["Unity.Indicators/VisibleIndicatorsModel 0.1"]
275− exportMetaObjectRevisions: [0]
276− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
277− Property { name: "visible"; type: "QVariantMap" }
278− Signal { name: "totalCountChanged" }
279− Method {
280− name: "onBeginRowInserted"
281− Parameter { type: "QModelIndex" }
282− Parameter { name: "start"; type: "int" }
283− Parameter { name: "end"; type: "int" }
284− }
285− Method {
286− name: "onRowInserted"
287− Parameter { type: "QModelIndex" }
288− Parameter { name: "start"; type: "int" }
289− Parameter { name: "end"; type: "int" }
290− }
291− }
292264}
plugins/Unity/Indicators/indicator.cpp+23−8
@@ -31,24 +31,26 @@ Indicator::~Indicator()
3131{
3232}
3333
34−void Indicator::init(const QString &profile, const QString& busName, const QSettings& settings)
34+void Indicator::init(const QString& busName, const QSettings& settings)
3535{
36− setId(settings.value("Indicator Service/Name").toString());
36+ // Save all keys we care about from the QSettings object. It's annoying
37+ // that we can't just copy the object.
38+ m_settings.clear();
39+ Q_FOREACH(const QString& key, settings.allKeys()) {
40+ if (key.endsWith("/Position") || key.endsWith("/ObjectPath")) {
41+ m_settings.insert(key, settings.value(key));
42+ }
43+ }
3744
38− QVariant pos = settings.value(profile + "/Position");
39− if (!pos.isValid())
40− pos = settings.value("Indicator Service/Position", QVariant::fromValue(0));
41− setPosition(pos.toInt());
45+ setId(settings.value("Indicator Service/Name").toString());
4246
4347 QString actionObjectPath = settings.value("Indicator Service/ObjectPath").toString();
44− QString menuObjectPath = settings.value(profile + "/ObjectPath").toString();
4548
4649 QVariantMap properties;
4750 properties.clear();
4851 properties.insert("busType", 1);
4952 properties.insert("busName", busName);
5053 properties.insert("actionsObjectPath", actionObjectPath);
51− properties.insert("menuObjectPath", menuObjectPath);
5254 setIndicatorProperties(properties);
5355}
5456
@@ -78,6 +80,19 @@ void Indicator::setPosition(int position)
7880 }
7981}
8082
83+void Indicator::setProfile(const QString& profile)
84+{
85+ QVariant pos = m_settings.value(profile + "/Position");
86+ if (!pos.isValid())
87+ pos = m_settings.value("Indicator Service/Position", QVariant::fromValue(0));
88+ setPosition(pos.toInt());
89+
90+ QString menuObjectPath = m_settings.value(profile + "/ObjectPath").toString();
91+ QVariantMap map = m_properties.toMap();
92+ map.insert("menuObjectPath", menuObjectPath);
93+ setIndicatorProperties(map);
94+}
95+
8196QVariant Indicator::indicatorProperties() const
8297{
8398 return m_properties;
plugins/Unity/Indicators/indicator.h+5−1
@@ -35,12 +35,15 @@ public:
3535 Indicator(QObject *parent = 0);
3636 virtual ~Indicator();
3737
38− void init(const QString &profile, const QString& busName, const QSettings& settings);
38+ void init(const QString& busName, const QSettings& settings);
3939
4040 QString identifier() const;
4141 int position() const;
4242 QVariant indicatorProperties() const;
4343
44+public Q_SLOTS:
45+ void setProfile(const QString& profile);
46+
4447Q_SIGNALS:
4548 void identifierChanged(const QString &identifier);
4649 void positionChanged(int position);
@@ -55,6 +58,7 @@ private:
5558 QString m_identifier;
5659 int m_position;
5760 QVariant m_properties;
61+ QVariantMap m_settings;
5862};
5963
6064#endif // INDICATOR_H
plugins/Unity/Indicators/indicatorsmanager.cpp+17−3
@@ -54,10 +54,9 @@ IndicatorsManager::~IndicatorsManager()
5454
5555}
5656
57−void IndicatorsManager::load(const QString& profile)
57+void IndicatorsManager::load()
5858{
5959 unload();
60− m_profile = profile;
6160
6261 QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
6362
@@ -216,6 +215,19 @@ void IndicatorsManager::setLoaded(bool loaded)
216215 }
217216}
218217
218+QString IndicatorsManager::profile() const
219+{
220+ return m_profile;
221+}
222+
223+void IndicatorsManager::setProfile(const QString& profile)
224+{
225+ if (m_profile != profile) {
226+ m_profile = profile;
227+ Q_EMIT profileChanged(m_profile);
228+ }
229+}
230+
219231void IndicatorsManager::startVerify(const QString& path)
220232{
221233 QHashIterator<QString, IndicatorData*> iter(m_indicatorsData);
@@ -268,7 +280,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
268280 Indicator::Ptr new_indicator(new Indicator(this));
269281 data->m_indicator = new_indicator;
270282 QSettings settings(data->m_fileInfo.absoluteFilePath(), QSettings::IniFormat, this);
271− new_indicator->init(m_profile, data->m_fileInfo.fileName(), settings);
283+ new_indicator->init(data->m_fileInfo.fileName(), settings);
284+ new_indicator->setProfile(m_profile);
285+ QObject::connect(this, SIGNAL(profileChanged(const QString&)), new_indicator.data(), SLOT(setProfile(const QString&)));
272286 return new_indicator;
273287}
274288
plugins/Unity/Indicators/indicatorsmanager.h+6−1
@@ -32,13 +32,17 @@ class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject
3232{
3333 Q_OBJECT
3434 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
35+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
3536public:
3637 explicit IndicatorsManager(QObject* parent = 0);
3738 ~IndicatorsManager();
3839
39− Q_INVOKABLE void load(const QString& profile);
40+ Q_INVOKABLE void load();
4041 Q_INVOKABLE void unload();
4142
43+ QString profile() const;
44+ void setProfile(const QString& profile);
45+
4246 Indicator::Ptr indicator(const QString& indicator_name);
4347
4448 QList<Indicator::Ptr> indicators();
@@ -47,6 +51,7 @@ public:
4751
4852Q_SIGNALS:
4953 void loadedChanged(bool);
54+ void profileChanged(const QString&);
5055
5156 void indicatorLoaded(const QString& indicator_name);
5257 void indicatorAboutToBeUnloaded(const QString& indicator_name);
plugins/Unity/Indicators/indicatorsmodel.cpp+25−2
@@ -56,6 +56,7 @@ IndicatorsModel::IndicatorsModel(QObject *parent)
5656 m_manager = new IndicatorsManager(this);
5757 QObject::connect(m_manager, SIGNAL(indicatorLoaded(const QString&)), this, SLOT(onIndicatorLoaded(const QString&)));
5858 QObject::connect(m_manager, SIGNAL(indicatorAboutToBeUnloaded(const QString&)), this, SLOT(onIndicatorAboutToBeUnloaded(const QString&)));
59+ QObject::connect(m_manager, SIGNAL(profileChanged(const QString&)), this, SIGNAL(profileChanged()));
5960
6061 QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
6162 QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
@@ -80,15 +81,37 @@ int IndicatorsModel::count() const
8081 return rowCount();
8182}
8283
84+/*!
85+ \qmlproperty IndicatorsModel::profile
86+ The indicator profile to use for the model.
87+
88+ \b Note: methods should only be called after the Component has completed.
89+*/
90+QString IndicatorsModel::profile() const
91+{
92+ return m_manager->profile();
93+}
94+
95+/*!
96+ \qmlproperty IndicatorsModel::setProfile
97+ Set the indicator profile to use for the model.
98+
99+ \b Note: methods should only be called after the Component has completed.
100+*/
101+void IndicatorsModel::setProfile(const QString &profile)
102+{
103+ m_manager->setProfile(profile);
104+}
105+
83106/*!
84107 \qmlmethod IndicatorsModel::unload()
85108
86109 Load all indicators.
87110*/
88−void IndicatorsModel::load(const QString& profile)
111+void IndicatorsModel::load()
89112{
90113 m_indicators.clear();
91− m_manager->load(profile);
114+ m_manager->load();
92115}
93116
94117/*!
plugins/Unity/Indicators/indicatorsmodel.h+6−1
@@ -34,17 +34,21 @@ class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
3434 Q_OBJECT
3535 Q_ENUMS(Roles)
3636 Q_PROPERTY(int count READ count NOTIFY countChanged)
37+ Q_PROPERTY(QString profile READ profile WRITE setProfile NOTIFY profileChanged)
3738
3839public:
3940
4041 IndicatorsModel(QObject *parent=0);
4142 ~IndicatorsModel();
4243
43− Q_INVOKABLE void load(const QString& profile);
44+ Q_INVOKABLE void load();
4445 Q_INVOKABLE void unload();
4546
4647 Q_INVOKABLE QVariant data(int row, int role) const;
4748
49+ QString profile() const;
50+ void setProfile(const QString& profile);
51+
4852 /* QAbstractItemModel */
4953 QHash<int, QByteArray> roleNames() const;
5054 int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -55,6 +59,7 @@ public:
5559
5660Q_SIGNALS:
5761 void countChanged();
62+ void profileChanged();
5863 void indicatorDataChanged(const QVariant& data);
5964
6065private Q_SLOTS:
plugins/Unity/Indicators/modelactionrootstate.cpp+4−2
@@ -71,7 +71,7 @@ void ModelActionRootState::setMenu(UnityMenuModel* menu)
7171
7272bool ModelActionRootState::valid() const
7373{
74− return m_menu && m_menu->rowCount() > 0;
74+ return !currentState().empty();
7575}
7676
7777void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
@@ -121,7 +121,9 @@ void ModelActionRootState::updateActionState()
121121 m_menu->setActionStateParser(oldParser);
122122
123123 setCurrentState(state);
124− } else {
124+ } else if (!m_menu) {
125125 setCurrentState(QVariantMap());
126126 }
127+ // else if m_menu->rowCount() == 0, let's leave existing cache in place
128+ // until the new menu comes in, to avoid flashing the UI empty for a moment
127129}
plugins/Unity/Indicators/unitymenumodelcache.cpp+8−11
@@ -46,17 +46,14 @@ QSharedPointer<UnityMenuModel> UnityMenuModelCache::model(const QByteArray& path
4646 QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
4747
4848 QSharedPointer<UnityMenuModel> menuModel(model);
49− connect(model, &QObject::destroyed, this, [this] {
50− QMutableHashIterator<QByteArray, QWeakPointer<UnityMenuModel>> iter(m_registry);
51− while(iter.hasNext()) {
52− auto keyVal = iter.next();
53− if (keyVal.value().isNull()) {
54− iter.remove();
55− break;
56− }
57− }
58− });
59− m_registry[path] = menuModel.toWeakRef();
49+
50+ // Keep a shared pointer (rather than weak pointer which would cause the
51+ // model to be deleted when all shared pointers we give out are deleted).
52+ // We want to keep all models cached because when we switch indicator
53+ // profiles, we will be switching paths often. And we want to keep the
54+ // old model around, ready to be used. Otherwise the UI might momentarily
55+ // wait as we populate the model from DBus yet again.
56+ m_registry[path] = menuModel;
6057
6158 menuModel->setMenuObjectPath(path);
6259 return menuModel;
plugins/Unity/Indicators/unitymenumodelcache.h+2−2
@@ -25,7 +25,7 @@
2525#include <QObject>
2626#include <QHash>
2727#include <QPointer>
28−#include <QWeakPointer>
28+#include <QSharedPointer>
2929
3030class UnityMenuModel;
3131
@@ -43,7 +43,7 @@ public:
4343 Q_INVOKABLE virtual bool contains(const QByteArray& path);
4444
4545protected:
46− QHash<QByteArray, QWeakPointer<UnityMenuModel>> m_registry;
46+ QHash<QByteArray, QSharedPointer<UnityMenuModel>> m_registry;
4747 static QPointer<UnityMenuModelCache> theCache;
4848};
4949
plugins/Unity/Launcher/CMakeLists.txt+3−1
@@ -1,4 +1,4 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
22pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
33pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
44
@@ -20,7 +20,9 @@ set(QMLLAUNCHERPLUGIN_SRC
2020 dbusinterface.cpp
2121 gsettings.cpp
2222 desktopfilehandler.cpp
23+ asadapter.cpp
2324 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
25+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
2426 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
2527 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
2628 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
plugins/Unity/Launcher/Launcher.qmltypes+3
@@ -25,6 +25,7 @@ Module {
2525 name: "requestRemove"
2626 Parameter { name: "appId"; type: "string" }
2727 }
28+ Method { name: "refresh" }
2829 Method {
2930 name: "get"
3031 type: "unity::shell::launcher::LauncherItemInterface*"
@@ -136,6 +137,8 @@ Module {
136137 type: "unity::shell::application::ApplicationManagerInterface"
137138 isPointer: true
138139 }
140+ Property { name: "onlyPinned"; type: "bool" }
141+ Signal { name: "hint" }
139142 Method {
140143 name: "move"
141144 Parameter { name: "oldIndex"; type: "int" }
plugins/Unity/Launcher/asadapter.cppnew file+60
@@ -0,0 +1,60 @@
1+/*
2+ * Copyright 2014-2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "asadapter.h"
18+#include "launcheritem.h"
19+#include "AccountsServiceDBusAdaptor.h"
20+
21+#include <QDebug>
22+
23+ASAdapter::ASAdapter()
24+{
25+ m_accounts = new AccountsServiceDBusAdaptor();
26+ m_user = qgetenv("USER");
27+ if (m_user.isEmpty()) {
28+ qWarning() << "$USER not valid. Account Service integration will not work.";
29+ }
30+}
31+
32+ASAdapter::~ASAdapter()
33+{
34+ m_accounts->deleteLater();
35+}
36+
37+void ASAdapter::syncItems(QList<LauncherItem *> m_list)
38+{
39+ if (m_accounts && !m_user.isEmpty()) {
40+ QList<QVariantMap> items;
41+
42+ Q_FOREACH(LauncherItem *item, m_list) {
43+ items << itemToVariant(item);
44+ }
45+
46+ m_accounts->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "LauncherItems", QVariant::fromValue(items));
47+ }
48+}
49+
50+QVariantMap ASAdapter::itemToVariant(LauncherItem *item) const
51+{
52+ QVariantMap details;
53+ details.insert("id", item->appId());
54+ details.insert("name", item->name());
55+ details.insert("icon", item->icon());
56+ details.insert("count", item->count());
57+ details.insert("countVisible", item->countVisible());
58+ details.insert("pinned", item->pinned());
59+ return details;
60+}
tests/mocks/Unity/Notifications/MockNotificationTypes.h → plugins/Unity/Launcher/asadapter.hrenamed+24−14
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2014 Canonical Ltd.
2+ * Copyright 2014-2015 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,25 +12,35 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Mirco Mueller <mirco.mueller@canonical.com>
1815 */
1916
20−#ifndef MOCK_NOTIFICATION_TYPES_H
21−#define MOCK_NOTIFICATION_TYPES_H
17+#ifndef ASADAPTER_H
18+#define ASADAPTER_H
2219
23−#include <QObject>
20+#include <QVariantMap>
2421
25−class MockNotification : public QObject {
26− Q_OBJECT
27− Q_ENUMS(Type)
22+class LauncherItem;
23+class AccountsServiceDBusAdaptor;
24+class QDBusInterface;
2825
26+class ASAdapter
27+{
2928public:
30− MockNotification(QObject *parent=nullptr);
31− virtual ~MockNotification();
29+ ASAdapter();
30+ ~ASAdapter();
31+
32+ void syncItems(QList<LauncherItem*> m_list);
33+
34+private:
35+ QVariantMap itemToVariant(LauncherItem *item) const;
36+
37+private:
38+ AccountsServiceDBusAdaptor *m_accounts;
39+ QString m_user;
40+
41+ QDBusInterface *m_userInterface;
3242
33− enum Type { PlaceHolder, Confirmation, Ephemeral, Interactive, SnapDecision };
43+ friend class LauncherModelTest;
3444};
3545
36−#endif // MOCK_NOTIFICATION_TYPES_H
46+#endif
plugins/Unity/Launcher/gsettings.cpp+8−1
@@ -59,12 +59,19 @@ void GSettings::setStoredApplications(const QStringList &storedApplications)
5959 Q_FOREACH(const QString &entry, storedApplications) {
6060 gSettingsList << QString("appid://%1").arg(entry);
6161 }
62+ // GSettings will emit a changed signal to ourselves. Let's cache the items
63+ // and only forward the changed signal when the list did actually change.
64+ m_cachedItems = gSettingsList;
6265 m_gSettings->set("items", gSettingsList);
6366}
6467
6568void GSettings::onSettingsChanged(const QString &key)
6669{
6770 if (key == "items") {
68− Q_EMIT changed();
71+ QStringList cachedItems = m_gSettings->get("items").toStringList();
72+ if (m_cachedItems != cachedItems) {
73+ m_cachedItems = cachedItems;
74+ Q_EMIT changed();
75+ }
6976 }
7077}
plugins/Unity/Launcher/gsettings.h+1
@@ -41,6 +41,7 @@ private Q_SLOTS:
4141
4242private:
4343 QGSettings *m_gSettings;
44+ QStringList m_cachedItems;
4445};
4546
4647#endif
plugins/Unity/Launcher/launchermodel.cpp+27−7
@@ -22,6 +22,7 @@
2222#include "gsettings.h"
2323#include "desktopfilehandler.h"
2424#include "dbusinterface.h"
25+#include "asadapter.h"
2526
2627#include <unity/shell/application/ApplicationInfoInterface.h>
2728
@@ -34,6 +35,7 @@ LauncherModel::LauncherModel(QObject *parent):
3435 LauncherModelInterface(parent),
3536 m_settings(new GSettings(this)),
3637 m_dbusIface(new DBusInterface(this)),
38+ m_asAdapter(new ASAdapter()),
3739 m_appManager(0)
3840{
3941 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
@@ -50,6 +52,8 @@ LauncherModel::~LauncherModel()
5052 while (!m_list.empty()) {
5153 m_list.takeFirst()->deleteLater();
5254 }
55+
56+ delete m_asAdapter;
5357}
5458
5559int LauncherModel::rowCount(const QModelIndex &parent) const
@@ -261,6 +265,15 @@ void LauncherModel::setApplicationManager(unity::shell::application::Application
261265 }
262266}
263267
268+bool LauncherModel::onlyPinned() const
269+{
270+ return false;
271+}
272+
273+void LauncherModel::setOnlyPinned(bool onlyPinned) {
274+ Q_UNUSED(onlyPinned);
275+ qWarning() << "This launcher implementation does not support showing only pinned apps";
276+}
264277
265278void LauncherModel::storeAppList()
266279{
@@ -271,6 +284,7 @@ void LauncherModel::storeAppList()
271284 }
272285 }
273286 m_settings->setStoredApplications(appIds);
287+ m_asAdapter->syncItems(m_list);
274288}
275289
276290void LauncherModel::unpin(const QString &appId)
@@ -321,6 +335,7 @@ void LauncherModel::countChanged(const QString &appId, int count)
321335 LauncherItem *item = m_list.at(idx);
322336 item->setCount(count);
323337 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
338+ m_asAdapter->syncItems(m_list);
324339 }
325340}
326341
@@ -352,6 +367,7 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
352367 Q_EMIT hint();
353368 }
354369 }
370+ m_asAdapter->syncItems(m_list);
355371}
356372
357373void LauncherModel::refresh()
@@ -433,6 +449,8 @@ void LauncherModel::refresh()
433449 if (changed) {
434450 Q_EMIT hint();
435451 }
452+
453+ m_asAdapter->syncItems(m_list);
436454}
437455
438456void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
@@ -450,14 +468,14 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
450468 return;
451469 }
452470
453− bool found = false;
454− Q_FOREACH(LauncherItem *item, m_list) {
455− if (app->appId() == item->appId()) {
456− found = true;
457− break;
471+ int itemIndex = findApplication(app->appId());
472+ if (itemIndex != -1) {
473+ LauncherItem *item = m_list.at(itemIndex);
474+ if (!item->recent()) {
475+ item->setRecent(true);
476+ m_asAdapter->syncItems(m_list);
477+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);
458478 }
459− }
460− if (found) {
461479 // Shall we paint some running/recent app highlight? If yes, do it here.
462480 } else {
463481 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
@@ -467,6 +485,7 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
467485 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
468486 m_list.append(item);
469487 endInsertRows();
488+ m_asAdapter->syncItems(m_list);
470489 }
471490}
472491
@@ -486,6 +505,7 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
486505 beginRemoveRows(QModelIndex(), appIndex, appIndex);
487506 m_list.takeAt(appIndex)->deleteLater();
488507 endRemoveRows();
508+ m_asAdapter->syncItems(m_list);
489509 }
490510}
491511
plugins/Unity/Launcher/launchermodel.h+5
@@ -28,6 +28,7 @@
2828class LauncherItem;
2929class GSettings;
3030class DBusInterface;
31+class ASAdapter;
3132
3233using namespace unity::shell::launcher;
3334using namespace unity::shell::application;
@@ -54,6 +55,9 @@ public:
5455 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
5556 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
5657
58+ bool onlyPinned() const override;
59+ void setOnlyPinned(bool onlyPinned) override;
60+
5761 int findApplication(const QString &appId);
5862
5963public Q_SLOTS:
@@ -79,6 +83,7 @@ private:
7983
8084 GSettings *m_settings;
8185 DBusInterface *m_dbusIface;
86+ ASAdapter *m_asAdapter;
8287
8388 ApplicationManagerInterface *m_appManager;
8489
plugins/Unity/Session/Session.qmltypes+5−1
@@ -9,7 +9,7 @@ import QtQuick.tooling 1.1
99Module {
1010 Component {
1111 name: "DBusUnitySessionService"
12− prototype: "QObject"
12+ prototype: "UnityDBusObject"
1313 exports: ["Unity.Session/DBusUnitySessionService 0.1"]
1414 isCreatable: false
1515 isSingleton: true
@@ -33,6 +33,9 @@ Module {
3333 Method { name: "RequestLogout" }
3434 Method { name: "RequestReboot" }
3535 Method { name: "RequestShutdown" }
36+ Method { name: "logout" }
37+ Method { name: "reboot" }
38+ Method { name: "shutdown" }
3639 }
3740 Component {
3841 name: "OrientationLock"
@@ -44,4 +47,5 @@ Module {
4447 Property { name: "enabled"; type: "bool"; isReadonly: true }
4548 Property { name: "savedOrientation"; type: "Qt::ScreenOrientation" }
4649 }
50+ Component { name: "UnityDBusObject"; prototype: "QObject" }
4751}
plugins/Unity/Session/dbusunitysessionservice.cpp+60
@@ -35,6 +35,17 @@ void DBusUnitySessionService::Logout()
3535 Q_EMIT logoutReady();
3636}
3737
38+void DBusUnitySessionService::EndSession()
39+{
40+ QDBusConnection connection = QDBusConnection::sessionBus();
41+ QDBusInterface iface1 ("com.ubuntu.Upstart",
42+ "/com/ubuntu/Upstart",
43+ "com.ubuntu.Upstart0_6",
44+ connection);
45+
46+ iface1.call("EndSession");
47+}
48+
3849void DBusUnitySessionService::RequestLogout()
3950{
4051 Q_EMIT logoutRequested(false);
@@ -71,3 +82,52 @@ void DBusUnitySessionService::RequestShutdown()
7182{
7283 Q_EMIT shutdownRequested(false);
7384}
85+
86+enum class Action : unsigned
87+{
88+ LOGOUT = 0,
89+ SHUTDOWN,
90+ REBOOT,
91+ NONE
92+};
93+
94+DBusGnomeSessionManagerWrapper::DBusGnomeSessionManagerWrapper()
95+ : UnityDBusObject("/org/gnome/SessionManager/EndSessionDialog", "com.canonical.Unity")
96+{
97+}
98+
99+DBusGnomeSessionManagerWrapper::~DBusGnomeSessionManagerWrapper()
100+{
101+}
102+
103+void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)
104+{
105+ Q_UNUSED(arg_1);
106+ Q_UNUSED(max_wait);
107+ Q_UNUSED(inhibitors);
108+
109+ QDBusConnection connection = QDBusConnection::sessionBus();
110+ QDBusInterface iface1 ("com.canonical.Unity",
111+ "/com/canonical/Unity/Session",
112+ "com.canonical.Unity.Session",
113+ connection);
114+
115+ Action action = (Action)type;
116+
117+ switch (action)
118+ {
119+ case Action::LOGOUT:
120+ iface1.call("RequestLogout");
121+ break;
122+
123+ case Action::REBOOT:
124+ iface1.call("RequestShutdown");
125+ break;
126+
127+ case Action::SHUTDOWN:
128+ break;
129+
130+ default:
131+ break;
132+ }
133+}
plugins/Unity/Session/dbusunitysessionservice.h+28−3
@@ -17,8 +17,13 @@
1717#ifndef DBUSUNITYSESSIONSERVICE_H
1818#define DBUSUNITYSESSIONSERVICE_H
1919
20+#include <QDBusObjectPath>
21+
2022#include "unitydbusobject.h"
2123
24+typedef QList<QDBusObjectPath> QDbusList;
25+Q_DECLARE_METATYPE(QList<QDBusObjectPath>)
26+
2227/**
2328 * DBusUnitySessionService provides com.canonical.Unity.Session dbus
2429 * interface.
@@ -39,6 +44,7 @@ public:
3944 Q_INVOKABLE void logout() { Logout(); }
4045 Q_INVOKABLE void reboot() { Reboot(); }
4146 Q_INVOKABLE void shutdown() { Shutdown(); }
47+ Q_INVOKABLE void endSession() { EndSession(); }
4248
4349Q_SIGNALS:
4450 /**
@@ -49,7 +55,7 @@ Q_SIGNALS:
4955 * @param have_inhibitors if there are any special running applications
5056 * which inhibit the logout.
5157 */
52− void logoutRequested(bool have_inhibitors);
58+ Q_SCRIPTABLE void logoutRequested(bool have_inhibitors);
5359
5460 /**
5561 * rebootRequested signal
@@ -59,7 +65,7 @@ Q_SIGNALS:
5965 * @param have_inhibitors if there are any special running applications
6066 * which inhibit the reboot.
6167 */
62− void rebootRequested(bool have_inhibitors);
68+ Q_SCRIPTABLE void rebootRequested(bool have_inhibitors);
6369
6470 /**
6571 * shutdownRequested signal
@@ -69,7 +75,7 @@ Q_SIGNALS:
6975 * @param have_inhibitors if there are any special running applications
7076 * which inhibit the shutdown.
7177 */
72− void shutdownRequested(bool have_inhibitors);
78+ Q_SCRIPTABLE void shutdownRequested(bool have_inhibitors);
7379
7480
7581 /**
@@ -139,6 +145,25 @@ public Q_SLOTS:
139145 */
140146 Q_SCRIPTABLE void RequestShutdown();
141147
148+ /**
149+ * Issue an EndSession request.
150+ *
151+ * This method calls the EndSession() Upstart DBus method on the
152+ * current DBus session bus.
153+ */
154+ Q_SCRIPTABLE void EndSession();
142155};
143156
157+class DBusGnomeSessionManagerWrapper : public UnityDBusObject
158+{
159+ Q_OBJECT
160+ Q_CLASSINFO("D-Bus Interface", "org.gnome.SessionManager.EndSessionDialog")
161+
162+public:
163+ DBusGnomeSessionManagerWrapper();
164+ ~DBusGnomeSessionManagerWrapper();
165+
166+public Q_SLOTS:
167+ Q_SCRIPTABLE void Open(const unsigned int type, const unsigned int arg_1, const unsigned int max_wait, const QList<QDBusObjectPath> &inhibitors);
168+};
144169#endif // DBUSUNITYSESSIONSERVICE_H
plugins/Unity/Session/plugin.cpp+1
@@ -26,6 +26,7 @@
2626
2727static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
2828{
29+ new DBusGnomeSessionManagerWrapper();
2930 return new DBusUnitySessionService();
3031}
3132
plugins/Utils/CMakeLists.txt+4−1
@@ -8,6 +8,8 @@ include_directories(
88)
99
1010set(QMLPLUGIN_SRC
11+ constants.cpp
12+ inputwatcher.cpp
1113 qlimitproxymodelqml.cpp
1214 unitysortfilterproxymodelqml.cpp
1315 relativetimeformatter.cpp
@@ -15,6 +17,7 @@ set(QMLPLUGIN_SRC
1517 unitymenumodelpaths.cpp
1618 windowkeysfilter.cpp
1719 easingcurve.cpp
20+ windowstatestorage.cpp
1821 plugin.cpp
1922 )
2023
@@ -30,6 +33,6 @@ target_link_libraries(Utils-qml ${GIO_LDFLAGS})
3033# files directly in targets.
3134set_target_properties(Utils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
3235
33−qt5_use_modules(Utils-qml Qml Quick DBus Network Gui)
36+qt5_use_modules(Utils-qml Qml Quick DBus Network Gui Sql Concurrent)
3437
3538add_unity8_plugin(Utils 0.1 Utils TARGETS Utils-qml)
plugins/Utils/Utils.qmltypes+60−41
@@ -60,9 +60,49 @@ Module {
6060 Method { name: "invalidate" }
6161 }
6262 Component {
63− name: "QSortFilterProxyModelQML"
63+ name: "RelativeTimeFormatter"
64+ prototype: "TimeFormatter"
65+ exports: ["Utils/RelativeTimeFormatter 0.1"]
66+ exportMetaObjectRevisions: [0]
67+ }
68+ Component {
69+ name: "TimeFormatter"
70+ prototype: "QObject"
71+ exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]
72+ exportMetaObjectRevisions: [0, 0]
73+ Property { name: "format"; type: "string" }
74+ Property { name: "timeString"; type: "string"; isReadonly: true }
75+ Property { name: "time"; type: "qlonglong" }
76+ Signal {
77+ name: "formatChanged"
78+ Parameter { name: "format"; type: "string" }
79+ }
80+ Signal {
81+ name: "timeStringChanged"
82+ Parameter { name: "timeString"; type: "string" }
83+ }
84+ Signal {
85+ name: "timeChanged"
86+ Parameter { name: "time"; type: "qlonglong" }
87+ }
88+ }
89+ Component {
90+ name: "UnityMenuModelPaths"
91+ prototype: "QObject"
92+ exports: ["Utils/UnityMenuModelPaths 0.1"]
93+ exportMetaObjectRevisions: [0]
94+ Property { name: "source"; type: "QVariant" }
95+ Property { name: "busName"; type: "QByteArray"; isReadonly: true }
96+ Property { name: "actions"; type: "QVariantMap"; isReadonly: true }
97+ Property { name: "menuObjectPath"; type: "QByteArray"; isReadonly: true }
98+ Property { name: "busNameHint"; type: "QByteArray" }
99+ Property { name: "actionsHint"; type: "QByteArray" }
100+ Property { name: "menuObjectPathHint"; type: "QByteArray" }
101+ }
102+ Component {
103+ name: "UnitySortFilterProxyModelQML"
64104 prototype: "QSortFilterProxyModel"
65− exports: ["Utils/SortFilterProxyModel 0.1"]
105+ exports: ["Utils/UnitySortFilterProxyModel 0.1"]
66106 exportMetaObjectRevisions: [0]
67107 Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
68108 Property { name: "totalCount"; type: "int"; isReadonly: true }
@@ -107,50 +147,29 @@ Module {
107147 }
108148 }
109149 Component {
110− name: "RelativeTimeFormatter"
111− prototype: "TimeFormatter"
112− exports: ["Utils/RelativeTimeFormatter 0.1"]
150+ name: "WindowKeysFilter"
151+ defaultProperty: "data"
152+ prototype: "QQuickItem"
153+ exports: ["Utils/WindowKeysFilter 0.1"]
113154 exportMetaObjectRevisions: [0]
114155 }
115156 Component {
116− name: "TimeFormatter"
157+ name: "WindowStateStorage"
117158 prototype: "QObject"
118− exports: ["Utils/GDateTimeFormatter 0.1", "Utils/TimeFormatter 0.1"]
119− exportMetaObjectRevisions: [0, 0]
120− Property { name: "format"; type: "string" }
121− Property { name: "timeString"; type: "string"; isReadonly: true }
122− Property { name: "time"; type: "qlonglong" }
123− Signal {
124− name: "formatChanged"
125− Parameter { name: "format"; type: "string" }
126− }
127− Signal {
128− name: "timeStringChanged"
129− Parameter { name: "timeString"; type: "string" }
159+ exports: ["Utils/WindowStateStorage 0.1"]
160+ isCreatable: false
161+ isSingleton: true
162+ exportMetaObjectRevisions: [0]
163+ Method {
164+ name: "saveGeometry"
165+ Parameter { name: "windowId"; type: "string" }
166+ Parameter { name: "rect"; type: "QRect" }
130167 }
131− Signal {
132− name: "timeChanged"
133− Parameter { name: "time"; type: "qlonglong" }
168+ Method {
169+ name: "getGeometry"
170+ type: "QRect"
171+ Parameter { name: "windowId"; type: "string" }
172+ Parameter { name: "defaultValue"; type: "QRect" }
134173 }
135174 }
136− Component {
137− name: "UnityMenuModelPaths"
138− prototype: "QObject"
139− exports: ["Utils/UnityMenuModelPaths 0.1"]
140− exportMetaObjectRevisions: [0]
141− Property { name: "source"; type: "QVariant" }
142− Property { name: "busName"; type: "QByteArray"; isReadonly: true }
143− Property { name: "actions"; type: "QVariantMap"; isReadonly: true }
144− Property { name: "menuObjectPath"; type: "QByteArray"; isReadonly: true }
145− Property { name: "busNameHint"; type: "QByteArray" }
146− Property { name: "actionsHint"; type: "QByteArray" }
147− Property { name: "menuObjectPathHint"; type: "QByteArray" }
148− }
149− Component {
150− name: "WindowKeysFilter"
151− defaultProperty: "data"
152− prototype: "QQuickItem"
153− exports: ["Utils/WindowKeysFilter 0.1"]
154− exportMetaObjectRevisions: [0]
155− }
156175}
plugins/Utils/constants.cppnew file+27
@@ -0,0 +1,27 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#include "constants.h"
18+
19+Constants::Constants(QObject *parent)
20+ : QObject(parent)
21+{
22+ if (qgetenv("QT_LOAD_TESTABILITY").isEmpty()) {
23+ m_indicatorValueTimeout = 30000;
24+ } else {
25+ m_indicatorValueTimeout = 5000;
26+ }
27+}
plugins/Utils/constants.hnew file+43
@@ -0,0 +1,43 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#ifndef CONSTANTS_H
18+#define CONSTANTS_H
19+
20+#include <QObject>
21+
22+/**
23+ * @brief The Constants class
24+ *
25+ * This singleton class exposes contants to Qml
26+ *
27+ */
28+
29+class Constants: public QObject
30+{
31+ Q_OBJECT
32+ Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT)
33+
34+public:
35+ Constants(QObject *parent = 0);
36+
37+ int indicatorValueTimeout() const { return m_indicatorValueTimeout; }
38+
39+private:
40+ int m_indicatorValueTimeout;
41+};
42+
43+#endif
plugins/Utils/inputwatcher.cppnew file+118
@@ -0,0 +1,118 @@
1+/*
2+ * Copyright (C) 2015 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+
18+#include "inputwatcher.h"
19+
20+#include <QMouseEvent>
21+
22+InputWatcher::InputWatcher(QObject *parent)
23+ : QObject(parent)
24+ , m_mousePressed(false)
25+ , m_touchPressed(false)
26+{
27+}
28+
29+QObject *InputWatcher::target() const
30+{
31+ return m_target;
32+}
33+
34+void InputWatcher::setTarget(QObject *value)
35+{
36+ if (m_target == value) {
37+ return;
38+ }
39+
40+ if (m_target) {
41+ m_target->removeEventFilter(this);
42+ }
43+
44+ setMousePressed(false);
45+ setTouchPressed(false);
46+
47+ m_target = value;
48+ if (m_target) {
49+ m_target->installEventFilter(this);
50+ }
51+
52+ Q_EMIT targetChanged(value);
53+}
54+
55+bool InputWatcher::targetPressed() const
56+{
57+ return m_mousePressed || m_touchPressed;
58+}
59+
60+bool InputWatcher::eventFilter(QObject* /*watched*/, QEvent *event)
61+{
62+ switch (event->type()) {
63+ case QEvent::TouchBegin:
64+ setTouchPressed(true);
65+ break;
66+ case QEvent::TouchEnd:
67+ setTouchPressed(false);
68+ break;
69+ case QEvent::MouseButtonPress:
70+ {
71+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
72+ if (mouseEvent->button() == Qt::LeftButton) {
73+ setMousePressed(true);
74+ }
75+ }
76+ break;
77+ case QEvent::MouseButtonRelease:
78+ {
79+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
80+ if (mouseEvent->button() == Qt::LeftButton) {
81+ setMousePressed(false);
82+ }
83+ }
84+ break;
85+ default:
86+ // Not interested
87+ break;
88+ }
89+
90+ // We never filter them out. We are just watching.
91+ return false;
92+}
93+
94+void InputWatcher::setMousePressed(bool value)
95+{
96+ if (value == m_mousePressed) {
97+ return;
98+ }
99+
100+ bool oldPressed = targetPressed();
101+ m_mousePressed = value;
102+ if (targetPressed() != oldPressed) {
103+ Q_EMIT targetPressedChanged(targetPressed());
104+ }
105+}
106+
107+void InputWatcher::setTouchPressed(bool value)
108+{
109+ if (value == m_touchPressed) {
110+ return;
111+ }
112+
113+ bool oldPressed = targetPressed();
114+ m_touchPressed = value;
115+ if (targetPressed() != oldPressed) {
116+ Q_EMIT targetPressedChanged(targetPressed());
117+ }
118+}
plugins/Utils/inputwatcher.hnew file+58
@@ -0,0 +1,58 @@
1+/*
2+ * Copyright (C) 2015 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+
18+#ifndef UNITY_INPUTWATCHER_H
19+#define UNITY_INPUTWATCHER_H
20+
21+#include <QObject>
22+#include <QPointer>
23+
24+/*
25+ Monitors the target object for input events to figure out whether it's pressed
26+ or not.
27+ */
28+class InputWatcher : public QObject
29+{
30+ Q_OBJECT
31+ Q_PROPERTY(QObject* target READ target WRITE setTarget NOTIFY targetChanged)
32+
33+ // Whether the target object is pressed (by either touch or mouse)
34+ Q_PROPERTY(bool targetPressed READ targetPressed NOTIFY targetPressedChanged)
35+public:
36+ InputWatcher(QObject *parent = nullptr);
37+
38+ QObject *target() const;
39+ void setTarget(QObject *value);
40+
41+ bool targetPressed() const;
42+
43+ bool eventFilter(QObject *watched, QEvent *event) override;
44+
45+Q_SIGNALS:
46+ void targetChanged(QObject *value);
47+ void targetPressedChanged(bool value);
48+
49+private:
50+ void setMousePressed(bool value);
51+ void setTouchPressed(bool value);
52+
53+ bool m_mousePressed;
54+ bool m_touchPressed;
55+ QPointer<QObject> m_target;
56+};
57+
58+#endif // UNITY_INPUTWATCHER_H
plugins/Utils/plugin.cpp+20
@@ -26,6 +26,7 @@
2626#include "plugin.h"
2727
2828// local
29+#include "inputwatcher.h"
2930#include "qlimitproxymodelqml.h"
3031#include "unitysortfilterproxymodelqml.h"
3132#include "relativetimeformatter.h"
@@ -33,6 +34,22 @@
3334#include "unitymenumodelpaths.h"
3435#include "windowkeysfilter.h"
3536#include "easingcurve.h"
37+#include "windowstatestorage.h"
38+#include "constants.h"
39+
40+static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
41+{
42+ Q_UNUSED(engine)
43+ Q_UNUSED(scriptEngine)
44+ return new WindowStateStorage();
45+}
46+
47+static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)
48+{
49+ Q_UNUSED(engine)
50+ Q_UNUSED(scriptEngine)
51+ return new Constants();
52+}
3653
3754void UtilsPlugin::registerTypes(const char *uri)
3855{
@@ -46,6 +63,9 @@ void UtilsPlugin::registerTypes(const char *uri)
4663 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
4764 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
4865 qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");
66+ qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
67+ qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
68+ qmlRegisterSingletonType<Constants>(uri, 0, 1, "Constants", createConstants);
4969}
5070
5171void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Utils/windowstatestorage.cppnew file+117
@@ -0,0 +1,117 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "windowstatestorage.h"
18+
19+#include <QtConcurrent>
20+#include <QDebug>
21+#include <QFutureSynchronizer>
22+#include <QSqlQuery>
23+#include <QSqlError>
24+#include <QSqlResult>
25+#include <QRect>
26+
27+QMutex WindowStateStorage::s_mutex;
28+
29+WindowStateStorage::WindowStateStorage(QObject *parent):
30+ QObject(parent)
31+{
32+ QString dbPath = QDir::homePath() + "/.cache/unity8/";
33+ m_db = QSqlDatabase::addDatabase("QSQLITE");
34+ QDir dir;
35+ dir.mkpath(dbPath);
36+ m_db.setDatabaseName(dbPath + "windowstatestorage.sqlite");
37+ initdb();
38+}
39+
40+WindowStateStorage::~WindowStateStorage()
41+{
42+ QFutureSynchronizer<void> futureSync;
43+ for (int i = 0; i < m_asyncQueries.count(); ++i) {
44+ futureSync.addFuture(m_asyncQueries[i]);
45+ }
46+ futureSync.waitForFinished();
47+ m_db.close();
48+}
49+
50+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
51+{
52+ QMutexLocker mutexLocker(&s_mutex);
53+
54+ QString queryString = QString("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
55+ .arg(windowId)
56+ .arg(rect.x())
57+ .arg(rect.y())
58+ .arg(rect.width())
59+ .arg(rect.height());
60+
61+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
62+ m_asyncQueries.append(future);
63+
64+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
65+ futureWatcher->setFuture(future);
66+ connect(futureWatcher, &QFutureWatcher<void>::finished,
67+ this,
68+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());
69+ futureWatcher->deleteLater(); });
70+}
71+
72+void WindowStateStorage::executeAsyncQuery(const QString &queryString)
73+{
74+ QMutexLocker l(&s_mutex);
75+ QSqlQuery query;
76+
77+ bool ok = query.exec(queryString);
78+ if (!ok) {
79+ qWarning() << "Error executing query" << queryString
80+ << "Driver error:" << query.lastError().driverText()
81+ << "Database error:" << query.lastError().databaseText();
82+ }
83+}
84+
85+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)
86+{
87+ QMutexLocker l(&s_mutex);
88+ QString queryString = QString("SELECT * FROM geometry WHERE windowId = '%1';")
89+ .arg(windowId);
90+ QSqlQuery query;
91+
92+ bool ok = query.exec(queryString);
93+ if (!ok) {
94+ qWarning() << "Error retrieving window state for" << windowId
95+ << "Driver error:" << query.lastError().driverText()
96+ << "Database error:" << query.lastError().databaseText();
97+ return defaultValue;
98+ }
99+ if (!query.first()) {
100+ return defaultValue;
101+ }
102+ return QRect(query.value("x").toInt(), query.value("y").toInt(), query.value("width").toInt(), query.value("height").toInt());
103+}
104+
105+void WindowStateStorage::initdb()
106+{
107+ m_db.open();
108+ if (!m_db.open()) {
109+ qWarning() << "Error opening state database:" << m_db.lastError().driverText() << m_db.lastError().databaseText();
110+ return;
111+ }
112+
113+ if (!m_db.tables().contains("geometry")) {
114+ QSqlQuery query;
115+ query.exec("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);");
116+ }
117+}
plugins/Utils/windowstatestorage.hnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include <QObject>
18+#include <QSqlDatabase>
19+#include <QMutex>
20+#include <QFuture>
21+
22+class WindowStateStorage: public QObject
23+{
24+ Q_OBJECT
25+public:
26+ WindowStateStorage(QObject *parent = 0);
27+ virtual ~WindowStateStorage();
28+
29+ Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
30+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
31+
32+private:
33+ void initdb();
34+
35+ static void executeAsyncQuery(const QString &queryString);
36+ static QMutex s_mutex;
37+
38+ // NB: This is accessed from threads. Make sure to mutex it.
39+ QSqlDatabase m_db;
40+
41+ QList< QFuture<void> > m_asyncQueries;
42+};
plugins/Wizard/Wizard.qmltypes−3
@@ -11,8 +11,6 @@ Module {
1111 name: "PageList"
1212 prototype: "QObject"
1313 exports: ["Wizard/PageList 0.1"]
14− isCreatable: false
15− isSingleton: true
1614 exportMetaObjectRevisions: [0]
1715 Property { name: "index"; type: "int"; isReadonly: true }
1816 Property { name: "numPages"; type: "int"; isReadonly: true }
@@ -33,4 +31,3 @@ Module {
3331 }
3432 }
3533}
36−
po/am.po+271−143
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-01-29 00:07+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-19 23:16+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: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "የ መግቢያ ቃል: "
2424
@@ -31,64 +31,91 @@ msgstr "አቋራጭ ማጣበቂያ"
3131msgid "Unpin shortcut"
3232msgstr "አቋራጭ መለያያ"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "አካሉ ተቆልፏል"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
5151msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr "መውጫ"
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
64−msgstr "አይ"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr "መቆለፊያ"
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
69−msgstr "አዎ"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr "መውጫ"
7071
71−#: qml/Components/Dialogs.qml:108
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr "መሰረዣ"
76+
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr "ማጥፊያ"
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr "እንደገና ማስነሻ"
8290
83−#: qml/Components/Dialogs.qml:132
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr "ማጥፊያ"
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr "እንደገና ማስነሻ"
100+
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr "አይ"
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr "አዎ"
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr "ሐይል"
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
@@ -96,65 +123,16 @@ msgstr ""
96123"በእርግጥ ሐይሉን ማጥፋት\n"
97124"ይፈልጋሉ?"
98125
99−#: qml/Components/Dialogs.qml:157
126+#: qml/Components/Dialogs.qml:153
127+msgctxt "Button: Power off the system"
100128msgid "Power off"
101−msgstr "ማጥፊያ"
129+msgstr "ሐይል ማጥፊያ"
102130
103−#: qml/Components/Dialogs.qml:166
131+#: qml/Components/Dialogs.qml:162
132+msgctxt "Button: Restart the system"
104133msgid "Restart"
105134msgstr "እንደገና ማስጀመሪያ"
106135
107−#: qml/Components/Dialogs.qml:175
108−msgid "Cancel"
109−msgstr "መሰረዣ"
110−
111−#: qml/Components/EdgeDemoOverlay.qml:151
112−msgid "Skip intro"
113−msgstr "መግቢያውን መዝለያ"
114−
115−#: qml/Components/EdgeDemo.qml:125
116−msgid "Right edge"
117−msgstr "የቀኝ ጠርዝ"
118−
119−#: qml/Components/EdgeDemo.qml:126
120−msgid "Try swiping from the right edge to unlock the phone"
121−msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
122−
123−#: qml/Components/EdgeDemo.qml:157
124−msgid "Top edge"
125−msgstr "የላይ ጠርዝ"
126−
127−#: qml/Components/EdgeDemo.qml:158
128−msgid "Try swiping from the top edge to access the indicators"
129−msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
130−
131−#: qml/Components/EdgeDemo.qml:183
132−msgid "Close"
133−msgstr "መዝጊያ"
134−
135−#: qml/Components/EdgeDemo.qml:184
136−msgid "Swipe up again to close the settings screen"
137−msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
138−
139−#: qml/Components/EdgeDemo.qml:214
140−msgid "Left edge"
141−msgstr "የግራ ጠርዝ"
142−
143−#: qml/Components/EdgeDemo.qml:215
144−msgid "Swipe from the left to reveal the launcher for quick access to apps"
145−msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
146−
147−#: qml/Components/EdgeDemo.qml:242
148−msgid "Well done"
149−msgstr "ጥሩ አድረገዋል"
150−
151−#: qml/Components/EdgeDemo.qml:243
152−msgid ""
153−"You have now mastered the edge gestures and can start using the "
154−"phone<br><br>Tap on the screen to start"
155−msgstr ""
156−"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
157−
158136#: qml/Components/Lockscreen.qml:238
159137msgid "Return to Call"
160138msgstr "ወደ ጥሪ መመለሻ"
@@ -167,32 +145,39 @@ msgstr "የ ድንገተኛ ጥሪ"
167145msgid "OK"
168146msgstr "እሺ"
169147
170−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
171149msgid "See less"
172150msgstr "አነስተኛ መመልከቻ"
173151
174−#: qml/Dash/GenericScopeView.qml:485
152+#: qml/Dash/GenericScopeView.qml:533
175153msgid "See all"
176154msgstr "ሁሉንም መመልከቻ"
177155
178−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179−#: qml/Panel/SearchIndicator.qml:27
156+#: qml/Dash/GenericScopeView.qml:595
157+msgctxt "Label: Hint for dash search line edit"
180158msgid "Search"
181159msgstr "መፈለጊያ"
182160
183−#: qml/Dash/PageHeader.qml:267
161+#: qml/Dash/PageHeader.qml:269
162+msgctxt "Button: Open the Ubuntu Store"
184163msgid "Store"
185164msgstr "ማስቀመጫ"
186165
187−#: qml/Dash/PageHeader.qml:284
166+#: qml/Dash/PageHeader.qml:276
167+msgctxt "Button: Start a search in the current dash scope"
168+msgid "Search"
169+msgstr "መፈለጊያ"
170+
171+#: qml/Dash/PageHeader.qml:286
172+msgctxt "Button: Show the current dash scope settings"
188173msgid "Settings"
189−msgstr "ማሰናጃ"
174+msgstr "ማሰናጃዎች"
190175
191−#: qml/Dash/PageHeader.qml:291
176+#: qml/Dash/PageHeader.qml:293
192177msgid "Remove from Favorites"
193178msgstr "ከምወዳቸው ማስወገጃ"
194179
195−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
196181msgid "Add to Favorites"
197182msgstr "ወደምወዳቸው መጨመሪያ"
198183
@@ -224,6 +209,10 @@ msgstr "ይሳቡ ለማነቃቃት…"
224209msgid "Release to refresh…"
225210msgstr "ይልቀቁ ለማነቃቃት…"
226211
212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
213+msgid "Enable location data"
214+msgstr "የአካባቢ ዳታ ማስቻያ"
215+
227216#: qml/Dash/ScopesList.qml:66
228217msgid "Manage"
229218msgstr "አስተዳዳሪ"
@@ -236,10 +225,76 @@ msgstr "ቤት"
236225msgid "Also installed"
237226msgstr "እንዲሁም የተገጠሙ"
238227
239−#: qml/Greeter/Greeter.qml:133
228+#: qml/Greeter/CoverPage.qml:107
240229msgid "Unlock"
241230msgstr "መክፈቻ"
242231
232+#: qml/Greeter/LoginList.qml:236
233+msgid "Retry"
234+msgstr "እንደገና ይሞክሩ"
235+
236+#: qml/Greeter/LoginList.qml:237
237+msgid "Tap to unlock"
238+msgstr "ለመክፈት መታ ያድርጉ"
239+
240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
241+msgid "Sorry, incorrect passphrase."
242+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
243+
244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
245+msgid "Sorry, incorrect passcode."
246+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
247+
248+#: qml/Greeter/NarrowView.qml:55
249+msgid "This will be your last attempt."
250+msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
251+
252+#: qml/Greeter/NarrowView.qml:57
253+msgid ""
254+"If passphrase is entered incorrectly, your phone will conduct a factory "
255+"reset and all personal data will be deleted."
256+msgstr ""
257+"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
258+"ይጠፋል"
259+
260+#: qml/Greeter/NarrowView.qml:58
261+msgid ""
262+"If passcode is entered incorrectly, your phone will conduct a factory reset "
263+"and all personal data will be deleted."
264+msgstr ""
265+"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
266+"ይጠፋል"
267+
268+#: qml/Greeter/NarrowView.qml:115
269+#, qt-format
270+msgid "Enter %1"
271+msgstr "ማስገቢያ %1"
272+
273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
274+msgid "Enter passphrase"
275+msgstr "የ ማለፊያ ሀረግ ያስገቡ"
276+
277+#: qml/Greeter/NarrowView.qml:117
278+msgid "Enter passcode"
279+msgstr "የ ማለፊያ ኮድ ያስገቡ"
280+
281+#: qml/Greeter/NarrowView.qml:118
282+#, qt-format
283+msgid "Sorry, incorrect %1"
284+msgstr "አዝናለሁ: የተሳሳተ%1"
285+
286+#: qml/Greeter/NarrowView.qml:119
287+msgid "Sorry, incorrect passphrase"
288+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
289+
290+#: qml/Greeter/NarrowView.qml:120
291+msgid "Please re-enter"
292+msgstr "እባክዎን እንደገና-ያስገቡ"
293+
294+#: qml/Greeter/NarrowView.qml:121
295+msgid "Sorry, incorrect passcode"
296+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
297+
243298#: qml/Notifications/NotificationMenuItemFactory.qml:128
244299msgid "Show password"
245300msgstr "የመግቢያ ቃል ማሳያ"
@@ -281,6 +336,7 @@ msgid "Failed, tap to retry"
281336msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
282337
283338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
339+msgctxt "Label: Hint in message indicator line edit"
284340msgid "Reply"
285341msgstr "መመለሻ"
286342
@@ -292,65 +348,60 @@ msgstr "ሲም መክፈቻ"
292348msgid "Roaming"
293349msgstr "ማዘዋወሪያ"
294350
295−#: qml/Shell.qml:390
296−#, qt-format
297−msgid "Enter %1"
298−msgstr "ማስገቢያ %1"
351+#: qml/Tutorial/TutorialBottomFinish.qml:24
352+msgid "This action does different things for different apps"
353+msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"
299354
300−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
301−msgid "Enter passphrase"
302−msgstr "የ ማለፊያ ሀረግ ያስገቡ"
355+#: qml/Tutorial/TutorialBottomFinish.qml:25
356+msgid "Tap here to finish."
357+msgstr "እዚህ መታ ይድርጉ ለመጨረስ"
303358
304−#: qml/Shell.qml:392
305−msgid "Enter passcode"
306−msgstr "የ ማለፊያ ኮድ ያስገቡ"
359+#: qml/Tutorial/TutorialBottom.qml:28
360+msgid "Open special menus"
361+msgstr "የተለዩ ዝርዝሮች መክፈቻ"
307362
308−#: qml/Shell.qml:393
309−#, qt-format
310−msgid "Sorry, incorrect %1"
311−msgstr "አዝናለሁ: የተሳሳተ%1"
363+#: qml/Tutorial/TutorialBottom.qml:29
364+msgid "Swipe up from the bottom edge."
365+msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"
312366
313−#: qml/Shell.qml:394
314−msgid "Sorry, incorrect passphrase"
315−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
367+#: qml/Tutorial/TutorialLeftFinish.qml:24
368+msgid "These are the shortcuts to favorite apps"
369+msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"
316370
317−#: qml/Shell.qml:395
318−msgid "Please re-enter"
319−msgstr "እባክዎን እንደገና-ያስገቡ"
371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
372+msgid "Tap here to continue."
373+msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
320374
321−#: qml/Shell.qml:396
322−msgid "Sorry, incorrect passcode"
323−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
375+#: qml/Tutorial/TutorialLeft.qml:26
376+msgid "Open the launcher"
377+msgstr "ማስጀመሪያውን መክፈቻ"
324378
325−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326−msgid "Sorry, incorrect passphrase."
327−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
379+#: qml/Tutorial/TutorialLeft.qml:27
380+msgid "Short swipe from the left edge."
381+msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"
328382
329−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330−msgid "Sorry, incorrect passcode."
331−msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
383+#: qml/Tutorial/TutorialPage.qml:178
384+msgid "You almost got it!"
385+msgstr "እርስዎ አሁን እያገኙት ነው!"
332386
333−#: qml/Shell.qml:492
334−msgid "This will be your last attempt."
335−msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
387+#: qml/Tutorial/TutorialPage.qml:195
388+msgid "Try again."
389+msgstr "እንደገና ይሞክሩ"
336390
337−#: qml/Shell.qml:494
338−msgid ""
339−"If passphrase is entered incorrectly, your phone will conduct a factory "
340−"reset and all personal data will be deleted."
341−msgstr ""
342−"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
343−"ይጠፋል"
391+#: qml/Tutorial/TutorialRight.qml:31
392+msgid "To view open apps"
393+msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"
344394
345−#: qml/Shell.qml:495
346−msgid ""
347−"If passcode is entered incorrectly, your phone will conduct a factory reset "
348−"and all personal data will be deleted."
349−msgstr ""
350−"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
351−"ይጠፋል"
395+#: qml/Tutorial/TutorialRight.qml:32
396+msgid "Long swipe from the right edge."
397+msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"
398+
399+#: qml/Tutorial/TutorialRight.qml:122
400+msgid "View all your running tasks."
401+msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"
352402
353403#: qml/Wizard/Page.qml:89
404+msgctxt "Button: Go back one page in the Wizard"
354405msgid "Back"
355406msgstr "ወደ ኋላ"
356407
@@ -367,7 +418,7 @@ msgid "Let’s get started."
367418msgstr "ስራ እንጀምር"
368419
369420#: 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
421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
371422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372423#: qml/Wizard/Pages/passwd-set.qml:90
373424msgid "Continue"
@@ -377,11 +428,11 @@ msgstr "ይቀጥሉ"
377428msgid "Add a SIM card and restart your device"
378429msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
379430
380−#: qml/Wizard/Pages/20-sim.qml:55
431+#: qml/Wizard/Pages/20-sim.qml:59
381432msgid "Without it, you won’t be able to make calls or use text messaging."
382433msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
383434
384−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
385436msgid "Skip"
386437msgstr "መዝለያ"
387438
@@ -394,38 +445,44 @@ msgid "Please select how you’d like to unlock your phone."
394445msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
395446
396447#: qml/Wizard/Pages/30-passwd-type.qml:97
448+msgctxt "Label: Type of security method"
397449msgid "Swipe"
398450msgstr "መጥረጊያ"
399451
400452#: qml/Wizard/Pages/30-passwd-type.qml:98
453+msgctxt "Label: Description of security method"
401454msgid "No security"
402455msgstr "ደህንነት አልተገኘም"
403456
404457#: qml/Wizard/Pages/30-passwd-type.qml:100
458+msgctxt "Label: Type of security method"
405459msgid "Passcode"
406460msgstr "ማለፊያ ኮድ"
407461
408462#: qml/Wizard/Pages/30-passwd-type.qml:101
463+msgctxt "Label: Description of security method"
409464msgid "4 digits only"
410−msgstr "4 ዲጂትስ ብቻ"
465+msgstr "4 ዲጂት ብቻ"
411466
412467#: qml/Wizard/Pages/30-passwd-type.qml:103
468+msgctxt "Label: Type of security method"
413469msgid "Passphrase"
414−msgstr "ማለፊያ ሐረግ"
470+msgstr "የማለፊያ ሐረግ"
415471
416472#: qml/Wizard/Pages/30-passwd-type.qml:104
473+msgctxt "Label: Description of security method"
417474msgid "Numbers and letters"
418475msgstr "ቁጥሮች እና ፊደሎች"
419476
420−#: qml/Wizard/Pages/40-wifi.qml:28
477+#: qml/Wizard/Pages/40-wifi.qml:29
421478msgid "Connect to Wi‑Fi"
422479msgstr "ወደ ዋይ‑ፋይ መገናኛ"
423480
424−#: qml/Wizard/Pages/40-wifi.qml:147
481+#: qml/Wizard/Pages/40-wifi.qml:168
425482msgid "Available networks…"
426483msgstr "ዝግጁ ኔትዎርኮች…"
427484
428−#: qml/Wizard/Pages/40-wifi.qml:148
485+#: qml/Wizard/Pages/40-wifi.qml:169
429486msgid "No available networks."
430487msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
431488
@@ -530,6 +587,18 @@ msgstr "〈 %1"
530587msgid "%1 〉"
531588msgstr "%1 〉"
532589
590+#~ msgid "Top edge"
591+#~ msgstr "የላይ ጠርዝ"
592+
593+#~ msgid "Close"
594+#~ msgstr "መዝጊያ"
595+
596+#~ msgid "Left edge"
597+#~ msgstr "የግራ ጠርዝ"
598+
599+#~ msgid "Right edge"
600+#~ msgstr "የቀኝ ጠርዝ"
601+
533602#~ msgid "Type or say a command"
534603#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
535604
@@ -545,14 +614,73 @@ msgstr "%1 〉"
545614#~ msgid "Confirm"
546615#~ msgstr "ማረጋገጫ"
547616
617+#~ msgid "Search"
618+#~ msgstr "መፈለጊያ"
619+
620+#~ msgid "Skip intro"
621+#~ msgstr "መግቢያውን መዝለያ"
622+
623+#~ msgid "Try swiping from the top edge to access the indicators"
624+#~ msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
625+
626+#~ msgid "Swipe up again to close the settings screen"
627+#~ msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
628+
629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
630+#~ msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
631+
632+#~ msgid "Well done"
633+#~ msgstr "ጥሩ አድረገዋል"
634+
635+#~ msgid "Try swiping from the right edge to unlock the phone"
636+#~ msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
637+
548638#~ msgid "Favorites"
549639#~ msgstr "የምወዳቸው"
550640
551641#~ msgid "All"
552642#~ msgstr "ሁሉንም"
553643
644+#~ msgid "Store"
645+#~ msgstr "ማስቀመጫ"
646+
554647#~ msgid "Done"
555648#~ msgstr "ጨርሷል"
556649
650+#~ msgid "Power off"
651+#~ msgstr "ማጥፊያ"
652+
653+#~ msgid "Power"
654+#~ msgstr "ሐይል"
655+
656+#~ msgid "Log out"
657+#~ msgstr "መውጫ"
658+
659+#~ msgid "Shut down"
660+#~ msgstr "ማጥፊያ"
661+
662+#~ msgid "Reboot"
663+#~ msgstr "እንደገና ማስነሻ"
664+
665+#~ msgid "Settings"
666+#~ msgstr "ማሰናጃ"
667+
668+#~ msgid ""
669+#~ "You have now mastered the edge gestures and can start using the "
670+#~ "phone<br><br>Tap on the screen to start"
671+#~ msgstr ""
672+#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
673+
674+#~ msgid "Restart"
675+#~ msgstr "እንደገና ማስጀመሪያ"
676+
557677#~ msgid "Manage Scopes"
558678#~ msgstr "የ ክልል አስተዳዳሪ"
679+
680+#~ msgctxt "Button: Shown in Page Header Menu"
681+#~ msgid "Search"
682+#~ msgstr "መፈለጊያ"
683+
684+#~ msgctxt "Button: The Ubuntu Store"
685+#~ msgid "Store"
686+#~ msgstr "ማስቀመጫ"
po/ar.po+219−123
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +16,10 @@ 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: 2015-01-28 06:29+0000\n"
20−"X-Generator: Launchpad (build 17306)\n"
19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
20+"X-Generator: Launchpad (build 17413)\n"
2121
22−#: plugins/LightDM/Greeter.cpp:130
22+#: plugins/LightDM/Greeter.cpp:112
2323msgid "Password: "
2424msgstr ""
2525
@@ -32,129 +32,105 @@ msgstr ""
3232msgid "Unpin shortcut"
3333msgstr ""
3434
35−#: qml/Components/DelayedLockscreen.qml:47
35+#: qml/Components/DelayedLockscreen.qml:49
3636msgid "Device Locked"
3737msgstr ""
3838
39−#: qml/Components/DelayedLockscreen.qml:62
39+#: qml/Components/DelayedLockscreen.qml:64
4040msgid "You have been locked out due to too many failed passphrase attempts."
4141msgstr ""
4242
43−#: qml/Components/DelayedLockscreen.qml:63
43+#: qml/Components/DelayedLockscreen.qml:65
4444msgid "You have been locked out due to too many failed passcode attempts."
4545msgstr ""
4646
47−#: qml/Components/DelayedLockscreen.qml:72
47+#: qml/Components/DelayedLockscreen.qml:74
4848#, qt-format
4949msgid "Please wait %1 minute and then try again…"
5050msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:86
54+#: qml/Components/Dialogs.qml:67
55+msgctxt "Title: Lock/Log out dialog"
5556msgid "Log out"
5657msgstr ""
5758
58−#: qml/Components/Dialogs.qml:87
59+#: qml/Components/Dialogs.qml:68
5960msgid "Are you sure you want to log out?"
6061msgstr ""
6162
62−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:134
64−msgid "No"
63+#: qml/Components/Dialogs.qml:70
64+msgctxt "Button: Lock the system"
65+msgid "Lock"
6566msgstr ""
6667
67−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:140
69−msgid "Yes"
68+#: qml/Components/Dialogs.qml:77
69+msgctxt "Button: Log out from the system"
70+msgid "Log Out"
71+msgstr ""
72+
73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
74+#: qml/Components/Dialogs.qml:171
75+msgid "Cancel"
7076msgstr ""
7177
72−#: qml/Components/Dialogs.qml:108
78+#: qml/Components/Dialogs.qml:96
79+msgctxt "Title: Reboot/Shut down dialog"
7380msgid "Shut down"
7481msgstr ""
7582
76−#: qml/Components/Dialogs.qml:109
83+#: qml/Components/Dialogs.qml:97
7784msgid "Are you sure you want to shut down?"
7885msgstr ""
7986
80−#: qml/Components/Dialogs.qml:131
87+#: qml/Components/Dialogs.qml:99
88+msgctxt "Button: Reboot the system"
8189msgid "Reboot"
8290msgstr ""
8391
84−#: qml/Components/Dialogs.qml:132
85−msgid "Are you sure you want to reboot?"
92+#: qml/Components/Dialogs.qml:107
93+msgctxt "Button: Shut down the system"
94+msgid "Shut down"
8695msgstr ""
8796
88−#: qml/Components/Dialogs.qml:154
89−msgid "Power"
97+#: qml/Components/Dialogs.qml:127
98+msgctxt "Title: Reboot dialog"
99+msgid "Reboot"
90100msgstr ""
91101
92−#: qml/Components/Dialogs.qml:155
93−msgid ""
94−"Are you sure you would like\n"
95−"to power off?"
102+#: qml/Components/Dialogs.qml:128
103+msgid "Are you sure you want to reboot?"
96104msgstr ""
97105
98−#: qml/Components/Dialogs.qml:157
99−msgid "Power off"
106+#: qml/Components/Dialogs.qml:130
107+msgid "No"
100108msgstr ""
101109
102−#: qml/Components/Dialogs.qml:166
103−msgid "Restart"
110+#: qml/Components/Dialogs.qml:136
111+msgid "Yes"
104112msgstr ""
105113
106−#: qml/Components/Dialogs.qml:175
107−msgid "Cancel"
114+#: qml/Components/Dialogs.qml:150
115+msgctxt "Title: Power off/Restart dialog"
116+msgid "Power"
108117msgstr ""
109118
110−#: qml/Components/EdgeDemoOverlay.qml:151
111−msgid "Skip intro"
112−msgstr "تخطي المقدمة"
113−
114−#: qml/Components/EdgeDemo.qml:125
115−msgid "Right edge"
116−msgstr "الحافة اليمنى"
117−
118−#: qml/Components/EdgeDemo.qml:126
119−msgid "Try swiping from the right edge to unlock the phone"
120−msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
121−
122−#: qml/Components/EdgeDemo.qml:157
123−msgid "Top edge"
124−msgstr "الحافة العلوية"
125−
126−#: qml/Components/EdgeDemo.qml:158
127−msgid "Try swiping from the top edge to access the indicators"
128−msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
129−
130−#: qml/Components/EdgeDemo.qml:183
131−msgid "Close"
132−msgstr "أغلق"
133−
134−#: qml/Components/EdgeDemo.qml:184
135−msgid "Swipe up again to close the settings screen"
136−msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
137−
138−#: qml/Components/EdgeDemo.qml:214
139−msgid "Left edge"
140−msgstr "الحافة اليسرى"
141−
142−#: qml/Components/EdgeDemo.qml:215
143−msgid "Swipe from the left to reveal the launcher for quick access to apps"
119+#: qml/Components/Dialogs.qml:151
120+msgid ""
121+"Are you sure you would like\n"
122+"to power off?"
144123msgstr ""
145−"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
146124
147−#: qml/Components/EdgeDemo.qml:242
148−msgid "Well done"
149−msgstr "أحسنت!"
125+#: qml/Components/Dialogs.qml:153
126+msgctxt "Button: Power off the system"
127+msgid "Power off"
128+msgstr ""
150129
151−#: qml/Components/EdgeDemo.qml:243
152−msgid ""
153−"You have now mastered the edge gestures and can start using the "
154−"phone<br><br>Tap on the screen to start"
130+#: qml/Components/Dialogs.qml:162
131+msgctxt "Button: Restart the system"
132+msgid "Restart"
155133msgstr ""
156−"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
157−"الشاشة للبدء"
158134
159135#: qml/Components/Lockscreen.qml:238
160136msgid "Return to Call"
@@ -168,32 +144,39 @@ msgstr "مكالمة طوارئ"
168144msgid "OK"
169145msgstr ""
170146
171−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
172148msgid "See less"
173149msgstr "شاهد أقل"
174150
175−#: qml/Dash/GenericScopeView.qml:485
151+#: qml/Dash/GenericScopeView.qml:533
176152msgid "See all"
177153msgstr ""
178154
179−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180−#: qml/Panel/SearchIndicator.qml:27
155+#: qml/Dash/GenericScopeView.qml:595
156+msgctxt "Label: Hint for dash search line edit"
181157msgid "Search"
182−msgstr "ابحث"
158+msgstr ""
183159
184−#: qml/Dash/PageHeader.qml:267
160+#: qml/Dash/PageHeader.qml:269
161+msgctxt "Button: Open the Ubuntu Store"
185162msgid "Store"
186163msgstr ""
187164
188−#: qml/Dash/PageHeader.qml:284
165+#: qml/Dash/PageHeader.qml:276
166+msgctxt "Button: Start a search in the current dash scope"
167+msgid "Search"
168+msgstr ""
169+
170+#: qml/Dash/PageHeader.qml:286
171+msgctxt "Button: Show the current dash scope settings"
189172msgid "Settings"
190173msgstr ""
191174
192−#: qml/Dash/PageHeader.qml:291
175+#: qml/Dash/PageHeader.qml:293
193176msgid "Remove from Favorites"
194177msgstr ""
195178
196−#: qml/Dash/PageHeader.qml:291
179+#: qml/Dash/PageHeader.qml:293
197180msgid "Add to Favorites"
198181msgstr ""
199182
@@ -225,6 +208,10 @@ msgstr ""
225208msgid "Release to refresh…"
226209msgstr ""
227210
211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
212+msgid "Enable location data"
213+msgstr ""
214+
228215#: qml/Dash/ScopesList.qml:66
229216msgid "Manage"
230217msgstr ""
@@ -237,10 +224,72 @@ msgstr ""
237224msgid "Also installed"
238225msgstr ""
239226
240−#: qml/Greeter/Greeter.qml:133
227+#: qml/Greeter/CoverPage.qml:107
241228msgid "Unlock"
242229msgstr ""
243230
231+#: qml/Greeter/LoginList.qml:236
232+msgid "Retry"
233+msgstr ""
234+
235+#: qml/Greeter/LoginList.qml:237
236+msgid "Tap to unlock"
237+msgstr ""
238+
239+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
240+msgid "Sorry, incorrect passphrase."
241+msgstr ""
242+
243+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
244+msgid "Sorry, incorrect passcode."
245+msgstr ""
246+
247+#: qml/Greeter/NarrowView.qml:55
248+msgid "This will be your last attempt."
249+msgstr ""
250+
251+#: qml/Greeter/NarrowView.qml:57
252+msgid ""
253+"If passphrase is entered incorrectly, your phone will conduct a factory "
254+"reset and all personal data will be deleted."
255+msgstr ""
256+
257+#: qml/Greeter/NarrowView.qml:58
258+msgid ""
259+"If passcode is entered incorrectly, your phone will conduct a factory reset "
260+"and all personal data will be deleted."
261+msgstr ""
262+
263+#: qml/Greeter/NarrowView.qml:115
264+#, qt-format
265+msgid "Enter %1"
266+msgstr ""
267+
268+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
269+msgid "Enter passphrase"
270+msgstr ""
271+
272+#: qml/Greeter/NarrowView.qml:117
273+msgid "Enter passcode"
274+msgstr ""
275+
276+#: qml/Greeter/NarrowView.qml:118
277+#, qt-format
278+msgid "Sorry, incorrect %1"
279+msgstr ""
280+
281+#: qml/Greeter/NarrowView.qml:119
282+msgid "Sorry, incorrect passphrase"
283+msgstr ""
284+
285+#: qml/Greeter/NarrowView.qml:120
286+msgid "Please re-enter"
287+msgstr ""
288+
289+#: qml/Greeter/NarrowView.qml:121
290+msgid "Sorry, incorrect passcode"
291+msgstr ""
292+
244293#: qml/Notifications/NotificationMenuItemFactory.qml:128
245294msgid "Show password"
246295msgstr "عرض كلمة السر"
@@ -282,6 +331,7 @@ msgid "Failed, tap to retry"
282331msgstr ""
283332
284333#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
334+msgctxt "Label: Hint in message indicator line edit"
285335msgid "Reply"
286336msgstr ""
287337
@@ -293,61 +343,60 @@ msgstr ""
293343msgid "Roaming"
294344msgstr ""
295345
296−#: qml/Shell.qml:390
297−#, qt-format
298−msgid "Enter %1"
346+#: qml/Tutorial/TutorialBottomFinish.qml:24
347+msgid "This action does different things for different apps"
299348msgstr ""
300349
301−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
302−msgid "Enter passphrase"
350+#: qml/Tutorial/TutorialBottomFinish.qml:25
351+msgid "Tap here to finish."
303352msgstr ""
304353
305−#: qml/Shell.qml:392
306−msgid "Enter passcode"
354+#: qml/Tutorial/TutorialBottom.qml:28
355+msgid "Open special menus"
307356msgstr ""
308357
309−#: qml/Shell.qml:393
310−#, qt-format
311−msgid "Sorry, incorrect %1"
358+#: qml/Tutorial/TutorialBottom.qml:29
359+msgid "Swipe up from the bottom edge."
312360msgstr ""
313361
314−#: qml/Shell.qml:394
315−msgid "Sorry, incorrect passphrase"
362+#: qml/Tutorial/TutorialLeftFinish.qml:24
363+msgid "These are the shortcuts to favorite apps"
316364msgstr ""
317365
318−#: qml/Shell.qml:395
319−msgid "Please re-enter"
366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
367+msgid "Tap here to continue."
320368msgstr ""
321369
322−#: qml/Shell.qml:396
323−msgid "Sorry, incorrect passcode"
370+#: qml/Tutorial/TutorialLeft.qml:26
371+msgid "Open the launcher"
324372msgstr ""
325373
326−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−msgid "Sorry, incorrect passphrase."
374+#: qml/Tutorial/TutorialLeft.qml:27
375+msgid "Short swipe from the left edge."
328376msgstr ""
329377
330−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331−msgid "Sorry, incorrect passcode."
378+#: qml/Tutorial/TutorialPage.qml:178
379+msgid "You almost got it!"
332380msgstr ""
333381
334−#: qml/Shell.qml:492
335−msgid "This will be your last attempt."
382+#: qml/Tutorial/TutorialPage.qml:195
383+msgid "Try again."
336384msgstr ""
337385
338−#: qml/Shell.qml:494
339−msgid ""
340−"If passphrase is entered incorrectly, your phone will conduct a factory "
341−"reset and all personal data will be deleted."
386+#: qml/Tutorial/TutorialRight.qml:31
387+msgid "To view open apps"
342388msgstr ""
343389
344−#: qml/Shell.qml:495
345−msgid ""
346−"If passcode is entered incorrectly, your phone will conduct a factory reset "
347−"and all personal data will be deleted."
390+#: qml/Tutorial/TutorialRight.qml:32
391+msgid "Long swipe from the right edge."
392+msgstr ""
393+
394+#: qml/Tutorial/TutorialRight.qml:122
395+msgid "View all your running tasks."
348396msgstr ""
349397
350398#: qml/Wizard/Page.qml:89
399+msgctxt "Button: Go back one page in the Wizard"
351400msgid "Back"
352401msgstr ""
353402
@@ -364,7 +413,7 @@ msgid "Let’s get started."
364413msgstr ""
365414
366415#: 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
416+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
368417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369418#: qml/Wizard/Pages/passwd-set.qml:90
370419msgid "Continue"
@@ -374,11 +423,11 @@ msgstr ""
374423msgid "Add a SIM card and restart your device"
375424msgstr ""
376425
377−#: qml/Wizard/Pages/20-sim.qml:55
426+#: qml/Wizard/Pages/20-sim.qml:59
378427msgid "Without it, you won’t be able to make calls or use text messaging."
379428msgstr ""
380429
381−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
430+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
382431msgid "Skip"
383432msgstr ""
384433
@@ -391,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."
391440msgstr ""
392441
393442#: qml/Wizard/Pages/30-passwd-type.qml:97
443+msgctxt "Label: Type of security method"
394444msgid "Swipe"
395445msgstr ""
396446
397447#: qml/Wizard/Pages/30-passwd-type.qml:98
448+msgctxt "Label: Description of security method"
398449msgid "No security"
399450msgstr ""
400451
401452#: qml/Wizard/Pages/30-passwd-type.qml:100
453+msgctxt "Label: Type of security method"
402454msgid "Passcode"
403455msgstr ""
404456
405457#: qml/Wizard/Pages/30-passwd-type.qml:101
458+msgctxt "Label: Description of security method"
406459msgid "4 digits only"
407460msgstr ""
408461
409462#: qml/Wizard/Pages/30-passwd-type.qml:103
463+msgctxt "Label: Type of security method"
410464msgid "Passphrase"
411465msgstr ""
412466
413467#: qml/Wizard/Pages/30-passwd-type.qml:104
468+msgctxt "Label: Description of security method"
414469msgid "Numbers and letters"
415470msgstr ""
416471
417−#: qml/Wizard/Pages/40-wifi.qml:28
472+#: qml/Wizard/Pages/40-wifi.qml:29
418473msgid "Connect to Wi‑Fi"
419474msgstr ""
420475
421−#: qml/Wizard/Pages/40-wifi.qml:147
476+#: qml/Wizard/Pages/40-wifi.qml:168
422477msgid "Available networks…"
423478msgstr ""
424479
425−#: qml/Wizard/Pages/40-wifi.qml:148
480+#: qml/Wizard/Pages/40-wifi.qml:169
426481msgid "No available networks."
427482msgstr ""
428483
@@ -538,3 +593,44 @@ msgstr ""
538593
539594#~ msgid "Speaking..."
540595#~ msgstr "تتكلم الآن..."
596+
597+#~ msgid "Search"
598+#~ msgstr "ابحث"
599+
600+#~ msgid "Try swiping from the top edge to access the indicators"
601+#~ msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
602+
603+#~ msgid "Top edge"
604+#~ msgstr "الحافة العلوية"
605+
606+#~ msgid "Close"
607+#~ msgstr "أغلق"
608+
609+#~ msgid "Swipe up again to close the settings screen"
610+#~ msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
611+
612+#~ msgid "Skip intro"
613+#~ msgstr "تخطي المقدمة"
614+
615+#~ msgid "Try swiping from the right edge to unlock the phone"
616+#~ msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
617+
618+#~ msgid "Right edge"
619+#~ msgstr "الحافة اليمنى"
620+
621+#~ msgid "Left edge"
622+#~ msgstr "الحافة اليسرى"
623+
624+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
625+#~ msgstr ""
626+#~ "اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
627+
628+#~ msgid "Well done"
629+#~ msgstr "أحسنت!"
630+
631+#~ msgid ""
632+#~ "You have now mastered the edge gestures and can start using the "
633+#~ "phone<br><br>Tap on the screen to start"
634+#~ msgstr ""
635+#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
636+#~ "الشاشة للبدء"
po/ast.po+308−181
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-08 18:24+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-02 18:12+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: 2015-01-28 06:29+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
@@ -31,65 +31,92 @@ msgstr "Anclar"
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Preséu bloquiáu"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de frase de pasu."
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."
4646
47−#: qml/Components/DelayedLockscreen.qml:72
47+#: qml/Components/DelayedLockscreen.qml:74
4848#, qt-format
4949msgid "Please wait %1 minute and then try again…"
5050msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
5252msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
5353
54−#: qml/Components/Dialogs.qml:86
54+#: qml/Components/Dialogs.qml:67
55+msgctxt "Title: Lock/Log out dialog"
5556msgid "Log out"
56−msgstr "Zarrar sesión"
57+msgstr ""
5758
58−#: qml/Components/Dialogs.qml:87
59+#: qml/Components/Dialogs.qml:68
5960msgid "Are you sure you want to log out?"
6061msgstr "De xuru que quies zarrar la sesión?"
6162
62−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:134
64−msgid "No"
65−msgstr "Non"
63+#: qml/Components/Dialogs.qml:70
64+msgctxt "Button: Lock the system"
65+msgid "Lock"
66+msgstr ""
6667
67−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:140
69−msgid "Yes"
70−msgstr "Sí"
68+#: qml/Components/Dialogs.qml:77
69+msgctxt "Button: Log out from the system"
70+msgid "Log Out"
71+msgstr ""
72+
73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
74+#: qml/Components/Dialogs.qml:171
75+msgid "Cancel"
76+msgstr "Encaboxar"
7177
72−#: qml/Components/Dialogs.qml:108
78+#: qml/Components/Dialogs.qml:96
79+msgctxt "Title: Reboot/Shut down dialog"
7380msgid "Shut down"
74−msgstr "Apagar"
81+msgstr ""
7582
76−#: qml/Components/Dialogs.qml:109
83+#: qml/Components/Dialogs.qml:97
7784msgid "Are you sure you want to shut down?"
7885msgstr "De xuru que quies apagar?"
7986
80−#: qml/Components/Dialogs.qml:131
87+#: qml/Components/Dialogs.qml:99
88+msgctxt "Button: Reboot the system"
89+msgid "Reboot"
90+msgstr ""
91+
92+#: qml/Components/Dialogs.qml:107
93+msgctxt "Button: Shut down the system"
94+msgid "Shut down"
95+msgstr ""
96+
97+#: qml/Components/Dialogs.qml:127
98+msgctxt "Title: Reboot dialog"
8199msgid "Reboot"
82−msgstr "Reaniciar"
100+msgstr ""
83101
84−#: qml/Components/Dialogs.qml:132
102+#: qml/Components/Dialogs.qml:128
85103msgid "Are you sure you want to reboot?"
86104msgstr "De xuru que quies reaniciar?"
87105
88−#: qml/Components/Dialogs.qml:154
106+#: qml/Components/Dialogs.qml:130
107+msgid "No"
108+msgstr "Non"
109+
110+#: qml/Components/Dialogs.qml:136
111+msgid "Yes"
112+msgstr "Sí"
113+
114+#: qml/Components/Dialogs.qml:150
115+msgctxt "Title: Power off/Restart dialog"
89116msgid "Power"
90−msgstr "Enerxía"
117+msgstr ""
91118
92−#: qml/Components/Dialogs.qml:155
119+#: qml/Components/Dialogs.qml:151
93120msgid ""
94121"Are you sure you would like\n"
95122"to power off?"
@@ -97,67 +124,15 @@ msgstr ""
97124"De xuru que quies\n"
98125"apagar?"
99126
100−#: qml/Components/Dialogs.qml:157
127+#: qml/Components/Dialogs.qml:153
128+msgctxt "Button: Power off the system"
101129msgid "Power off"
102−msgstr "Apagar"
103−
104−#: qml/Components/Dialogs.qml:166
105−msgid "Restart"
106−msgstr "Reaniciar"
107−
108−#: qml/Components/Dialogs.qml:175
109−msgid "Cancel"
110−msgstr "Encaboxar"
111−
112−#: qml/Components/EdgeDemoOverlay.qml:151
113−msgid "Skip intro"
114−msgstr "Omitir la intro"
115−
116−#: qml/Components/EdgeDemo.qml:125
117−msgid "Right edge"
118−msgstr "Berbesu drechu"
119−
120−#: qml/Components/EdgeDemo.qml:126
121−msgid "Try swiping from the right edge to unlock the phone"
122−msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
123−
124−#: qml/Components/EdgeDemo.qml:157
125−msgid "Top edge"
126−msgstr "Berbesu superior"
127−
128−#: qml/Components/EdgeDemo.qml:158
129−msgid "Try swiping from the top edge to access the indicators"
130−msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
131−
132−#: qml/Components/EdgeDemo.qml:183
133−msgid "Close"
134−msgstr "Zarrar"
135−
136−#: qml/Components/EdgeDemo.qml:184
137−msgid "Swipe up again to close the settings screen"
138−msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
139−
140−#: qml/Components/EdgeDemo.qml:214
141−msgid "Left edge"
142−msgstr "Berbesu esquierdu"
143−
144−#: qml/Components/EdgeDemo.qml:215
145−msgid "Swipe from the left to reveal the launcher for quick access to apps"
146130msgstr ""
147−"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
148−"a les aplicaciones"
149131
150−#: qml/Components/EdgeDemo.qml:242
151−msgid "Well done"
152−msgstr "Bien fecho"
153−
154−#: qml/Components/EdgeDemo.qml:243
155−msgid ""
156−"You have now mastered the edge gestures and can start using the "
157−"phone<br><br>Tap on the screen to start"
132+#: qml/Components/Dialogs.qml:162
133+msgctxt "Button: Restart the system"
134+msgid "Restart"
158135msgstr ""
159−"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
160−"teléfonu<br><br>Toca la pantalla pa comenzar"
161136
162137#: qml/Components/Lockscreen.qml:238
163138msgid "Return to Call"
@@ -171,32 +146,39 @@ msgstr "Llamada d'emerxencia"
171146msgid "OK"
172147msgstr "Aceutar"
173148
174−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
175150msgid "See less"
176151msgstr "Ver menos"
177152
178−#: qml/Dash/GenericScopeView.qml:485
153+#: qml/Dash/GenericScopeView.qml:533
179154msgid "See all"
180155msgstr "Ver too"
181156
182−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183−#: qml/Panel/SearchIndicator.qml:27
157+#: qml/Dash/GenericScopeView.qml:595
158+msgctxt "Label: Hint for dash search line edit"
184159msgid "Search"
185−msgstr "Guetar"
160+msgstr ""
186161
187−#: qml/Dash/PageHeader.qml:267
162+#: qml/Dash/PageHeader.qml:269
163+msgctxt "Button: Open the Ubuntu Store"
188164msgid "Store"
189−msgstr "Tienda"
165+msgstr ""
166+
167+#: qml/Dash/PageHeader.qml:276
168+msgctxt "Button: Start a search in the current dash scope"
169+msgid "Search"
170+msgstr ""
190171
191−#: qml/Dash/PageHeader.qml:284
172+#: qml/Dash/PageHeader.qml:286
173+msgctxt "Button: Show the current dash scope settings"
192174msgid "Settings"
193−msgstr "Axustes"
175+msgstr ""
194176
195−#: qml/Dash/PageHeader.qml:291
177+#: qml/Dash/PageHeader.qml:293
196178msgid "Remove from Favorites"
197179msgstr "Desaniciar de favoritos"
198180
199−#: qml/Dash/PageHeader.qml:291
181+#: qml/Dash/PageHeader.qml:293
200182msgid "Add to Favorites"
201183msgstr "Amestar a favoritos"
202184
@@ -228,22 +210,92 @@ msgstr "Tirar p'anovar..."
228210msgid "Release to refresh…"
229211msgstr "Soltar p'anovar..."
230212
213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
214+msgid "Enable location data"
215+msgstr "Activar datos de llocalización"
216+
231217#: qml/Dash/ScopesList.qml:66
232218msgid "Manage"
233−msgstr ""
219+msgstr "Alministrar"
234220
235221#: qml/Dash/ScopesList.qml:112
236222msgid "Home"
237−msgstr ""
223+msgstr "Aniciu"
238224
239225#: qml/Dash/ScopesList.qml:113
240226msgid "Also installed"
241−msgstr ""
227+msgstr "Tamién instalaos"
242228
243−#: qml/Greeter/Greeter.qml:133
229+#: qml/Greeter/CoverPage.qml:107
244230msgid "Unlock"
245231msgstr "Desbloquiar"
246232
233+#: qml/Greeter/LoginList.qml:236
234+msgid "Retry"
235+msgstr ""
236+
237+#: qml/Greeter/LoginList.qml:237
238+msgid "Tap to unlock"
239+msgstr ""
240+
241+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
242+msgid "Sorry, incorrect passphrase."
243+msgstr "Fras de pasu incorreuta"
244+
245+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
246+msgid "Sorry, incorrect passcode."
247+msgstr "Códigu de pasu incorreutu"
248+
249+#: qml/Greeter/NarrowView.qml:55
250+msgid "This will be your last attempt."
251+msgstr "Esti ye'l caberu intentu."
252+
253+#: qml/Greeter/NarrowView.qml:57
254+msgid ""
255+"If passphrase is entered incorrectly, your phone will conduct a factory "
256+"reset and all personal data will be deleted."
257+msgstr ""
258+"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
259+"configuración de fábrica y van perdese tolos datos personales."
260+
261+#: qml/Greeter/NarrowView.qml:58
262+msgid ""
263+"If passcode is entered incorrectly, your phone will conduct a factory reset "
264+"and all personal data will be deleted."
265+msgstr ""
266+"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
267+"configuración de fábrica y van perdese tolos datos personales."
268+
269+#: qml/Greeter/NarrowView.qml:115
270+#, qt-format
271+msgid "Enter %1"
272+msgstr "Escribi %1"
273+
274+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
275+msgid "Enter passphrase"
276+msgstr "Escribi la frase contraseña"
277+
278+#: qml/Greeter/NarrowView.qml:117
279+msgid "Enter passcode"
280+msgstr "Escribi'l códigu de pasu"
281+
282+#: qml/Greeter/NarrowView.qml:118
283+#, qt-format
284+msgid "Sorry, incorrect %1"
285+msgstr "Sentímoslo, %1 incorreutu"
286+
287+#: qml/Greeter/NarrowView.qml:119
288+msgid "Sorry, incorrect passphrase"
289+msgstr "Sentímoslo, contraseña incorreuta"
290+
291+#: qml/Greeter/NarrowView.qml:120
292+msgid "Please re-enter"
293+msgstr "Vuelvi a escribila"
294+
295+#: qml/Greeter/NarrowView.qml:121
296+msgid "Sorry, incorrect passcode"
297+msgstr "Sentímoslo, códigu de pasu incorreutu"
298+
247299#: qml/Notifications/NotificationMenuItemFactory.qml:128
248300msgid "Show password"
249301msgstr "Amosar contraseña"
@@ -285,6 +337,7 @@ msgid "Failed, tap to retry"
285337msgstr "Falló, toca pa reintentar"
286338
287339#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
340+msgctxt "Label: Hint in message indicator line edit"
288341msgid "Reply"
289342msgstr ""
290343
@@ -296,158 +349,160 @@ msgstr "Desbloquiar SIM"
296349msgid "Roaming"
297350msgstr "Roaming"
298351
299−#: qml/Shell.qml:390
300−#, qt-format
301−msgid "Enter %1"
302−msgstr "Escribi %1"
352+#: qml/Tutorial/TutorialBottomFinish.qml:24
353+msgid "This action does different things for different apps"
354+msgstr "Esta aición tiene efeutos distintos en cada aplicación"
303355
304−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
305−msgid "Enter passphrase"
306−msgstr "Escribi la frase contraseña"
356+#: qml/Tutorial/TutorialBottomFinish.qml:25
357+msgid "Tap here to finish."
358+msgstr "Toca equí pa finar."
307359
308−#: qml/Shell.qml:392
309−msgid "Enter passcode"
310−msgstr "Escribi'l códigu de pasu"
360+#: qml/Tutorial/TutorialBottom.qml:28
361+msgid "Open special menus"
362+msgstr "Abrir menús especiales"
311363
312−#: qml/Shell.qml:393
313−#, qt-format
314−msgid "Sorry, incorrect %1"
315−msgstr "Sentímoslo, %1 incorreutu"
364+#: qml/Tutorial/TutorialBottom.qml:29
365+msgid "Swipe up from the bottom edge."
366+msgstr ""
316367
317−#: qml/Shell.qml:394
318−msgid "Sorry, incorrect passphrase"
319−msgstr "Sentímoslo, contraseña incorreuta"
368+#: qml/Tutorial/TutorialLeftFinish.qml:24
369+msgid "These are the shortcuts to favorite apps"
370+msgstr ""
320371
321−#: qml/Shell.qml:395
322−msgid "Please re-enter"
323−msgstr "Vuelvi a escribila"
372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
373+msgid "Tap here to continue."
374+msgstr "Toca equí pa siguir."
324375
325−#: qml/Shell.qml:396
326−msgid "Sorry, incorrect passcode"
327−msgstr "Sentímoslo, códigu de pasu incorreutu"
376+#: qml/Tutorial/TutorialLeft.qml:26
377+msgid "Open the launcher"
378+msgstr "Abrir el llanzador"
328379
329−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
330−msgid "Sorry, incorrect passphrase."
331−msgstr "Fras de pasu incorreuta"
380+#: qml/Tutorial/TutorialLeft.qml:27
381+msgid "Short swipe from the left edge."
382+msgstr ""
332383
333−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334−msgid "Sorry, incorrect passcode."
335−msgstr "Códigu de pasu incorreutu"
384+#: qml/Tutorial/TutorialPage.qml:178
385+msgid "You almost got it!"
386+msgstr ""
336387
337−#: qml/Shell.qml:492
338−msgid "This will be your last attempt."
339−msgstr "Esti ye'l caberu intentu."
388+#: qml/Tutorial/TutorialPage.qml:195
389+msgid "Try again."
390+msgstr ""
340391
341−#: qml/Shell.qml:494
342−msgid ""
343−"If passphrase is entered incorrectly, your phone will conduct a factory "
344−"reset and all personal data will be deleted."
392+#: qml/Tutorial/TutorialRight.qml:31
393+msgid "To view open apps"
345394msgstr ""
346−"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
347−"configuración de fábrica y van perdese tolos datos personales."
348395
349−#: qml/Shell.qml:495
350−msgid ""
351−"If passcode is entered incorrectly, your phone will conduct a factory reset "
352−"and all personal data will be deleted."
396+#: qml/Tutorial/TutorialRight.qml:32
397+msgid "Long swipe from the right edge."
398+msgstr ""
399+
400+#: qml/Tutorial/TutorialRight.qml:122
401+msgid "View all your running tasks."
353402msgstr ""
354−"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
355−"configuración de fábrica y van perdese tolos datos personales."
356403
357404#: qml/Wizard/Page.qml:89
405+msgctxt "Button: Go back one page in the Wizard"
358406msgid "Back"
359407msgstr ""
360408
361409#: qml/Wizard/Pages/10-welcome.qml:27
362410msgid "Hi!"
363−msgstr ""
411+msgstr "Hola!"
364412
365413#: qml/Wizard/Pages/10-welcome.qml:44
366414msgid "Welcome to your Ubuntu phone."
367−msgstr ""
415+msgstr "Dámoste l'acoyida a Ubuntu Phone"
368416
369417#: qml/Wizard/Pages/10-welcome.qml:52
370418msgid "Let’s get started."
371−msgstr ""
419+msgstr "Entamamos."
372420
373421#: 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
422+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
375423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376424#: qml/Wizard/Pages/passwd-set.qml:90
377425msgid "Continue"
378−msgstr ""
426+msgstr "Siguir"
379427
380428#: qml/Wizard/Pages/20-sim.qml:25
381429msgid "Add a SIM card and restart your device"
382−msgstr ""
430+msgstr "Amiesta una tarxeta SIM y reanicia'l preséu"
383431
384−#: qml/Wizard/Pages/20-sim.qml:55
432+#: qml/Wizard/Pages/20-sim.qml:59
385433msgid "Without it, you won’t be able to make calls or use text messaging."
386−msgstr ""
434+msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
387435
388−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
389437msgid "Skip"
390−msgstr ""
438+msgstr "Omitir"
391439
392440#: qml/Wizard/Pages/30-passwd-type.qml:39
393441msgid "Lock security"
394−msgstr ""
442+msgstr "Seguridá de bloquéu"
395443
396444#: qml/Wizard/Pages/30-passwd-type.qml:74
397445msgid "Please select how you’d like to unlock your phone."
398−msgstr ""
446+msgstr "Seleiciona cómo te prestaría desbloquiar el teléfonu."
399447
400448#: qml/Wizard/Pages/30-passwd-type.qml:97
449+msgctxt "Label: Type of security method"
401450msgid "Swipe"
402451msgstr ""
403452
404453#: qml/Wizard/Pages/30-passwd-type.qml:98
454+msgctxt "Label: Description of security method"
405455msgid "No security"
406456msgstr ""
407457
408458#: qml/Wizard/Pages/30-passwd-type.qml:100
459+msgctxt "Label: Type of security method"
409460msgid "Passcode"
410461msgstr ""
411462
412463#: qml/Wizard/Pages/30-passwd-type.qml:101
464+msgctxt "Label: Description of security method"
413465msgid "4 digits only"
414466msgstr ""
415467
416468#: qml/Wizard/Pages/30-passwd-type.qml:103
469+msgctxt "Label: Type of security method"
417470msgid "Passphrase"
418471msgstr ""
419472
420473#: qml/Wizard/Pages/30-passwd-type.qml:104
474+msgctxt "Label: Description of security method"
421475msgid "Numbers and letters"
422476msgstr ""
423477
424−#: qml/Wizard/Pages/40-wifi.qml:28
478+#: qml/Wizard/Pages/40-wifi.qml:29
425479msgid "Connect to Wi‑Fi"
426−msgstr ""
480+msgstr "Coneutar a WiFi"
427481
428−#: qml/Wizard/Pages/40-wifi.qml:147
482+#: qml/Wizard/Pages/40-wifi.qml:168
429483msgid "Available networks…"
430−msgstr ""
484+msgstr "Redes disponibles..."
431485
432−#: qml/Wizard/Pages/40-wifi.qml:148
486+#: qml/Wizard/Pages/40-wifi.qml:169
433487msgid "No available networks."
434−msgstr ""
488+msgstr "Nun hai redes disponibles"
435489
436490#: qml/Wizard/Pages/50-location.qml:27
437491msgid "Location"
438−msgstr ""
492+msgstr "Llocalización"
439493
440494#: qml/Wizard/Pages/50-location.qml:62
441495msgid "Let the phone detect your location:"
442−msgstr ""
496+msgstr "Permitir al teléfonu deteutar la llocalización:"
443497
444498#: qml/Wizard/Pages/50-location.qml:69
445499msgid "Using GPS only (less accurate)"
446−msgstr ""
500+msgstr "Namái usando GPS (menos precisión)"
447501
448502#: qml/Wizard/Pages/50-location.qml:86
449503msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450504msgstr ""
505+"Usando GPS, Wifi anónimes ya información de redes móviles (recomiéndase)"
451506
452507#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453508#: qml/Wizard/Pages/50-location.qml:103
@@ -455,81 +510,119 @@ msgid ""
455510"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456511"conditions</a>."
457512msgstr ""
513+"Seleicionando esta opción, aceutes los <a href='#'>términos y "
514+"condiciones</a> de Nokia HERE."
458515
459516#: qml/Wizard/Pages/50-location.qml:112
460517msgid "Not at all"
461−msgstr ""
518+msgstr "De nengún mou"
462519
463520#: qml/Wizard/Pages/50-location.qml:124
464521msgid "You can change your mind later in <b>System Settings</b>."
465−msgstr ""
522+msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
466523
467524#: qml/Wizard/Pages/60-reporting.qml:24
468525msgid "Improving your experience"
469−msgstr ""
526+msgstr "Ameyorar la esperiencia"
470527
471528#: qml/Wizard/Pages/60-reporting.qml:36
472529msgid ""
473530"Your phone is set up to automatically report errors to Canonical and its "
474531"partners, the makers of the operating system."
475532msgstr ""
533+"El teléfonu ta configuráu pa informar automáticamente de los fallos a "
534+"Canonical y asociaos, los fabricantes del sistema operativu."
476535
477536#: qml/Wizard/Pages/60-reporting.qml:43
478537msgid ""
479538"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480539"Privacy</b>"
481540msgstr ""
541+"Esto pue desactivase nos <b>Axustes del sistema</b> en <b>Seguranza y "
542+"privacidá</b>"
482543
483544#: qml/Wizard/Pages/80-finished.qml:24
484545msgid "All done"
485−msgstr ""
546+msgstr "Too fecho"
486547
487548#: qml/Wizard/Pages/80-finished.qml:39
488549msgid "Nice work!"
489−msgstr ""
550+msgstr "Bon trabayu!"
490551
491552#: qml/Wizard/Pages/80-finished.qml:46
492553msgid "Your phone is now ready to use."
493−msgstr ""
554+msgstr "El teléfonu yá ta preparáu pa usar."
494555
495556#: qml/Wizard/Pages/80-finished.qml:53
496557msgid "Finish"
497−msgstr ""
558+msgstr "Finar"
498559
499560#: qml/Wizard/Pages/here-terms.qml:27
500561msgid "Terms & Conditions"
501−msgstr ""
562+msgstr "Términos y condiciones"
502563
503564#: qml/Wizard/Pages/passwd-confirm.qml:49
504565msgid "Confirm passphrase"
505−msgstr ""
566+msgstr "Confirmar fras secreta"
506567
507568#: qml/Wizard/Pages/passwd-confirm.qml:50
508569msgid "Confirm passcode"
509−msgstr ""
570+msgstr "Confirmar el códigu de pasu"
510571
511572#: qml/Wizard/Pages/passwd-confirm.qml:53
512573#: qml/Wizard/Pages/passwd-confirm.qml:54
513574msgid "Please try again."
514−msgstr ""
575+msgstr "Vuelvi a intentalo."
515576
516577#: qml/Wizard/Pages/passwd-set.qml:61
517578msgid "Choose your passcode"
518−msgstr ""
579+msgstr "Escueyi'l códigu de pasu"
519580
520581#: qml/Wizard/Pages/passwd-set.qml:68
521582msgid "Passphrase must be 4 characters long"
522−msgstr ""
583+msgstr "La fras de contraseña tien de ser de 4 caráuteres"
523584
524585#: qml/Wizard/StackButton.qml:39
525586#, qt-format
526587msgid "〈 %1"
527−msgstr ""
588+msgstr "〈 %1"
528589
529590#: qml/Wizard/StackButton.qml:42
530591#, qt-format
531592msgid "%1 〉"
532−msgstr ""
593+msgstr "%1 〉"
594+
595+#~ msgid "Skip intro"
596+#~ msgstr "Omitir la intro"
597+
598+#~ msgid "Try swiping from the right edge to unlock the phone"
599+#~ msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
600+
601+#~ msgid "Right edge"
602+#~ msgstr "Berbesu drechu"
603+
604+#~ msgid "Top edge"
605+#~ msgstr "Berbesu superior"
606+
607+#~ msgid "Try swiping from the top edge to access the indicators"
608+#~ msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
609+
610+#~ msgid "Close"
611+#~ msgstr "Zarrar"
612+
613+#~ msgid "Swipe up again to close the settings screen"
614+#~ msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
615+
616+#~ msgid "Left edge"
617+#~ msgstr "Berbesu esquierdu"
618+
619+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
620+#~ msgstr ""
621+#~ "Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
622+#~ "a les aplicaciones"
623+
624+#~ msgid "Well done"
625+#~ msgstr "Bien fecho"
533626
534627#~ msgid "Confirm"
535628#~ msgstr "Confirmar"
@@ -546,6 +639,34 @@ msgstr ""
546639#~ msgid "Speak Now..."
547640#~ msgstr "Fala agora…"
548641
642+#~ msgid "Search"
643+#~ msgstr "Guetar"
644+
645+#~ msgid ""
646+#~ "You have now mastered the edge gestures and can start using the "
647+#~ "phone<br><br>Tap on the screen to start"
648+#~ msgstr ""
649+#~ "Agora yá domines los xestos de los berbesos y pues entamar a usar el "
650+#~ "teléfonu<br><br>Toca la pantalla pa comenzar"
651+
652+#~ msgid "Power"
653+#~ msgstr "Enerxía"
654+
655+#~ msgid "Log out"
656+#~ msgstr "Zarrar sesión"
657+
658+#~ msgid "Reboot"
659+#~ msgstr "Reaniciar"
660+
661+#~ msgid "Shut down"
662+#~ msgstr "Apagar"
663+
664+#~ msgid "Settings"
665+#~ msgstr "Axustes"
666+
667+#~ msgid "Power off"
668+#~ msgstr "Apagar"
669+
549670#~ msgid "Done"
550671#~ msgstr "Fecho"
551672
@@ -555,5 +676,11 @@ msgstr ""
555676#~ msgid "All"
556677#~ msgstr "Too"
557678
679+#~ msgid "Store"
680+#~ msgstr "Tienda"
681+
682+#~ msgid "Restart"
683+#~ msgstr "Reaniciar"
684+
558685#~ msgid "Manage Scopes"
559686#~ msgstr "Xestionar ámbitos"
po/az.po+250−139
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +15,10 @@ 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: 2015-01-28 06:29+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Şifrә: "
2424
@@ -31,129 +31,105 @@ msgstr "Pin qısayolu"
3131msgid "Unpin shortcut"
3232msgstr "Açma qısayolu"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
55−msgstr "Çıxış"
56+msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
64−msgstr "Yox"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
69−msgstr "Hə"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr "İmtina"
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
73−msgstr "Sistemi Söndür"
80+msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
81−msgstr "Yenidən yüklə"
89+msgstr ""
90+
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr ""
8295
83−#: qml/Components/Dialogs.qml:132
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr ""
100+
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr "Yox"
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr "Hə"
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr ""
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
95122msgstr ""
96123
97−#: qml/Components/Dialogs.qml:157
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
98126msgid "Power off"
99−msgstr "Söndür"
100−
101−#: qml/Components/Dialogs.qml:166
102−msgid "Restart"
103127msgstr ""
104128
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr "İmtina"
108−
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr "Tәqdimatı keç"
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr "Sağ Künc"
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
119−msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
120−
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
123−msgstr "Yuxarı künc"
124−
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
127−msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
128−
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
131−msgstr "Bağla"
132−
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
135−msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
136−
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
139−msgstr "Sol künc"
140−
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
143−msgstr ""
144−"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
145−
146−#: qml/Components/EdgeDemo.qml:242
147−msgid "Well done"
148−msgstr "Təbriklər"
149−
150−#: qml/Components/EdgeDemo.qml:243
151−msgid ""
152−"You have now mastered the edge gestures and can start using the "
153−"phone<br><br>Tap on the screen to start"
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
131+msgid "Restart"
154132msgstr ""
155−"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
156−"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
157133
158134#: qml/Components/Lockscreen.qml:238
159135msgid "Return to Call"
@@ -167,32 +143,39 @@ msgstr "Zərurət zəngi"
167143msgid "OK"
168144msgstr "Oldu"
169145
170−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
171147msgid "See less"
172148msgstr "Daha azını gör"
173149
174−#: qml/Dash/GenericScopeView.qml:485
150+#: qml/Dash/GenericScopeView.qml:533
175151msgid "See all"
176152msgstr "Hamısını gör"
177153
178−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179−#: qml/Panel/SearchIndicator.qml:27
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
180156msgid "Search"
181−msgstr "Axtar"
157+msgstr ""
182158
183−#: qml/Dash/PageHeader.qml:267
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
184161msgid "Store"
185162msgstr ""
186163
187−#: qml/Dash/PageHeader.qml:284
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
188171msgid "Settings"
189−msgstr "Tənzimləmələr"
172+msgstr ""
190173
191−#: qml/Dash/PageHeader.qml:291
174+#: qml/Dash/PageHeader.qml:293
192175msgid "Remove from Favorites"
193176msgstr "Seçilmişlәrdәn çıxart"
194177
195−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
196179msgid "Add to Favorites"
197180msgstr "Seçilmişlәrә әlavә et"
198181
@@ -224,6 +207,10 @@ msgstr ""
224207msgid "Release to refresh…"
225208msgstr ""
226209
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
227214#: qml/Dash/ScopesList.qml:66
228215msgid "Manage"
229216msgstr ""
@@ -236,10 +223,76 @@ msgstr ""
236223msgid "Also installed"
237224msgstr ""
238225
239−#: qml/Greeter/Greeter.qml:133
226+#: qml/Greeter/CoverPage.qml:107
240227msgid "Unlock"
241228msgstr ""
242229
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr "Bağışlayın, açar söz yanlışdır."
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr "Təəssüf ki, açar kod yanlışdır."
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr "Bu sizin son cəhdiniz olacaq."
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
256+"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
257+
258+#: qml/Greeter/NarrowView.qml:58
259+msgid ""
260+"If passcode is entered incorrectly, your phone will conduct a factory reset "
261+"and all personal data will be deleted."
262+msgstr ""
263+"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
264+"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
265+
266+#: qml/Greeter/NarrowView.qml:115
267+#, qt-format
268+msgid "Enter %1"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
272+msgid "Enter passphrase"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:117
276+msgid "Enter passcode"
277+msgstr ""
278+
279+#: qml/Greeter/NarrowView.qml:118
280+#, qt-format
281+msgid "Sorry, incorrect %1"
282+msgstr "Bağışlayın, %1 yanlışdır"
283+
284+#: qml/Greeter/NarrowView.qml:119
285+msgid "Sorry, incorrect passphrase"
286+msgstr "Bağışlayın, açar söz yanlışdır"
287+
288+#: qml/Greeter/NarrowView.qml:120
289+msgid "Please re-enter"
290+msgstr ""
291+
292+#: qml/Greeter/NarrowView.qml:121
293+msgid "Sorry, incorrect passcode"
294+msgstr ""
295+
243296#: qml/Notifications/NotificationMenuItemFactory.qml:128
244297msgid "Show password"
245298msgstr "Şifrәni göstәr"
@@ -281,6 +334,7 @@ msgid "Failed, tap to retry"
281334msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
282335
283336#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
337+msgctxt "Label: Hint in message indicator line edit"
284338msgid "Reply"
285339msgstr ""
286340
@@ -292,65 +346,60 @@ msgstr "SIM kilidini aç"
292346msgid "Roaming"
293347msgstr "Rominq"
294348
295−#: qml/Shell.qml:390
296−#, qt-format
297−msgid "Enter %1"
349+#: qml/Tutorial/TutorialBottomFinish.qml:24
350+msgid "This action does different things for different apps"
298351msgstr ""
299352
300−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
301−msgid "Enter passphrase"
353+#: qml/Tutorial/TutorialBottomFinish.qml:25
354+msgid "Tap here to finish."
302355msgstr ""
303356
304−#: qml/Shell.qml:392
305−msgid "Enter passcode"
357+#: qml/Tutorial/TutorialBottom.qml:28
358+msgid "Open special menus"
306359msgstr ""
307360
308−#: qml/Shell.qml:393
309−#, qt-format
310−msgid "Sorry, incorrect %1"
311−msgstr "Bağışlayın, %1 yanlışdır"
361+#: qml/Tutorial/TutorialBottom.qml:29
362+msgid "Swipe up from the bottom edge."
363+msgstr ""
312364
313−#: qml/Shell.qml:394
314−msgid "Sorry, incorrect passphrase"
315−msgstr "Bağışlayın, açar söz yanlışdır"
365+#: qml/Tutorial/TutorialLeftFinish.qml:24
366+msgid "These are the shortcuts to favorite apps"
367+msgstr ""
316368
317−#: qml/Shell.qml:395
318−msgid "Please re-enter"
369+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
370+msgid "Tap here to continue."
319371msgstr ""
320372
321−#: qml/Shell.qml:396
322−msgid "Sorry, incorrect passcode"
373+#: qml/Tutorial/TutorialLeft.qml:26
374+msgid "Open the launcher"
323375msgstr ""
324376
325−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326−msgid "Sorry, incorrect passphrase."
327−msgstr "Bağışlayın, açar söz yanlışdır."
377+#: qml/Tutorial/TutorialLeft.qml:27
378+msgid "Short swipe from the left edge."
379+msgstr ""
328380
329−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330−msgid "Sorry, incorrect passcode."
331−msgstr "Təəssüf ki, açar kod yanlışdır."
381+#: qml/Tutorial/TutorialPage.qml:178
382+msgid "You almost got it!"
383+msgstr ""
332384
333−#: qml/Shell.qml:492
334−msgid "This will be your last attempt."
335−msgstr "Bu sizin son cəhdiniz olacaq."
385+#: qml/Tutorial/TutorialPage.qml:195
386+msgid "Try again."
387+msgstr ""
336388
337−#: qml/Shell.qml:494
338−msgid ""
339−"If passphrase is entered incorrectly, your phone will conduct a factory "
340−"reset and all personal data will be deleted."
389+#: qml/Tutorial/TutorialRight.qml:31
390+msgid "To view open apps"
341391msgstr ""
342−"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
343−"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
344392
345−#: qml/Shell.qml:495
346−msgid ""
347−"If passcode is entered incorrectly, your phone will conduct a factory reset "
348−"and all personal data will be deleted."
393+#: qml/Tutorial/TutorialRight.qml:32
394+msgid "Long swipe from the right edge."
395+msgstr ""
396+
397+#: qml/Tutorial/TutorialRight.qml:122
398+msgid "View all your running tasks."
349399msgstr ""
350−"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
351−"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
352400
353401#: qml/Wizard/Page.qml:89
402+msgctxt "Button: Go back one page in the Wizard"
354403msgid "Back"
355404msgstr ""
356405
@@ -367,7 +416,7 @@ msgid "Let’s get started."
367416msgstr ""
368417
369418#: 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
419+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
371420#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372421#: qml/Wizard/Pages/passwd-set.qml:90
373422msgid "Continue"
@@ -377,11 +426,11 @@ msgstr ""
377426msgid "Add a SIM card and restart your device"
378427msgstr ""
379428
380−#: qml/Wizard/Pages/20-sim.qml:55
429+#: qml/Wizard/Pages/20-sim.qml:59
381430msgid "Without it, you won’t be able to make calls or use text messaging."
382431msgstr ""
383432
384−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
433+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
385434msgid "Skip"
386435msgstr ""
387436
@@ -394,38 +443,44 @@ msgid "Please select how you’d like to unlock your phone."
394443msgstr ""
395444
396445#: qml/Wizard/Pages/30-passwd-type.qml:97
446+msgctxt "Label: Type of security method"
397447msgid "Swipe"
398448msgstr ""
399449
400450#: qml/Wizard/Pages/30-passwd-type.qml:98
451+msgctxt "Label: Description of security method"
401452msgid "No security"
402453msgstr ""
403454
404455#: qml/Wizard/Pages/30-passwd-type.qml:100
456+msgctxt "Label: Type of security method"
405457msgid "Passcode"
406458msgstr ""
407459
408460#: qml/Wizard/Pages/30-passwd-type.qml:101
461+msgctxt "Label: Description of security method"
409462msgid "4 digits only"
410463msgstr ""
411464
412465#: qml/Wizard/Pages/30-passwd-type.qml:103
466+msgctxt "Label: Type of security method"
413467msgid "Passphrase"
414468msgstr ""
415469
416470#: qml/Wizard/Pages/30-passwd-type.qml:104
471+msgctxt "Label: Description of security method"
417472msgid "Numbers and letters"
418473msgstr ""
419474
420−#: qml/Wizard/Pages/40-wifi.qml:28
475+#: qml/Wizard/Pages/40-wifi.qml:29
421476msgid "Connect to Wi‑Fi"
422477msgstr ""
423478
424−#: qml/Wizard/Pages/40-wifi.qml:147
479+#: qml/Wizard/Pages/40-wifi.qml:168
425480msgid "Available networks…"
426481msgstr ""
427482
428−#: qml/Wizard/Pages/40-wifi.qml:148
483+#: qml/Wizard/Pages/40-wifi.qml:169
429484msgid "No available networks."
430485msgstr ""
431486
@@ -530,6 +585,24 @@ msgstr ""
530585#~ msgid "Confirm"
531586#~ msgstr "Təsdiqlə"
532587
588+#~ msgid "Search"
589+#~ msgstr "Axtar"
590+
591+#~ msgid "Top edge"
592+#~ msgstr "Yuxarı künc"
593+
594+#~ msgid "Close"
595+#~ msgstr "Bağla"
596+
597+#~ msgid "Left edge"
598+#~ msgstr "Sol künc"
599+
600+#~ msgid "Well done"
601+#~ msgstr "Təbriklər"
602+
603+#~ msgid "Right edge"
604+#~ msgstr "Sağ Künc"
605+
533606#~ msgid "Speaking..."
534607#~ msgstr "Danışır..."
535608
@@ -539,6 +612,13 @@ msgstr ""
539612#~ msgid "Speak Now..."
540613#~ msgstr "Danışın..."
541614
615+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
616+#~ msgstr ""
617+#~ "Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
618+
619+#~ msgid "Power off"
620+#~ msgstr "Söndür"
621+
542622#~ msgid "All"
543623#~ msgstr "Hamısı"
544624
@@ -548,5 +628,36 @@ msgstr ""
548628#~ msgid "Done"
549629#~ msgstr "Başa çatdı"
550630
631+#~ msgid "Log out"
632+#~ msgstr "Çıxış"
633+
634+#~ msgid "Shut down"
635+#~ msgstr "Sistemi Söndür"
636+
637+#~ msgid "Reboot"
638+#~ msgstr "Yenidən yüklə"
639+
640+#~ msgid "Try swiping from the top edge to access the indicators"
641+#~ msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
642+
643+#~ msgid "Skip intro"
644+#~ msgstr "Tәqdimatı keç"
645+
646+#~ msgid "Try swiping from the right edge to unlock the phone"
647+#~ msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
648+
649+#~ msgid "Swipe up again to close the settings screen"
650+#~ msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
651+
652+#~ msgid ""
653+#~ "You have now mastered the edge gestures and can start using the "
654+#~ "phone<br><br>Tap on the screen to start"
655+#~ msgstr ""
656+#~ "Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
657+#~ "bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
658+
659+#~ msgid "Settings"
660+#~ msgstr "Tənzimləmələr"
661+
551662#~ msgid "Type or say a command"
552663#~ msgstr "Bir әmr söyləyin və ya yazın"
po/be.po+276−156
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
1111"PO-Revision-Date: 2015-02-07 19:04+0000\n"
1212"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"
1313"Language-Team: Belarusian <be@li.org>\n"
@@ -16,10 +16,10 @@ 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: 2015-02-08 06:11+0000\n"
20−"X-Generator: Launchpad (build 17331)\n"
19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
20+"X-Generator: Launchpad (build 17413)\n"
2121
22−#: plugins/LightDM/Greeter.cpp:130
22+#: plugins/LightDM/Greeter.cpp:112
2323msgid "Password: "
2424msgstr "Пароль: "
2525
@@ -32,22 +32,22 @@ msgstr "Заблакаваць кнопку"
3232msgid "Unpin shortcut"
3333msgstr "Разблакаваць кнопку"
3434
35−#: qml/Components/DelayedLockscreen.qml:47
35+#: qml/Components/DelayedLockscreen.qml:49
3636msgid "Device Locked"
3737msgstr "Прылада заблакаваная"
3838
39−#: qml/Components/DelayedLockscreen.qml:62
39+#: qml/Components/DelayedLockscreen.qml:64
4040msgid "You have been locked out due to too many failed passphrase attempts."
4141msgstr ""
4242"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў уводу "
4848"код доступу."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
@@ -55,45 +55,72 @@ msgstr[0] "Пачакайце %1 хвіліну і паўтарыце спроб
5555msgstr[1] "Пачакайце %1 хвіліны і паўтарыце спробу…"
5656msgstr[2] "Пачакайце %1 хвілінаў і паўтарыце спробу…"
5757
58−#: qml/Components/Dialogs.qml:86
58+#: qml/Components/Dialogs.qml:67
59+msgctxt "Title: Lock/Log out dialog"
5960msgid "Log out"
60−msgstr "Выйсці"
61+msgstr ""
6162
62−#: qml/Components/Dialogs.qml:87
63+#: qml/Components/Dialogs.qml:68
6364msgid "Are you sure you want to log out?"
6465msgstr "Вы насамрэч хочаце выйсці?"
6566
66−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
67−#: qml/Components/Dialogs.qml:134
68−msgid "No"
69−msgstr "Не"
67+#: qml/Components/Dialogs.qml:70
68+msgctxt "Button: Lock the system"
69+msgid "Lock"
70+msgstr ""
7071
71−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
72−#: qml/Components/Dialogs.qml:140
73−msgid "Yes"
74−msgstr "Так"
72+#: qml/Components/Dialogs.qml:77
73+msgctxt "Button: Log out from the system"
74+msgid "Log Out"
75+msgstr ""
7576
76−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
78+#: qml/Components/Dialogs.qml:171
79+msgid "Cancel"
80+msgstr "Скасаваць"
81+
82+#: qml/Components/Dialogs.qml:96
83+msgctxt "Title: Reboot/Shut down dialog"
7784msgid "Shut down"
78−msgstr "Выключыць"
85+msgstr ""
7986
80−#: qml/Components/Dialogs.qml:109
87+#: qml/Components/Dialogs.qml:97
8188msgid "Are you sure you want to shut down?"
8289msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
8390
84−#: qml/Components/Dialogs.qml:131
91+#: qml/Components/Dialogs.qml:99
92+msgctxt "Button: Reboot the system"
8593msgid "Reboot"
86−msgstr "Перазагрузіць"
94+msgstr ""
95+
96+#: qml/Components/Dialogs.qml:107
97+msgctxt "Button: Shut down the system"
98+msgid "Shut down"
99+msgstr ""
87100
88−#: qml/Components/Dialogs.qml:132
101+#: qml/Components/Dialogs.qml:127
102+msgctxt "Title: Reboot dialog"
103+msgid "Reboot"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:128
89107msgid "Are you sure you want to reboot?"
90108msgstr "Вы ўпэўнены, што жадаеце перазагрузіць?"
91109
92−#: qml/Components/Dialogs.qml:154
110+#: qml/Components/Dialogs.qml:130
111+msgid "No"
112+msgstr "Не"
113+
114+#: qml/Components/Dialogs.qml:136
115+msgid "Yes"
116+msgstr "Так"
117+
118+#: qml/Components/Dialogs.qml:150
119+msgctxt "Title: Power off/Restart dialog"
93120msgid "Power"
94−msgstr "Сілкаванне"
121+msgstr ""
95122
96−#: qml/Components/Dialogs.qml:155
123+#: qml/Components/Dialogs.qml:151
97124msgid ""
98125"Are you sure you would like\n"
99126"to power off?"
@@ -101,68 +128,15 @@ msgstr ""
101128"Вы сапраўды хочаце выключыць\n"
102129"сілкаванне?"
103130
104−#: qml/Components/Dialogs.qml:157
131+#: qml/Components/Dialogs.qml:153
132+msgctxt "Button: Power off the system"
105133msgid "Power off"
106−msgstr "Выключыць"
107−
108−#: qml/Components/Dialogs.qml:166
109−msgid "Restart"
110−msgstr "Перазапуск"
111−
112−#: qml/Components/Dialogs.qml:175
113−msgid "Cancel"
114−msgstr "Скасаваць"
115−
116−#: qml/Components/EdgeDemoOverlay.qml:151
117−msgid "Skip intro"
118−msgstr "Прапусціць уводзіны"
119−
120−#: qml/Components/EdgeDemo.qml:125
121−msgid "Right edge"
122−msgstr "Правы край"
123−
124−#: qml/Components/EdgeDemo.qml:126
125−msgid "Try swiping from the right edge to unlock the phone"
126−msgstr "Правядзіце пальцам з правага краю, каб разблакаваць тэлефон"
127−
128−#: qml/Components/EdgeDemo.qml:157
129−msgid "Top edge"
130−msgstr "Верхні край"
131−
132−#: qml/Components/EdgeDemo.qml:158
133−msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135−"Паспрабуйце правесці пальцам ад верхняга краю, для доступу да індыкатараў"
136−
137−#: qml/Components/EdgeDemo.qml:183
138−msgid "Close"
139−msgstr "Зачыніць"
140135
141−#: qml/Components/EdgeDemo.qml:184
142−msgid "Swipe up again to close the settings screen"
143−msgstr "Правядзіце пальцам яшчэ раз, каб зачыніць акно параметраў"
144−
145−#: qml/Components/EdgeDemo.qml:214
146−msgid "Left edge"
147−msgstr "Левы край"
148−
149−#: qml/Components/EdgeDemo.qml:215
150−msgid "Swipe from the left to reveal the launcher for quick access to apps"
151−msgstr ""
152−"Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "
153−"доступу да праграм"
154−
155−#: qml/Components/EdgeDemo.qml:242
156−msgid "Well done"
157−msgstr "Добра"
158−
159−#: qml/Components/EdgeDemo.qml:243
160−msgid ""
161−"You have now mastered the edge gestures and can start using the "
162−"phone<br><br>Tap on the screen to start"
136+#: qml/Components/Dialogs.qml:162
137+msgctxt "Button: Restart the system"
138+msgid "Restart"
163139msgstr ""
164−"Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "
165−"выкарыстоўваць.<br><br>Дакраніцеся да экрана, каб пачаць."
166140
167141#: qml/Components/Lockscreen.qml:238
168142msgid "Return to Call"
@@ -176,32 +150,39 @@ msgstr "Терміновы выклік"
176150msgid "OK"
177151msgstr "Добра"
178152
179−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
153+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
180154msgid "See less"
181155msgstr "Карацей"
182156
183−#: qml/Dash/GenericScopeView.qml:485
157+#: qml/Dash/GenericScopeView.qml:533
184158msgid "See all"
185159msgstr "Больш падрабязна"
186160
187−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
188−#: qml/Panel/SearchIndicator.qml:27
161+#: qml/Dash/GenericScopeView.qml:595
162+msgctxt "Label: Hint for dash search line edit"
189163msgid "Search"
190−msgstr "Пошук"
164+msgstr ""
191165
192−#: qml/Dash/PageHeader.qml:267
166+#: qml/Dash/PageHeader.qml:269
167+msgctxt "Button: Open the Ubuntu Store"
193168msgid "Store"
194−msgstr "Крама"
169+msgstr ""
170+
171+#: qml/Dash/PageHeader.qml:276
172+msgctxt "Button: Start a search in the current dash scope"
173+msgid "Search"
174+msgstr ""
195175
196−#: qml/Dash/PageHeader.qml:284
176+#: qml/Dash/PageHeader.qml:286
177+msgctxt "Button: Show the current dash scope settings"
197178msgid "Settings"
198−msgstr "Параметры"
179+msgstr ""
199180
200−#: qml/Dash/PageHeader.qml:291
181+#: qml/Dash/PageHeader.qml:293
201182msgid "Remove from Favorites"
202183msgstr "Выдаліць з абранага"
203184
204−#: qml/Dash/PageHeader.qml:291
185+#: qml/Dash/PageHeader.qml:293
205186msgid "Add to Favorites"
206187msgstr "Дадаць да абранага"
207188
@@ -233,6 +214,10 @@ msgstr "Пацягніце для абнаўлення ..."
233214msgid "Release to refresh…"
234215msgstr "Адпусціце для абнаўлення ..."
235216
217+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
218+msgid "Enable location data"
219+msgstr ""
220+
236221#: qml/Dash/ScopesList.qml:66
237222msgid "Manage"
238223msgstr "Кіраванне"
@@ -245,10 +230,76 @@ msgstr "Дом"
245230msgid "Also installed"
246231msgstr "Таксама ўсталявана"
247232
248−#: qml/Greeter/Greeter.qml:133
233+#: qml/Greeter/CoverPage.qml:107
249234msgid "Unlock"
250235msgstr "Разблакаваць"
251236
237+#: qml/Greeter/LoginList.qml:236
238+msgid "Retry"
239+msgstr ""
240+
241+#: qml/Greeter/LoginList.qml:237
242+msgid "Tap to unlock"
243+msgstr ""
244+
245+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
246+msgid "Sorry, incorrect passphrase."
247+msgstr "Даруце, няслушны пароль"
248+
249+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
250+msgid "Sorry, incorrect passcode."
251+msgstr "Даруйце, няслушны код"
252+
253+#: qml/Greeter/NarrowView.qml:55
254+msgid "This will be your last attempt."
255+msgstr "Апошняя спроба."
256+
257+#: qml/Greeter/NarrowView.qml:57
258+msgid ""
259+"If passphrase is entered incorrectly, your phone will conduct a factory "
260+"reset and all personal data will be deleted."
261+msgstr ""
262+"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "
263+"асабістыя дадзеныя будуць выдаленыя."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "
271+"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."
272+
273+#: qml/Greeter/NarrowView.qml:115
274+#, qt-format
275+msgid "Enter %1"
276+msgstr "Увядзіце %1"
277+
278+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
279+msgid "Enter passphrase"
280+msgstr "Увядзіце парольную фразу"
281+
282+#: qml/Greeter/NarrowView.qml:117
283+msgid "Enter passcode"
284+msgstr "Увядзіце код"
285+
286+#: qml/Greeter/NarrowView.qml:118
287+#, qt-format
288+msgid "Sorry, incorrect %1"
289+msgstr "Даруйце, некарэктны %1"
290+
291+#: qml/Greeter/NarrowView.qml:119
292+msgid "Sorry, incorrect passphrase"
293+msgstr "Даруйце, няслушны пароль"
294+
295+#: qml/Greeter/NarrowView.qml:120
296+msgid "Please re-enter"
297+msgstr "Калі ласка паўтарыце ўвод"
298+
299+#: qml/Greeter/NarrowView.qml:121
300+msgid "Sorry, incorrect passcode"
301+msgstr "Даруйце, няслушны код"
302+
252303#: qml/Notifications/NotificationMenuItemFactory.qml:128
253304msgid "Show password"
254305msgstr "Паказаць пароль"
@@ -290,8 +341,9 @@ msgid "Failed, tap to retry"
290341msgstr "Памылка, націсніце для паўтору"
291342
292343#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
344+msgctxt "Label: Hint in message indicator line edit"
293345msgid "Reply"
294−msgstr "Адказаць"
346+msgstr ""
295347
296348#: qml/Panel/Indicators/ModemInfoItem.qml:105
297349msgid "Unlock SIM"
@@ -301,67 +353,62 @@ msgstr "Разблакаваць SIM"
301353msgid "Roaming"
302354msgstr "Роўмінг"
303355
304−#: qml/Shell.qml:390
305−#, qt-format
306−msgid "Enter %1"
307−msgstr "Увядзіце %1"
356+#: qml/Tutorial/TutorialBottomFinish.qml:24
357+msgid "This action does different things for different apps"
358+msgstr ""
308359
309−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
310−msgid "Enter passphrase"
311−msgstr "Увядзіце парольную фразу"
360+#: qml/Tutorial/TutorialBottomFinish.qml:25
361+msgid "Tap here to finish."
362+msgstr ""
312363
313−#: qml/Shell.qml:392
314−msgid "Enter passcode"
315−msgstr "Увядзіце код"
364+#: qml/Tutorial/TutorialBottom.qml:28
365+msgid "Open special menus"
366+msgstr ""
316367
317−#: qml/Shell.qml:393
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr "Даруйце, некарэктны %1"
368+#: qml/Tutorial/TutorialBottom.qml:29
369+msgid "Swipe up from the bottom edge."
370+msgstr ""
321371
322−#: qml/Shell.qml:394
323−msgid "Sorry, incorrect passphrase"
324−msgstr "Даруйце, няслушны пароль"
372+#: qml/Tutorial/TutorialLeftFinish.qml:24
373+msgid "These are the shortcuts to favorite apps"
374+msgstr ""
325375
326−#: qml/Shell.qml:395
327−msgid "Please re-enter"
328−msgstr "Калі ласка паўтарыце ўвод"
376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
377+msgid "Tap here to continue."
378+msgstr ""
329379
330−#: qml/Shell.qml:396
331−msgid "Sorry, incorrect passcode"
332−msgstr "Даруйце, няслушны код"
380+#: qml/Tutorial/TutorialLeft.qml:26
381+msgid "Open the launcher"
382+msgstr ""
333383
334−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
335−msgid "Sorry, incorrect passphrase."
336−msgstr "Даруце, няслушны пароль"
384+#: qml/Tutorial/TutorialLeft.qml:27
385+msgid "Short swipe from the left edge."
386+msgstr ""
337387
338−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
339−msgid "Sorry, incorrect passcode."
340−msgstr "Даруйце, няслушны код"
388+#: qml/Tutorial/TutorialPage.qml:178
389+msgid "You almost got it!"
390+msgstr ""
341391
342−#: qml/Shell.qml:492
343−msgid "This will be your last attempt."
344−msgstr "Апошняя спроба."
392+#: qml/Tutorial/TutorialPage.qml:195
393+msgid "Try again."
394+msgstr ""
345395
346−#: qml/Shell.qml:494
347−msgid ""
348−"If passphrase is entered incorrectly, your phone will conduct a factory "
349−"reset and all personal data will be deleted."
396+#: qml/Tutorial/TutorialRight.qml:31
397+msgid "To view open apps"
350398msgstr ""
351−"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "
352−"асабістыя дадзеныя будуць выдаленыя."
353399
354−#: qml/Shell.qml:495
355−msgid ""
356−"If passcode is entered incorrectly, your phone will conduct a factory reset "
357−"and all personal data will be deleted."
400+#: qml/Tutorial/TutorialRight.qml:32
401+msgid "Long swipe from the right edge."
402+msgstr ""
403+
404+#: qml/Tutorial/TutorialRight.qml:122
405+msgid "View all your running tasks."
358406msgstr ""
359−"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "
360−"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."
361407
362408#: qml/Wizard/Page.qml:89
409+msgctxt "Button: Go back one page in the Wizard"
363410msgid "Back"
364−msgstr "Назад"
411+msgstr ""
365412
366413#: qml/Wizard/Pages/10-welcome.qml:27
367414msgid "Hi!"
@@ -376,7 +423,7 @@ msgid "Let’s get started."
376423msgstr "Пачнем."
377424
378425#: 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
426+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
380427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
381428#: qml/Wizard/Pages/passwd-set.qml:90
382429msgid "Continue"
@@ -386,11 +433,11 @@ msgstr "Працягнуць"
386433msgid "Add a SIM card and restart your device"
387434msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
388435
389−#: qml/Wizard/Pages/20-sim.qml:55
436+#: qml/Wizard/Pages/20-sim.qml:59
390437msgid "Without it, you won’t be able to make calls or use text messaging."
391438msgstr "Без яе вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
392439
393−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
440+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
394441msgid "Skip"
395442msgstr "Прапусціць"
396443
@@ -403,38 +450,44 @@ msgid "Please select how you’d like to unlock your phone."
403450msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
404451
405452#: qml/Wizard/Pages/30-passwd-type.qml:97
453+msgctxt "Label: Type of security method"
406454msgid "Swipe"
407−msgstr "Свайп(Рух пальцам)"
455+msgstr ""
408456
409457#: qml/Wizard/Pages/30-passwd-type.qml:98
458+msgctxt "Label: Description of security method"
410459msgid "No security"
411−msgstr "Без абароны"
460+msgstr ""
412461
413462#: qml/Wizard/Pages/30-passwd-type.qml:100
463+msgctxt "Label: Type of security method"
414464msgid "Passcode"
415−msgstr "Код-пароль"
465+msgstr ""
416466
417467#: qml/Wizard/Pages/30-passwd-type.qml:101
468+msgctxt "Label: Description of security method"
418469msgid "4 digits only"
419−msgstr "Толькі 4 лічбы"
470+msgstr ""
420471
421472#: qml/Wizard/Pages/30-passwd-type.qml:103
473+msgctxt "Label: Type of security method"
422474msgid "Passphrase"
423−msgstr "Пароль"
475+msgstr ""
424476
425477#: qml/Wizard/Pages/30-passwd-type.qml:104
478+msgctxt "Label: Description of security method"
426479msgid "Numbers and letters"
427−msgstr "Лічбы і літары"
480+msgstr ""
428481
429−#: qml/Wizard/Pages/40-wifi.qml:28
482+#: qml/Wizard/Pages/40-wifi.qml:29
430483msgid "Connect to Wi‑Fi"
431484msgstr "Злучыцца з Wi-Fi"
432485
433−#: qml/Wizard/Pages/40-wifi.qml:147
486+#: qml/Wizard/Pages/40-wifi.qml:168
434487msgid "Available networks…"
435488msgstr "Даступныя сеткі..."
436489
437−#: qml/Wizard/Pages/40-wifi.qml:148
490+#: qml/Wizard/Pages/40-wifi.qml:169
438491msgid "No available networks."
439492msgstr "Няма даступных сетак."
440493
@@ -543,9 +596,33 @@ msgstr "〈 %1"
543596msgid "%1 〉"
544597msgstr "%1 〉"
545598
599+#~ msgid "Reboot"
600+#~ msgstr "Перазагрузіць"
601+
602+#~ msgid "Shut down"
603+#~ msgstr "Выключыць"
604+
605+#~ msgid "Top edge"
606+#~ msgstr "Верхні край"
607+
608+#~ msgid "Right edge"
609+#~ msgstr "Правы край"
610+
611+#~ msgid "Close"
612+#~ msgstr "Зачыніць"
613+
614+#~ msgid "Left edge"
615+#~ msgstr "Левы край"
616+
617+#~ msgid "Search"
618+#~ msgstr "Пошук"
619+
546620#~ msgid "Confirm"
547621#~ msgstr "Пацвердзіць"
548622
623+#~ msgid "Try swiping from the right edge to unlock the phone"
624+#~ msgstr "Правядзіце пальцам з правага краю, каб разблакаваць тэлефон"
625+
549626#~ msgid "Loading. Please Wait..."
550627#~ msgstr "Загрузка. Чакайце..."
551628
@@ -557,3 +634,46 @@ msgstr "%1 〉"
557634
558635#~ msgid "Type or say a command"
559636#~ msgstr "Напішыце або вымавіце каманду"
637+
638+#~ msgid "Log out"
639+#~ msgstr "Выйсці"
640+
641+#~ msgid "Power"
642+#~ msgstr "Сілкаванне"
643+
644+#~ msgid "Restart"
645+#~ msgstr "Перазапуск"
646+
647+#~ msgid "Power off"
648+#~ msgstr "Выключыць"
649+
650+#~ msgid "Try swiping from the top edge to access the indicators"
651+#~ msgstr ""
652+#~ "Паспрабуйце правесці пальцам ад верхняга краю, для доступу да індыкатараў"
653+
654+#~ msgid "Swipe up again to close the settings screen"
655+#~ msgstr "Правядзіце пальцам яшчэ раз, каб зачыніць акно параметраў"
656+
657+#~ msgid "Well done"
658+#~ msgstr "Добра"
659+
660+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
661+#~ msgstr ""
662+#~ "Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "
663+#~ "доступу да праграм"
664+
665+#~ msgid "Skip intro"
666+#~ msgstr "Прапусціць уводзіны"
667+
668+#~ msgid "Settings"
669+#~ msgstr "Параметры"
670+
671+#~ msgid ""
672+#~ "You have now mastered the edge gestures and can start using the "
673+#~ "phone<br><br>Tap on the screen to start"
674+#~ msgstr ""
675+#~ "Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "
676+#~ "выкарыстоўваць.<br><br>Дакраніцеся да экрана, каб пачаць."
677+
678+#~ msgid "Store"
679+#~ msgstr "Крама"
po/bg.po+221−128
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-04-01 14:08+0000\n"
12−"Last-Translator: Atanas Kovachki <Unknown>\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-04-12 14:43+0000\n"
12+"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
1313"Language-Team: Bulgarian <bg@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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"
19+"X-Generator: Launchpad (build 17423)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr ""
2424
@@ -31,132 +31,106 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr ""
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
6465msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
6975msgstr ""
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr ""
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr ""
8290
83−#: qml/Components/Dialogs.qml:132
84−msgid "Are you sure you want to reboot?"
85−msgstr ""
86−
87−#: qml/Components/Dialogs.qml:154
88−msgid "Power"
89−msgstr ""
90−
91−#: qml/Components/Dialogs.qml:155
92−msgid ""
93−"Are you sure you would like\n"
94−"to power off?"
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
9594msgstr ""
9695
97−#: qml/Components/Dialogs.qml:157
98−msgid "Power off"
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:166
102−msgid "Restart"
101+#: qml/Components/Dialogs.qml:128
102+msgid "Are you sure you want to reboot?"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107107msgstr ""
108108
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr "Пропусни интрото"
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr "Десен край"
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
119111msgstr ""
120−"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
121−"отключите телефона"
122−
123−#: qml/Components/EdgeDemo.qml:157
124−msgid "Top edge"
125−msgstr "Горен край"
126112
127−#: qml/Components/EdgeDemo.qml:158
128−msgid "Try swiping from the top edge to access the indicators"
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
115+msgid "Power"
129116msgstr ""
130−"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
131−"получите достъп до индикаторите"
132−
133−#: qml/Components/EdgeDemo.qml:183
134−msgid "Close"
135−msgstr "Затвори"
136117
137−#: qml/Components/EdgeDemo.qml:184
138−msgid "Swipe up again to close the settings screen"
118+#: qml/Components/Dialogs.qml:151
119+msgid ""
120+"Are you sure you would like\n"
121+"to power off?"
139122msgstr ""
140−"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
123+"Искате ли да \n"
124+"изключите захранването на устройството?"
141125
142−#: qml/Components/EdgeDemo.qml:214
143−msgid "Left edge"
144−msgstr "Ляв край"
145−
146−#: qml/Components/EdgeDemo.qml:215
147−msgid "Swipe from the left to reveal the launcher for quick access to apps"
126+#: qml/Components/Dialogs.qml:153
127+msgctxt "Button: Power off the system"
128+msgid "Power off"
148129msgstr ""
149−"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
150−"бърз достъп до приложенията"
151130
152−#: qml/Components/EdgeDemo.qml:242
153−msgid "Well done"
154−msgstr "Великолепно"
155−
156−#: qml/Components/EdgeDemo.qml:243
157−msgid ""
158−"You have now mastered the edge gestures and can start using the "
159−"phone<br><br>Tap on the screen to start"
131+#: qml/Components/Dialogs.qml:162
132+msgctxt "Button: Restart the system"
133+msgid "Restart"
160134msgstr ""
161135
162136#: qml/Components/Lockscreen.qml:238
@@ -171,32 +145,39 @@ msgstr "Спешно повикване"
171145msgid "OK"
172146msgstr ""
173147
174−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
175149msgid "See less"
176150msgstr ""
177151
178−#: qml/Dash/GenericScopeView.qml:485
152+#: qml/Dash/GenericScopeView.qml:533
179153msgid "See all"
180154msgstr ""
181155
182−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183−#: qml/Panel/SearchIndicator.qml:27
156+#: qml/Dash/GenericScopeView.qml:595
157+msgctxt "Label: Hint for dash search line edit"
184158msgid "Search"
185−msgstr "Търсене"
159+msgstr ""
186160
187−#: qml/Dash/PageHeader.qml:267
161+#: qml/Dash/PageHeader.qml:269
162+msgctxt "Button: Open the Ubuntu Store"
188163msgid "Store"
189164msgstr ""
190165
191−#: qml/Dash/PageHeader.qml:284
166+#: qml/Dash/PageHeader.qml:276
167+msgctxt "Button: Start a search in the current dash scope"
168+msgid "Search"
169+msgstr ""
170+
171+#: qml/Dash/PageHeader.qml:286
172+msgctxt "Button: Show the current dash scope settings"
192173msgid "Settings"
193174msgstr ""
194175
195−#: qml/Dash/PageHeader.qml:291
176+#: qml/Dash/PageHeader.qml:293
196177msgid "Remove from Favorites"
197178msgstr ""
198179
199−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
200181msgid "Add to Favorites"
201182msgstr ""
202183
@@ -228,6 +209,10 @@ msgstr ""
228209msgid "Release to refresh…"
229210msgstr ""
230211
212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
213+msgid "Enable location data"
214+msgstr ""
215+
231216#: qml/Dash/ScopesList.qml:66
232217msgid "Manage"
233218msgstr ""
@@ -240,10 +225,72 @@ msgstr ""
240225msgid "Also installed"
241226msgstr ""
242227
243−#: qml/Greeter/Greeter.qml:133
228+#: qml/Greeter/CoverPage.qml:107
244229msgid "Unlock"
245230msgstr ""
246231
232+#: qml/Greeter/LoginList.qml:236
233+msgid "Retry"
234+msgstr ""
235+
236+#: qml/Greeter/LoginList.qml:237
237+msgid "Tap to unlock"
238+msgstr ""
239+
240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
241+msgid "Sorry, incorrect passphrase."
242+msgstr ""
243+
244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
245+msgid "Sorry, incorrect passcode."
246+msgstr ""
247+
248+#: qml/Greeter/NarrowView.qml:55
249+msgid "This will be your last attempt."
250+msgstr ""
251+
252+#: qml/Greeter/NarrowView.qml:57
253+msgid ""
254+"If passphrase is entered incorrectly, your phone will conduct a factory "
255+"reset and all personal data will be deleted."
256+msgstr ""
257+
258+#: qml/Greeter/NarrowView.qml:58
259+msgid ""
260+"If passcode is entered incorrectly, your phone will conduct a factory reset "
261+"and all personal data will be deleted."
262+msgstr ""
263+
264+#: qml/Greeter/NarrowView.qml:115
265+#, qt-format
266+msgid "Enter %1"
267+msgstr ""
268+
269+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
270+msgid "Enter passphrase"
271+msgstr ""
272+
273+#: qml/Greeter/NarrowView.qml:117
274+msgid "Enter passcode"
275+msgstr ""
276+
277+#: qml/Greeter/NarrowView.qml:118
278+#, qt-format
279+msgid "Sorry, incorrect %1"
280+msgstr ""
281+
282+#: qml/Greeter/NarrowView.qml:119
283+msgid "Sorry, incorrect passphrase"
284+msgstr ""
285+
286+#: qml/Greeter/NarrowView.qml:120
287+msgid "Please re-enter"
288+msgstr ""
289+
290+#: qml/Greeter/NarrowView.qml:121
291+msgid "Sorry, incorrect passcode"
292+msgstr ""
293+
247294#: qml/Notifications/NotificationMenuItemFactory.qml:128
248295msgid "Show password"
249296msgstr "Покажи паролата"
@@ -285,6 +332,7 @@ msgid "Failed, tap to retry"
285332msgstr ""
286333
287334#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
335+msgctxt "Label: Hint in message indicator line edit"
288336msgid "Reply"
289337msgstr ""
290338
@@ -296,61 +344,60 @@ msgstr ""
296344msgid "Roaming"
297345msgstr ""
298346
299−#: qml/Shell.qml:390
300−#, qt-format
301−msgid "Enter %1"
347+#: qml/Tutorial/TutorialBottomFinish.qml:24
348+msgid "This action does different things for different apps"
302349msgstr ""
303350
304−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
305−msgid "Enter passphrase"
351+#: qml/Tutorial/TutorialBottomFinish.qml:25
352+msgid "Tap here to finish."
306353msgstr ""
307354
308−#: qml/Shell.qml:392
309−msgid "Enter passcode"
355+#: qml/Tutorial/TutorialBottom.qml:28
356+msgid "Open special menus"
310357msgstr ""
311358
312−#: qml/Shell.qml:393
313−#, qt-format
314−msgid "Sorry, incorrect %1"
359+#: qml/Tutorial/TutorialBottom.qml:29
360+msgid "Swipe up from the bottom edge."
315361msgstr ""
316362
317−#: qml/Shell.qml:394
318−msgid "Sorry, incorrect passphrase"
363+#: qml/Tutorial/TutorialLeftFinish.qml:24
364+msgid "These are the shortcuts to favorite apps"
319365msgstr ""
320366
321−#: qml/Shell.qml:395
322−msgid "Please re-enter"
367+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
368+msgid "Tap here to continue."
323369msgstr ""
324370
325−#: qml/Shell.qml:396
326−msgid "Sorry, incorrect passcode"
371+#: qml/Tutorial/TutorialLeft.qml:26
372+msgid "Open the launcher"
327373msgstr ""
328374
329−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
330−msgid "Sorry, incorrect passphrase."
375+#: qml/Tutorial/TutorialLeft.qml:27
376+msgid "Short swipe from the left edge."
331377msgstr ""
332378
333−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334−msgid "Sorry, incorrect passcode."
379+#: qml/Tutorial/TutorialPage.qml:178
380+msgid "You almost got it!"
335381msgstr ""
336382
337−#: qml/Shell.qml:492
338−msgid "This will be your last attempt."
383+#: qml/Tutorial/TutorialPage.qml:195
384+msgid "Try again."
339385msgstr ""
340386
341−#: qml/Shell.qml:494
342−msgid ""
343−"If passphrase is entered incorrectly, your phone will conduct a factory "
344−"reset and all personal data will be deleted."
387+#: qml/Tutorial/TutorialRight.qml:31
388+msgid "To view open apps"
345389msgstr ""
346390
347−#: qml/Shell.qml:495
348−msgid ""
349−"If passcode is entered incorrectly, your phone will conduct a factory reset "
350−"and all personal data will be deleted."
391+#: qml/Tutorial/TutorialRight.qml:32
392+msgid "Long swipe from the right edge."
393+msgstr ""
394+
395+#: qml/Tutorial/TutorialRight.qml:122
396+msgid "View all your running tasks."
351397msgstr ""
352398
353399#: qml/Wizard/Page.qml:89
400+msgctxt "Button: Go back one page in the Wizard"
354401msgid "Back"
355402msgstr ""
356403
@@ -367,7 +414,7 @@ msgid "Let’s get started."
367414msgstr ""
368415
369416#: 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
417+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
371418#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372419#: qml/Wizard/Pages/passwd-set.qml:90
373420msgid "Continue"
@@ -377,11 +424,11 @@ msgstr ""
377424msgid "Add a SIM card and restart your device"
378425msgstr ""
379426
380−#: qml/Wizard/Pages/20-sim.qml:55
427+#: qml/Wizard/Pages/20-sim.qml:59
381428msgid "Without it, you won’t be able to make calls or use text messaging."
382429msgstr ""
383430
384−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
431+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
385432msgid "Skip"
386433msgstr ""
387434
@@ -394,38 +441,44 @@ msgid "Please select how you’d like to unlock your phone."
394441msgstr ""
395442
396443#: qml/Wizard/Pages/30-passwd-type.qml:97
444+msgctxt "Label: Type of security method"
397445msgid "Swipe"
398446msgstr ""
399447
400448#: qml/Wizard/Pages/30-passwd-type.qml:98
449+msgctxt "Label: Description of security method"
401450msgid "No security"
402451msgstr ""
403452
404453#: qml/Wizard/Pages/30-passwd-type.qml:100
454+msgctxt "Label: Type of security method"
405455msgid "Passcode"
406456msgstr ""
407457
408458#: qml/Wizard/Pages/30-passwd-type.qml:101
459+msgctxt "Label: Description of security method"
409460msgid "4 digits only"
410461msgstr ""
411462
412463#: qml/Wizard/Pages/30-passwd-type.qml:103
464+msgctxt "Label: Type of security method"
413465msgid "Passphrase"
414466msgstr ""
415467
416468#: qml/Wizard/Pages/30-passwd-type.qml:104
469+msgctxt "Label: Description of security method"
417470msgid "Numbers and letters"
418471msgstr ""
419472
420−#: qml/Wizard/Pages/40-wifi.qml:28
473+#: qml/Wizard/Pages/40-wifi.qml:29
421474msgid "Connect to Wi‑Fi"
422475msgstr ""
423476
424−#: qml/Wizard/Pages/40-wifi.qml:147
477+#: qml/Wizard/Pages/40-wifi.qml:168
425478msgid "Available networks…"
426479msgstr ""
427480
428−#: qml/Wizard/Pages/40-wifi.qml:148
481+#: qml/Wizard/Pages/40-wifi.qml:169
429482msgid "No available networks."
430483msgstr ""
431484
@@ -530,6 +583,21 @@ msgstr ""
530583#~ msgid "Confirm"
531584#~ msgstr "Потвърди"
532585
586+#~ msgid "Search"
587+#~ msgstr "Търсене"
588+
589+#~ msgid "Top edge"
590+#~ msgstr "Горен край"
591+
592+#~ msgid "Close"
593+#~ msgstr "Затвори"
594+
595+#~ msgid "Left edge"
596+#~ msgstr "Ляв край"
597+
598+#~ msgid "Right edge"
599+#~ msgstr "Десен край"
600+
533601#~ msgid "Type or say a command"
534602#~ msgstr "Въведете или кажете команда"
535603
@@ -539,5 +607,30 @@ msgstr ""
539607#~ msgid "Speak Now..."
540608#~ msgstr "Говорете сега..."
541609
610+#~ msgid "Well done"
611+#~ msgstr "Великолепно"
612+
613+#~ msgid "Skip intro"
614+#~ msgstr "Пропусни интрото"
615+
542616#~ msgid "Loading. Please Wait..."
543617#~ msgstr "Зарежда се. Моля, почакайте..."
618+
619+#~ msgid "Try swiping from the top edge to access the indicators"
620+#~ msgstr ""
621+#~ "Опитайте се да приплъзнете пръста си от горния край към долния, за да "
622+#~ "получите достъп до индикаторите"
623+
624+#~ msgid "Swipe up again to close the settings screen"
625+#~ msgstr ""
626+#~ "Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
627+
628+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
629+#~ msgstr ""
630+#~ "Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
631+#~ "бърз достъп до приложенията"
632+
633+#~ msgid "Try swiping from the right edge to unlock the phone"
634+#~ msgstr ""
635+#~ "Опитайте се да приплъзнете пръста си от десния край към левия, за да "
636+#~ "отключите телефона"
po/br.po+268−148
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-12-16 07:27+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-25 07:36+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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Ger-tremen : "
2424
@@ -31,68 +31,95 @@ msgstr "Spilhennañ ar verradenn"
3131msgid "Unpin shortcut"
3232msgstr "Dispilhennañ ar verradenn"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Benveg prennet"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "
4242"ho frazenn-dremen."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"
4848"tremen."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
5555msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
5960msgstr "Digevreañ"
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "N'on ket"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr "Prennañ"
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Ya"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr "Digevreañ"
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Nullañ"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
7784msgstr "Lazhañ ar benveg"
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
8492msgid "Reboot"
8593msgstr "Adloc'hañ"
8694
87−#: qml/Components/Dialogs.qml:132
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr "Lazhañ ar benveg"
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
102+msgid "Reboot"
103+msgstr "Adloc'hañ"
104+
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "N'on ket"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Ya"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93−msgstr "Tredan"
120+msgstr "Enaouiñ"
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,71 +127,16 @@ msgstr ""
100127"Ha sur oc'h e fell deoc'h\n"
101128"troc'hañ an tredan ?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105133msgstr "Lazhañ"
106134
107−#: qml/Components/Dialogs.qml:166
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
108137msgid "Restart"
109138msgstr "Adloc'hañ"
110139
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Nullañ"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Tremen hep sellet ouzh an digoradur"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Bord dehoù"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr ""
126−"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
127−
128−#: qml/Components/EdgeDemo.qml:157
129−msgid "Top edge"
130−msgstr "Bord uhelañ"
131−
132−#: qml/Components/EdgeDemo.qml:158
133−msgid "Try swiping from the top edge to access the indicators"
134−msgstr ""
135−"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
136−
137−#: qml/Components/EdgeDemo.qml:183
138−msgid "Close"
139−msgstr "Serriñ"
140−
141−#: qml/Components/EdgeDemo.qml:184
142−msgid "Swipe up again to close the settings screen"
143−msgstr ""
144−"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
145−
146−#: qml/Components/EdgeDemo.qml:214
147−msgid "Left edge"
148−msgstr "Bord kleiz"
149−
150−#: qml/Components/EdgeDemo.qml:215
151−msgid "Swipe from the left to reveal the launcher for quick access to apps"
152−msgstr ""
153−"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
154−"prim."
155−
156−#: qml/Components/EdgeDemo.qml:242
157−msgid "Well done"
158−msgstr "Gourc'hemennoù !"
159−
160−#: qml/Components/EdgeDemo.qml:243
161−msgid ""
162−"You have now mastered the edge gestures and can start using the "
163−"phone<br><br>Tap on the screen to start"
164−msgstr ""
165−"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
166−"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
167−
168140#: qml/Components/Lockscreen.qml:238
169141msgid "Return to Call"
170142msgstr "Distreiñ d'ar bellgomzadenn"
@@ -177,32 +149,39 @@ msgstr "Pellgomzadenn vallus"
177149msgid "OK"
178150msgstr "Mat eo"
179151
180−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
181153msgid "See less"
182154msgstr "Gwelet nebeutoc'h"
183155
184−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
185157msgid "See all"
186158msgstr "Gwelet pep tra"
187159
188−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
189−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
190162msgid "Search"
191163msgstr "Klask"
192164
193−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
194167msgid "Store"
195−msgstr "Enrollañ"
168+msgstr "Stal"
169+
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr "Klask"
196174
197−#: qml/Dash/PageHeader.qml:284
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
198177msgid "Settings"
199178msgstr "Arventennoù"
200179
201−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
202181msgid "Remove from Favorites"
203182msgstr "Lemel eus ar sinedoù"
204183
205−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
206185msgid "Add to Favorites"
207186msgstr "Ouzhpennañ d'ar sinedoù"
208187
@@ -234,6 +213,10 @@ msgstr "Tennañ evit freskaat..."
234213msgid "Release to refresh…"
235214msgstr "Lezel da vont evit freskaat..."
236215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Gweredekaat ar roadennoù lec'hiañ"
219+
237220#: qml/Dash/ScopesList.qml:66
238221msgid "Manage"
239222msgstr "Merañ"
@@ -246,10 +229,76 @@ msgstr "Er gêr"
246229msgid "Also installed"
247230msgstr "Staliet ivez"
248231
249−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
250233msgid "Unlock"
251234msgstr "Dibrennañ"
252235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Esaeañ en-dro"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Pouezañ evit dibrennañ"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "Siwazh, frazenn-dremen direizh"
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "Siwazh, kod-tremen direizh"
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Ho taol-esae diwezhañ e vo."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
262+"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
263+
264+#: qml/Greeter/NarrowView.qml:58
265+msgid ""
266+"If passcode is entered incorrectly, your phone will conduct a factory reset "
267+"and all personal data will be deleted."
268+msgstr ""
269+"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
270+"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
271+
272+#: qml/Greeter/NarrowView.qml:115
273+#, qt-format
274+msgid "Enter %1"
275+msgstr "Merkañ %1"
276+
277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
278+msgid "Enter passphrase"
279+msgstr "Merkañ ar frazenn-dremen"
280+
281+#: qml/Greeter/NarrowView.qml:117
282+msgid "Enter passcode"
283+msgstr "Merkañ ar c'hod-tremen"
284+
285+#: qml/Greeter/NarrowView.qml:118
286+#, qt-format
287+msgid "Sorry, incorrect %1"
288+msgstr "Siwazh, %1 direizh"
289+
290+#: qml/Greeter/NarrowView.qml:119
291+msgid "Sorry, incorrect passphrase"
292+msgstr "Siwazh, frazenn-dremen direizh"
293+
294+#: qml/Greeter/NarrowView.qml:120
295+msgid "Please re-enter"
296+msgstr "Adverkañ, mar plij"
297+
298+#: qml/Greeter/NarrowView.qml:121
299+msgid "Sorry, incorrect passcode"
300+msgstr "Digarezit, kod-tremen direizh"
301+
253302#: qml/Notifications/NotificationMenuItemFactory.qml:128
254303msgid "Show password"
255304msgstr "Diskouez ar ger-tremen"
@@ -291,8 +340,9 @@ msgid "Failed, tap to retry"
291340msgstr "C'hwitet, touchit evit adkregiñ"
292341
293342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
343+msgctxt "Label: Hint in message indicator line edit"
294344msgid "Reply"
295−msgstr ""
345+msgstr "Respont"
296346
297347#: qml/Panel/Indicators/ModemInfoItem.qml:105
298348msgid "Unlock SIM"
@@ -302,65 +352,60 @@ msgstr "Dibrennañ ar gartenn SIM"
302352msgid "Roaming"
303353msgstr "O kantren"
304354
305−#: qml/Shell.qml:390
306−#, qt-format
307−msgid "Enter %1"
308−msgstr "Merkañ %1"
355+#: qml/Tutorial/TutorialBottomFinish.qml:24
356+msgid "This action does different things for different apps"
357+msgstr "An ober-mañ a ra meur a dra evit meur a arload"
309358
310−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
311−msgid "Enter passphrase"
312−msgstr "Merkañ ar frazenn-dremen"
359+#: qml/Tutorial/TutorialBottomFinish.qml:25
360+msgid "Tap here to finish."
361+msgstr "Pouezañ amañ evit echuiñ."
313362
314−#: qml/Shell.qml:392
315−msgid "Enter passcode"
316−msgstr "Merkañ ar c'hod-tremen"
363+#: qml/Tutorial/TutorialBottom.qml:28
364+msgid "Open special menus"
365+msgstr "Digeriñ al lañserioù ispisial"
317366
318−#: qml/Shell.qml:393
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr "Siwazh, %1 direizh"
367+#: qml/Tutorial/TutorialBottom.qml:29
368+msgid "Swipe up from the bottom edge."
369+msgstr "Riklit war-du an nec'h adalek an traoñ"
322370
323−#: qml/Shell.qml:394
324−msgid "Sorry, incorrect passphrase"
325−msgstr "Siwazh, frazenn-dremen direizh"
371+#: qml/Tutorial/TutorialLeftFinish.qml:24
372+msgid "These are the shortcuts to favorite apps"
373+msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
326374
327−#: qml/Shell.qml:395
328−msgid "Please re-enter"
329−msgstr "Adverkañ, mar plij"
375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
376+msgid "Tap here to continue."
377+msgstr "Pouzañ amañ evit kenderc'hel"
330378
331−#: qml/Shell.qml:396
332−msgid "Sorry, incorrect passcode"
333−msgstr "Digarezit, kod-tremen direizh"
379+#: qml/Tutorial/TutorialLeft.qml:26
380+msgid "Open the launcher"
381+msgstr "Digeriñ al lañser"
334382
335−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
336−msgid "Sorry, incorrect passphrase."
337−msgstr "Siwazh, frazenn-dremen direizh"
383+#: qml/Tutorial/TutorialLeft.qml:27
384+msgid "Short swipe from the left edge."
385+msgstr "Riklik dousik adalek ar bord kleiz."
338386
339−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
340−msgid "Sorry, incorrect passcode."
341−msgstr "Siwazh, kod-tremen direizh"
387+#: qml/Tutorial/TutorialPage.qml:178
388+msgid "You almost got it!"
389+msgstr "Deuet eo ganeoc'h pe dost ?"
342390
343−#: qml/Shell.qml:492
344−msgid "This will be your last attempt."
345−msgstr "Ho taol-esae diwezhañ e vo."
391+#: qml/Tutorial/TutorialPage.qml:195
392+msgid "Try again."
393+msgstr "Esaeit en-dro."
346394
347−#: qml/Shell.qml:494
348−msgid ""
349−"If passphrase is entered incorrectly, your phone will conduct a factory "
350−"reset and all personal data will be deleted."
351−msgstr ""
352−"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
353−"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
395+#: qml/Tutorial/TutorialRight.qml:31
396+msgid "To view open apps"
397+msgstr "Evit gwelet an arloadoù digor"
354398
355−#: qml/Shell.qml:495
356−msgid ""
357−"If passcode is entered incorrectly, your phone will conduct a factory reset "
358−"and all personal data will be deleted."
359−msgstr ""
360−"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
361−"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
399+#: qml/Tutorial/TutorialRight.qml:32
400+msgid "Long swipe from the right edge."
401+msgstr "Riklit pell adalek ar bord dehoù."
402+
403+#: qml/Tutorial/TutorialRight.qml:122
404+msgid "View all your running tasks."
405+msgstr "Gwelet an holl drevelloù a ya en-dro."
362406
363407#: qml/Wizard/Page.qml:89
408+msgctxt "Button: Go back one page in the Wizard"
364409msgid "Back"
365410msgstr "Distreiñ"
366411
@@ -377,7 +422,7 @@ msgid "Let’s get started."
377422msgstr "Krogomp ganti."
378423
379424#: 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
425+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
381426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
382427#: qml/Wizard/Pages/passwd-set.qml:90
383428msgid "Continue"
@@ -387,11 +432,11 @@ msgstr "Kenderc'hel"
387432msgid "Add a SIM card and restart your device"
388433msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
389434
390−#: qml/Wizard/Pages/20-sim.qml:55
435+#: qml/Wizard/Pages/20-sim.qml:59
391436msgid "Without it, you won’t be able to make calls or use text messaging."
392437msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
393438
394−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
439+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
395440msgid "Skip"
396441msgstr "Tremen hebiou"
397442
@@ -405,38 +450,44 @@ msgstr ""
405450"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
406451
407452#: qml/Wizard/Pages/30-passwd-type.qml:97
453+msgctxt "Label: Type of security method"
408454msgid "Swipe"
409455msgstr "Riklañ"
410456
411457#: qml/Wizard/Pages/30-passwd-type.qml:98
458+msgctxt "Label: Description of security method"
412459msgid "No security"
413460msgstr "Tamm surentez ebet"
414461
415462#: qml/Wizard/Pages/30-passwd-type.qml:100
463+msgctxt "Label: Type of security method"
416464msgid "Passcode"
417465msgstr "Kod-tremen"
418466
419467#: qml/Wizard/Pages/30-passwd-type.qml:101
468+msgctxt "Label: Description of security method"
420469msgid "4 digits only"
421470msgstr "4 sifr hepken"
422471
423472#: qml/Wizard/Pages/30-passwd-type.qml:103
473+msgctxt "Label: Type of security method"
424474msgid "Passphrase"
425475msgstr "Frazenn-dremen"
426476
427477#: qml/Wizard/Pages/30-passwd-type.qml:104
478+msgctxt "Label: Description of security method"
428479msgid "Numbers and letters"
429480msgstr "Sifroù ha lizherennoù"
430481
431−#: qml/Wizard/Pages/40-wifi.qml:28
482+#: qml/Wizard/Pages/40-wifi.qml:29
432483msgid "Connect to Wi‑Fi"
433484msgstr "Kevreañ ouzh ar Wi-Fi"
434485
435−#: qml/Wizard/Pages/40-wifi.qml:147
486+#: qml/Wizard/Pages/40-wifi.qml:168
436487msgid "Available networks…"
437488msgstr "Rouedadoù a c'haller kaout..."
438489
439−#: qml/Wizard/Pages/40-wifi.qml:148
490+#: qml/Wizard/Pages/40-wifi.qml:169
440491msgid "No available networks."
441492msgstr "N'eus rouedad ebet da gaout."
442493
@@ -545,6 +596,28 @@ msgstr "〈 %1"
545596msgid "%1 〉"
546597msgstr "%1 〉"
547598
599+#~ msgid "Close"
600+#~ msgstr "Serriñ"
601+
602+#~ msgid "Top edge"
603+#~ msgstr "Bord uhelañ"
604+
605+#~ msgid "Left edge"
606+#~ msgstr "Bord kleiz"
607+
608+#~ msgid "Skip intro"
609+#~ msgstr "Tremen hep sellet ouzh an digoradur"
610+
611+#~ msgid "Right edge"
612+#~ msgstr "Bord dehoù"
613+
614+#~ msgid ""
615+#~ "You have now mastered the edge gestures and can start using the "
616+#~ "phone<br><br>Tap on the screen to start"
617+#~ msgstr ""
618+#~ "Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
619+#~ "pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
620+
548621#~ msgid "Loading. Please Wait..."
549622#~ msgstr "O kargañ. Gortozit, mar plij..."
550623
@@ -557,9 +630,38 @@ msgstr "%1 〉"
557630#~ msgid "Confirm"
558631#~ msgstr "Kadarnaat"
559632
633+#~ msgid "Search"
634+#~ msgstr "Klask"
635+
636+#~ msgid "Try swiping from the top edge to access the indicators"
637+#~ msgstr ""
638+#~ "Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
639+
640+#~ msgid "Swipe up again to close the settings screen"
641+#~ msgstr ""
642+#~ "Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
643+
644+#~ msgid "Try swiping from the right edge to unlock the phone"
645+#~ msgstr ""
646+#~ "Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
647+
648+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
649+#~ msgstr ""
650+#~ "Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
651+#~ "prim."
652+
653+#~ msgid "Well done"
654+#~ msgstr "Gourc'hemennoù !"
655+
560656#~ msgid "Type or say a command"
561657#~ msgstr "Skrivit pe lavarit un urzhiad"
562658
659+#~ msgid "Store"
660+#~ msgstr "Enrollañ"
661+
662+#~ msgid "Power off"
663+#~ msgstr "Lazhañ"
664+
563665#~ msgid "Done"
564666#~ msgstr "Graet eo"
565667
@@ -569,5 +671,23 @@ msgstr "%1 〉"
569671#~ msgid "Favorites"
570672#~ msgstr "Gwellañ deuet"
571673
674+#~ msgid "Power"
675+#~ msgstr "Tredan"
676+
677+#~ msgid "Log out"
678+#~ msgstr "Digevreañ"
679+
680+#~ msgid "Reboot"
681+#~ msgstr "Adloc'hañ"
682+
683+#~ msgid "Shut down"
684+#~ msgstr "Lazhañ ar benveg"
685+
686+#~ msgid "Settings"
687+#~ msgstr "Arventennoù"
688+
689+#~ msgid "Restart"
690+#~ msgstr "Adloc'hañ"
691+
572692#~ msgid "Manage Scopes"
573693#~ msgstr "Merañ ar c'hefluskerioù enklask"
po/bs.po+188−118
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +16,10 @@ 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: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17306)\n"
19+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
20+"X-Generator: Launchpad (build 17413)\n"
2121
22−#: plugins/LightDM/Greeter.cpp:130
22+#: plugins/LightDM/Greeter.cpp:112
2323msgid "Password: "
2424msgstr ""
2525
@@ -32,125 +32,104 @@ msgstr ""
3232msgid "Unpin shortcut"
3333msgstr ""
3434
35−#: qml/Components/DelayedLockscreen.qml:47
35+#: qml/Components/DelayedLockscreen.qml:49
3636msgid "Device Locked"
3737msgstr ""
3838
39−#: qml/Components/DelayedLockscreen.qml:62
39+#: qml/Components/DelayedLockscreen.qml:64
4040msgid "You have been locked out due to too many failed passphrase attempts."
4141msgstr ""
4242
43−#: qml/Components/DelayedLockscreen.qml:63
43+#: qml/Components/DelayedLockscreen.qml:65
4444msgid "You have been locked out due to too many failed passcode attempts."
4545msgstr ""
4646
47−#: qml/Components/DelayedLockscreen.qml:72
47+#: qml/Components/DelayedLockscreen.qml:74
4848#, qt-format
4949msgid "Please wait %1 minute and then try again…"
5050msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:86
54+#: qml/Components/Dialogs.qml:67
55+msgctxt "Title: Lock/Log out dialog"
5556msgid "Log out"
5657msgstr ""
5758
58−#: qml/Components/Dialogs.qml:87
59+#: qml/Components/Dialogs.qml:68
5960msgid "Are you sure you want to log out?"
6061msgstr ""
6162
62−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:134
64−msgid "No"
63+#: qml/Components/Dialogs.qml:70
64+msgctxt "Button: Lock the system"
65+msgid "Lock"
6566msgstr ""
6667
67−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:140
69−msgid "Yes"
68+#: qml/Components/Dialogs.qml:77
69+msgctxt "Button: Log out from the system"
70+msgid "Log Out"
7071msgstr ""
7172
72−#: qml/Components/Dialogs.qml:108
73+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
74+#: qml/Components/Dialogs.qml:171
75+msgid "Cancel"
76+msgstr ""
77+
78+#: qml/Components/Dialogs.qml:96
79+msgctxt "Title: Reboot/Shut down dialog"
7380msgid "Shut down"
7481msgstr ""
7582
76−#: qml/Components/Dialogs.qml:109
83+#: qml/Components/Dialogs.qml:97
7784msgid "Are you sure you want to shut down?"
7885msgstr ""
7986
80−#: qml/Components/Dialogs.qml:131
87+#: qml/Components/Dialogs.qml:99
88+msgctxt "Button: Reboot the system"
8189msgid "Reboot"
8290msgstr ""
8391
84−#: qml/Components/Dialogs.qml:132
85−msgid "Are you sure you want to reboot?"
86−msgstr ""
87−
88−#: qml/Components/Dialogs.qml:154
89−msgid "Power"
90−msgstr ""
91−
92−#: qml/Components/Dialogs.qml:155
93−msgid ""
94−"Are you sure you would like\n"
95−"to power off?"
96−msgstr ""
97−
98−#: qml/Components/Dialogs.qml:157
99−msgid "Power off"
100−msgstr ""
101−
102−#: qml/Components/Dialogs.qml:166
103−msgid "Restart"
92+#: qml/Components/Dialogs.qml:107
93+msgctxt "Button: Shut down the system"
94+msgid "Shut down"
10495msgstr ""
10596
106−#: qml/Components/Dialogs.qml:175
107−msgid "Cancel"
97+#: qml/Components/Dialogs.qml:127
98+msgctxt "Title: Reboot dialog"
99+msgid "Reboot"
108100msgstr ""
109101
110−#: qml/Components/EdgeDemoOverlay.qml:151
111−msgid "Skip intro"
112−msgstr "Preskoči uvod"
113−
114−#: qml/Components/EdgeDemo.qml:125
115−msgid "Right edge"
116−msgstr "Desna ivica"
117−
118−#: qml/Components/EdgeDemo.qml:126
119−msgid "Try swiping from the right edge to unlock the phone"
102+#: qml/Components/Dialogs.qml:128
103+msgid "Are you sure you want to reboot?"
120104msgstr ""
121105
122−#: qml/Components/EdgeDemo.qml:157
123−msgid "Top edge"
124−msgstr "Gornja ivica"
125−
126−#: qml/Components/EdgeDemo.qml:158
127−msgid "Try swiping from the top edge to access the indicators"
106+#: qml/Components/Dialogs.qml:130
107+msgid "No"
128108msgstr ""
129109
130−#: qml/Components/EdgeDemo.qml:183
131−msgid "Close"
132−msgstr "Zatvori"
133−
134−#: qml/Components/EdgeDemo.qml:184
135−msgid "Swipe up again to close the settings screen"
110+#: qml/Components/Dialogs.qml:136
111+msgid "Yes"
136112msgstr ""
137113
138−#: qml/Components/EdgeDemo.qml:214
139−msgid "Left edge"
114+#: qml/Components/Dialogs.qml:150
115+msgctxt "Title: Power off/Restart dialog"
116+msgid "Power"
140117msgstr ""
141118
142−#: qml/Components/EdgeDemo.qml:215
143−msgid "Swipe from the left to reveal the launcher for quick access to apps"
119+#: qml/Components/Dialogs.qml:151
120+msgid ""
121+"Are you sure you would like\n"
122+"to power off?"
144123msgstr ""
145124
146−#: qml/Components/EdgeDemo.qml:242
147−msgid "Well done"
125+#: qml/Components/Dialogs.qml:153
126+msgctxt "Button: Power off the system"
127+msgid "Power off"
148128msgstr ""
149129
150−#: qml/Components/EdgeDemo.qml:243
151−msgid ""
152−"You have now mastered the edge gestures and can start using the "
153−"phone<br><br>Tap on the screen to start"
130+#: qml/Components/Dialogs.qml:162
131+msgctxt "Button: Restart the system"
132+msgid "Restart"
154133msgstr ""
155134
156135#: qml/Components/Lockscreen.qml:238
@@ -165,32 +144,39 @@ msgstr ""
165144msgid "OK"
166145msgstr ""
167146
168−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
147+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
169148msgid "See less"
170149msgstr ""
171150
172−#: qml/Dash/GenericScopeView.qml:485
151+#: qml/Dash/GenericScopeView.qml:533
173152msgid "See all"
174153msgstr ""
175154
176−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177−#: qml/Panel/SearchIndicator.qml:27
155+#: qml/Dash/GenericScopeView.qml:595
156+msgctxt "Label: Hint for dash search line edit"
178157msgid "Search"
179158msgstr ""
180159
181−#: qml/Dash/PageHeader.qml:267
160+#: qml/Dash/PageHeader.qml:269
161+msgctxt "Button: Open the Ubuntu Store"
182162msgid "Store"
183163msgstr ""
184164
185−#: qml/Dash/PageHeader.qml:284
165+#: qml/Dash/PageHeader.qml:276
166+msgctxt "Button: Start a search in the current dash scope"
167+msgid "Search"
168+msgstr ""
169+
170+#: qml/Dash/PageHeader.qml:286
171+msgctxt "Button: Show the current dash scope settings"
186172msgid "Settings"
187173msgstr ""
188174
189−#: qml/Dash/PageHeader.qml:291
175+#: qml/Dash/PageHeader.qml:293
190176msgid "Remove from Favorites"
191177msgstr ""
192178
193−#: qml/Dash/PageHeader.qml:291
179+#: qml/Dash/PageHeader.qml:293
194180msgid "Add to Favorites"
195181msgstr ""
196182
@@ -222,6 +208,10 @@ msgstr ""
222208msgid "Release to refresh…"
223209msgstr ""
224210
211+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
212+msgid "Enable location data"
213+msgstr ""
214+
225215#: qml/Dash/ScopesList.qml:66
226216msgid "Manage"
227217msgstr ""
@@ -234,10 +224,72 @@ msgstr ""
234224msgid "Also installed"
235225msgstr ""
236226
237−#: qml/Greeter/Greeter.qml:133
227+#: qml/Greeter/CoverPage.qml:107
238228msgid "Unlock"
239229msgstr ""
240230
231+#: qml/Greeter/LoginList.qml:236
232+msgid "Retry"
233+msgstr ""
234+
235+#: qml/Greeter/LoginList.qml:237
236+msgid "Tap to unlock"
237+msgstr ""
238+
239+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
240+msgid "Sorry, incorrect passphrase."
241+msgstr ""
242+
243+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
244+msgid "Sorry, incorrect passcode."
245+msgstr ""
246+
247+#: qml/Greeter/NarrowView.qml:55
248+msgid "This will be your last attempt."
249+msgstr ""
250+
251+#: qml/Greeter/NarrowView.qml:57
252+msgid ""
253+"If passphrase is entered incorrectly, your phone will conduct a factory "
254+"reset and all personal data will be deleted."
255+msgstr ""
256+
257+#: qml/Greeter/NarrowView.qml:58
258+msgid ""
259+"If passcode is entered incorrectly, your phone will conduct a factory reset "
260+"and all personal data will be deleted."
261+msgstr ""
262+
263+#: qml/Greeter/NarrowView.qml:115
264+#, qt-format
265+msgid "Enter %1"
266+msgstr ""
267+
268+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
269+msgid "Enter passphrase"
270+msgstr ""
271+
272+#: qml/Greeter/NarrowView.qml:117
273+msgid "Enter passcode"
274+msgstr ""
275+
276+#: qml/Greeter/NarrowView.qml:118
277+#, qt-format
278+msgid "Sorry, incorrect %1"
279+msgstr ""
280+
281+#: qml/Greeter/NarrowView.qml:119
282+msgid "Sorry, incorrect passphrase"
283+msgstr ""
284+
285+#: qml/Greeter/NarrowView.qml:120
286+msgid "Please re-enter"
287+msgstr ""
288+
289+#: qml/Greeter/NarrowView.qml:121
290+msgid "Sorry, incorrect passcode"
291+msgstr ""
292+
241293#: qml/Notifications/NotificationMenuItemFactory.qml:128
242294msgid "Show password"
243295msgstr ""
@@ -279,6 +331,7 @@ msgid "Failed, tap to retry"
279331msgstr ""
280332
281333#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
334+msgctxt "Label: Hint in message indicator line edit"
282335msgid "Reply"
283336msgstr ""
284337
@@ -290,61 +343,60 @@ msgstr ""
290343msgid "Roaming"
291344msgstr ""
292345
293−#: qml/Shell.qml:390
294−#, qt-format
295−msgid "Enter %1"
346+#: qml/Tutorial/TutorialBottomFinish.qml:24
347+msgid "This action does different things for different apps"
296348msgstr ""
297349
298−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
299−msgid "Enter passphrase"
350+#: qml/Tutorial/TutorialBottomFinish.qml:25
351+msgid "Tap here to finish."
300352msgstr ""
301353
302−#: qml/Shell.qml:392
303−msgid "Enter passcode"
354+#: qml/Tutorial/TutorialBottom.qml:28
355+msgid "Open special menus"
304356msgstr ""
305357
306−#: qml/Shell.qml:393
307−#, qt-format
308−msgid "Sorry, incorrect %1"
358+#: qml/Tutorial/TutorialBottom.qml:29
359+msgid "Swipe up from the bottom edge."
309360msgstr ""
310361
311−#: qml/Shell.qml:394
312−msgid "Sorry, incorrect passphrase"
362+#: qml/Tutorial/TutorialLeftFinish.qml:24
363+msgid "These are the shortcuts to favorite apps"
313364msgstr ""
314365
315−#: qml/Shell.qml:395
316−msgid "Please re-enter"
366+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
367+msgid "Tap here to continue."
317368msgstr ""
318369
319−#: qml/Shell.qml:396
320−msgid "Sorry, incorrect passcode"
370+#: qml/Tutorial/TutorialLeft.qml:26
371+msgid "Open the launcher"
321372msgstr ""
322373
323−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324−msgid "Sorry, incorrect passphrase."
374+#: qml/Tutorial/TutorialLeft.qml:27
375+msgid "Short swipe from the left edge."
325376msgstr ""
326377
327−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328−msgid "Sorry, incorrect passcode."
378+#: qml/Tutorial/TutorialPage.qml:178
379+msgid "You almost got it!"
329380msgstr ""
330381
331−#: qml/Shell.qml:492
332−msgid "This will be your last attempt."
382+#: qml/Tutorial/TutorialPage.qml:195
383+msgid "Try again."
333384msgstr ""
334385
335−#: qml/Shell.qml:494
336−msgid ""
337−"If passphrase is entered incorrectly, your phone will conduct a factory "
338−"reset and all personal data will be deleted."
386+#: qml/Tutorial/TutorialRight.qml:31
387+msgid "To view open apps"
339388msgstr ""
340389
341−#: qml/Shell.qml:495
342−msgid ""
343−"If passcode is entered incorrectly, your phone will conduct a factory reset "
344−"and all personal data will be deleted."
390+#: qml/Tutorial/TutorialRight.qml:32
391+msgid "Long swipe from the right edge."
392+msgstr ""
393+
394+#: qml/Tutorial/TutorialRight.qml:122
395+msgid "View all your running tasks."
345396msgstr ""
346397
347398#: qml/Wizard/Page.qml:89
399+msgctxt "Button: Go back one page in the Wizard"
348400msgid "Back"
349401msgstr ""
350402
@@ -361,7 +413,7 @@ msgid "Let’s get started."
361413msgstr ""
362414
363415#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
364−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
416+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
365417#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
366418#: qml/Wizard/Pages/passwd-set.qml:90
367419msgid "Continue"
@@ -371,11 +423,11 @@ msgstr ""
371423msgid "Add a SIM card and restart your device"
372424msgstr ""
373425
374−#: qml/Wizard/Pages/20-sim.qml:55
426+#: qml/Wizard/Pages/20-sim.qml:59
375427msgid "Without it, you won’t be able to make calls or use text messaging."
376428msgstr ""
377429
378−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
430+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
379431msgid "Skip"
380432msgstr ""
381433
@@ -388,38 +440,44 @@ msgid "Please select how you’d like to unlock your phone."
388440msgstr ""
389441
390442#: qml/Wizard/Pages/30-passwd-type.qml:97
443+msgctxt "Label: Type of security method"
391444msgid "Swipe"
392445msgstr ""
393446
394447#: qml/Wizard/Pages/30-passwd-type.qml:98
448+msgctxt "Label: Description of security method"
395449msgid "No security"
396450msgstr ""
397451
398452#: qml/Wizard/Pages/30-passwd-type.qml:100
453+msgctxt "Label: Type of security method"
399454msgid "Passcode"
400455msgstr ""
401456
402457#: qml/Wizard/Pages/30-passwd-type.qml:101
458+msgctxt "Label: Description of security method"
403459msgid "4 digits only"
404460msgstr ""
405461
406462#: qml/Wizard/Pages/30-passwd-type.qml:103
463+msgctxt "Label: Type of security method"
407464msgid "Passphrase"
408465msgstr ""
409466
410467#: qml/Wizard/Pages/30-passwd-type.qml:104
468+msgctxt "Label: Description of security method"
411469msgid "Numbers and letters"
412470msgstr ""
413471
414−#: qml/Wizard/Pages/40-wifi.qml:28
472+#: qml/Wizard/Pages/40-wifi.qml:29
415473msgid "Connect to Wi‑Fi"
416474msgstr ""
417475
418−#: qml/Wizard/Pages/40-wifi.qml:147
476+#: qml/Wizard/Pages/40-wifi.qml:168
419477msgid "Available networks…"
420478msgstr ""
421479
422−#: qml/Wizard/Pages/40-wifi.qml:148
480+#: qml/Wizard/Pages/40-wifi.qml:169
423481msgid "No available networks."
424482msgstr ""
425483
@@ -520,3 +578,15 @@ msgstr ""
520578#, qt-format
521579msgid "%1 〉"
522580msgstr ""
581+
582+#~ msgid "Top edge"
583+#~ msgstr "Gornja ivica"
584+
585+#~ msgid "Close"
586+#~ msgstr "Zatvori"
587+
588+#~ msgid "Skip intro"
589+#~ msgstr "Preskoči uvod"
590+
591+#~ msgid "Right edge"
592+#~ msgstr "Desna ivica"
po/ca.po+284−164
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-01-28 08:52+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-07 11:45+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: 2015-01-29 06:00+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
@@ -31,68 +31,95 @@ msgstr "Enganxa la drecera"
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Dispositiu bloquejat"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
4242"d'intents d'introducció de la contrasenya."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
4848"d'intents d'introducció del codi d'accés."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
59−msgstr "Surt"
60+msgstr ""
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Segur que voleu sortir?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "No"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr ""
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Sí"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr ""
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Cancel·la"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
77−msgstr "Apaga"
84+msgstr ""
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Segur que voleu apagar?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
8492msgid "Reboot"
85−msgstr "Reinicia"
93+msgstr ""
94+
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr ""
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
102+msgid "Reboot"
103+msgstr ""
86104
87−#: qml/Components/Dialogs.qml:132
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Segur que voleu reiniciar?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "No"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Sí"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93−msgstr "Energia"
120+msgstr ""
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,71 +127,15 @@ msgstr ""
100127"Segur que voleu\n"
101128"apagar?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105−msgstr "Apaga"
106−
107−#: qml/Components/Dialogs.qml:166
108−msgid "Restart"
109−msgstr "Reinicia"
110−
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Cancel·la"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Omet la introducció"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Vora dreta"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr ""
126−"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127−
128−#: qml/Components/EdgeDemo.qml:157
129−msgid "Top edge"
130−msgstr "Vora superior"
131−
132−#: qml/Components/EdgeDemo.qml:158
133−msgid "Try swiping from the top edge to access the indicators"
134−msgstr ""
135−"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136−
137−#: qml/Components/EdgeDemo.qml:183
138−msgid "Close"
139−msgstr "Tanca"
140−
141−#: qml/Components/EdgeDemo.qml:184
142−msgid "Swipe up again to close the settings screen"
143−msgstr ""
144−"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145−"configuració"
146−
147−#: qml/Components/EdgeDemo.qml:214
148−msgid "Left edge"
149−msgstr "Vora esquerra"
150−
151−#: qml/Components/EdgeDemo.qml:215
152−msgid "Swipe from the left to reveal the launcher for quick access to apps"
153133msgstr ""
154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155−"ràpidament a les aplicacions"
156134
157−#: qml/Components/EdgeDemo.qml:242
158−msgid "Well done"
159−msgstr "Enhorabona!"
160−
161−#: qml/Components/EdgeDemo.qml:243
162−msgid ""
163−"You have now mastered the edge gestures and can start using the "
164−"phone<br><br>Tap on the screen to start"
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
137+msgid "Restart"
165138msgstr ""
166−"Ja heu après com utilitzar els gestos de les vores per fer servir el "
167−"telèfon<br><br>Feu un toc a la pantalla per començar"
168139
169140#: qml/Components/Lockscreen.qml:238
170141msgid "Return to Call"
@@ -178,32 +149,39 @@ msgstr "Trucada d'emergència"
178149msgid "OK"
179150msgstr "D'acord"
180151
181−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
182153msgid "See less"
183154msgstr "Mostra'n menys"
184155
185−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
186157msgid "See all"
187158msgstr "Mostra-ho tot"
188159
189−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
191162msgid "Search"
192−msgstr "Cerca"
163+msgstr ""
193164
194−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
195167msgid "Store"
196−msgstr "Botiga"
168+msgstr ""
197169
198−#: qml/Dash/PageHeader.qml:284
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr ""
174+
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
199177msgid "Settings"
200−msgstr "Paràmetres"
178+msgstr ""
201179
202−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
203181msgid "Remove from Favorites"
204182msgstr "Suprimeix dels preferits"
205183
206−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
207185msgid "Add to Favorites"
208186msgstr "Afegeix als preferits"
209187
@@ -235,6 +213,10 @@ msgstr "Estireu per actualitzar..."
235213msgid "Release to refresh…"
236214msgstr "Deixeu anar per actualitzar..."
237215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Habilita les dades d'ubicació"
219+
238220#: qml/Dash/ScopesList.qml:66
239221msgid "Manage"
240222msgstr "Gestiona"
@@ -247,10 +229,78 @@ msgstr "Inici"
247229msgid "Also installed"
248230msgstr "També instal·lat"
249231
250−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
251233msgid "Unlock"
252234msgstr "Desbloca"
253235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Torna-ho a provar"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Feu un toc per desblocar"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "La contrasenya és incorrecta"
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "El codi d'accés no és correcte"
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Aquest serà el darrer intent."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "
262+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
263+"personals."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
271+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
272+"personals."
273+
274+#: qml/Greeter/NarrowView.qml:115
275+#, qt-format
276+msgid "Enter %1"
277+msgstr "Introduïu: %1"
278+
279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
280+msgid "Enter passphrase"
281+msgstr "Introduïu la contrasenya"
282+
283+#: qml/Greeter/NarrowView.qml:117
284+msgid "Enter passcode"
285+msgstr "Introduïu el codi d'accés"
286+
287+#: qml/Greeter/NarrowView.qml:118
288+#, qt-format
289+msgid "Sorry, incorrect %1"
290+msgstr "Incorrecte (%1)"
291+
292+#: qml/Greeter/NarrowView.qml:119
293+msgid "Sorry, incorrect passphrase"
294+msgstr "La contrasenya no és correcta"
295+
296+#: qml/Greeter/NarrowView.qml:120
297+msgid "Please re-enter"
298+msgstr "Torneu-ho a introduir"
299+
300+#: qml/Greeter/NarrowView.qml:121
301+msgid "Sorry, incorrect passcode"
302+msgstr "El codi d'accés no és correcte"
303+
254304#: qml/Notifications/NotificationMenuItemFactory.qml:128
255305msgid "Show password"
256306msgstr "Mostra la contrasenya"
@@ -292,8 +342,9 @@ msgid "Failed, tap to retry"
292342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
293343
294344#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
345+msgctxt "Label: Hint in message indicator line edit"
295346msgid "Reply"
296−msgstr "Respon"
347+msgstr ""
297348
298349#: qml/Panel/Indicators/ModemInfoItem.qml:105
299350msgid "Unlock SIM"
@@ -303,69 +354,62 @@ msgstr "Desbloca la SIM"
303354msgid "Roaming"
304355msgstr "Itinerància"
305356
306−#: qml/Shell.qml:390
307−#, qt-format
308−msgid "Enter %1"
309−msgstr "Introduïu: %1"
357+#: qml/Tutorial/TutorialBottomFinish.qml:24
358+msgid "This action does different things for different apps"
359+msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
310360
311−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
312−msgid "Enter passphrase"
313−msgstr "Introduïu la contrasenya"
361+#: qml/Tutorial/TutorialBottomFinish.qml:25
362+msgid "Tap here to finish."
363+msgstr "Feu un toc per finalitzar."
314364
315−#: qml/Shell.qml:392
316−msgid "Enter passcode"
317−msgstr "Introduïu el codi d'accés"
365+#: qml/Tutorial/TutorialBottom.qml:28
366+msgid "Open special menus"
367+msgstr "Obre els menús especials"
318368
319−#: qml/Shell.qml:393
320−#, qt-format
321−msgid "Sorry, incorrect %1"
322−msgstr "Incorrecte (%1)"
369+#: qml/Tutorial/TutorialBottom.qml:29
370+msgid "Swipe up from the bottom edge."
371+msgstr "Llisqueu el dit des de la vora inferior."
323372
324−#: qml/Shell.qml:394
325−msgid "Sorry, incorrect passphrase"
326−msgstr "La contrasenya no és correcta"
373+#: qml/Tutorial/TutorialLeftFinish.qml:24
374+msgid "These are the shortcuts to favorite apps"
375+msgstr "Aquestes són les dreceres a les aplicacions preferides"
327376
328−#: qml/Shell.qml:395
329−msgid "Please re-enter"
330−msgstr "Torneu-ho a introduir"
377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
378+msgid "Tap here to continue."
379+msgstr "Feu un toc per continuar."
331380
332−#: qml/Shell.qml:396
333−msgid "Sorry, incorrect passcode"
334−msgstr "El codi d'accés no és correcte"
381+#: qml/Tutorial/TutorialLeft.qml:26
382+msgid "Open the launcher"
383+msgstr "Obre el llançador"
335384
336−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
337−msgid "Sorry, incorrect passphrase."
338−msgstr "La contrasenya és incorrecta"
385+#: qml/Tutorial/TutorialLeft.qml:27
386+msgid "Short swipe from the left edge."
387+msgstr "Lliscament curt des de la vora esquerra."
339388
340−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341−msgid "Sorry, incorrect passcode."
342−msgstr "El codi d'accés no és correcte"
389+#: qml/Tutorial/TutorialPage.qml:178
390+msgid "You almost got it!"
391+msgstr "Ja gairebé ho teniu!"
343392
344−#: qml/Shell.qml:492
345−msgid "This will be your last attempt."
346−msgstr "Aquest serà el darrer intent."
393+#: qml/Tutorial/TutorialPage.qml:195
394+msgid "Try again."
395+msgstr "Torneu-ho a provar."
347396
348−#: qml/Shell.qml:494
349−msgid ""
350−"If passphrase is entered incorrectly, your phone will conduct a factory "
351−"reset and all personal data will be deleted."
352−msgstr ""
353−"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "
354−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355−"personals."
397+#: qml/Tutorial/TutorialRight.qml:31
398+msgid "To view open apps"
399+msgstr "Per veure les aplicacions obertes"
356400
357−#: qml/Shell.qml:495
358−msgid ""
359−"If passcode is entered incorrectly, your phone will conduct a factory reset "
360−"and all personal data will be deleted."
361−msgstr ""
362−"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
363−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364−"personals."
401+#: qml/Tutorial/TutorialRight.qml:32
402+msgid "Long swipe from the right edge."
403+msgstr "Lliscament llarg des de la vora dreta."
404+
405+#: qml/Tutorial/TutorialRight.qml:122
406+msgid "View all your running tasks."
407+msgstr "Mostra totes les tasques en execució."
365408
366409#: qml/Wizard/Page.qml:89
410+msgctxt "Button: Go back one page in the Wizard"
367411msgid "Back"
368−msgstr "Enrere"
412+msgstr ""
369413
370414#: qml/Wizard/Pages/10-welcome.qml:27
371415msgid "Hi!"
@@ -380,7 +424,7 @@ msgid "Let’s get started."
380424msgstr "Comencem."
381425
382426#: 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
427+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
384428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385429#: qml/Wizard/Pages/passwd-set.qml:90
386430msgid "Continue"
@@ -390,11 +434,11 @@ msgstr "Continua"
390434msgid "Add a SIM card and restart your device"
391435msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
392436
393−#: qml/Wizard/Pages/20-sim.qml:55
437+#: qml/Wizard/Pages/20-sim.qml:59
394438msgid "Without it, you won’t be able to make calls or use text messaging."
395439msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
396440
397−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
441+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
398442msgid "Skip"
399443msgstr "Omet"
400444
@@ -407,38 +451,44 @@ msgid "Please select how you’d like to unlock your phone."
407451msgstr "Seleccioneu com voleu desblocar el telèfon."
408452
409453#: qml/Wizard/Pages/30-passwd-type.qml:97
454+msgctxt "Label: Type of security method"
410455msgid "Swipe"
411−msgstr "Lliscament amb el dit"
456+msgstr ""
412457
413458#: qml/Wizard/Pages/30-passwd-type.qml:98
459+msgctxt "Label: Description of security method"
414460msgid "No security"
415−msgstr "Sense seguretat"
461+msgstr ""
416462
417463#: qml/Wizard/Pages/30-passwd-type.qml:100
464+msgctxt "Label: Type of security method"
418465msgid "Passcode"
419−msgstr "Codi d'accés"
466+msgstr ""
420467
421468#: qml/Wizard/Pages/30-passwd-type.qml:101
469+msgctxt "Label: Description of security method"
422470msgid "4 digits only"
423−msgstr "Només 4 dígits"
471+msgstr ""
424472
425473#: qml/Wizard/Pages/30-passwd-type.qml:103
474+msgctxt "Label: Type of security method"
426475msgid "Passphrase"
427−msgstr "Contrasenya"
476+msgstr ""
428477
429478#: qml/Wizard/Pages/30-passwd-type.qml:104
479+msgctxt "Label: Description of security method"
430480msgid "Numbers and letters"
431−msgstr "Números i lletres"
481+msgstr ""
432482
433−#: qml/Wizard/Pages/40-wifi.qml:28
483+#: qml/Wizard/Pages/40-wifi.qml:29
434484msgid "Connect to Wi‑Fi"
435485msgstr "Connecta't a la Wi-Fi"
436486
437−#: qml/Wizard/Pages/40-wifi.qml:147
487+#: qml/Wizard/Pages/40-wifi.qml:168
438488msgid "Available networks…"
439489msgstr "Xarxes disponibles..."
440490
441−#: qml/Wizard/Pages/40-wifi.qml:148
491+#: qml/Wizard/Pages/40-wifi.qml:169
442492msgid "No available networks."
443493msgstr "No hi ha xarxes disponibles"
444494
@@ -564,6 +614,55 @@ msgstr "%1 〉"
564614#~ msgid "Speaking..."
565615#~ msgstr "S'està parlant..."
566616
617+#~ msgid "Search"
618+#~ msgstr "Cerca"
619+
620+#~ msgid "Right edge"
621+#~ msgstr "Vora dreta"
622+
623+#~ msgid "Top edge"
624+#~ msgstr "Vora superior"
625+
626+#~ msgid "Well done"
627+#~ msgstr "Enhorabona!"
628+
629+#~ msgid "Left edge"
630+#~ msgstr "Vora esquerra"
631+
632+#~ msgid "Try swiping from the top edge to access the indicators"
633+#~ msgstr ""
634+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
635+
636+#~ msgid "Close"
637+#~ msgstr "Tanca"
638+
639+#~ msgid "Swipe up again to close the settings screen"
640+#~ msgstr ""
641+#~ "Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
642+#~ "configuració"
643+
644+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
645+#~ msgstr ""
646+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
647+#~ "ràpidament a les aplicacions"
648+
649+#~ msgid "Skip intro"
650+#~ msgstr "Omet la introducció"
651+
652+#~ msgid "Try swiping from the right edge to unlock the phone"
653+#~ msgstr ""
654+#~ "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
655+
656+#~ msgid ""
657+#~ "You have now mastered the edge gestures and can start using the "
658+#~ "phone<br><br>Tap on the screen to start"
659+#~ msgstr ""
660+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "
661+#~ "telèfon<br><br>Feu un toc a la pantalla per començar"
662+
663+#~ msgid "Store"
664+#~ msgstr "Botiga"
665+
567666#~ msgid "Done"
568667#~ msgstr "Fet"
569668
@@ -573,5 +672,26 @@ msgstr "%1 〉"
573672#~ msgid "All"
574673#~ msgstr "Totes"
575674
675+#~ msgid "Log out"
676+#~ msgstr "Surt"
677+
678+#~ msgid "Reboot"
679+#~ msgstr "Reinicia"
680+
681+#~ msgid "Settings"
682+#~ msgstr "Paràmetres"
683+
684+#~ msgid "Power"
685+#~ msgstr "Energia"
686+
687+#~ msgid "Power off"
688+#~ msgstr "Apaga"
689+
690+#~ msgid "Shut down"
691+#~ msgstr "Apaga"
692+
693+#~ msgid "Restart"
694+#~ msgstr "Reinicia"
695+
576696#~ msgid "Manage Scopes"
577697#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+325−196
@@ -1,24 +1,24 @@
1−# Catalan translation for unity8
2−# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3−# This file is distributed under the same license as the unity8 package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
1+# Catalan translation for unity
2+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3+# This file is distributed under the same license as the unity package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
55#
66msgid ""
77msgstr ""
8−"Project-Id-Version: unity8\n"
8+"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-23 07:17+0000\n"
12−"Last-Translator: Pau Iranzo <Unknown>\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-02-22 15:22+0000\n"
12+"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: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
@@ -31,68 +31,95 @@ msgstr "Apega la drecera"
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Dispositiu bloquejat"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
4242"d'intents d'introducció de la contrasenya."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Se vos ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
4848"d'intents d'introducció del codi d'accés."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
59−msgstr "Ix"
60+msgstr ""
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Segur que voleu eixir?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "No"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr ""
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Sí"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr ""
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Cancel·la"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
77−msgstr "Apaga"
84+msgstr ""
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Segur que voleu apagar?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
92+msgid "Reboot"
93+msgstr ""
94+
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr ""
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
84102msgid "Reboot"
85−msgstr "Reinicia"
103+msgstr ""
86104
87−#: qml/Components/Dialogs.qml:132
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Segur que voleu reiniciar?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "No"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Sí"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93−msgstr "Energia"
120+msgstr ""
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,75 +127,19 @@ msgstr ""
100127"Segur que voleu\n"
101128"apagar?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105−msgstr "Apaga"
106−
107−#: qml/Components/Dialogs.qml:166
108−msgid "Restart"
109−msgstr "Reinicia"
110−
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Cancel·la"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Omet la introducció"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Vora dreta"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr ""
126−"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127−
128−#: qml/Components/EdgeDemo.qml:157
129−msgid "Top edge"
130−msgstr "Vora superior"
131−
132−#: qml/Components/EdgeDemo.qml:158
133−msgid "Try swiping from the top edge to access the indicators"
134−msgstr ""
135−"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136−
137−#: qml/Components/EdgeDemo.qml:183
138−msgid "Close"
139−msgstr "Tanca"
140−
141−#: qml/Components/EdgeDemo.qml:184
142−msgid "Swipe up again to close the settings screen"
143133msgstr ""
144−"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145−"configuració"
146134
147−#: qml/Components/EdgeDemo.qml:214
148−msgid "Left edge"
149−msgstr "Vora esquerra"
150−
151−#: qml/Components/EdgeDemo.qml:215
152−msgid "Swipe from the left to reveal the launcher for quick access to apps"
153−msgstr ""
154−"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155−"ràpidament a les aplicacions"
156−
157−#: qml/Components/EdgeDemo.qml:242
158−msgid "Well done"
159−msgstr "Enhorabona!"
160−
161−#: qml/Components/EdgeDemo.qml:243
162−msgid ""
163−"You have now mastered the edge gestures and can start using the "
164−"phone<br><br>Tap on the screen to start"
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
137+msgid "Restart"
165138msgstr ""
166−"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "
167−"telèfon<br><br>Feu un toc a la pantalla per començar"
168139
169140#: qml/Components/Lockscreen.qml:238
170141msgid "Return to Call"
171−msgstr "Torna a la trucada"
142+msgstr "Torna a la cridada"
172143
173144#: qml/Components/Lockscreen.qml:238
174145msgid "Emergency Call"
@@ -178,32 +149,39 @@ msgstr "Cridada d'emergència"
178149msgid "OK"
179150msgstr "D'acord"
180151
181−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
182153msgid "See less"
183154msgstr "Mostra'n menys"
184155
185−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
186157msgid "See all"
187158msgstr "Mostra-ho tot"
188159
189−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
191162msgid "Search"
192−msgstr "Cerca"
163+msgstr ""
193164
194−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
195167msgid "Store"
196−msgstr "Botiga"
168+msgstr ""
169+
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr ""
197174
198−#: qml/Dash/PageHeader.qml:284
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
199177msgid "Settings"
200−msgstr "Paràmetres"
178+msgstr ""
201179
202−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
203181msgid "Remove from Favorites"
204182msgstr "Suprimeix dels preferits"
205183
206−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
207185msgid "Add to Favorites"
208186msgstr "Afig als preferits"
209187
@@ -235,22 +213,94 @@ msgstr "Estireu per actualitzar..."
235213msgid "Release to refresh…"
236214msgstr "Deixeu anar per actualitzar..."
237215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Habilita les dades d'ubicació"
219+
238220#: qml/Dash/ScopesList.qml:66
239221msgid "Manage"
240−msgstr ""
222+msgstr "Gestiona"
241223
242224#: qml/Dash/ScopesList.qml:112
243225msgid "Home"
244−msgstr ""
226+msgstr "Inici"
245227
246228#: qml/Dash/ScopesList.qml:113
247229msgid "Also installed"
248−msgstr ""
230+msgstr "També instal·lat"
249231
250−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
251233msgid "Unlock"
252234msgstr "Desbloca"
253235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr ""
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr ""
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "La contrasenya és incorrecta"
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "El codi d'accés no és correcte"
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Este serà el darrer intent."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "
262+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
263+"personals."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
271+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
272+"personals."
273+
274+#: qml/Greeter/NarrowView.qml:115
275+#, qt-format
276+msgid "Enter %1"
277+msgstr "Introduïu: %1"
278+
279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
280+msgid "Enter passphrase"
281+msgstr "Introduïu la contrasenya"
282+
283+#: qml/Greeter/NarrowView.qml:117
284+msgid "Enter passcode"
285+msgstr "Introduïu el codi d'accés"
286+
287+#: qml/Greeter/NarrowView.qml:118
288+#, qt-format
289+msgid "Sorry, incorrect %1"
290+msgstr "Incorrecte (%1)"
291+
292+#: qml/Greeter/NarrowView.qml:119
293+msgid "Sorry, incorrect passphrase"
294+msgstr "La contrasenya no és correcta"
295+
296+#: qml/Greeter/NarrowView.qml:120
297+msgid "Please re-enter"
298+msgstr "Torneu-ho a introduir"
299+
300+#: qml/Greeter/NarrowView.qml:121
301+msgid "Sorry, incorrect passcode"
302+msgstr "El codi d'accés no és correcte"
303+
254304#: qml/Notifications/NotificationMenuItemFactory.qml:128
255305msgid "Show password"
256306msgstr "Mostra la contrasenya"
@@ -292,6 +342,7 @@ msgid "Failed, tap to retry"
292342msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
293343
294344#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
345+msgctxt "Label: Hint in message indicator line edit"
295346msgid "Reply"
296347msgstr ""
297348
@@ -303,160 +354,161 @@ msgstr "Desbloca la SIM"
303354msgid "Roaming"
304355msgstr "Itinerància"
305356
306−#: qml/Shell.qml:390
307−#, qt-format
308−msgid "Enter %1"
309−msgstr "Introduïu: %1"
357+#: qml/Tutorial/TutorialBottomFinish.qml:24
358+msgid "This action does different things for different apps"
359+msgstr ""
310360
311−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
312−msgid "Enter passphrase"
313−msgstr "Introduïu la contrasenya"
361+#: qml/Tutorial/TutorialBottomFinish.qml:25
362+msgid "Tap here to finish."
363+msgstr ""
314364
315−#: qml/Shell.qml:392
316−msgid "Enter passcode"
317−msgstr "Introduïu el codi d'accés"
365+#: qml/Tutorial/TutorialBottom.qml:28
366+msgid "Open special menus"
367+msgstr ""
318368
319−#: qml/Shell.qml:393
320−#, qt-format
321−msgid "Sorry, incorrect %1"
322−msgstr "Incorrecte (%1)"
369+#: qml/Tutorial/TutorialBottom.qml:29
370+msgid "Swipe up from the bottom edge."
371+msgstr ""
323372
324−#: qml/Shell.qml:394
325−msgid "Sorry, incorrect passphrase"
326−msgstr "La contrasenya no és correcta"
373+#: qml/Tutorial/TutorialLeftFinish.qml:24
374+msgid "These are the shortcuts to favorite apps"
375+msgstr ""
327376
328−#: qml/Shell.qml:395
329−msgid "Please re-enter"
330−msgstr "Torneu-ho a introduir"
377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
378+msgid "Tap here to continue."
379+msgstr ""
331380
332−#: qml/Shell.qml:396
333−msgid "Sorry, incorrect passcode"
334−msgstr "El codi d'accés no és correcte"
381+#: qml/Tutorial/TutorialLeft.qml:26
382+msgid "Open the launcher"
383+msgstr ""
335384
336−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
337−msgid "Sorry, incorrect passphrase."
338−msgstr "La contrasenya és incorrecta"
385+#: qml/Tutorial/TutorialLeft.qml:27
386+msgid "Short swipe from the left edge."
387+msgstr ""
339388
340−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341−msgid "Sorry, incorrect passcode."
342−msgstr "El codi d'accés no és correcte"
389+#: qml/Tutorial/TutorialPage.qml:178
390+msgid "You almost got it!"
391+msgstr ""
343392
344−#: qml/Shell.qml:492
345−msgid "This will be your last attempt."
346−msgstr "Este serà el darrer intent."
393+#: qml/Tutorial/TutorialPage.qml:195
394+msgid "Try again."
395+msgstr ""
347396
348−#: qml/Shell.qml:494
349−msgid ""
350−"If passphrase is entered incorrectly, your phone will conduct a factory "
351−"reset and all personal data will be deleted."
397+#: qml/Tutorial/TutorialRight.qml:31
398+msgid "To view open apps"
352399msgstr ""
353−"Si la contrasenya s'introdueix de manera incorrecta, el telèfon es "
354−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355−"personals."
356400
357−#: qml/Shell.qml:495
358−msgid ""
359−"If passcode is entered incorrectly, your phone will conduct a factory reset "
360−"and all personal data will be deleted."
401+#: qml/Tutorial/TutorialRight.qml:32
402+msgid "Long swipe from the right edge."
403+msgstr ""
404+
405+#: qml/Tutorial/TutorialRight.qml:122
406+msgid "View all your running tasks."
361407msgstr ""
362−"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
363−"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364−"personals."
365408
366409#: qml/Wizard/Page.qml:89
410+msgctxt "Button: Go back one page in the Wizard"
367411msgid "Back"
368412msgstr ""
369413
370414#: qml/Wizard/Pages/10-welcome.qml:27
371415msgid "Hi!"
372−msgstr ""
416+msgstr "Hola!"
373417
374418#: qml/Wizard/Pages/10-welcome.qml:44
375419msgid "Welcome to your Ubuntu phone."
376−msgstr ""
420+msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."
377421
378422#: qml/Wizard/Pages/10-welcome.qml:52
379423msgid "Let’s get started."
380−msgstr ""
424+msgstr "Comencem."
381425
382426#: 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
427+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
384428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385429#: qml/Wizard/Pages/passwd-set.qml:90
386430msgid "Continue"
387−msgstr ""
431+msgstr "Continua"
388432
389433#: qml/Wizard/Pages/20-sim.qml:25
390434msgid "Add a SIM card and restart your device"
391−msgstr ""
435+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
392436
393−#: qml/Wizard/Pages/20-sim.qml:55
437+#: qml/Wizard/Pages/20-sim.qml:59
394438msgid "Without it, you won’t be able to make calls or use text messaging."
395−msgstr ""
439+msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
396440
397−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
441+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
398442msgid "Skip"
399−msgstr ""
443+msgstr "Omet"
400444
401445#: qml/Wizard/Pages/30-passwd-type.qml:39
402446msgid "Lock security"
403−msgstr ""
447+msgstr "Seguretat del bloqueig"
404448
405449#: qml/Wizard/Pages/30-passwd-type.qml:74
406450msgid "Please select how you’d like to unlock your phone."
407−msgstr ""
451+msgstr "Seleccioneu com voleu desblocar el telèfon."
408452
409453#: qml/Wizard/Pages/30-passwd-type.qml:97
454+msgctxt "Label: Type of security method"
410455msgid "Swipe"
411456msgstr ""
412457
413458#: qml/Wizard/Pages/30-passwd-type.qml:98
459+msgctxt "Label: Description of security method"
414460msgid "No security"
415461msgstr ""
416462
417463#: qml/Wizard/Pages/30-passwd-type.qml:100
464+msgctxt "Label: Type of security method"
418465msgid "Passcode"
419466msgstr ""
420467
421468#: qml/Wizard/Pages/30-passwd-type.qml:101
469+msgctxt "Label: Description of security method"
422470msgid "4 digits only"
423471msgstr ""
424472
425473#: qml/Wizard/Pages/30-passwd-type.qml:103
474+msgctxt "Label: Type of security method"
426475msgid "Passphrase"
427476msgstr ""
428477
429478#: qml/Wizard/Pages/30-passwd-type.qml:104
479+msgctxt "Label: Description of security method"
430480msgid "Numbers and letters"
431481msgstr ""
432482
433−#: qml/Wizard/Pages/40-wifi.qml:28
483+#: qml/Wizard/Pages/40-wifi.qml:29
434484msgid "Connect to Wi‑Fi"
435−msgstr ""
485+msgstr "Connecta't a la Wi-Fi"
436486
437−#: qml/Wizard/Pages/40-wifi.qml:147
487+#: qml/Wizard/Pages/40-wifi.qml:168
438488msgid "Available networks…"
439−msgstr ""
489+msgstr "Xarxes disponibles..."
440490
441−#: qml/Wizard/Pages/40-wifi.qml:148
491+#: qml/Wizard/Pages/40-wifi.qml:169
442492msgid "No available networks."
443−msgstr ""
493+msgstr "No hi ha xarxes disponibles"
444494
445495#: qml/Wizard/Pages/50-location.qml:27
446496msgid "Location"
447−msgstr ""
497+msgstr "Ubicació"
448498
449499#: qml/Wizard/Pages/50-location.qml:62
450500msgid "Let the phone detect your location:"
451−msgstr ""
501+msgstr "Fes que el telèfon detecti la meua ubicació:"
452502
453503#: qml/Wizard/Pages/50-location.qml:69
454504msgid "Using GPS only (less accurate)"
455−msgstr ""
505+msgstr "Utilitza només el GPS (menys precís)"
456506
457507#: qml/Wizard/Pages/50-location.qml:86
458508msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459509msgstr ""
510+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
511+"(recomanat)"
460512
461513#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
462514#: qml/Wizard/Pages/50-location.qml:103
@@ -464,81 +516,148 @@ msgid ""
464516"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
465517"conditions</a>."
466518msgstr ""
519+"Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "
520+"servei Nokia HERE</a>."
467521
468522#: qml/Wizard/Pages/50-location.qml:112
469523msgid "Not at all"
470−msgstr ""
524+msgstr "No"
471525
472526#: qml/Wizard/Pages/50-location.qml:124
473527msgid "You can change your mind later in <b>System Settings</b>."
474528msgstr ""
529+"Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"
475530
476531#: qml/Wizard/Pages/60-reporting.qml:24
477532msgid "Improving your experience"
478−msgstr ""
533+msgstr "Millora de l'experiència"
479534
480535#: qml/Wizard/Pages/60-reporting.qml:36
481536msgid ""
482537"Your phone is set up to automatically report errors to Canonical and its "
483538"partners, the makers of the operating system."
484539msgstr ""
540+"Este telèfon està configurat per enviar errors de manera automàtica a "
541+"Canonical i associats, els creadors del sistema operatiu."
485542
486543#: qml/Wizard/Pages/60-reporting.qml:43
487544msgid ""
488545"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
489546"Privacy</b>"
490547msgstr ""
548+"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
549+"<b>Seguretat i privadesa</b>"
491550
492551#: qml/Wizard/Pages/80-finished.qml:24
493552msgid "All done"
494−msgstr ""
553+msgstr "Tot fet"
495554
496555#: qml/Wizard/Pages/80-finished.qml:39
497556msgid "Nice work!"
498−msgstr ""
557+msgstr "Bona faena!"
499558
500559#: qml/Wizard/Pages/80-finished.qml:46
501560msgid "Your phone is now ready to use."
502−msgstr ""
561+msgstr "Ja podeu utilitzar el vostre telèfon."
503562
504563#: qml/Wizard/Pages/80-finished.qml:53
505564msgid "Finish"
506−msgstr ""
565+msgstr "Finalitza"
507566
508567#: qml/Wizard/Pages/here-terms.qml:27
509568msgid "Terms & Conditions"
510−msgstr ""
569+msgstr "Condicions generals"
511570
512571#: qml/Wizard/Pages/passwd-confirm.qml:49
513572msgid "Confirm passphrase"
514−msgstr ""
573+msgstr "Confirmeu la contrasenya"
515574
516575#: qml/Wizard/Pages/passwd-confirm.qml:50
517576msgid "Confirm passcode"
518−msgstr ""
577+msgstr "Confirmeu el codi d'accés"
519578
520579#: qml/Wizard/Pages/passwd-confirm.qml:53
521580#: qml/Wizard/Pages/passwd-confirm.qml:54
522581msgid "Please try again."
523−msgstr ""
582+msgstr "Torneu-ho a intentar."
524583
525584#: qml/Wizard/Pages/passwd-set.qml:61
526585msgid "Choose your passcode"
527−msgstr ""
586+msgstr "Trieu el codi d'accés"
528587
529588#: qml/Wizard/Pages/passwd-set.qml:68
530589msgid "Passphrase must be 4 characters long"
531−msgstr ""
590+msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
532591
533592#: qml/Wizard/StackButton.qml:39
534593#, qt-format
535594msgid "〈 %1"
536−msgstr ""
595+msgstr "〈 %1"
537596
538597#: qml/Wizard/StackButton.qml:42
539598#, qt-format
540599msgid "%1 〉"
541−msgstr ""
600+msgstr "%1 〉"
601+
602+#~ msgid "Log out"
603+#~ msgstr "Ix"
604+
605+#~ msgid "Shut down"
606+#~ msgstr "Apaga"
607+
608+#~ msgid "Reboot"
609+#~ msgstr "Reinicia"
610+
611+#~ msgid "Power"
612+#~ msgstr "Energia"
613+
614+#~ msgid "Power off"
615+#~ msgstr "Apaga"
616+
617+#~ msgid "Restart"
618+#~ msgstr "Reinicia"
619+
620+#~ msgid "Skip intro"
621+#~ msgstr "Omet la introducció"
622+
623+#~ msgid "Right edge"
624+#~ msgstr "Vora dreta"
625+
626+#~ msgid "Try swiping from the right edge to unlock the phone"
627+#~ msgstr ""
628+#~ "Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
629+
630+#~ msgid "Top edge"
631+#~ msgstr "Vora superior"
632+
633+#~ msgid "Try swiping from the top edge to access the indicators"
634+#~ msgstr ""
635+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
636+
637+#~ msgid "Close"
638+#~ msgstr "Tanca"
639+
640+#~ msgid "Swipe up again to close the settings screen"
641+#~ msgstr ""
642+#~ "Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
643+#~ "configuració"
644+
645+#~ msgid "Left edge"
646+#~ msgstr "Vora esquerra"
647+
648+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
649+#~ msgstr ""
650+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
651+#~ "ràpidament a les aplicacions"
652+
653+#~ msgid "Well done"
654+#~ msgstr "Enhorabona!"
655+
656+#~ msgid "Search"
657+#~ msgstr "Cerca"
658+
659+#~ msgid "Settings"
660+#~ msgstr "Paràmetres"
542661
543662#~ msgid "Manage Scopes"
544663#~ msgstr "Gestioneu les lents"
@@ -546,6 +665,9 @@ msgstr ""
546665#~ msgid "Done"
547666#~ msgstr "Fet"
548667
668+#~ msgid "Store"
669+#~ msgstr "Botiga"
670+
549671#~ msgid "Favorites"
550672#~ msgstr "Preferides"
551673
@@ -555,9 +677,6 @@ msgstr ""
555677#~ msgid "Confirm"
556678#~ msgstr "Confirma"
557679
558−#~ msgid "Type or say a command"
559−#~ msgstr "Escriviu o pronuncieu una orde"
560−
561680#~ msgid "Loading. Please Wait..."
562681#~ msgstr "S'està carregant. Espereu-vos un moment..."
563682
@@ -566,3 +685,13 @@ msgstr ""
566685
567686#~ msgid "Speaking..."
568687#~ msgstr "S'està parlant..."
688+
689+#~ msgid "Type or say a command"
690+#~ msgstr "Escriviu o pronuncieu una ordre"
691+
692+#~ msgid ""
693+#~ "You have now mastered the edge gestures and can start using the "
694+#~ "phone<br><br>Tap on the screen to start"
695+#~ msgstr ""
696+#~ "Ja heu après com utilitzar els gestos de les vores per fer servir el "
697+#~ "telèfon<br><br>Feu un toc a la pantalla per començar"
po/ce.ponew file+579
@@ -0,0 +1,579 @@
1+# Chechen translation for unity8
2+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3+# This file is distributed under the same license as the unity8 package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity8\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-02-15 04:01+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Chechen <ce@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
20+
21+#: plugins/LightDM/Greeter.cpp:112
22+msgid "Password: "
23+msgstr ""
24+
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
27+msgid "Pin shortcut"
28+msgstr ""
29+
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
31+msgid "Unpin shortcut"
32+msgstr ""
33+
34+#: qml/Components/DelayedLockscreen.qml:49
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:64
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:65
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:74
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
55+msgid "Log out"
56+msgstr ""
57+
58+#: qml/Components/Dialogs.qml:68
59+msgid "Are you sure you want to log out?"
60+msgstr ""
61+
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr ""
66+
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr ""
76+
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
79+msgid "Shut down"
80+msgstr ""
81+
82+#: qml/Components/Dialogs.qml:97
83+msgid "Are you sure you want to shut down?"
84+msgstr ""
85+
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
88+msgid "Reboot"
89+msgstr ""
90+
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr ""
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr ""
100+
101+#: qml/Components/Dialogs.qml:128
102+msgid "Are you sure you want to reboot?"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr ""
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr ""
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
115+msgid "Power"
116+msgstr ""
117+
118+#: qml/Components/Dialogs.qml:151
119+msgid ""
120+"Are you sure you would like\n"
121+"to power off?"
122+msgstr ""
123+
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
126+msgid "Power off"
127+msgstr ""
128+
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
131+msgid "Restart"
132+msgstr ""
133+
134+#: qml/Components/Lockscreen.qml:238
135+msgid "Return to Call"
136+msgstr ""
137+
138+#: qml/Components/Lockscreen.qml:238
139+msgid "Emergency Call"
140+msgstr ""
141+
142+#: qml/Components/Lockscreen.qml:270
143+msgid "OK"
144+msgstr ""
145+
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
147+msgid "See less"
148+msgstr ""
149+
150+#: qml/Dash/GenericScopeView.qml:533
151+msgid "See all"
152+msgstr ""
153+
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
156+msgid "Search"
157+msgstr ""
158+
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
161+msgid "Store"
162+msgstr ""
163+
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
171+msgid "Settings"
172+msgstr ""
173+
174+#: qml/Dash/PageHeader.qml:293
175+msgid "Remove from Favorites"
176+msgstr ""
177+
178+#: qml/Dash/PageHeader.qml:293
179+msgid "Add to Favorites"
180+msgstr ""
181+
182+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183+msgid "More..."
184+msgstr ""
185+
186+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187+msgid "Less..."
188+msgstr ""
189+
190+#: qml/Dash/Previews/PreviewRatingInput.qml:81
191+msgid "Rate this"
192+msgstr ""
193+
194+#: qml/Dash/Previews/PreviewRatingInput.qml:126
195+msgid "Add a review"
196+msgstr ""
197+
198+#: qml/Dash/Previews/PreviewRatingInput.qml:166
199+msgid "Send"
200+msgstr ""
201+
202+#: qml/Dash/PullToRefreshScopeStyle.qml:55
203+msgid "Pull to refresh…"
204+msgstr ""
205+
206+#: qml/Dash/PullToRefreshScopeStyle.qml:60
207+msgid "Release to refresh…"
208+msgstr ""
209+
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
214+#: qml/Dash/ScopesList.qml:66
215+msgid "Manage"
216+msgstr ""
217+
218+#: qml/Dash/ScopesList.qml:112
219+msgid "Home"
220+msgstr ""
221+
222+#: qml/Dash/ScopesList.qml:113
223+msgid "Also installed"
224+msgstr ""
225+
226+#: qml/Greeter/CoverPage.qml:107
227+msgid "Unlock"
228+msgstr ""
229+
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr ""
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+
256+#: qml/Greeter/NarrowView.qml:58
257+msgid ""
258+"If passcode is entered incorrectly, your phone will conduct a factory reset "
259+"and all personal data will be deleted."
260+msgstr ""
261+
262+#: qml/Greeter/NarrowView.qml:115
263+#, qt-format
264+msgid "Enter %1"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
268+msgid "Enter passphrase"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:117
272+msgid "Enter passcode"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:118
276+#, qt-format
277+msgid "Sorry, incorrect %1"
278+msgstr ""
279+
280+#: qml/Greeter/NarrowView.qml:119
281+msgid "Sorry, incorrect passphrase"
282+msgstr ""
283+
284+#: qml/Greeter/NarrowView.qml:120
285+msgid "Please re-enter"
286+msgstr ""
287+
288+#: qml/Greeter/NarrowView.qml:121
289+msgid "Sorry, incorrect passcode"
290+msgstr ""
291+
292+#: qml/Notifications/NotificationMenuItemFactory.qml:128
293+msgid "Show password"
294+msgstr ""
295+
296+#: qml/Panel/ActiveCallHint.qml:79
297+msgid "Tap to return to call..."
298+msgstr ""
299+
300+#: qml/Panel/ActiveCallHint.qml:92
301+msgid "Conference"
302+msgstr ""
303+
304+#: qml/Panel/Indicators/MenuItemFactory.qml:643
305+msgid "Nothing is playing"
306+msgstr ""
307+
308+#: qml/Panel/Indicators/MenuItemFactory.qml:791
309+msgid "In queue…"
310+msgstr ""
311+
312+#: qml/Panel/Indicators/MenuItemFactory.qml:795
313+msgid "Downloading"
314+msgstr ""
315+
316+#: qml/Panel/Indicators/MenuItemFactory.qml:797
317+msgid "Paused, tap to resume"
318+msgstr ""
319+
320+#: qml/Panel/Indicators/MenuItemFactory.qml:799
321+msgid "Canceled"
322+msgstr ""
323+
324+#: qml/Panel/Indicators/MenuItemFactory.qml:801
325+msgid "Finished"
326+msgstr ""
327+
328+#: qml/Panel/Indicators/MenuItemFactory.qml:803
329+msgid "Failed, tap to retry"
330+msgstr ""
331+
332+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
333+msgctxt "Label: Hint in message indicator line edit"
334+msgid "Reply"
335+msgstr ""
336+
337+#: qml/Panel/Indicators/ModemInfoItem.qml:105
338+msgid "Unlock SIM"
339+msgstr ""
340+
341+#: qml/Panel/Indicators/RoamingIndication.qml:27
342+msgid "Roaming"
343+msgstr ""
344+
345+#: qml/Tutorial/TutorialBottomFinish.qml:24
346+msgid "This action does different things for different apps"
347+msgstr ""
348+
349+#: qml/Tutorial/TutorialBottomFinish.qml:25
350+msgid "Tap here to finish."
351+msgstr ""
352+
353+#: qml/Tutorial/TutorialBottom.qml:28
354+msgid "Open special menus"
355+msgstr ""
356+
357+#: qml/Tutorial/TutorialBottom.qml:29
358+msgid "Swipe up from the bottom edge."
359+msgstr ""
360+
361+#: qml/Tutorial/TutorialLeftFinish.qml:24
362+msgid "These are the shortcuts to favorite apps"
363+msgstr ""
364+
365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
366+msgid "Tap here to continue."
367+msgstr ""
368+
369+#: qml/Tutorial/TutorialLeft.qml:26
370+msgid "Open the launcher"
371+msgstr ""
372+
373+#: qml/Tutorial/TutorialLeft.qml:27
374+msgid "Short swipe from the left edge."
375+msgstr ""
376+
377+#: qml/Tutorial/TutorialPage.qml:178
378+msgid "You almost got it!"
379+msgstr ""
380+
381+#: qml/Tutorial/TutorialPage.qml:195
382+msgid "Try again."
383+msgstr ""
384+
385+#: qml/Tutorial/TutorialRight.qml:31
386+msgid "To view open apps"
387+msgstr ""
388+
389+#: qml/Tutorial/TutorialRight.qml:32
390+msgid "Long swipe from the right edge."
391+msgstr ""
392+
393+#: qml/Tutorial/TutorialRight.qml:122
394+msgid "View all your running tasks."
395+msgstr ""
396+
397+#: qml/Wizard/Page.qml:89
398+msgctxt "Button: Go back one page in the Wizard"
399+msgid "Back"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/10-welcome.qml:27
403+msgid "Hi!"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/10-welcome.qml:44
407+msgid "Welcome to your Ubuntu phone."
408+msgstr ""
409+
410+#: qml/Wizard/Pages/10-welcome.qml:52
411+msgid "Let’s get started."
412+msgstr ""
413+
414+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
416+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
417+#: qml/Wizard/Pages/passwd-set.qml:90
418+msgid "Continue"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/20-sim.qml:25
422+msgid "Add a SIM card and restart your device"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/20-sim.qml:59
426+msgid "Without it, you won’t be able to make calls or use text messaging."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
430+msgid "Skip"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/30-passwd-type.qml:39
434+msgid "Lock security"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/30-passwd-type.qml:74
438+msgid "Please select how you’d like to unlock your phone."
439+msgstr ""
440+
441+#: qml/Wizard/Pages/30-passwd-type.qml:97
442+msgctxt "Label: Type of security method"
443+msgid "Swipe"
444+msgstr ""
445+
446+#: qml/Wizard/Pages/30-passwd-type.qml:98
447+msgctxt "Label: Description of security method"
448+msgid "No security"
449+msgstr ""
450+
451+#: qml/Wizard/Pages/30-passwd-type.qml:100
452+msgctxt "Label: Type of security method"
453+msgid "Passcode"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/30-passwd-type.qml:101
457+msgctxt "Label: Description of security method"
458+msgid "4 digits only"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/30-passwd-type.qml:103
462+msgctxt "Label: Type of security method"
463+msgid "Passphrase"
464+msgstr ""
465+
466+#: qml/Wizard/Pages/30-passwd-type.qml:104
467+msgctxt "Label: Description of security method"
468+msgid "Numbers and letters"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/40-wifi.qml:29
472+msgid "Connect to Wi‑Fi"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/40-wifi.qml:168
476+msgid "Available networks…"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/40-wifi.qml:169
480+msgid "No available networks."
481+msgstr ""
482+
483+#: qml/Wizard/Pages/50-location.qml:27
484+msgid "Location"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/50-location.qml:62
488+msgid "Let the phone detect your location:"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/50-location.qml:69
492+msgid "Using GPS only (less accurate)"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/50-location.qml:86
496+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
497+msgstr ""
498+
499+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
500+#: qml/Wizard/Pages/50-location.qml:103
501+msgid ""
502+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
503+"conditions</a>."
504+msgstr ""
505+
506+#: qml/Wizard/Pages/50-location.qml:112
507+msgid "Not at all"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/50-location.qml:124
511+msgid "You can change your mind later in <b>System Settings</b>."
512+msgstr ""
513+
514+#: qml/Wizard/Pages/60-reporting.qml:24
515+msgid "Improving your experience"
516+msgstr ""
517+
518+#: qml/Wizard/Pages/60-reporting.qml:36
519+msgid ""
520+"Your phone is set up to automatically report errors to Canonical and its "
521+"partners, the makers of the operating system."
522+msgstr ""
523+
524+#: qml/Wizard/Pages/60-reporting.qml:43
525+msgid ""
526+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
527+"Privacy</b>"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/80-finished.qml:24
531+msgid "All done"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/80-finished.qml:39
535+msgid "Nice work!"
536+msgstr ""
537+
538+#: qml/Wizard/Pages/80-finished.qml:46
539+msgid "Your phone is now ready to use."
540+msgstr ""
541+
542+#: qml/Wizard/Pages/80-finished.qml:53
543+msgid "Finish"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/here-terms.qml:27
547+msgid "Terms & Conditions"
548+msgstr ""
549+
550+#: qml/Wizard/Pages/passwd-confirm.qml:49
551+msgid "Confirm passphrase"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/passwd-confirm.qml:50
555+msgid "Confirm passcode"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/passwd-confirm.qml:53
559+#: qml/Wizard/Pages/passwd-confirm.qml:54
560+msgid "Please try again."
561+msgstr ""
562+
563+#: qml/Wizard/Pages/passwd-set.qml:61
564+msgid "Choose your passcode"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/passwd-set.qml:68
568+msgid "Passphrase must be 4 characters long"
569+msgstr ""
570+
571+#: qml/Wizard/StackButton.qml:39
572+#, qt-format
573+msgid "〈 %1"
574+msgstr ""
575+
576+#: qml/Wizard/StackButton.qml:42
577+#, qt-format
578+msgid "%1 〉"
579+msgstr ""
po/ckb.po+211−120
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +15,10 @@ 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: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr ""
2424
@@ -31,127 +31,106 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr ""
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
6465msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
6975msgstr ""
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr ""
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr ""
8290
83−#: qml/Components/Dialogs.qml:132
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr ""
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr ""
100+
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr ""
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr ""
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr ""
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr ""
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
95122msgstr ""
96123
97−#: qml/Components/Dialogs.qml:157
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
98126msgid "Power off"
99127msgstr ""
100128
101−#: qml/Components/Dialogs.qml:166
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
102131msgid "Restart"
103132msgstr ""
104133
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr "پێشەکیی بپەڕێنە"
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr "لێواری ڕاست"
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
119−msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
120−
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
123−msgstr "لێواری سەرەوە"
124−
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
127−msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
128−
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
131−msgstr "داخستن"
132−
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
135−msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
136−
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
139−msgstr "لێواری چەپ"
140−
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
143−msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
144−
145−#: qml/Components/EdgeDemo.qml:242
146−msgid "Well done"
147−msgstr "دەستخۆش"
148−
149−#: qml/Components/EdgeDemo.qml:243
150−msgid ""
151−"You have now mastered the edge gestures and can start using the "
152−"phone<br><br>Tap on the screen to start"
153−msgstr ""
154−
155134#: qml/Components/Lockscreen.qml:238
156135msgid "Return to Call"
157136msgstr ""
@@ -164,32 +143,39 @@ msgstr "هێڵی فریاگوزاری"
164143msgid "OK"
165144msgstr ""
166145
167−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
168147msgid "See less"
169148msgstr ""
170149
171−#: qml/Dash/GenericScopeView.qml:485
150+#: qml/Dash/GenericScopeView.qml:533
172151msgid "See all"
173152msgstr ""
174153
175−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176−#: qml/Panel/SearchIndicator.qml:27
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
177156msgid "Search"
178−msgstr "گەڕان"
157+msgstr ""
179158
180−#: qml/Dash/PageHeader.qml:267
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
181161msgid "Store"
182162msgstr ""
183163
184−#: qml/Dash/PageHeader.qml:284
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
185171msgid "Settings"
186172msgstr ""
187173
188−#: qml/Dash/PageHeader.qml:291
174+#: qml/Dash/PageHeader.qml:293
189175msgid "Remove from Favorites"
190176msgstr ""
191177
192−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
193179msgid "Add to Favorites"
194180msgstr ""
195181
@@ -221,6 +207,10 @@ msgstr ""
221207msgid "Release to refresh…"
222208msgstr ""
223209
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
224214#: qml/Dash/ScopesList.qml:66
225215msgid "Manage"
226216msgstr ""
@@ -233,10 +223,72 @@ msgstr ""
233223msgid "Also installed"
234224msgstr ""
235225
236−#: qml/Greeter/Greeter.qml:133
226+#: qml/Greeter/CoverPage.qml:107
237227msgid "Unlock"
238228msgstr ""
239229
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr ""
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+
256+#: qml/Greeter/NarrowView.qml:58
257+msgid ""
258+"If passcode is entered incorrectly, your phone will conduct a factory reset "
259+"and all personal data will be deleted."
260+msgstr ""
261+
262+#: qml/Greeter/NarrowView.qml:115
263+#, qt-format
264+msgid "Enter %1"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
268+msgid "Enter passphrase"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:117
272+msgid "Enter passcode"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:118
276+#, qt-format
277+msgid "Sorry, incorrect %1"
278+msgstr ""
279+
280+#: qml/Greeter/NarrowView.qml:119
281+msgid "Sorry, incorrect passphrase"
282+msgstr ""
283+
284+#: qml/Greeter/NarrowView.qml:120
285+msgid "Please re-enter"
286+msgstr ""
287+
288+#: qml/Greeter/NarrowView.qml:121
289+msgid "Sorry, incorrect passcode"
290+msgstr ""
291+
240292#: qml/Notifications/NotificationMenuItemFactory.qml:128
241293msgid "Show password"
242294msgstr "تێپەڕەوشە پیشان بدە"
@@ -278,6 +330,7 @@ msgid "Failed, tap to retry"
278330msgstr ""
279331
280332#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
333+msgctxt "Label: Hint in message indicator line edit"
281334msgid "Reply"
282335msgstr ""
283336
@@ -289,61 +342,60 @@ msgstr ""
289342msgid "Roaming"
290343msgstr ""
291344
292−#: qml/Shell.qml:390
293−#, qt-format
294−msgid "Enter %1"
345+#: qml/Tutorial/TutorialBottomFinish.qml:24
346+msgid "This action does different things for different apps"
295347msgstr ""
296348
297−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
298−msgid "Enter passphrase"
349+#: qml/Tutorial/TutorialBottomFinish.qml:25
350+msgid "Tap here to finish."
299351msgstr ""
300352
301−#: qml/Shell.qml:392
302−msgid "Enter passcode"
353+#: qml/Tutorial/TutorialBottom.qml:28
354+msgid "Open special menus"
303355msgstr ""
304356
305−#: qml/Shell.qml:393
306−#, qt-format
307−msgid "Sorry, incorrect %1"
357+#: qml/Tutorial/TutorialBottom.qml:29
358+msgid "Swipe up from the bottom edge."
308359msgstr ""
309360
310−#: qml/Shell.qml:394
311−msgid "Sorry, incorrect passphrase"
361+#: qml/Tutorial/TutorialLeftFinish.qml:24
362+msgid "These are the shortcuts to favorite apps"
312363msgstr ""
313364
314−#: qml/Shell.qml:395
315−msgid "Please re-enter"
365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
366+msgid "Tap here to continue."
316367msgstr ""
317368
318−#: qml/Shell.qml:396
319−msgid "Sorry, incorrect passcode"
369+#: qml/Tutorial/TutorialLeft.qml:26
370+msgid "Open the launcher"
320371msgstr ""
321372
322−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323−msgid "Sorry, incorrect passphrase."
373+#: qml/Tutorial/TutorialLeft.qml:27
374+msgid "Short swipe from the left edge."
324375msgstr ""
325376
326−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327−msgid "Sorry, incorrect passcode."
377+#: qml/Tutorial/TutorialPage.qml:178
378+msgid "You almost got it!"
328379msgstr ""
329380
330−#: qml/Shell.qml:492
331−msgid "This will be your last attempt."
381+#: qml/Tutorial/TutorialPage.qml:195
382+msgid "Try again."
332383msgstr ""
333384
334−#: qml/Shell.qml:494
335−msgid ""
336−"If passphrase is entered incorrectly, your phone will conduct a factory "
337−"reset and all personal data will be deleted."
385+#: qml/Tutorial/TutorialRight.qml:31
386+msgid "To view open apps"
338387msgstr ""
339388
340−#: qml/Shell.qml:495
341−msgid ""
342−"If passcode is entered incorrectly, your phone will conduct a factory reset "
343−"and all personal data will be deleted."
389+#: qml/Tutorial/TutorialRight.qml:32
390+msgid "Long swipe from the right edge."
391+msgstr ""
392+
393+#: qml/Tutorial/TutorialRight.qml:122
394+msgid "View all your running tasks."
344395msgstr ""
345396
346397#: qml/Wizard/Page.qml:89
398+msgctxt "Button: Go back one page in the Wizard"
347399msgid "Back"
348400msgstr ""
349401
@@ -360,7 +412,7 @@ msgid "Let’s get started."
360412msgstr ""
361413
362414#: 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
415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
364416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365417#: qml/Wizard/Pages/passwd-set.qml:90
366418msgid "Continue"
@@ -370,11 +422,11 @@ msgstr ""
370422msgid "Add a SIM card and restart your device"
371423msgstr ""
372424
373−#: qml/Wizard/Pages/20-sim.qml:55
425+#: qml/Wizard/Pages/20-sim.qml:59
374426msgid "Without it, you won’t be able to make calls or use text messaging."
375427msgstr ""
376428
377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
378430msgid "Skip"
379431msgstr ""
380432
@@ -387,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."
387439msgstr ""
388440
389441#: qml/Wizard/Pages/30-passwd-type.qml:97
442+msgctxt "Label: Type of security method"
390443msgid "Swipe"
391444msgstr ""
392445
393446#: qml/Wizard/Pages/30-passwd-type.qml:98
447+msgctxt "Label: Description of security method"
394448msgid "No security"
395449msgstr ""
396450
397451#: qml/Wizard/Pages/30-passwd-type.qml:100
452+msgctxt "Label: Type of security method"
398453msgid "Passcode"
399454msgstr ""
400455
401456#: qml/Wizard/Pages/30-passwd-type.qml:101
457+msgctxt "Label: Description of security method"
402458msgid "4 digits only"
403459msgstr ""
404460
405461#: qml/Wizard/Pages/30-passwd-type.qml:103
462+msgctxt "Label: Type of security method"
406463msgid "Passphrase"
407464msgstr ""
408465
409466#: qml/Wizard/Pages/30-passwd-type.qml:104
467+msgctxt "Label: Description of security method"
410468msgid "Numbers and letters"
411469msgstr ""
412470
413−#: qml/Wizard/Pages/40-wifi.qml:28
471+#: qml/Wizard/Pages/40-wifi.qml:29
414472msgid "Connect to Wi‑Fi"
415473msgstr ""
416474
417−#: qml/Wizard/Pages/40-wifi.qml:147
475+#: qml/Wizard/Pages/40-wifi.qml:168
418476msgid "Available networks…"
419477msgstr ""
420478
421−#: qml/Wizard/Pages/40-wifi.qml:148
479+#: qml/Wizard/Pages/40-wifi.qml:169
422480msgid "No available networks."
423481msgstr ""
424482
@@ -520,6 +578,27 @@ msgstr ""
520578msgid "%1 〉"
521579msgstr ""
522580
581+#~ msgid "Top edge"
582+#~ msgstr "لێواری سەرەوە"
583+
584+#~ msgid "Try swiping from the top edge to access the indicators"
585+#~ msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
586+
587+#~ msgid "Close"
588+#~ msgstr "داخستن"
589+
590+#~ msgid "Swipe up again to close the settings screen"
591+#~ msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
592+
593+#~ msgid "Left edge"
594+#~ msgstr "لێواری چەپ"
595+
596+#~ msgid "Try swiping from the right edge to unlock the phone"
597+#~ msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
598+
599+#~ msgid "Right edge"
600+#~ msgstr "لێواری ڕاست"
601+
523602#~ msgid "Speaking..."
524603#~ msgstr "قسە دەکات..."
525604
@@ -529,6 +608,18 @@ msgstr ""
529608#~ msgid "Confirm"
530609#~ msgstr "پشتڕاستکردنەوە"
531610
611+#~ msgid "Search"
612+#~ msgstr "گەڕان"
613+
614+#~ msgid "Skip intro"
615+#~ msgstr "پێشەکیی بپەڕێنە"
616+
617+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
618+#~ msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
619+
620+#~ msgid "Well done"
621+#~ msgstr "دەستخۆش"
622+
532623#~ msgid "Type or say a command"
533624#~ msgstr "فەرمانێک بێژە یان بنووسە"
534625
po/cs.po+211−120
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +15,10 @@ 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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr ""
2424
@@ -31,127 +31,106 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr ""
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
6465msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
6975msgstr ""
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr ""
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr ""
8290
83−#: qml/Components/Dialogs.qml:132
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr ""
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr ""
100+
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr ""
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr ""
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr ""
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr ""
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
95122msgstr ""
96123
97−#: qml/Components/Dialogs.qml:157
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
98126msgid "Power off"
99127msgstr ""
100128
101−#: qml/Components/Dialogs.qml:166
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
102131msgid "Restart"
103132msgstr ""
104133
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr "Přeskočit intro"
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr "Pravý okraj"
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
119−msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
120−
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
123−msgstr "Horní okraj"
124−
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
127−msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
128−
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
131−msgstr "Uzavřít"
132−
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
135−msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
136−
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
139−msgstr "Levý okraj"
140−
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
143−msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
144−
145−#: qml/Components/EdgeDemo.qml:242
146−msgid "Well done"
147−msgstr "Výborně"
148−
149−#: qml/Components/EdgeDemo.qml:243
150−msgid ""
151−"You have now mastered the edge gestures and can start using the "
152−"phone<br><br>Tap on the screen to start"
153−msgstr ""
154−
155134#: qml/Components/Lockscreen.qml:238
156135msgid "Return to Call"
157136msgstr ""
@@ -164,32 +143,39 @@ msgstr "Tísňové volání"
164143msgid "OK"
165144msgstr ""
166145
167−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
168147msgid "See less"
169148msgstr ""
170149
171−#: qml/Dash/GenericScopeView.qml:485
150+#: qml/Dash/GenericScopeView.qml:533
172151msgid "See all"
173152msgstr ""
174153
175−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176−#: qml/Panel/SearchIndicator.qml:27
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
177156msgid "Search"
178−msgstr "Hledat"
157+msgstr ""
179158
180−#: qml/Dash/PageHeader.qml:267
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
181161msgid "Store"
182162msgstr ""
183163
184−#: qml/Dash/PageHeader.qml:284
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
185171msgid "Settings"
186172msgstr ""
187173
188−#: qml/Dash/PageHeader.qml:291
174+#: qml/Dash/PageHeader.qml:293
189175msgid "Remove from Favorites"
190176msgstr ""
191177
192−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
193179msgid "Add to Favorites"
194180msgstr ""
195181
@@ -221,6 +207,10 @@ msgstr ""
221207msgid "Release to refresh…"
222208msgstr ""
223209
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
224214#: qml/Dash/ScopesList.qml:66
225215msgid "Manage"
226216msgstr ""
@@ -233,10 +223,72 @@ msgstr ""
233223msgid "Also installed"
234224msgstr ""
235225
236−#: qml/Greeter/Greeter.qml:133
226+#: qml/Greeter/CoverPage.qml:107
237227msgid "Unlock"
238228msgstr ""
239229
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr ""
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+
256+#: qml/Greeter/NarrowView.qml:58
257+msgid ""
258+"If passcode is entered incorrectly, your phone will conduct a factory reset "
259+"and all personal data will be deleted."
260+msgstr ""
261+
262+#: qml/Greeter/NarrowView.qml:115
263+#, qt-format
264+msgid "Enter %1"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
268+msgid "Enter passphrase"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:117
272+msgid "Enter passcode"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:118
276+#, qt-format
277+msgid "Sorry, incorrect %1"
278+msgstr ""
279+
280+#: qml/Greeter/NarrowView.qml:119
281+msgid "Sorry, incorrect passphrase"
282+msgstr ""
283+
284+#: qml/Greeter/NarrowView.qml:120
285+msgid "Please re-enter"
286+msgstr ""
287+
288+#: qml/Greeter/NarrowView.qml:121
289+msgid "Sorry, incorrect passcode"
290+msgstr ""
291+
240292#: qml/Notifications/NotificationMenuItemFactory.qml:128
241293msgid "Show password"
242294msgstr "Zobrazit heslo"
@@ -278,6 +330,7 @@ msgid "Failed, tap to retry"
278330msgstr ""
279331
280332#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
333+msgctxt "Label: Hint in message indicator line edit"
281334msgid "Reply"
282335msgstr ""
283336
@@ -289,61 +342,60 @@ msgstr ""
289342msgid "Roaming"
290343msgstr ""
291344
292−#: qml/Shell.qml:390
293−#, qt-format
294−msgid "Enter %1"
345+#: qml/Tutorial/TutorialBottomFinish.qml:24
346+msgid "This action does different things for different apps"
295347msgstr ""
296348
297−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
298−msgid "Enter passphrase"
349+#: qml/Tutorial/TutorialBottomFinish.qml:25
350+msgid "Tap here to finish."
299351msgstr ""
300352
301−#: qml/Shell.qml:392
302−msgid "Enter passcode"
353+#: qml/Tutorial/TutorialBottom.qml:28
354+msgid "Open special menus"
303355msgstr ""
304356
305−#: qml/Shell.qml:393
306−#, qt-format
307−msgid "Sorry, incorrect %1"
357+#: qml/Tutorial/TutorialBottom.qml:29
358+msgid "Swipe up from the bottom edge."
308359msgstr ""
309360
310−#: qml/Shell.qml:394
311−msgid "Sorry, incorrect passphrase"
361+#: qml/Tutorial/TutorialLeftFinish.qml:24
362+msgid "These are the shortcuts to favorite apps"
312363msgstr ""
313364
314−#: qml/Shell.qml:395
315−msgid "Please re-enter"
365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
366+msgid "Tap here to continue."
316367msgstr ""
317368
318−#: qml/Shell.qml:396
319−msgid "Sorry, incorrect passcode"
369+#: qml/Tutorial/TutorialLeft.qml:26
370+msgid "Open the launcher"
320371msgstr ""
321372
322−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323−msgid "Sorry, incorrect passphrase."
373+#: qml/Tutorial/TutorialLeft.qml:27
374+msgid "Short swipe from the left edge."
324375msgstr ""
325376
326−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327−msgid "Sorry, incorrect passcode."
377+#: qml/Tutorial/TutorialPage.qml:178
378+msgid "You almost got it!"
328379msgstr ""
329380
330−#: qml/Shell.qml:492
331−msgid "This will be your last attempt."
381+#: qml/Tutorial/TutorialPage.qml:195
382+msgid "Try again."
332383msgstr ""
333384
334−#: qml/Shell.qml:494
335−msgid ""
336−"If passphrase is entered incorrectly, your phone will conduct a factory "
337−"reset and all personal data will be deleted."
385+#: qml/Tutorial/TutorialRight.qml:31
386+msgid "To view open apps"
338387msgstr ""
339388
340−#: qml/Shell.qml:495
341−msgid ""
342−"If passcode is entered incorrectly, your phone will conduct a factory reset "
343−"and all personal data will be deleted."
389+#: qml/Tutorial/TutorialRight.qml:32
390+msgid "Long swipe from the right edge."
391+msgstr ""
392+
393+#: qml/Tutorial/TutorialRight.qml:122
394+msgid "View all your running tasks."
344395msgstr ""
345396
346397#: qml/Wizard/Page.qml:89
398+msgctxt "Button: Go back one page in the Wizard"
347399msgid "Back"
348400msgstr ""
349401
@@ -360,7 +412,7 @@ msgid "Let’s get started."
360412msgstr ""
361413
362414#: 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
415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
364416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365417#: qml/Wizard/Pages/passwd-set.qml:90
366418msgid "Continue"
@@ -370,11 +422,11 @@ msgstr ""
370422msgid "Add a SIM card and restart your device"
371423msgstr ""
372424
373−#: qml/Wizard/Pages/20-sim.qml:55
425+#: qml/Wizard/Pages/20-sim.qml:59
374426msgid "Without it, you won’t be able to make calls or use text messaging."
375427msgstr ""
376428
377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
378430msgid "Skip"
379431msgstr ""
380432
@@ -387,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."
387439msgstr ""
388440
389441#: qml/Wizard/Pages/30-passwd-type.qml:97
442+msgctxt "Label: Type of security method"
390443msgid "Swipe"
391444msgstr ""
392445
393446#: qml/Wizard/Pages/30-passwd-type.qml:98
447+msgctxt "Label: Description of security method"
394448msgid "No security"
395449msgstr ""
396450
397451#: qml/Wizard/Pages/30-passwd-type.qml:100
452+msgctxt "Label: Type of security method"
398453msgid "Passcode"
399454msgstr ""
400455
401456#: qml/Wizard/Pages/30-passwd-type.qml:101
457+msgctxt "Label: Description of security method"
402458msgid "4 digits only"
403459msgstr ""
404460
405461#: qml/Wizard/Pages/30-passwd-type.qml:103
462+msgctxt "Label: Type of security method"
406463msgid "Passphrase"
407464msgstr ""
408465
409466#: qml/Wizard/Pages/30-passwd-type.qml:104
467+msgctxt "Label: Description of security method"
410468msgid "Numbers and letters"
411469msgstr ""
412470
413−#: qml/Wizard/Pages/40-wifi.qml:28
471+#: qml/Wizard/Pages/40-wifi.qml:29
414472msgid "Connect to Wi‑Fi"
415473msgstr ""
416474
417−#: qml/Wizard/Pages/40-wifi.qml:147
475+#: qml/Wizard/Pages/40-wifi.qml:168
418476msgid "Available networks…"
419477msgstr ""
420478
421−#: qml/Wizard/Pages/40-wifi.qml:148
479+#: qml/Wizard/Pages/40-wifi.qml:169
422480msgid "No available networks."
423481msgstr ""
424482
@@ -520,6 +578,27 @@ msgstr ""
520578msgid "%1 〉"
521579msgstr ""
522580
581+#~ msgid "Try swiping from the right edge to unlock the phone"
582+#~ msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
583+
584+#~ msgid "Skip intro"
585+#~ msgstr "Přeskočit intro"
586+
587+#~ msgid "Right edge"
588+#~ msgstr "Pravý okraj"
589+
590+#~ msgid "Top edge"
591+#~ msgstr "Horní okraj"
592+
593+#~ msgid "Try swiping from the top edge to access the indicators"
594+#~ msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
595+
596+#~ msgid "Close"
597+#~ msgstr "Uzavřít"
598+
599+#~ msgid "Left edge"
600+#~ msgstr "Levý okraj"
601+
523602#~ msgid "Loading. Please Wait..."
524603#~ msgstr "Načítám. Čekejte prosím..."
525604
@@ -529,8 +608,20 @@ msgstr ""
529608#~ msgid "Confirm"
530609#~ msgstr "Potvrdit"
531610
611+#~ msgid "Search"
612+#~ msgstr "Hledat"
613+
532614#~ msgid "Speaking..."
533615#~ msgstr "Mluvte..."
534616
617+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
618+#~ msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
619+
620+#~ msgid "Well done"
621+#~ msgstr "Výborně"
622+
535623#~ msgid "Type or say a command"
536624#~ msgstr "Napište nebo řekněte příkaz"
625+
626+#~ msgid "Swipe up again to close the settings screen"
627+#~ msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
po/da.po+280−167
@@ -8,18 +8,18 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
12−"PO-Revision-Date: 2014-07-30 12:37+0000\n"
13−"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
11+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
12+"PO-Revision-Date: 2015-04-17 10:46+0000\n"
13+"Last-Translator: Bluegrassin <anderslgade@gmail.com>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
1515"MIME-Version: 1.0\n"
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: 2015-01-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17306)\n"
19+"X-Launchpad-Export-Date: 2015-04-18 05:48+0000\n"
20+"X-Generator: Launchpad (build 17430)\n"
2121
22−#: plugins/LightDM/Greeter.cpp:130
22+#: plugins/LightDM/Greeter.cpp:112
2323msgid "Password: "
2424msgstr ""
2525
@@ -32,132 +32,115 @@ msgstr "Fastgør genvej"
3232msgid "Unpin shortcut"
3333msgstr "Gør genvej flytbar"
3434
35−#: qml/Components/DelayedLockscreen.qml:47
35+#: qml/Components/DelayedLockscreen.qml:49
3636msgid "Device Locked"
37−msgstr ""
37+msgstr "Enheden er låst"
3838
39−#: qml/Components/DelayedLockscreen.qml:62
39+#: qml/Components/DelayedLockscreen.qml:64
4040msgid "You have been locked out due to too many failed passphrase attempts."
4141msgstr ""
42+"Du er blevet låst ude på grund af for mange fejlslagne forsøg på at angive "
43+"adgangskode."
4244
43−#: qml/Components/DelayedLockscreen.qml:63
45+#: qml/Components/DelayedLockscreen.qml:65
4446msgid "You have been locked out due to too many failed passcode attempts."
4547msgstr ""
48+"Du er blevet låst ude på grund af for mange fejlslagne forsøg på at angive "
49+"adgangskode."
4650
47−#: qml/Components/DelayedLockscreen.qml:72
51+#: qml/Components/DelayedLockscreen.qml:74
4852#, qt-format
4953msgid "Please wait %1 minute and then try again…"
5054msgid_plural "Please wait %1 minutes and then try again…"
51−msgstr[0] ""
52−msgstr[1] ""
55+msgstr[0] "Vent venligst %1 minut og prøv igen..."
56+msgstr[1] "Vent venligst %1 minutter og prøv igen..."
5357
54−#: qml/Components/Dialogs.qml:86
58+#: qml/Components/Dialogs.qml:67
59+msgctxt "Title: Lock/Log out dialog"
5560msgid "Log out"
5661msgstr ""
5762
58−#: qml/Components/Dialogs.qml:87
63+#: qml/Components/Dialogs.qml:68
5964msgid "Are you sure you want to log out?"
65+msgstr "Vil du logge ud?"
66+
67+#: qml/Components/Dialogs.qml:70
68+msgctxt "Button: Lock the system"
69+msgid "Lock"
6070msgstr ""
6171
62−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63−#: qml/Components/Dialogs.qml:134
64−msgid "No"
72+#: qml/Components/Dialogs.qml:77
73+msgctxt "Button: Log out from the system"
74+msgid "Log Out"
6575msgstr ""
6676
67−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68−#: qml/Components/Dialogs.qml:140
69−msgid "Yes"
77+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
78+#: qml/Components/Dialogs.qml:171
79+msgid "Cancel"
7080msgstr ""
7181
72−#: qml/Components/Dialogs.qml:108
82+#: qml/Components/Dialogs.qml:96
83+msgctxt "Title: Reboot/Shut down dialog"
7384msgid "Shut down"
7485msgstr ""
7586
76−#: qml/Components/Dialogs.qml:109
87+#: qml/Components/Dialogs.qml:97
7788msgid "Are you sure you want to shut down?"
89+msgstr "Er du sikker på du vil lukke ned?"
90+
91+#: qml/Components/Dialogs.qml:99
92+msgctxt "Button: Reboot the system"
93+msgid "Reboot"
94+msgstr ""
95+
96+#: qml/Components/Dialogs.qml:107
97+msgctxt "Button: Shut down the system"
98+msgid "Shut down"
7899msgstr ""
79100
80−#: qml/Components/Dialogs.qml:131
101+#: qml/Components/Dialogs.qml:127
102+msgctxt "Title: Reboot dialog"
81103msgid "Reboot"
82104msgstr ""
83105
84−#: qml/Components/Dialogs.qml:132
106+#: qml/Components/Dialogs.qml:128
85107msgid "Are you sure you want to reboot?"
108+msgstr "Er du sikker på du vil genstarte?"
109+
110+#: qml/Components/Dialogs.qml:130
111+msgid "No"
86112msgstr ""
87113
88−#: qml/Components/Dialogs.qml:154
114+#: qml/Components/Dialogs.qml:136
115+msgid "Yes"
116+msgstr ""
117+
118+#: qml/Components/Dialogs.qml:150
119+msgctxt "Title: Power off/Restart dialog"
89120msgid "Power"
90121msgstr ""
91122
92−#: qml/Components/Dialogs.qml:155
123+#: qml/Components/Dialogs.qml:151
93124msgid ""
94125"Are you sure you would like\n"
95126"to power off?"
96127msgstr ""
128+"Er du sikker på at du vil\n"
129+"slukke enheden?"
97130
98−#: qml/Components/Dialogs.qml:157
131+#: qml/Components/Dialogs.qml:153
132+msgctxt "Button: Power off the system"
99133msgid "Power off"
100134msgstr ""
101135
102−#: qml/Components/Dialogs.qml:166
136+#: qml/Components/Dialogs.qml:162
137+msgctxt "Button: Restart the system"
103138msgid "Restart"
104139msgstr ""
105140
106−#: qml/Components/Dialogs.qml:175
107−msgid "Cancel"
108−msgstr ""
109−
110−#: qml/Components/EdgeDemoOverlay.qml:151
111−msgid "Skip intro"
112−msgstr "Spring intro over"
113−
114−#: qml/Components/EdgeDemo.qml:125
115−msgid "Right edge"
116−msgstr "Højre kant"
117−
118−#: qml/Components/EdgeDemo.qml:126
119−msgid "Try swiping from the right edge to unlock the phone"
120−msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
121−
122−#: qml/Components/EdgeDemo.qml:157
123−msgid "Top edge"
124−msgstr "Øvre kant"
125−
126−#: qml/Components/EdgeDemo.qml:158
127−msgid "Try swiping from the top edge to access the indicators"
128−msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
129−
130−#: qml/Components/EdgeDemo.qml:183
131−msgid "Close"
132−msgstr "Luk"
133−
134−#: qml/Components/EdgeDemo.qml:184
135−msgid "Swipe up again to close the settings screen"
136−msgstr "Stryg op igen for at låse indstillingsskærmen"
137−
138−#: qml/Components/EdgeDemo.qml:214
139−msgid "Left edge"
140−msgstr "Venstre kant"
141−
142−#: qml/Components/EdgeDemo.qml:215
143−msgid "Swipe from the left to reveal the launcher for quick access to apps"
144−msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
145−
146−#: qml/Components/EdgeDemo.qml:242
147−msgid "Well done"
148−msgstr "Godt gjort"
149−
150−#: qml/Components/EdgeDemo.qml:243
151−msgid ""
152−"You have now mastered the edge gestures and can start using the "
153−"phone<br><br>Tap on the screen to start"
154−msgstr ""
155−"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
156−"på skærmen for at starte"
157−
158141#: qml/Components/Lockscreen.qml:238
159142msgid "Return to Call"
160−msgstr ""
143+msgstr "Vend tilbage til opkald"
161144
162145#: qml/Components/Lockscreen.qml:238
163146msgid "Emergency Call"
@@ -165,34 +148,41 @@ msgstr "Nødopkald"
165148
166149#: qml/Components/Lockscreen.qml:270
167150msgid "OK"
168−msgstr "O.k."
151+msgstr "Ok"
169152
170−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
153+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
171154msgid "See less"
172155msgstr "Vis mindre"
173156
174−#: qml/Dash/GenericScopeView.qml:485
157+#: qml/Dash/GenericScopeView.qml:533
175158msgid "See all"
176159msgstr "Se alle"
177160
178−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179−#: qml/Panel/SearchIndicator.qml:27
161+#: qml/Dash/GenericScopeView.qml:595
162+msgctxt "Label: Hint for dash search line edit"
180163msgid "Search"
181−msgstr "Søg"
164+msgstr ""
182165
183−#: qml/Dash/PageHeader.qml:267
166+#: qml/Dash/PageHeader.qml:269
167+msgctxt "Button: Open the Ubuntu Store"
184168msgid "Store"
185169msgstr ""
186170
187−#: qml/Dash/PageHeader.qml:284
171+#: qml/Dash/PageHeader.qml:276
172+msgctxt "Button: Start a search in the current dash scope"
173+msgid "Search"
174+msgstr ""
175+
176+#: qml/Dash/PageHeader.qml:286
177+msgctxt "Button: Show the current dash scope settings"
188178msgid "Settings"
189179msgstr ""
190180
191−#: qml/Dash/PageHeader.qml:291
181+#: qml/Dash/PageHeader.qml:293
192182msgid "Remove from Favorites"
193183msgstr ""
194184
195−#: qml/Dash/PageHeader.qml:291
185+#: qml/Dash/PageHeader.qml:293
196186msgid "Add to Favorites"
197187msgstr ""
198188
@@ -210,7 +200,7 @@ msgstr "Bedøm dette"
210200
211201#: qml/Dash/Previews/PreviewRatingInput.qml:126
212202msgid "Add a review"
213−msgstr "Tilføj en forhåndsvisning"
203+msgstr "Tilføj en anmeldelse"
214204
215205#: qml/Dash/Previews/PreviewRatingInput.qml:166
216206msgid "Send"
@@ -218,11 +208,15 @@ msgstr "Send"
218208
219209#: qml/Dash/PullToRefreshScopeStyle.qml:55
220210msgid "Pull to refresh…"
221−msgstr ""
211+msgstr "Træk ned for at genindlæse..."
222212
223213#: qml/Dash/PullToRefreshScopeStyle.qml:60
224214msgid "Release to refresh…"
225−msgstr ""
215+msgstr "Giv slip for at genindlæse..."
216+
217+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
218+msgid "Enable location data"
219+msgstr "Aktivér lokationsdata"
226220
227221#: qml/Dash/ScopesList.qml:66
228222msgid "Manage"
@@ -234,19 +228,85 @@ msgstr ""
234228
235229#: qml/Dash/ScopesList.qml:113
236230msgid "Also installed"
237−msgstr ""
231+msgstr "Også installeret"
238232
239−#: qml/Greeter/Greeter.qml:133
233+#: qml/Greeter/CoverPage.qml:107
240234msgid "Unlock"
241235msgstr ""
242236
237+#: qml/Greeter/LoginList.qml:236
238+msgid "Retry"
239+msgstr ""
240+
241+#: qml/Greeter/LoginList.qml:237
242+msgid "Tap to unlock"
243+msgstr ""
244+
245+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
246+msgid "Sorry, incorrect passphrase."
247+msgstr "Beklager, forkert adgangsfrase."
248+
249+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
250+msgid "Sorry, incorrect passcode."
251+msgstr "Beklager, forkert adgangskode."
252+
253+#: qml/Greeter/NarrowView.qml:55
254+msgid "This will be your last attempt."
255+msgstr "Dette er dit sidste forsøg."
256+
257+#: qml/Greeter/NarrowView.qml:57
258+msgid ""
259+"If passphrase is entered incorrectly, your phone will conduct a factory "
260+"reset and all personal data will be deleted."
261+msgstr ""
262+"Hvis adgangsfrasen er forkert, vil telefonen blive gendannet til "
263+"fabriksindstillinger og al personlig data vil blive slettet."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Hvis adgangskoden er forkert, vil telefonen blive gendannet til "
271+"fabriksindstillinger og al personlig data vil blive slettet."
272+
273+#: qml/Greeter/NarrowView.qml:115
274+#, qt-format
275+msgid "Enter %1"
276+msgstr "Indtast %1"
277+
278+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
279+msgid "Enter passphrase"
280+msgstr ""
281+
282+#: qml/Greeter/NarrowView.qml:117
283+msgid "Enter passcode"
284+msgstr "Indtast adgangskode"
285+
286+#: qml/Greeter/NarrowView.qml:118
287+#, qt-format
288+msgid "Sorry, incorrect %1"
289+msgstr "Beklager, forkert %1"
290+
291+#: qml/Greeter/NarrowView.qml:119
292+msgid "Sorry, incorrect passphrase"
293+msgstr "Beklager, forkert adgangsfrase"
294+
295+#: qml/Greeter/NarrowView.qml:120
296+msgid "Please re-enter"
297+msgstr "Vær venlig at genindtaste"
298+
299+#: qml/Greeter/NarrowView.qml:121
300+msgid "Sorry, incorrect passcode"
301+msgstr "Beklager, forkert adgangskode"
302+
243303#: qml/Notifications/NotificationMenuItemFactory.qml:128
244304msgid "Show password"
245305msgstr "Vis adgangskode"
246306
247307#: qml/Panel/ActiveCallHint.qml:79
248308msgid "Tap to return to call..."
249−msgstr "Tryk for at besvare opkaldet..."
309+msgstr "Tryk for at vende tilbage til opkaldet..."
250310
251311#: qml/Panel/ActiveCallHint.qml:92
252312msgid "Conference"
@@ -266,7 +326,7 @@ msgstr "Henter"
266326
267327#: qml/Panel/Indicators/MenuItemFactory.qml:797
268328msgid "Paused, tap to resume"
269−msgstr "På pause; tryk for at fortsætte"
329+msgstr "På pause - tryk for at fortsætte"
270330
271331#: qml/Panel/Indicators/MenuItemFactory.qml:799
272332msgid "Canceled"
@@ -278,75 +338,75 @@ msgstr "Færdig"
278338
279339#: qml/Panel/Indicators/MenuItemFactory.qml:803
280340msgid "Failed, tap to retry"
281−msgstr "Mislykkedes; tryk for at prøve igen"
341+msgstr "Mislykkedes - tryk for at prøve igen"
282342
283343#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
344+msgctxt "Label: Hint in message indicator line edit"
284345msgid "Reply"
285346msgstr ""
286347
287348#: qml/Panel/Indicators/ModemInfoItem.qml:105
288349msgid "Unlock SIM"
289−msgstr ""
350+msgstr "Lås SIM-kort op"
290351
291352#: qml/Panel/Indicators/RoamingIndication.qml:27
292353msgid "Roaming"
293354msgstr ""
294355
295−#: qml/Shell.qml:390
296−#, qt-format
297−msgid "Enter %1"
298−msgstr ""
356+#: qml/Tutorial/TutorialBottomFinish.qml:24
357+msgid "This action does different things for different apps"
358+msgstr "Denne handling gør forskellige ting i forskellige apps"
299359
300−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
301−msgid "Enter passphrase"
302−msgstr ""
360+#: qml/Tutorial/TutorialBottomFinish.qml:25
361+msgid "Tap here to finish."
362+msgstr "Tryk her for at afslutte."
303363
304−#: qml/Shell.qml:392
305−msgid "Enter passcode"
306−msgstr ""
364+#: qml/Tutorial/TutorialBottom.qml:28
365+msgid "Open special menus"
366+msgstr "Åben specialmenuer"
307367
308−#: qml/Shell.qml:393
309−#, qt-format
310−msgid "Sorry, incorrect %1"
311−msgstr ""
368+#: qml/Tutorial/TutorialBottom.qml:29
369+msgid "Swipe up from the bottom edge."
370+msgstr "Swipe op fra den nedre kant."
312371
313−#: qml/Shell.qml:394
314−msgid "Sorry, incorrect passphrase"
315−msgstr ""
372+#: qml/Tutorial/TutorialLeftFinish.qml:24
373+msgid "These are the shortcuts to favorite apps"
374+msgstr "Disse er genveje til favorit-apps"
316375
317−#: qml/Shell.qml:395
318−msgid "Please re-enter"
319−msgstr ""
376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
377+msgid "Tap here to continue."
378+msgstr "Tryk her for at fortsætte."
320379
321−#: qml/Shell.qml:396
322−msgid "Sorry, incorrect passcode"
380+#: qml/Tutorial/TutorialLeft.qml:26
381+msgid "Open the launcher"
323382msgstr ""
324383
325−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326−msgid "Sorry, incorrect passphrase."
327−msgstr ""
384+#: qml/Tutorial/TutorialLeft.qml:27
385+msgid "Short swipe from the left edge."
386+msgstr "Kort swipe fra den venstre kant."
328387
329−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330−msgid "Sorry, incorrect passcode."
331−msgstr ""
388+#: qml/Tutorial/TutorialPage.qml:178
389+msgid "You almost got it!"
390+msgstr "Du havde den næsten!"
332391
333−#: qml/Shell.qml:492
334−msgid "This will be your last attempt."
335−msgstr ""
392+#: qml/Tutorial/TutorialPage.qml:195
393+msgid "Try again."
394+msgstr "Prøv igen."
336395
337−#: qml/Shell.qml:494
338−msgid ""
339−"If passphrase is entered incorrectly, your phone will conduct a factory "
340−"reset and all personal data will be deleted."
341−msgstr ""
396+#: qml/Tutorial/TutorialRight.qml:31
397+msgid "To view open apps"
398+msgstr "For at se åbne apps"
342399
343−#: qml/Shell.qml:495
344−msgid ""
345−"If passcode is entered incorrectly, your phone will conduct a factory reset "
346−"and all personal data will be deleted."
347−msgstr ""
400+#: qml/Tutorial/TutorialRight.qml:32
401+msgid "Long swipe from the right edge."
402+msgstr "Langt swipe fra den højre kant."
403+
404+#: qml/Tutorial/TutorialRight.qml:122
405+msgid "View all your running tasks."
406+msgstr "Se alle dine kørende opgaver."
348407
349408#: qml/Wizard/Page.qml:89
409+msgctxt "Button: Go back one page in the Wizard"
350410msgid "Back"
351411msgstr ""
352412
@@ -356,14 +416,14 @@ msgstr ""
356416
357417#: qml/Wizard/Pages/10-welcome.qml:44
358418msgid "Welcome to your Ubuntu phone."
359−msgstr ""
419+msgstr "Velkommen til din Ubuntu-telefon."
360420
361421#: qml/Wizard/Pages/10-welcome.qml:52
362422msgid "Let’s get started."
363−msgstr ""
423+msgstr "Lad os komme i gang."
364424
365425#: 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
426+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
367427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368428#: qml/Wizard/Pages/passwd-set.qml:90
369429msgid "Continue"
@@ -371,13 +431,13 @@ msgstr ""
371431
372432#: qml/Wizard/Pages/20-sim.qml:25
373433msgid "Add a SIM card and restart your device"
374−msgstr ""
434+msgstr "Indsæt et SIM-kort og genstart din enhed"
375435
376−#: qml/Wizard/Pages/20-sim.qml:55
436+#: qml/Wizard/Pages/20-sim.qml:59
377437msgid "Without it, you won’t be able to make calls or use text messaging."
378438msgstr ""
379439
380−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
440+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
381441msgid "Skip"
382442msgstr ""
383443
@@ -387,43 +447,49 @@ msgstr ""
387447
388448#: qml/Wizard/Pages/30-passwd-type.qml:74
389449msgid "Please select how you’d like to unlock your phone."
390−msgstr ""
450+msgstr "Vælg venligst hvordan du ønsker at låse din telefon op."
391451
392452#: qml/Wizard/Pages/30-passwd-type.qml:97
453+msgctxt "Label: Type of security method"
393454msgid "Swipe"
394455msgstr ""
395456
396457#: qml/Wizard/Pages/30-passwd-type.qml:98
458+msgctxt "Label: Description of security method"
397459msgid "No security"
398460msgstr ""
399461
400462#: qml/Wizard/Pages/30-passwd-type.qml:100
463+msgctxt "Label: Type of security method"
401464msgid "Passcode"
402465msgstr ""
403466
404467#: qml/Wizard/Pages/30-passwd-type.qml:101
468+msgctxt "Label: Description of security method"
405469msgid "4 digits only"
406470msgstr ""
407471
408472#: qml/Wizard/Pages/30-passwd-type.qml:103
473+msgctxt "Label: Type of security method"
409474msgid "Passphrase"
410475msgstr ""
411476
412477#: qml/Wizard/Pages/30-passwd-type.qml:104
478+msgctxt "Label: Description of security method"
413479msgid "Numbers and letters"
414480msgstr ""
415481
416−#: qml/Wizard/Pages/40-wifi.qml:28
482+#: qml/Wizard/Pages/40-wifi.qml:29
417483msgid "Connect to Wi‑Fi"
418−msgstr ""
484+msgstr "Tilslut til Wi-Fi"
419485
420−#: qml/Wizard/Pages/40-wifi.qml:147
486+#: qml/Wizard/Pages/40-wifi.qml:168
421487msgid "Available networks…"
422−msgstr ""
488+msgstr "Tilgængelige netværk..."
423489
424−#: qml/Wizard/Pages/40-wifi.qml:148
490+#: qml/Wizard/Pages/40-wifi.qml:169
425491msgid "No available networks."
426−msgstr ""
492+msgstr "Ingen tilgængelige netværk."
427493
428494#: qml/Wizard/Pages/50-location.qml:27
429495msgid "Location"
@@ -431,15 +497,16 @@ msgstr ""
431497
432498#: qml/Wizard/Pages/50-location.qml:62
433499msgid "Let the phone detect your location:"
434−msgstr ""
500+msgstr "Lad telefonen bestemme din placering:"
435501
436502#: qml/Wizard/Pages/50-location.qml:69
437503msgid "Using GPS only (less accurate)"
438−msgstr ""
504+msgstr "Kun ved brug af GPS (mindre præcis)"
439505
440506#: qml/Wizard/Pages/50-location.qml:86
441507msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442508msgstr ""
509+"Ved brug af GPS, anonymiseret Wi-Fi og telenetværksinformation (anbefalet)"
443510
444511#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445512#: qml/Wizard/Pages/50-location.qml:103
@@ -447,42 +514,48 @@ msgid ""
447514"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448515"conditions</a>."
449516msgstr ""
517+"Ved at vælge dette siger du ja til Nokia HERE's <a href='#'>betingelser og "
518+"vilkår</a>."
450519
451520#: qml/Wizard/Pages/50-location.qml:112
452521msgid "Not at all"
453−msgstr ""
522+msgstr "Slet ikke"
454523
455524#: qml/Wizard/Pages/50-location.qml:124
456525msgid "You can change your mind later in <b>System Settings</b>."
457−msgstr ""
526+msgstr "Du kan fortryde senere i <b>Systemindstillinger</b>."
458527
459528#: qml/Wizard/Pages/60-reporting.qml:24
460529msgid "Improving your experience"
461−msgstr ""
530+msgstr "Forbedrer din oplevelse"
462531
463532#: qml/Wizard/Pages/60-reporting.qml:36
464533msgid ""
465534"Your phone is set up to automatically report errors to Canonical and its "
466535"partners, the makers of the operating system."
467536msgstr ""
537+"Din telefon er sat op til automatisk at rapportere fejl til Canonical og "
538+"deres partnere, skaberne af operativsystemet."
468539
469540#: qml/Wizard/Pages/60-reporting.qml:43
470541msgid ""
471542"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472543"Privacy</b>"
473544msgstr ""
545+"Dette kan slås fra i <b>Systemindstillinger</b> under <b>Sikkerhed &amp; "
546+"privatliv</b>"
474547
475548#: qml/Wizard/Pages/80-finished.qml:24
476549msgid "All done"
477−msgstr ""
550+msgstr "Helt færdig"
478551
479552#: qml/Wizard/Pages/80-finished.qml:39
480553msgid "Nice work!"
481−msgstr ""
554+msgstr "Godt arbejde!"
482555
483556#: qml/Wizard/Pages/80-finished.qml:46
484557msgid "Your phone is now ready to use."
485−msgstr ""
558+msgstr "Din telefon er nu klar til brug."
486559
487560#: qml/Wizard/Pages/80-finished.qml:53
488561msgid "Finish"
@@ -498,7 +571,7 @@ msgstr ""
498571
499572#: qml/Wizard/Pages/passwd-confirm.qml:50
500573msgid "Confirm passcode"
501−msgstr ""
574+msgstr "Bekræft adgangskode"
502575
503576#: qml/Wizard/Pages/passwd-confirm.qml:53
504577#: qml/Wizard/Pages/passwd-confirm.qml:54
@@ -507,7 +580,7 @@ msgstr ""
507580
508581#: qml/Wizard/Pages/passwd-set.qml:61
509582msgid "Choose your passcode"
510−msgstr ""
583+msgstr "Vælg din adgangskode"
511584
512585#: qml/Wizard/Pages/passwd-set.qml:68
513586msgid "Passphrase must be 4 characters long"
@@ -516,12 +589,24 @@ msgstr ""
516589#: qml/Wizard/StackButton.qml:39
517590#, qt-format
518591msgid "〈 %1"
519−msgstr ""
592+msgstr "〈 %1"
520593
521594#: qml/Wizard/StackButton.qml:42
522595#, qt-format
523596msgid "%1 〉"
524−msgstr ""
597+msgstr "%1 〉"
598+
599+#~ msgid "Close"
600+#~ msgstr "Luk"
601+
602+#~ msgid "Left edge"
603+#~ msgstr "Venstre kant"
604+
605+#~ msgid "Try swiping from the right edge to unlock the phone"
606+#~ msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
607+
608+#~ msgid "Right edge"
609+#~ msgstr "Højre kant"
525610
526611#~ msgid "Speaking..."
527612#~ msgstr "Taler..."
@@ -529,6 +614,27 @@ msgstr ""
529614#~ msgid "Confirm"
530615#~ msgstr "Bekræft"
531616
617+#~ msgid "Search"
618+#~ msgstr "Søg"
619+
620+#~ msgid "Skip intro"
621+#~ msgstr "Spring intro over"
622+
623+#~ msgid "Top edge"
624+#~ msgstr "Øvre kant"
625+
626+#~ msgid "Try swiping from the top edge to access the indicators"
627+#~ msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
628+
629+#~ msgid "Swipe up again to close the settings screen"
630+#~ msgstr "Stryg op igen for at låse indstillingsskærmen"
631+
632+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
633+#~ msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
634+
635+#~ msgid "Well done"
636+#~ msgstr "Godt gjort"
637+
532638#~ msgid "Type or say a command"
533639#~ msgstr "Skriv eller indtal en kommando"
534640
@@ -537,3 +643,10 @@ msgstr ""
537643
538644#~ msgid "Speak Now..."
539645#~ msgstr "Tal nu..."
646+
647+#~ msgid ""
648+#~ "You have now mastered the edge gestures and can start using the "
649+#~ "phone<br><br>Tap on the screen to start"
650+#~ msgstr ""
651+#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
652+#~ "på skærmen for at starte"
po/de.po+280−159
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-01-29 21:52+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-06 14:24+0000\n"
1212"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: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Passwort: "
2424
@@ -31,68 +31,95 @@ msgstr "Verknüpfung anheften"
3131msgid "Unpin shortcut"
3232msgstr "Verknüpfung entfernen"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Gerät gesperrt"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Das Gerät wurde aufgrund zu vieler falscher Passworteingaben für längere "
4242"Zeit gesperrt."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Das Gerät wurde aufgrund zu vieler falscher PIN-Eingaben für längere Zeit "
4848"gesperrt."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Bitte warten Sie %1 Minute und versuchen Sie es dann erneut..."
5555msgstr[1] "Bitte warten Sie %1 Minuten und versuchen Sie es dann erneut..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
59−msgstr "Abmelden"
60+msgstr ""
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "Nein"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr ""
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Ja"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr ""
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Abbrechen"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
77−msgstr "Herunterfahren"
84+msgstr ""
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
8492msgid "Reboot"
85−msgstr "Neustart"
93+msgstr ""
94+
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr ""
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
102+msgid "Reboot"
103+msgstr ""
86104
87−#: qml/Components/Dialogs.qml:132
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "Nein"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Ja"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93−msgstr "Energie"
120+msgstr ""
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,68 +127,15 @@ msgstr ""
100127"Sind Sie sicher, dass Sie das\n"
101128"Gerät ausschalten wollen?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105−msgstr "Ausschalten"
106−
107−#: qml/Components/Dialogs.qml:166
108−msgid "Restart"
109−msgstr "Neustarten"
110−
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Abbrechen"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Einführung überspringen"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Rechter Bildschirmrand"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
126−
127−#: qml/Components/EdgeDemo.qml:157
128−msgid "Top edge"
129−msgstr "Oberer Bildschirmrand"
130−
131−#: qml/Components/EdgeDemo.qml:158
132−msgid "Try swiping from the top edge to access the indicators"
133−msgstr ""
134−"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
135−
136−#: qml/Components/EdgeDemo.qml:183
137−msgid "Close"
138−msgstr "Schließen"
139−
140−#: qml/Components/EdgeDemo.qml:184
141−msgid "Swipe up again to close the settings screen"
142−msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
143−
144−#: qml/Components/EdgeDemo.qml:214
145−msgid "Left edge"
146−msgstr "Linker Rand"
147−
148−#: qml/Components/EdgeDemo.qml:215
149−msgid "Swipe from the left to reveal the launcher for quick access to apps"
150133msgstr ""
151−"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
152−"Schnellzugriff aufzurufen"
153−
154−#: qml/Components/EdgeDemo.qml:242
155−msgid "Well done"
156−msgstr "Gut gemacht"
157134
158−#: qml/Components/EdgeDemo.qml:243
159−msgid ""
160−"You have now mastered the edge gestures and can start using the "
161−"phone<br><br>Tap on the screen to start"
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
137+msgid "Restart"
162138msgstr ""
163−"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
164−"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
165139
166140#: qml/Components/Lockscreen.qml:238
167141msgid "Return to Call"
@@ -175,32 +149,39 @@ msgstr "Notruf"
175149msgid "OK"
176150msgstr "OK"
177151
178−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
179153msgid "See less"
180154msgstr "Weniger ansehen"
181155
182−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
183157msgid "See all"
184158msgstr "Alle anzeigen"
185159
186−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
188162msgid "Search"
189−msgstr "Suchen"
163+msgstr ""
190164
191−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
192167msgid "Store"
193−msgstr "Store"
168+msgstr ""
169+
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr ""
194174
195−#: qml/Dash/PageHeader.qml:284
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
196177msgid "Settings"
197−msgstr "Einstellungen"
178+msgstr ""
198179
199−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
200181msgid "Remove from Favorites"
201182msgstr "Aus den Favoriten entfernen"
202183
203−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
204185msgid "Add to Favorites"
205186msgstr "Zu Favoriten hinzufügen"
206187
@@ -232,6 +213,10 @@ msgstr "Zum Aktualisieren ziehen …"
232213msgid "Release to refresh…"
233214msgstr "Zum Aktualisieren loslassen …"
234215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Standortdaten aktivieren"
219+
235220#: qml/Dash/ScopesList.qml:66
236221msgid "Manage"
237222msgstr "Verwalten"
@@ -244,10 +229,76 @@ msgstr "Startseite"
244229msgid "Also installed"
245230msgstr "Ebenfalls installiert"
246231
247−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
248233msgid "Unlock"
249234msgstr "Entsperren"
250235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Erneut versuchen"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Zum Entsperren tippen"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "Entschuldigung, falsches Passwort."
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "Falsche PIN"
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Dies ist Ihr letzter Versuch."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
262+"zurückgesetzt und alle Daten werden gelöscht."
263+
264+#: qml/Greeter/NarrowView.qml:58
265+msgid ""
266+"If passcode is entered incorrectly, your phone will conduct a factory reset "
267+"and all personal data will be deleted."
268+msgstr ""
269+"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
270+"zurückgesetzt und alle Daten werden gelöscht."
271+
272+#: qml/Greeter/NarrowView.qml:115
273+#, qt-format
274+msgid "Enter %1"
275+msgstr "%1 eingeben"
276+
277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
278+msgid "Enter passphrase"
279+msgstr "Passwort eingeben"
280+
281+#: qml/Greeter/NarrowView.qml:117
282+msgid "Enter passcode"
283+msgstr "PIN eingeben"
284+
285+#: qml/Greeter/NarrowView.qml:118
286+#, qt-format
287+msgid "Sorry, incorrect %1"
288+msgstr "%1 falsch"
289+
290+#: qml/Greeter/NarrowView.qml:119
291+msgid "Sorry, incorrect passphrase"
292+msgstr "Das Passwort ist nicht korrekt"
293+
294+#: qml/Greeter/NarrowView.qml:120
295+msgid "Please re-enter"
296+msgstr "Bitte erneut eingeben"
297+
298+#: qml/Greeter/NarrowView.qml:121
299+msgid "Sorry, incorrect passcode"
300+msgstr "Falsches Passwort"
301+
251302#: qml/Notifications/NotificationMenuItemFactory.qml:128
252303msgid "Show password"
253304msgstr "Passwort anzeigen"
@@ -289,8 +340,9 @@ msgid "Failed, tap to retry"
289340msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
290341
291342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
343+msgctxt "Label: Hint in message indicator line edit"
292344msgid "Reply"
293−msgstr "Antworten"
345+msgstr ""
294346
295347#: qml/Panel/Indicators/ModemInfoItem.qml:105
296348msgid "Unlock SIM"
@@ -300,67 +352,63 @@ msgstr "SIM-Karte entsperren"
300352msgid "Roaming"
301353msgstr "Roaming"
302354
303−#: qml/Shell.qml:390
304−#, qt-format
305−msgid "Enter %1"
306−msgstr "%1 eingeben"
355+#: qml/Tutorial/TutorialBottomFinish.qml:24
356+msgid "This action does different things for different apps"
357+msgstr ""
358+"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."
307359
308−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
309−msgid "Enter passphrase"
310−msgstr "Passwort eingeben"
360+#: qml/Tutorial/TutorialBottomFinish.qml:25
361+msgid "Tap here to finish."
362+msgstr "Zum Beenden hier tippen."
311363
312−#: qml/Shell.qml:392
313−msgid "Enter passcode"
314−msgstr "PIN eingeben"
364+#: qml/Tutorial/TutorialBottom.qml:28
365+msgid "Open special menus"
366+msgstr "Spezielle Menüs öffnen"
315367
316−#: qml/Shell.qml:393
317−#, qt-format
318−msgid "Sorry, incorrect %1"
319−msgstr "%1 falsch"
368+#: qml/Tutorial/TutorialBottom.qml:29
369+msgid "Swipe up from the bottom edge."
370+msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."
320371
321−#: qml/Shell.qml:394
322−msgid "Sorry, incorrect passphrase"
323−msgstr "Das Passwort ist nicht korrekt"
372+#: qml/Tutorial/TutorialLeftFinish.qml:24
373+msgid "These are the shortcuts to favorite apps"
374+msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."
324375
325−#: qml/Shell.qml:395
326−msgid "Please re-enter"
327−msgstr "Bitte erneut eingeben"
376+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
377+msgid "Tap here to continue."
378+msgstr "Zum Fortfahren hier tippen."
328379
329−#: qml/Shell.qml:396
330−msgid "Sorry, incorrect passcode"
331−msgstr "Falsches Passwort"
380+#: qml/Tutorial/TutorialLeft.qml:26
381+msgid "Open the launcher"
382+msgstr "Öffnen Sie den Starter."
332383
333−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
334−msgid "Sorry, incorrect passphrase."
335−msgstr "Entschuldigung, falsches Passwort."
384+#: qml/Tutorial/TutorialLeft.qml:27
385+msgid "Short swipe from the left edge."
386+msgstr "Kurzer Wisch von der linken Bildschirmkante."
336387
337−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338−msgid "Sorry, incorrect passcode."
339−msgstr "Falsche PIN"
388+#: qml/Tutorial/TutorialPage.qml:178
389+msgid "You almost got it!"
390+msgstr "Fast geschafft!"
340391
341−#: qml/Shell.qml:492
342−msgid "This will be your last attempt."
343−msgstr "Dies ist Ihr letzter Versuch."
392+#: qml/Tutorial/TutorialPage.qml:195
393+msgid "Try again."
394+msgstr "Versuchen Sie es noch einmal."
344395
345−#: qml/Shell.qml:494
346−msgid ""
347−"If passphrase is entered incorrectly, your phone will conduct a factory "
348−"reset and all personal data will be deleted."
349−msgstr ""
350−"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
351−"zurückgesetzt und alle Daten werden gelöscht."
396+#: qml/Tutorial/TutorialRight.qml:31
397+msgid "To view open apps"
398+msgstr "Zum Ansehen offener Anwendungen"
352399
353−#: qml/Shell.qml:495
354−msgid ""
355−"If passcode is entered incorrectly, your phone will conduct a factory reset "
356−"and all personal data will be deleted."
357−msgstr ""
358−"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
359−"zurückgesetzt und alle Daten werden gelöscht."
400+#: qml/Tutorial/TutorialRight.qml:32
401+msgid "Long swipe from the right edge."
402+msgstr "Langer Wisch von der rechten Bildschirmkante."
403+
404+#: qml/Tutorial/TutorialRight.qml:122
405+msgid "View all your running tasks."
406+msgstr "Sehen Sie alle Ihre laufenden Anwendungen."
360407
361408#: qml/Wizard/Page.qml:89
409+msgctxt "Button: Go back one page in the Wizard"
362410msgid "Back"
363−msgstr "Zurück"
411+msgstr ""
364412
365413#: qml/Wizard/Pages/10-welcome.qml:27
366414msgid "Hi!"
@@ -375,7 +423,7 @@ msgid "Let’s get started."
375423msgstr "Fangen wir an!"
376424
377425#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
378−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
426+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
379427#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380428#: qml/Wizard/Pages/passwd-set.qml:90
381429msgid "Continue"
@@ -385,11 +433,11 @@ msgstr "Weiter"
385433msgid "Add a SIM card and restart your device"
386434msgstr "SIM-Karte einlegen und Gerät neustarten"
387435
388−#: qml/Wizard/Pages/20-sim.qml:55
436+#: qml/Wizard/Pages/20-sim.qml:59
389437msgid "Without it, you won’t be able to make calls or use text messaging."
390438msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
391439
392−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
440+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
393441msgid "Skip"
394442msgstr "Überspringen"
395443
@@ -402,38 +450,44 @@ msgid "Please select how you’d like to unlock your phone."
402450msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
403451
404452#: qml/Wizard/Pages/30-passwd-type.qml:97
453+msgctxt "Label: Type of security method"
405454msgid "Swipe"
406−msgstr "Wischgeste"
455+msgstr ""
407456
408457#: qml/Wizard/Pages/30-passwd-type.qml:98
458+msgctxt "Label: Description of security method"
409459msgid "No security"
410−msgstr "Keine Sicherheitssperre"
460+msgstr ""
411461
412462#: qml/Wizard/Pages/30-passwd-type.qml:100
463+msgctxt "Label: Type of security method"
413464msgid "Passcode"
414−msgstr "PIN"
465+msgstr ""
415466
416467#: qml/Wizard/Pages/30-passwd-type.qml:101
468+msgctxt "Label: Description of security method"
417469msgid "4 digits only"
418−msgstr "Nur 4 Ziffern"
470+msgstr ""
419471
420472#: qml/Wizard/Pages/30-passwd-type.qml:103
473+msgctxt "Label: Type of security method"
421474msgid "Passphrase"
422−msgstr "Passwort"
475+msgstr ""
423476
424477#: qml/Wizard/Pages/30-passwd-type.qml:104
478+msgctxt "Label: Description of security method"
425479msgid "Numbers and letters"
426−msgstr "Ziffern und Buchstaben"
480+msgstr ""
427481
428−#: qml/Wizard/Pages/40-wifi.qml:28
482+#: qml/Wizard/Pages/40-wifi.qml:29
429483msgid "Connect to Wi‑Fi"
430484msgstr "Mit WLAN verbinden"
431485
432−#: qml/Wizard/Pages/40-wifi.qml:147
486+#: qml/Wizard/Pages/40-wifi.qml:168
433487msgid "Available networks…"
434488msgstr "Verfügbare Netzwerke …"
435489
436−#: qml/Wizard/Pages/40-wifi.qml:148
490+#: qml/Wizard/Pages/40-wifi.qml:169
437491msgid "No available networks."
438492msgstr "Keine verfügbaren Netzwerke."
439493
@@ -552,12 +606,58 @@ msgstr "%1 〉"
552606#~ msgid "Speak Now..."
553607#~ msgstr "Sprechen Sie jetzt …"
554608
609+#~ msgid "Search"
610+#~ msgstr "Suchen"
611+
612+#~ msgid "Close"
613+#~ msgstr "Schließen"
614+
615+#~ msgid "Left edge"
616+#~ msgstr "Linker Rand"
617+
618+#~ msgid "Well done"
619+#~ msgstr "Gut gemacht"
620+
621+#~ msgid "Swipe up again to close the settings screen"
622+#~ msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
623+
624+#~ msgid "Skip intro"
625+#~ msgstr "Einführung überspringen"
626+
555627#~ msgid "Type or say a command"
556628#~ msgstr "Befehl eingeben oder sprechen"
557629
558630#~ msgid "Speaking..."
559631#~ msgstr "Sprechen Sie …"
560632
633+#~ msgid ""
634+#~ "You have now mastered the edge gestures and can start using the "
635+#~ "phone<br><br>Tap on the screen to start"
636+#~ msgstr ""
637+#~ "Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
638+#~ "nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
639+
640+#~ msgid "Top edge"
641+#~ msgstr "Oberer Bildschirmrand"
642+
643+#~ msgid "Try swiping from the top edge to access the indicators"
644+#~ msgstr ""
645+#~ "Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
646+
647+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
648+#~ msgstr ""
649+#~ "Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
650+#~ "Schnellzugriff aufzurufen"
651+
652+#~ msgid "Try swiping from the right edge to unlock the phone"
653+#~ msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
654+
655+#~ msgid "Right edge"
656+#~ msgstr "Rechter Bildschirmrand"
657+
658+#~ msgid "Power off"
659+#~ msgstr "Ausschalten"
660+
561661#~ msgid "All"
562662#~ msgstr "Alle"
563663
@@ -567,5 +667,26 @@ msgstr "%1 〉"
567667#~ msgid "Favorites"
568668#~ msgstr "Favoriten"
569669
670+#~ msgid "Store"
671+#~ msgstr "Store"
672+
673+#~ msgid "Log out"
674+#~ msgstr "Abmelden"
675+
676+#~ msgid "Reboot"
677+#~ msgstr "Neustart"
678+
679+#~ msgid "Shut down"
680+#~ msgstr "Herunterfahren"
681+
682+#~ msgid "Power"
683+#~ msgstr "Energie"
684+
685+#~ msgid "Settings"
686+#~ msgstr "Einstellungen"
687+
688+#~ msgid "Restart"
689+#~ msgstr "Neustarten"
690+
570691#~ msgid "Manage Scopes"
571692#~ msgstr "Filter verwalten"
po/el.po+321−182
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2014-11-08 18:38+0000\n"
12−"Last-Translator: Efstathios Iosifidis <Unknown>\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-30 19:52+0000\n"
12+"Last-Translator: Simos Xenitellis <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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-31 05:58+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Κωδικός πρόσβασης: "
2424
@@ -31,68 +31,95 @@ msgstr "Καρφίτσωμα συντόμευσης"
3131msgid "Unpin shortcut"
3232msgstr "Ξεκαρφίτσωμα συντόμευσης"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Κλειδωμένη συσκευή"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
4242"συνδεθείτε με λάθος κωδικό."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Δεν σας επιτρέπεται η πρόσβαση καθώς προσπαθήσατε επανηλλημένως να "
4848"συνδεθείτε με λάθος κωδικό."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
5555msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
5960msgstr "Αποσύνδεση"
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "Όχι"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr "Κλείδωμα"
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Ναι"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr "Αποσύνδεση"
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Ακύρωση"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
7784msgstr "Τερματισμός λειτουργίας"
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Επιθυμείτε σίγουρα τερματισμό;"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
92+msgid "Reboot"
93+msgstr "Επανεκκίνηση"
94+
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr "Τερματισμός"
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
84102msgid "Reboot"
85103msgstr "Επανεκκίνηση"
86104
87−#: qml/Components/Dialogs.qml:132
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "Όχι"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Ναι"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93120msgstr ""
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,68 +127,16 @@ msgstr ""
100127"Επιθυμείτε σίγουρα τον\n"
101128"τερματισμό λειτουργίας;"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105−msgstr "Τερματισμός"
133+msgstr "Κλείσιμο τροφοδοσίας"
106134
107−#: qml/Components/Dialogs.qml:166
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
108137msgid "Restart"
109138msgstr "Επανεκκίνηση"
110139
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Ακύρωση"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Παράλειψη εισαγωγής"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Δεξί άκρο"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
126−
127−#: qml/Components/EdgeDemo.qml:157
128−msgid "Top edge"
129−msgstr "Πάνω άκρο"
130−
131−#: qml/Components/EdgeDemo.qml:158
132−msgid "Try swiping from the top edge to access the indicators"
133−msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
134−
135−#: qml/Components/EdgeDemo.qml:183
136−msgid "Close"
137−msgstr "Κλείσιμο"
138−
139−#: qml/Components/EdgeDemo.qml:184
140−msgid "Swipe up again to close the settings screen"
141−msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
142−
143−#: qml/Components/EdgeDemo.qml:214
144−msgid "Left edge"
145−msgstr "Αριστερό άκρο"
146−
147−#: qml/Components/EdgeDemo.qml:215
148−msgid "Swipe from the left to reveal the launcher for quick access to apps"
149−msgstr ""
150−"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
151−"στις εφαρμογές"
152−
153−#: qml/Components/EdgeDemo.qml:242
154−msgid "Well done"
155−msgstr "Συγχαρητήρια"
156−
157−#: qml/Components/EdgeDemo.qml:243
158−msgid ""
159−"You have now mastered the edge gestures and can start using the "
160−"phone<br><br>Tap on the screen to start"
161−msgstr ""
162−"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
163−"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
164−
165140#: qml/Components/Lockscreen.qml:238
166141msgid "Return to Call"
167142msgstr "Επιστροφή στην κλήση"
@@ -174,32 +149,39 @@ msgstr "Κλήση έκτακτης ανάγκης"
174149msgid "OK"
175150msgstr "OK"
176151
177−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
178153msgid "See less"
179154msgstr "Λιγότερα"
180155
181−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
182157msgid "See all"
183158msgstr "Εμφάνιση όλων"
184159
185−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
186−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
187162msgid "Search"
188163msgstr "Αναζήτηση"
189164
190−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
191167msgid "Store"
192−msgstr "Κατάστημα"
168+msgstr ""
193169
194−#: qml/Dash/PageHeader.qml:284
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr ""
174+
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
195177msgid "Settings"
196−msgstr "Ρυθμίσεις"
178+msgstr ""
197179
198−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
199181msgid "Remove from Favorites"
200182msgstr "Αφαίρεση από τα αγαπημένα"
201183
202−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
203185msgid "Add to Favorites"
204186msgstr "Προσθήκη στα αγαπημένα"
205187
@@ -225,28 +207,100 @@ msgstr "Αποστολή"
225207
226208#: qml/Dash/PullToRefreshScopeStyle.qml:55
227209msgid "Pull to refresh…"
228−msgstr ""
210+msgstr "Σύρτε για ανανέωση…"
229211
230212#: qml/Dash/PullToRefreshScopeStyle.qml:60
231213msgid "Release to refresh…"
232−msgstr ""
214+msgstr "Αφήστε για ανανέωση…"
215+
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Ενεργοποίηση δεδομένων τοποθεσίας"
233219
234220#: qml/Dash/ScopesList.qml:66
235221msgid "Manage"
236−msgstr ""
222+msgstr "Διαχείριση"
237223
238224#: qml/Dash/ScopesList.qml:112
239225msgid "Home"
240−msgstr ""
226+msgstr "Αρχή"
241227
242228#: qml/Dash/ScopesList.qml:113
243229msgid "Also installed"
244−msgstr ""
230+msgstr "Επίσης εγκατεστημένα"
245231
246−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
247233msgid "Unlock"
248234msgstr "Ξεκλείδωμα"
249235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Επανάληψη"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Ακουμπήστε για να ξεκλειδώσετε"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "Συγνώμη, μη έγκυρη συνθηματική φράση."
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης."
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Αυτή θα είναι η τελευταία σας προσπάθεια."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Εάν η συνθηματική φράση που θα εισάγετε είναι μη έγκυρη, το τηλέφωνο σας θα "
262+"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
263+"διαγραφούν."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Εάν ο κωδικός πρόσβασης που θα εισάγετε είναι μη έγκυρος, το τηλέφωνο σας θα "
271+"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
272+"διαγραφούν."
273+
274+#: qml/Greeter/NarrowView.qml:115
275+#, qt-format
276+msgid "Enter %1"
277+msgstr "Εισάγετε %1"
278+
279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
280+msgid "Enter passphrase"
281+msgstr "Εισαγωγή συνθηματικού"
282+
283+#: qml/Greeter/NarrowView.qml:117
284+msgid "Enter passcode"
285+msgstr "Εισαγωγή κωδικού"
286+
287+#: qml/Greeter/NarrowView.qml:118
288+#, qt-format
289+msgid "Sorry, incorrect %1"
290+msgstr "Συγνώμη, μη έγκυρο %1"
291+
292+#: qml/Greeter/NarrowView.qml:119
293+msgid "Sorry, incorrect passphrase"
294+msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
295+
296+#: qml/Greeter/NarrowView.qml:120
297+msgid "Please re-enter"
298+msgstr "Παρακαλώ πληκτρολογήστε ξανά"
299+
300+#: qml/Greeter/NarrowView.qml:121
301+msgid "Sorry, incorrect passcode"
302+msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης"
303+
250304#: qml/Notifications/NotificationMenuItemFactory.qml:128
251305msgid "Show password"
252306msgstr "Εμφάνιση κωδικού"
@@ -288,8 +342,9 @@ msgid "Failed, tap to retry"
288342msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
289343
290344#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
345+msgctxt "Label: Hint in message indicator line edit"
291346msgid "Reply"
292−msgstr ""
347+msgstr "Απάντηση"
293348
294349#: qml/Panel/Indicators/ModemInfoItem.qml:105
295350msgid "Unlock SIM"
@@ -299,154 +354,164 @@ msgstr "Ξεκλείδωμα SIM"
299354msgid "Roaming"
300355msgstr "Περιαγωγή"
301356
302−#: qml/Shell.qml:390
303−#, qt-format
304−msgid "Enter %1"
305−msgstr "Εισάγετε %1"
357+#: qml/Tutorial/TutorialBottomFinish.qml:24
358+msgid "This action does different things for different apps"
359+msgstr ""
360+"Αυτή η ενέργεια κάνει διαφορετικά πράγματα για διαφορετικές εφαρμογές"
306361
307−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
308−msgid "Enter passphrase"
309−msgstr "Εισαγωγή συνθηματικού"
362+#: qml/Tutorial/TutorialBottomFinish.qml:25
363+msgid "Tap here to finish."
364+msgstr "Πατήστε εδώ για τέλος."
310365
311−#: qml/Shell.qml:392
312−msgid "Enter passcode"
313−msgstr "Εισαγωγή κωδικού"
366+#: qml/Tutorial/TutorialBottom.qml:28
367+msgid "Open special menus"
368+msgstr "Άνοιγμα ειδικών μενού"
314369
315−#: qml/Shell.qml:393
316−#, qt-format
317−msgid "Sorry, incorrect %1"
318−msgstr "Συγνώμη, μη έγκυρο %1"
370+#: qml/Tutorial/TutorialBottom.qml:29
371+msgid "Swipe up from the bottom edge."
372+msgstr "Σύρετε από την κάτω άκρη προς τα πάνω."
319373
320−#: qml/Shell.qml:394
321−msgid "Sorry, incorrect passphrase"
322−msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
374+#: qml/Tutorial/TutorialLeftFinish.qml:24
375+msgid "These are the shortcuts to favorite apps"
376+msgstr "Είναι συντομεύσεις για αγαπημένες εφαρμογές"
323377
324−#: qml/Shell.qml:395
325−msgid "Please re-enter"
326−msgstr "Παρακαλώ πληκτρολογήστε ξανά"
378+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
379+msgid "Tap here to continue."
380+msgstr "Πατήστε εδώ για συνέχεια."
327381
328−#: qml/Shell.qml:396
329−msgid "Sorry, incorrect passcode"
330−msgstr ""
382+#: qml/Tutorial/TutorialLeft.qml:26
383+msgid "Open the launcher"
384+msgstr "Άνοιγμα του εκκινητή"
331385
332−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
333−msgid "Sorry, incorrect passphrase."
334−msgstr ""
386+#: qml/Tutorial/TutorialLeft.qml:27
387+msgid "Short swipe from the left edge."
388+msgstr "Σύρετε ελάχιστα από την αριστερή άκρη."
335389
336−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
337−msgid "Sorry, incorrect passcode."
338−msgstr ""
390+#: qml/Tutorial/TutorialPage.qml:178
391+msgid "You almost got it!"
392+msgstr "Σχεδόν το είχατε!"
339393
340−#: qml/Shell.qml:492
341−msgid "This will be your last attempt."
342−msgstr ""
394+#: qml/Tutorial/TutorialPage.qml:195
395+msgid "Try again."
396+msgstr "Δοκιμάστε πάλι."
343397
344−#: qml/Shell.qml:494
345−msgid ""
346−"If passphrase is entered incorrectly, your phone will conduct a factory "
347−"reset and all personal data will be deleted."
348−msgstr ""
398+#: qml/Tutorial/TutorialRight.qml:31
399+msgid "To view open apps"
400+msgstr "Για να δείτε τις ανοιχτές εφαρμογές"
349401
350−#: qml/Shell.qml:495
351−msgid ""
352−"If passcode is entered incorrectly, your phone will conduct a factory reset "
353−"and all personal data will be deleted."
354−msgstr ""
402+#: qml/Tutorial/TutorialRight.qml:32
403+msgid "Long swipe from the right edge."
404+msgstr "Σύρετε παρατεταμένα από την δεξιά άκρη."
405+
406+#: qml/Tutorial/TutorialRight.qml:122
407+msgid "View all your running tasks."
408+msgstr "Δείτε όλες τις εργασίες που εκτελούνται."
355409
356410#: qml/Wizard/Page.qml:89
411+msgctxt "Button: Go back one page in the Wizard"
357412msgid "Back"
358−msgstr ""
413+msgstr "Πίσω"
359414
360415#: qml/Wizard/Pages/10-welcome.qml:27
361416msgid "Hi!"
362−msgstr ""
417+msgstr "Γεια!"
363418
364419#: qml/Wizard/Pages/10-welcome.qml:44
365420msgid "Welcome to your Ubuntu phone."
366−msgstr ""
421+msgstr "Καλώς ήρθατε στο Ubuntu phone σας."
367422
368423#: qml/Wizard/Pages/10-welcome.qml:52
369424msgid "Let’s get started."
370−msgstr ""
425+msgstr "Ας ξεκινήσουμε."
371426
372427#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
373−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
428+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
374429#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375430#: qml/Wizard/Pages/passwd-set.qml:90
376431msgid "Continue"
377−msgstr ""
432+msgstr "Συνέχιση"
378433
379434#: qml/Wizard/Pages/20-sim.qml:25
380435msgid "Add a SIM card and restart your device"
381−msgstr ""
436+msgstr "Εισάγετε μια κάρτα SIM και επανεκκινήστε τη συσκευή σας"
382437
383−#: qml/Wizard/Pages/20-sim.qml:55
438+#: qml/Wizard/Pages/20-sim.qml:59
384439msgid "Without it, you won’t be able to make calls or use text messaging."
385440msgstr ""
441+"Χωρίς αυτήν, δεν θα μπορείτε να κάνετε κλήσεις ή να χρησιμοποιήσετε μηνύματα "
442+"κειμένου."
386443
387−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
444+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
388445msgid "Skip"
389−msgstr ""
446+msgstr "Παράβλεψη"
390447
391448#: qml/Wizard/Pages/30-passwd-type.qml:39
392449msgid "Lock security"
393−msgstr ""
450+msgstr "Κλείδωμα ασφαλείας"
394451
395452#: qml/Wizard/Pages/30-passwd-type.qml:74
396453msgid "Please select how you’d like to unlock your phone."
397−msgstr ""
454+msgstr "Παρακαλούμε επιλέξτε πως θα θέλατε να ξεκλειδώνετε το τηλέφωνό σας."
398455
399456#: qml/Wizard/Pages/30-passwd-type.qml:97
457+msgctxt "Label: Type of security method"
400458msgid "Swipe"
401459msgstr ""
402460
403461#: qml/Wizard/Pages/30-passwd-type.qml:98
462+msgctxt "Label: Description of security method"
404463msgid "No security"
405−msgstr ""
464+msgstr "Χωρίς ασφάλεια"
406465
407466#: qml/Wizard/Pages/30-passwd-type.qml:100
467+msgctxt "Label: Type of security method"
408468msgid "Passcode"
409−msgstr ""
469+msgstr "Κωδικός αριθμός"
410470
411471#: qml/Wizard/Pages/30-passwd-type.qml:101
472+msgctxt "Label: Description of security method"
412473msgid "4 digits only"
413−msgstr ""
474+msgstr "Μόνο με 4 ψηφία"
414475
415476#: qml/Wizard/Pages/30-passwd-type.qml:103
477+msgctxt "Label: Type of security method"
416478msgid "Passphrase"
417−msgstr ""
479+msgstr "Κωδική φράση"
418480
419481#: qml/Wizard/Pages/30-passwd-type.qml:104
482+msgctxt "Label: Description of security method"
420483msgid "Numbers and letters"
421−msgstr ""
484+msgstr "Αριθμοί και γράμματα"
422485
423−#: qml/Wizard/Pages/40-wifi.qml:28
486+#: qml/Wizard/Pages/40-wifi.qml:29
424487msgid "Connect to Wi‑Fi"
425−msgstr ""
488+msgstr "Σύνδεση σε δίκτυο Wi-Fi"
426489
427−#: qml/Wizard/Pages/40-wifi.qml:147
490+#: qml/Wizard/Pages/40-wifi.qml:168
428491msgid "Available networks…"
429−msgstr ""
492+msgstr "Διαθέσιμα δίκτυα..."
430493
431−#: qml/Wizard/Pages/40-wifi.qml:148
494+#: qml/Wizard/Pages/40-wifi.qml:169
432495msgid "No available networks."
433−msgstr ""
496+msgstr "Δεν υπάρχουν διαθέσιμα δίκτυα."
434497
435498#: qml/Wizard/Pages/50-location.qml:27
436499msgid "Location"
437−msgstr ""
500+msgstr "Τοποθεσία"
438501
439502#: qml/Wizard/Pages/50-location.qml:62
440503msgid "Let the phone detect your location:"
441−msgstr ""
504+msgstr "Επιτρέψετε το τηλέφωνο να εντοπίσει την τοποθεσία σας:"
442505
443506#: qml/Wizard/Pages/50-location.qml:69
444507msgid "Using GPS only (less accurate)"
445−msgstr ""
508+msgstr "Χρήση μόνο GPS (λιγότερο ακριβή)"
446509
447510#: qml/Wizard/Pages/50-location.qml:86
448511msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
449512msgstr ""
513+"Χρήση GPS, ανωνυνοποιημένα δίκτυα Wi-Fi και πληροφορίες δικτύων κινητής "
514+"τηλεφωνίας (συνιστάται)"
450515
451516#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
452517#: qml/Wizard/Pages/50-location.qml:103
@@ -454,81 +519,89 @@ msgid ""
454519"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
455520"conditions</a>."
456521msgstr ""
522+"Ενεργοποιώντας αυτή την επιλογή, αποδέχεστε τους <a href='#'>όρους και "
523+"προϋποθέσεις</a> της Nokia HERE."
457524
458525#: qml/Wizard/Pages/50-location.qml:112
459526msgid "Not at all"
460−msgstr ""
527+msgstr "Καθόλου"
461528
462529#: qml/Wizard/Pages/50-location.qml:124
463530msgid "You can change your mind later in <b>System Settings</b>."
464531msgstr ""
532+"Μπορείτε να αλλάξετε τη γνώμη σας αργότερα στις <b>Ρυθμίσεις Συστήματος</b>."
465533
466534#: qml/Wizard/Pages/60-reporting.qml:24
467535msgid "Improving your experience"
468−msgstr ""
536+msgstr "Βελτιώστε την εμπειρία σας"
469537
470538#: qml/Wizard/Pages/60-reporting.qml:36
471539msgid ""
472540"Your phone is set up to automatically report errors to Canonical and its "
473541"partners, the makers of the operating system."
474542msgstr ""
543+"Το τηλέφωνό σας είναι ρυθμισμένο να στέλνει αυτόματα αναφορές σφαλμάτων στην "
544+"Canonical και τους συνεργάτες της, τους δημιουργούς τους λειτουργικού "
545+"συστήματος."
475546
476547#: qml/Wizard/Pages/60-reporting.qml:43
477548msgid ""
478549"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
479550"Privacy</b>"
480551msgstr ""
552+"Αυτό μπορεί να απενεργοποιηθεί στις <b>Ρυθμίσεις Συστήματος</b> στο πεδίο "
553+"<b>Ασφάλεια &amp; Ιδιωτικότητα</b>"
481554
482555#: qml/Wizard/Pages/80-finished.qml:24
483556msgid "All done"
484−msgstr ""
557+msgstr "Όλα έτοιμα"
485558
486559#: qml/Wizard/Pages/80-finished.qml:39
487560msgid "Nice work!"
488−msgstr ""
561+msgstr "Ωραία δουλειά!"
489562
490563#: qml/Wizard/Pages/80-finished.qml:46
491564msgid "Your phone is now ready to use."
492−msgstr ""
565+msgstr "Το τηλέφωνό σας είναι πλέον έτοιμο για χρήση."
493566
494567#: qml/Wizard/Pages/80-finished.qml:53
495568msgid "Finish"
496−msgstr ""
569+msgstr "Ολοκλήρωση"
497570
498571#: qml/Wizard/Pages/here-terms.qml:27
499572msgid "Terms & Conditions"
500−msgstr ""
573+msgstr "Όροι και προϋποθέσεις"
501574
502575#: qml/Wizard/Pages/passwd-confirm.qml:49
503576msgid "Confirm passphrase"
504−msgstr ""
577+msgstr "Επιβεβαίωση φράσης πρόσβασης"
505578
506579#: qml/Wizard/Pages/passwd-confirm.qml:50
507580msgid "Confirm passcode"
508−msgstr ""
581+msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης"
509582
510583#: qml/Wizard/Pages/passwd-confirm.qml:53
511584#: qml/Wizard/Pages/passwd-confirm.qml:54
512585msgid "Please try again."
513−msgstr ""
586+msgstr "Παρακαλώ προσπαθήστε ξανά."
514587
515588#: qml/Wizard/Pages/passwd-set.qml:61
516589msgid "Choose your passcode"
517−msgstr ""
590+msgstr "Επιλογή κωδικού πρόσβασης"
518591
519592#: qml/Wizard/Pages/passwd-set.qml:68
520593msgid "Passphrase must be 4 characters long"
521−msgstr ""
594+msgstr "Η φράση πρόσβασης πρέπει να έχει 4 χαρακτήρες"
522595
523596#: qml/Wizard/StackButton.qml:39
524597#, qt-format
525598msgid "〈 %1"
526−msgstr ""
599+msgstr "〈 %1"
527600
528601#: qml/Wizard/StackButton.qml:42
529602#, qt-format
530603msgid "%1 〉"
531−msgstr ""
604+msgstr "%1 〉"
532605
533606#~ msgid "Confirm"
534607#~ msgstr "Επιβεβαίωση"
@@ -542,9 +615,57 @@ msgstr ""
542615#~ msgid "Speaking..."
543616#~ msgstr "Ομιλία..."
544617
618+#~ msgid "Search"
619+#~ msgstr "Αναζήτηση"
620+
621+#~ msgid "Try swiping from the top edge to access the indicators"
622+#~ msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
623+
624+#~ msgid "Swipe up again to close the settings screen"
625+#~ msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
626+
627+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
628+#~ msgstr ""
629+#~ "Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
630+#~ "στις εφαρμογές"
631+
632+#~ msgid "Well done"
633+#~ msgstr "Συγχαρητήρια"
634+
635+#~ msgid "Close"
636+#~ msgstr "Κλείσιμο"
637+
638+#~ msgid "Left edge"
639+#~ msgstr "Αριστερό άκρο"
640+
641+#~ msgid "Top edge"
642+#~ msgstr "Πάνω άκρο"
643+
644+#~ msgid "Right edge"
645+#~ msgstr "Δεξί άκρο"
646+
545647#~ msgid "Loading. Please Wait..."
546648#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
547649
650+#~ msgid "Try swiping from the right edge to unlock the phone"
651+#~ msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
652+
653+#~ msgid "Skip intro"
654+#~ msgstr "Παράλειψη εισαγωγής"
655+
656+#~ msgid ""
657+#~ "You have now mastered the edge gestures and can start using the "
658+#~ "phone<br><br>Tap on the screen to start"
659+#~ msgstr ""
660+#~ "Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
661+#~ "χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
662+
663+#~ msgid "Store"
664+#~ msgstr "Κατάστημα"
665+
666+#~ msgid "Power off"
667+#~ msgstr "Τερματισμός"
668+
548669#~ msgid "All"
549670#~ msgstr "Όλα"
550671
@@ -553,3 +674,21 @@ msgstr ""
553674
554675#~ msgid "Done"
555676#~ msgstr "Ολοκληρώθηκε"
677+
678+#~ msgid "Log out"
679+#~ msgstr "Αποσύνδεση"
680+
681+#~ msgid "Reboot"
682+#~ msgstr "Επανεκκίνηση"
683+
684+#~ msgid "Restart"
685+#~ msgstr "Επανεκκίνηση"
686+
687+#~ msgid "Shut down"
688+#~ msgstr "Τερματισμός λειτουργίας"
689+
690+#~ msgid "Settings"
691+#~ msgstr "Ρυθμίσεις"
692+
693+#~ msgid "Power"
694+#~ msgstr "Ενέργεια"
po/en_AU.po+260−140
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-01-29 01:35+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-04-11 02:20+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"
19+"X-Generator: Launchpad (build 17423)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Password: "
2424
@@ -31,64 +31,91 @@ msgstr "Pin shortcut"
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Device Locked"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr "You have been locked out due to too many failed passphrase attempts."
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr "You have been locked out due to too many failed passcode attempts."
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Please wait %1 minute and then try again…"
5151msgstr[1] "Please wait %1 minutes and then try again…"
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr "Log out"
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr "Are you sure you want to log out?"
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
64−msgstr "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr "Lock"
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
69−msgstr "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr "Log Out"
7071
71−#: qml/Components/Dialogs.qml:108
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr "Cancel"
76+
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr "Shut down"
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr "Are you sure you want to shut down?"
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
88+msgid "Reboot"
89+msgstr "Reboot"
90+
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr "Shut down"
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
8098msgid "Reboot"
8199msgstr "Reboot"
82100
83−#: qml/Components/Dialogs.qml:132
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr "Are you sure you want to reboot?"
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr "No"
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr "Yes"
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr "Power"
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
@@ -96,66 +123,16 @@ msgstr ""
96123"Are you sure you would like\n"
97124"to power off?"
98125
99−#: qml/Components/Dialogs.qml:157
126+#: qml/Components/Dialogs.qml:153
127+msgctxt "Button: Power off the system"
100128msgid "Power off"
101129msgstr "Power off"
102130
103−#: qml/Components/Dialogs.qml:166
131+#: qml/Components/Dialogs.qml:162
132+msgctxt "Button: Restart the system"
104133msgid "Restart"
105134msgstr "Restart"
106135
107−#: qml/Components/Dialogs.qml:175
108−msgid "Cancel"
109−msgstr "Cancel"
110−
111−#: qml/Components/EdgeDemoOverlay.qml:151
112−msgid "Skip intro"
113−msgstr "Skip intro"
114−
115−#: qml/Components/EdgeDemo.qml:125
116−msgid "Right edge"
117−msgstr "Right edge"
118−
119−#: qml/Components/EdgeDemo.qml:126
120−msgid "Try swiping from the right edge to unlock the phone"
121−msgstr "Try swiping from the right edge to unlock the phone"
122−
123−#: qml/Components/EdgeDemo.qml:157
124−msgid "Top edge"
125−msgstr "Top edge"
126−
127−#: qml/Components/EdgeDemo.qml:158
128−msgid "Try swiping from the top edge to access the indicators"
129−msgstr "Try swiping from the top edge to access the indicators"
130−
131−#: qml/Components/EdgeDemo.qml:183
132−msgid "Close"
133−msgstr "Close"
134−
135−#: qml/Components/EdgeDemo.qml:184
136−msgid "Swipe up again to close the settings screen"
137−msgstr "Swipe up again to close the settings screen"
138−
139−#: qml/Components/EdgeDemo.qml:214
140−msgid "Left edge"
141−msgstr "Left edge"
142−
143−#: qml/Components/EdgeDemo.qml:215
144−msgid "Swipe from the left to reveal the launcher for quick access to apps"
145−msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146−
147−#: qml/Components/EdgeDemo.qml:242
148−msgid "Well done"
149−msgstr "Well done"
150−
151−#: qml/Components/EdgeDemo.qml:243
152−msgid ""
153−"You have now mastered the edge gestures and can start using the "
154−"phone<br><br>Tap on the screen to start"
155−msgstr ""
156−"You have now mastered the edge gestures and can start using the "
157−"phone<br><br>Tap on the screen to start"
158−
159136#: qml/Components/Lockscreen.qml:238
160137msgid "Return to Call"
161138msgstr "Return to Call"
@@ -168,32 +145,39 @@ msgstr "Emergency Call"
168145msgid "OK"
169146msgstr "OK"
170147
171−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
172149msgid "See less"
173150msgstr "See less"
174151
175−#: qml/Dash/GenericScopeView.qml:485
152+#: qml/Dash/GenericScopeView.qml:533
176153msgid "See all"
177154msgstr "See all"
178155
179−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180−#: qml/Panel/SearchIndicator.qml:27
156+#: qml/Dash/GenericScopeView.qml:595
157+msgctxt "Label: Hint for dash search line edit"
181158msgid "Search"
182159msgstr "Search"
183160
184−#: qml/Dash/PageHeader.qml:267
161+#: qml/Dash/PageHeader.qml:269
162+msgctxt "Button: Open the Ubuntu Store"
185163msgid "Store"
186164msgstr "Store"
187165
188−#: qml/Dash/PageHeader.qml:284
166+#: qml/Dash/PageHeader.qml:276
167+msgctxt "Button: Start a search in the current dash scope"
168+msgid "Search"
169+msgstr "Search"
170+
171+#: qml/Dash/PageHeader.qml:286
172+msgctxt "Button: Show the current dash scope settings"
189173msgid "Settings"
190174msgstr "Settings"
191175
192−#: qml/Dash/PageHeader.qml:291
176+#: qml/Dash/PageHeader.qml:293
193177msgid "Remove from Favorites"
194178msgstr "Remove from Favourites"
195179
196−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
197181msgid "Add to Favorites"
198182msgstr "Add to Favourites"
199183
@@ -225,6 +209,10 @@ msgstr "Pull to refresh…"
225209msgid "Release to refresh…"
226210msgstr "Release to refresh…"
227211
212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
213+msgid "Enable location data"
214+msgstr "Enable location data"
215+
228216#: qml/Dash/ScopesList.qml:66
229217msgid "Manage"
230218msgstr "Manage"
@@ -237,10 +225,76 @@ msgstr "Home"
237225msgid "Also installed"
238226msgstr "Also installed"
239227
240−#: qml/Greeter/Greeter.qml:133
228+#: qml/Greeter/CoverPage.qml:107
241229msgid "Unlock"
242230msgstr "Unlock"
243231
232+#: qml/Greeter/LoginList.qml:236
233+msgid "Retry"
234+msgstr "Retry"
235+
236+#: qml/Greeter/LoginList.qml:237
237+msgid "Tap to unlock"
238+msgstr "Tap to unlock"
239+
240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
241+msgid "Sorry, incorrect passphrase."
242+msgstr "Sorry, incorrect passphrase."
243+
244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
245+msgid "Sorry, incorrect passcode."
246+msgstr "Sorry, incorrect passcode."
247+
248+#: qml/Greeter/NarrowView.qml:55
249+msgid "This will be your last attempt."
250+msgstr "This will be your last attempt."
251+
252+#: qml/Greeter/NarrowView.qml:57
253+msgid ""
254+"If passphrase is entered incorrectly, your phone will conduct a factory "
255+"reset and all personal data will be deleted."
256+msgstr ""
257+"If passphrase is entered incorrectly, your phone will conduct a factory "
258+"reset and all personal data will be deleted."
259+
260+#: qml/Greeter/NarrowView.qml:58
261+msgid ""
262+"If passcode is entered incorrectly, your phone will conduct a factory reset "
263+"and all personal data will be deleted."
264+msgstr ""
265+"If passcode is entered incorrectly, your phone will conduct a factory reset "
266+"and all personal data will be deleted."
267+
268+#: qml/Greeter/NarrowView.qml:115
269+#, qt-format
270+msgid "Enter %1"
271+msgstr "Enter %1"
272+
273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
274+msgid "Enter passphrase"
275+msgstr "Enter passphrase"
276+
277+#: qml/Greeter/NarrowView.qml:117
278+msgid "Enter passcode"
279+msgstr "Enter passcode"
280+
281+#: qml/Greeter/NarrowView.qml:118
282+#, qt-format
283+msgid "Sorry, incorrect %1"
284+msgstr "Sorry, incorrect %1"
285+
286+#: qml/Greeter/NarrowView.qml:119
287+msgid "Sorry, incorrect passphrase"
288+msgstr "Sorry, incorrect passphrase"
289+
290+#: qml/Greeter/NarrowView.qml:120
291+msgid "Please re-enter"
292+msgstr "Please re-enter"
293+
294+#: qml/Greeter/NarrowView.qml:121
295+msgid "Sorry, incorrect passcode"
296+msgstr "Sorry, incorrect passcode"
297+
244298#: qml/Notifications/NotificationMenuItemFactory.qml:128
245299msgid "Show password"
246300msgstr "Show password"
@@ -282,6 +336,7 @@ msgid "Failed, tap to retry"
282336msgstr "Failed, tap to retry"
283337
284338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
339+msgctxt "Label: Hint in message indicator line edit"
285340msgid "Reply"
286341msgstr "Reply"
287342
@@ -293,65 +348,60 @@ msgstr "Unlock SIM"
293348msgid "Roaming"
294349msgstr "Roaming"
295350
296−#: qml/Shell.qml:390
297−#, qt-format
298−msgid "Enter %1"
299−msgstr "Enter %1"
351+#: qml/Tutorial/TutorialBottomFinish.qml:24
352+msgid "This action does different things for different apps"
353+msgstr "This action does different things for different apps"
300354
301−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
302−msgid "Enter passphrase"
303−msgstr "Enter passphrase"
355+#: qml/Tutorial/TutorialBottomFinish.qml:25
356+msgid "Tap here to finish."
357+msgstr "Tap here to finish."
304358
305−#: qml/Shell.qml:392
306−msgid "Enter passcode"
307−msgstr "Enter passcode"
359+#: qml/Tutorial/TutorialBottom.qml:28
360+msgid "Open special menus"
361+msgstr "Open special menus"
308362
309−#: qml/Shell.qml:393
310−#, qt-format
311−msgid "Sorry, incorrect %1"
312−msgstr "Sorry, incorrect %1"
363+#: qml/Tutorial/TutorialBottom.qml:29
364+msgid "Swipe up from the bottom edge."
365+msgstr "Swipe up from the bottom edge."
313366
314−#: qml/Shell.qml:394
315−msgid "Sorry, incorrect passphrase"
316−msgstr "Sorry, incorrect passphrase"
367+#: qml/Tutorial/TutorialLeftFinish.qml:24
368+msgid "These are the shortcuts to favorite apps"
369+msgstr "These are the shortcuts to favourite apps"
317370
318−#: qml/Shell.qml:395
319−msgid "Please re-enter"
320−msgstr "Please re-enter"
371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
372+msgid "Tap here to continue."
373+msgstr "Tap here to continue."
321374
322−#: qml/Shell.qml:396
323−msgid "Sorry, incorrect passcode"
324−msgstr "Sorry, incorrect passcode"
375+#: qml/Tutorial/TutorialLeft.qml:26
376+msgid "Open the launcher"
377+msgstr "Open the launcher"
325378
326−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−msgid "Sorry, incorrect passphrase."
328−msgstr "Sorry, incorrect passphrase."
379+#: qml/Tutorial/TutorialLeft.qml:27
380+msgid "Short swipe from the left edge."
381+msgstr "Short swipe from the left edge."
329382
330−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331−msgid "Sorry, incorrect passcode."
332−msgstr "Sorry, incorrect passcode."
383+#: qml/Tutorial/TutorialPage.qml:178
384+msgid "You almost got it!"
385+msgstr "You almost got it!"
333386
334−#: qml/Shell.qml:492
335−msgid "This will be your last attempt."
336−msgstr "This will be your last attempt."
387+#: qml/Tutorial/TutorialPage.qml:195
388+msgid "Try again."
389+msgstr "Try again."
337390
338−#: qml/Shell.qml:494
339−msgid ""
340−"If passphrase is entered incorrectly, your phone will conduct a factory "
341−"reset and all personal data will be deleted."
342−msgstr ""
343−"If passphrase is entered incorrectly, your phone will conduct a factory "
344−"reset and all personal data will be deleted."
391+#: qml/Tutorial/TutorialRight.qml:31
392+msgid "To view open apps"
393+msgstr "To view open apps"
345394
346−#: qml/Shell.qml:495
347−msgid ""
348−"If passcode is entered incorrectly, your phone will conduct a factory reset "
349−"and all personal data will be deleted."
350−msgstr ""
351−"If passcode is entered incorrectly, your phone will conduct a factory reset "
352−"and all personal data will be deleted."
395+#: qml/Tutorial/TutorialRight.qml:32
396+msgid "Long swipe from the right edge."
397+msgstr "Long swipe from the right edge."
398+
399+#: qml/Tutorial/TutorialRight.qml:122
400+msgid "View all your running tasks."
401+msgstr "View all your running tasks."
353402
354403#: qml/Wizard/Page.qml:89
404+msgctxt "Button: Go back one page in the Wizard"
355405msgid "Back"
356406msgstr "Back"
357407
@@ -368,7 +418,7 @@ msgid "Let’s get started."
368418msgstr "Let’s get started."
369419
370420#: 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
421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
372422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373423#: qml/Wizard/Pages/passwd-set.qml:90
374424msgid "Continue"
@@ -378,11 +428,11 @@ msgstr "Continue"
378428msgid "Add a SIM card and restart your device"
379429msgstr "Add a SIM card and restart your device"
380430
381−#: qml/Wizard/Pages/20-sim.qml:55
431+#: qml/Wizard/Pages/20-sim.qml:59
382432msgid "Without it, you won’t be able to make calls or use text messaging."
383433msgstr "Without it, you won’t be able to make calls or use text messaging."
384434
385−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
386436msgid "Skip"
387437msgstr "Skip"
388438
@@ -395,38 +445,44 @@ msgid "Please select how you’d like to unlock your phone."
395445msgstr "Please select how you’d like to unlock your phone."
396446
397447#: qml/Wizard/Pages/30-passwd-type.qml:97
448+msgctxt "Label: Type of security method"
398449msgid "Swipe"
399450msgstr "Swipe"
400451
401452#: qml/Wizard/Pages/30-passwd-type.qml:98
453+msgctxt "Label: Description of security method"
402454msgid "No security"
403455msgstr "No security"
404456
405457#: qml/Wizard/Pages/30-passwd-type.qml:100
458+msgctxt "Label: Type of security method"
406459msgid "Passcode"
407460msgstr "Passcode"
408461
409462#: qml/Wizard/Pages/30-passwd-type.qml:101
463+msgctxt "Label: Description of security method"
410464msgid "4 digits only"
411465msgstr "4 digits only"
412466
413467#: qml/Wizard/Pages/30-passwd-type.qml:103
468+msgctxt "Label: Type of security method"
414469msgid "Passphrase"
415470msgstr "Passphrase"
416471
417472#: qml/Wizard/Pages/30-passwd-type.qml:104
473+msgctxt "Label: Description of security method"
418474msgid "Numbers and letters"
419475msgstr "Numbers and letters"
420476
421−#: qml/Wizard/Pages/40-wifi.qml:28
477+#: qml/Wizard/Pages/40-wifi.qml:29
422478msgid "Connect to Wi‑Fi"
423479msgstr "Connect to Wi‑Fi"
424480
425−#: qml/Wizard/Pages/40-wifi.qml:147
481+#: qml/Wizard/Pages/40-wifi.qml:168
426482msgid "Available networks…"
427483msgstr "Available networks…"
428484
429−#: qml/Wizard/Pages/40-wifi.qml:148
485+#: qml/Wizard/Pages/40-wifi.qml:169
430486msgid "No available networks."
431487msgstr "No available networks."
432488
@@ -549,14 +605,78 @@ msgstr "%1 〉"
549605#~ msgid "Speaking..."
550606#~ msgstr "Speaking..."
551607
608+#~ msgid "Search"
609+#~ msgstr "Search"
610+
611+#~ msgid "Top edge"
612+#~ msgstr "Top edge"
613+
614+#~ msgid "Try swiping from the top edge to access the indicators"
615+#~ msgstr "Try swiping from the top edge to access the indicators"
616+
617+#~ msgid "Close"
618+#~ msgstr "Close"
619+
620+#~ msgid "Swipe up again to close the settings screen"
621+#~ msgstr "Swipe up again to close the settings screen"
622+
623+#~ msgid "Left edge"
624+#~ msgstr "Left edge"
625+
626+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
627+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"
628+
629+#~ msgid "Well done"
630+#~ msgstr "Well done"
631+
632+#~ msgid "Skip intro"
633+#~ msgstr "Skip intro"
634+
635+#~ msgid "Try swiping from the right edge to unlock the phone"
636+#~ msgstr "Try swiping from the right edge to unlock the phone"
637+
638+#~ msgid "Right edge"
639+#~ msgstr "Right edge"
640+
641+#~ msgid ""
642+#~ "You have now mastered the edge gestures and can start using the "
643+#~ "phone<br><br>Tap on the screen to start"
644+#~ msgstr ""
645+#~ "You have now mastered the edge gestures and can start using the "
646+#~ "phone<br><br>Tap on the screen to start"
647+
552648#~ msgid "All"
553649#~ msgstr "All"
554650
555651#~ msgid "Favorites"
556652#~ msgstr "Favourites"
557653
654+#~ msgid "Store"
655+#~ msgstr "Store"
656+
657+#~ msgid "Power off"
658+#~ msgstr "Power off"
659+
558660#~ msgid "Done"
559661#~ msgstr "Done"
560662
663+#~ msgid "Log out"
664+#~ msgstr "Log out"
665+
666+#~ msgid "Reboot"
667+#~ msgstr "Reboot"
668+
669+#~ msgid "Power"
670+#~ msgstr "Power"
671+
672+#~ msgid "Shut down"
673+#~ msgstr "Shut down"
674+
675+#~ msgid "Settings"
676+#~ msgstr "Settings"
677+
678+#~ msgid "Restart"
679+#~ msgstr "Restart"
680+
561681#~ msgid "Manage Scopes"
562682#~ msgstr "Manage Scopes"
po/en_GB.po+270−142
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
1111"PO-Revision-Date: 2015-01-22 12:14+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -15,10 +15,10 @@ 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: 2015-01-28 06:31+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Password: "
2424
@@ -31,64 +31,91 @@ msgstr "Pin shortcut"
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Device Locked"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr "You have been locked out due to too many failed passphrase attempts."
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr "You have been locked out due to too many failed passcode attempts."
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Please wait %1 minute and then try again…"
5151msgstr[1] "Please wait %1 minutes and then try again…"
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr "Log out"
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr "Are you sure you want to log out?"
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
64−msgstr "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr "Lock"
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
69−msgstr "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr "Log Out"
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr "Cancel"
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr "Shut down"
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr "Are you sure you want to shut down?"
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr "Reboot"
8290
83−#: qml/Components/Dialogs.qml:132
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr "Shut down"
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
99+msgstr "Reboot"
100+
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr "Are you sure you want to reboot?"
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr "No"
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr "Yes"
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89116msgstr "Power"
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
@@ -96,66 +123,16 @@ msgstr ""
96123"Are you sure you would like\n"
97124"to power off?"
98125
99−#: qml/Components/Dialogs.qml:157
126+#: qml/Components/Dialogs.qml:153
127+msgctxt "Button: Power off the system"
100128msgid "Power off"
101129msgstr "Power off"
102130
103−#: qml/Components/Dialogs.qml:166
131+#: qml/Components/Dialogs.qml:162
132+msgctxt "Button: Restart the system"
104133msgid "Restart"
105134msgstr "Restart"
106135
107−#: qml/Components/Dialogs.qml:175
108−msgid "Cancel"
109−msgstr "Cancel"
110−
111−#: qml/Components/EdgeDemoOverlay.qml:151
112−msgid "Skip intro"
113−msgstr "Skip intro"
114−
115−#: qml/Components/EdgeDemo.qml:125
116−msgid "Right edge"
117−msgstr "Right edge"
118−
119−#: qml/Components/EdgeDemo.qml:126
120−msgid "Try swiping from the right edge to unlock the phone"
121−msgstr "Try swiping from the right edge to unlock the phone"
122−
123−#: qml/Components/EdgeDemo.qml:157
124−msgid "Top edge"
125−msgstr "Top edge"
126−
127−#: qml/Components/EdgeDemo.qml:158
128−msgid "Try swiping from the top edge to access the indicators"
129−msgstr "Try swiping from the top edge to access the indicators"
130−
131−#: qml/Components/EdgeDemo.qml:183
132−msgid "Close"
133−msgstr "Close"
134−
135−#: qml/Components/EdgeDemo.qml:184
136−msgid "Swipe up again to close the settings screen"
137−msgstr "Swipe up again to close the settings screen"
138−
139−#: qml/Components/EdgeDemo.qml:214
140−msgid "Left edge"
141−msgstr "Left edge"
142−
143−#: qml/Components/EdgeDemo.qml:215
144−msgid "Swipe from the left to reveal the launcher for quick access to apps"
145−msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146−
147−#: qml/Components/EdgeDemo.qml:242
148−msgid "Well done"
149−msgstr "Well done"
150−
151−#: qml/Components/EdgeDemo.qml:243
152−msgid ""
153−"You have now mastered the edge gestures and can start using the "
154−"phone<br><br>Tap on the screen to start"
155−msgstr ""
156−"You have now mastered the edge gestures and can start using the "
157−"phone<br><br>Tap on the screen to start"
158−
159136#: qml/Components/Lockscreen.qml:238
160137msgid "Return to Call"
161138msgstr "Return to Call"
@@ -168,32 +145,39 @@ msgstr "Emergency Call"
168145msgid "OK"
169146msgstr "OK"
170147
171−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
172149msgid "See less"
173150msgstr "See less"
174151
175−#: qml/Dash/GenericScopeView.qml:485
152+#: qml/Dash/GenericScopeView.qml:533
176153msgid "See all"
177154msgstr "See all"
178155
179−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180−#: qml/Panel/SearchIndicator.qml:27
156+#: qml/Dash/GenericScopeView.qml:595
157+msgctxt "Label: Hint for dash search line edit"
181158msgid "Search"
182159msgstr "Search"
183160
184−#: qml/Dash/PageHeader.qml:267
161+#: qml/Dash/PageHeader.qml:269
162+msgctxt "Button: Open the Ubuntu Store"
185163msgid "Store"
186−msgstr "Store"
164+msgstr ""
165+
166+#: qml/Dash/PageHeader.qml:276
167+msgctxt "Button: Start a search in the current dash scope"
168+msgid "Search"
169+msgstr ""
187170
188−#: qml/Dash/PageHeader.qml:284
171+#: qml/Dash/PageHeader.qml:286
172+msgctxt "Button: Show the current dash scope settings"
189173msgid "Settings"
190−msgstr "Settings"
174+msgstr ""
191175
192−#: qml/Dash/PageHeader.qml:291
176+#: qml/Dash/PageHeader.qml:293
193177msgid "Remove from Favorites"
194178msgstr "Remove from Favourites"
195179
196−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
197181msgid "Add to Favorites"
198182msgstr "Add to Favourites"
199183
@@ -225,6 +209,10 @@ msgstr "Pull to refresh…"
225209msgid "Release to refresh…"
226210msgstr "Release to refresh…"
227211
212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
213+msgid "Enable location data"
214+msgstr "Enable location data"
215+
228216#: qml/Dash/ScopesList.qml:66
229217msgid "Manage"
230218msgstr "Manage"
@@ -237,10 +225,76 @@ msgstr "Home"
237225msgid "Also installed"
238226msgstr "Also installed"
239227
240−#: qml/Greeter/Greeter.qml:133
228+#: qml/Greeter/CoverPage.qml:107
241229msgid "Unlock"
242230msgstr "Unlock"
243231
232+#: qml/Greeter/LoginList.qml:236
233+msgid "Retry"
234+msgstr "Retry"
235+
236+#: qml/Greeter/LoginList.qml:237
237+msgid "Tap to unlock"
238+msgstr "Tap to unlock"
239+
240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
241+msgid "Sorry, incorrect passphrase."
242+msgstr "Sorry, incorrect passphrase."
243+
244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
245+msgid "Sorry, incorrect passcode."
246+msgstr "Sorry, incorrect passcode."
247+
248+#: qml/Greeter/NarrowView.qml:55
249+msgid "This will be your last attempt."
250+msgstr "This will be your last attempt."
251+
252+#: qml/Greeter/NarrowView.qml:57
253+msgid ""
254+"If passphrase is entered incorrectly, your phone will conduct a factory "
255+"reset and all personal data will be deleted."
256+msgstr ""
257+"If passphrase is entered incorrectly, your phone will conduct a factory "
258+"reset and all personal data will be deleted."
259+
260+#: qml/Greeter/NarrowView.qml:58
261+msgid ""
262+"If passcode is entered incorrectly, your phone will conduct a factory reset "
263+"and all personal data will be deleted."
264+msgstr ""
265+"If passcode is entered incorrectly, your phone will conduct a factory reset "
266+"and all personal data will be deleted."
267+
268+#: qml/Greeter/NarrowView.qml:115
269+#, qt-format
270+msgid "Enter %1"
271+msgstr "Enter %1"
272+
273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
274+msgid "Enter passphrase"
275+msgstr "Enter passphrase"
276+
277+#: qml/Greeter/NarrowView.qml:117
278+msgid "Enter passcode"
279+msgstr "Enter passcode"
280+
281+#: qml/Greeter/NarrowView.qml:118
282+#, qt-format
283+msgid "Sorry, incorrect %1"
284+msgstr "Sorry, incorrect %1"
285+
286+#: qml/Greeter/NarrowView.qml:119
287+msgid "Sorry, incorrect passphrase"
288+msgstr "Sorry, incorrect passphrase"
289+
290+#: qml/Greeter/NarrowView.qml:120
291+msgid "Please re-enter"
292+msgstr "Please re-enter"
293+
294+#: qml/Greeter/NarrowView.qml:121
295+msgid "Sorry, incorrect passcode"
296+msgstr "Sorry, incorrect passcode"
297+
244298#: qml/Notifications/NotificationMenuItemFactory.qml:128
245299msgid "Show password"
246300msgstr "Show password"
@@ -282,8 +336,9 @@ msgid "Failed, tap to retry"
282336msgstr "Failed, tap to retry"
283337
284338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
339+msgctxt "Label: Hint in message indicator line edit"
285340msgid "Reply"
286−msgstr ""
341+msgstr "Reply"
287342
288343#: qml/Panel/Indicators/ModemInfoItem.qml:105
289344msgid "Unlock SIM"
@@ -293,65 +348,60 @@ msgstr "Unlock SIM"
293348msgid "Roaming"
294349msgstr "Roaming"
295350
296−#: qml/Shell.qml:390
297−#, qt-format
298−msgid "Enter %1"
299−msgstr "Enter %1"
351+#: qml/Tutorial/TutorialBottomFinish.qml:24
352+msgid "This action does different things for different apps"
353+msgstr "This action does different things for different apps"
300354
301−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
302−msgid "Enter passphrase"
303−msgstr "Enter passphrase"
355+#: qml/Tutorial/TutorialBottomFinish.qml:25
356+msgid "Tap here to finish."
357+msgstr "Tap here to finish."
304358
305−#: qml/Shell.qml:392
306−msgid "Enter passcode"
307−msgstr "Enter passcode"
359+#: qml/Tutorial/TutorialBottom.qml:28
360+msgid "Open special menus"
361+msgstr "Open special menus"
308362
309−#: qml/Shell.qml:393
310−#, qt-format
311−msgid "Sorry, incorrect %1"
312−msgstr "Sorry, incorrect %1"
363+#: qml/Tutorial/TutorialBottom.qml:29
364+msgid "Swipe up from the bottom edge."
365+msgstr "Swipe up from the bottom edge."
313366
314−#: qml/Shell.qml:394
315−msgid "Sorry, incorrect passphrase"
316−msgstr "Sorry, incorrect passphrase"
367+#: qml/Tutorial/TutorialLeftFinish.qml:24
368+msgid "These are the shortcuts to favorite apps"
369+msgstr "These are the shortcuts to favourite apps"
317370
318−#: qml/Shell.qml:395
319−msgid "Please re-enter"
320−msgstr "Please re-enter"
371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
372+msgid "Tap here to continue."
373+msgstr "Tap here to continue."
321374
322−#: qml/Shell.qml:396
323−msgid "Sorry, incorrect passcode"
324−msgstr "Sorry, incorrect passcode"
375+#: qml/Tutorial/TutorialLeft.qml:26
376+msgid "Open the launcher"
377+msgstr "Open the launcher"
325378
326−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−msgid "Sorry, incorrect passphrase."
328−msgstr "Sorry, incorrect passphrase."
379+#: qml/Tutorial/TutorialLeft.qml:27
380+msgid "Short swipe from the left edge."
381+msgstr "Short swipe from the left edge."
329382
330−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331−msgid "Sorry, incorrect passcode."
332−msgstr "Sorry, incorrect passcode."
383+#: qml/Tutorial/TutorialPage.qml:178
384+msgid "You almost got it!"
385+msgstr "You almost got it!"
333386
334−#: qml/Shell.qml:492
335−msgid "This will be your last attempt."
336−msgstr "This will be your last attempt."
387+#: qml/Tutorial/TutorialPage.qml:195
388+msgid "Try again."
389+msgstr "Try again."
337390
338−#: qml/Shell.qml:494
339−msgid ""
340−"If passphrase is entered incorrectly, your phone will conduct a factory "
341−"reset and all personal data will be deleted."
342−msgstr ""
343−"If passphrase is entered incorrectly, your phone will conduct a factory "
344−"reset and all personal data will be deleted."
391+#: qml/Tutorial/TutorialRight.qml:31
392+msgid "To view open apps"
393+msgstr "To view open apps"
345394
346−#: qml/Shell.qml:495
347−msgid ""
348−"If passcode is entered incorrectly, your phone will conduct a factory reset "
349−"and all personal data will be deleted."
350−msgstr ""
351−"If passcode is entered incorrectly, your phone will conduct a factory reset "
352−"and all personal data will be deleted."
395+#: qml/Tutorial/TutorialRight.qml:32
396+msgid "Long swipe from the right edge."
397+msgstr "Long swipe from the right edge."
398+
399+#: qml/Tutorial/TutorialRight.qml:122
400+msgid "View all your running tasks."
401+msgstr "View all your running tasks."
353402
354403#: qml/Wizard/Page.qml:89
404+msgctxt "Button: Go back one page in the Wizard"
355405msgid "Back"
356406msgstr "Back"
357407
@@ -368,7 +418,7 @@ msgid "Let’s get started."
368418msgstr "Let’s get started."
369419
370420#: 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
421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
372422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373423#: qml/Wizard/Pages/passwd-set.qml:90
374424msgid "Continue"
@@ -378,11 +428,11 @@ msgstr "Continue"
378428msgid "Add a SIM card and restart your device"
379429msgstr "Add a SIM card and restart your device"
380430
381−#: qml/Wizard/Pages/20-sim.qml:55
431+#: qml/Wizard/Pages/20-sim.qml:59
382432msgid "Without it, you won’t be able to make calls or use text messaging."
383433msgstr "Without it, you won’t be able to make calls or use text messaging."
384434
385−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
435+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
386436msgid "Skip"
387437msgstr "Skip"
388438
@@ -395,38 +445,44 @@ msgid "Please select how you’d like to unlock your phone."
395445msgstr "Please select how you’d like to unlock your phone."
396446
397447#: qml/Wizard/Pages/30-passwd-type.qml:97
448+msgctxt "Label: Type of security method"
398449msgid "Swipe"
399450msgstr "Swipe"
400451
401452#: qml/Wizard/Pages/30-passwd-type.qml:98
453+msgctxt "Label: Description of security method"
402454msgid "No security"
403455msgstr "No security"
404456
405457#: qml/Wizard/Pages/30-passwd-type.qml:100
458+msgctxt "Label: Type of security method"
406459msgid "Passcode"
407460msgstr "Passcode"
408461
409462#: qml/Wizard/Pages/30-passwd-type.qml:101
463+msgctxt "Label: Description of security method"
410464msgid "4 digits only"
411465msgstr "4 digits only"
412466
413467#: qml/Wizard/Pages/30-passwd-type.qml:103
468+msgctxt "Label: Type of security method"
414469msgid "Passphrase"
415470msgstr "Passphrase"
416471
417472#: qml/Wizard/Pages/30-passwd-type.qml:104
473+msgctxt "Label: Description of security method"
418474msgid "Numbers and letters"
419475msgstr "Numbers and letters"
420476
421−#: qml/Wizard/Pages/40-wifi.qml:28
477+#: qml/Wizard/Pages/40-wifi.qml:29
422478msgid "Connect to Wi‑Fi"
423479msgstr "Connect to Wi‑Fi"
424480
425−#: qml/Wizard/Pages/40-wifi.qml:147
481+#: qml/Wizard/Pages/40-wifi.qml:168
426482msgid "Available networks…"
427483msgstr "Available networks…"
428484
429−#: qml/Wizard/Pages/40-wifi.qml:148
485+#: qml/Wizard/Pages/40-wifi.qml:169
430486msgid "No available networks."
431487msgstr "No available networks."
432488
@@ -549,14 +605,86 @@ msgstr "%1 〉"
549605#~ msgid "Speaking..."
550606#~ msgstr "Speaking..."
551607
608+#~ msgid "Search"
609+#~ msgstr "Search"
610+
611+#~ msgid "Try swiping from the right edge to unlock the phone"
612+#~ msgstr "Try swiping from the right edge to unlock the phone"
613+
614+#~ msgid "Top edge"
615+#~ msgstr "Top edge"
616+
617+#~ msgid "Try swiping from the top edge to access the indicators"
618+#~ msgstr "Try swiping from the top edge to access the indicators"
619+
620+#~ msgid "Close"
621+#~ msgstr "Close"
622+
623+#~ msgid "Swipe up again to close the settings screen"
624+#~ msgstr "Swipe up again to close the settings screen"
625+
626+#~ msgid "Left edge"
627+#~ msgstr "Left edge"
628+
629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
630+#~ msgstr "Swipe from the left to reveal the launcher for quick access to apps"
631+
632+#~ msgid "Well done"
633+#~ msgstr "Well done"
634+
635+#~ msgid "Skip intro"
636+#~ msgstr "Skip intro"
637+
638+#~ msgid "Right edge"
639+#~ msgstr "Right edge"
640+
641+#~ msgid ""
642+#~ "You have now mastered the edge gestures and can start using the "
643+#~ "phone<br><br>Tap on the screen to start"
644+#~ msgstr ""
645+#~ "You have now mastered the edge gestures and can start using the "
646+#~ "phone<br><br>Tap on the screen to start"
647+
648+#~ msgid "Store"
649+#~ msgstr "Store"
650+
552651#~ msgid "All"
553652#~ msgstr "All"
554653
555654#~ msgid "Favorites"
556655#~ msgstr "Favourites"
557656
657+#~ msgid "Power off"
658+#~ msgstr "Power off"
659+
558660#~ msgid "Done"
559661#~ msgstr "Done"
560662
663+#~ msgid "Log out"
664+#~ msgstr "Log out"
665+
666+#~ msgid "Reboot"
667+#~ msgstr "Reboot"
668+
669+#~ msgid "Power"
670+#~ msgstr "Power"
671+
672+#~ msgid "Shut down"
673+#~ msgstr "Shut down"
674+
675+#~ msgid "Settings"
676+#~ msgstr "Settings"
677+
678+#~ msgid "Restart"
679+#~ msgstr "Restart"
680+
561681#~ msgid "Manage Scopes"
562682#~ msgstr "Manage Scopes"
683+
684+#~ msgctxt "Button: Shown in Page Header Menu"
685+#~ msgid "Search"
686+#~ msgstr "Search"
687+
688+#~ msgctxt "Button: The Ubuntu Store"
689+#~ msgid "Store"
690+#~ msgstr "Store"
po/eo.po+176−118
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +15,10 @@ 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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr ""
2424
@@ -31,125 +31,104 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr ""
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
6465msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
6970msgstr ""
7071
71−#: qml/Components/Dialogs.qml:108
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr ""
76+
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr ""
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr ""
8290
83−#: qml/Components/Dialogs.qml:132
84−msgid "Are you sure you want to reboot?"
85−msgstr ""
86−
87−#: qml/Components/Dialogs.qml:154
88−msgid "Power"
89−msgstr ""
90−
91−#: qml/Components/Dialogs.qml:155
92−msgid ""
93−"Are you sure you would like\n"
94−"to power off?"
95−msgstr ""
96−
97−#: qml/Components/Dialogs.qml:157
98−msgid "Power off"
99−msgstr ""
100−
101−#: qml/Components/Dialogs.qml:166
102−msgid "Restart"
103−msgstr ""
104−
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
111−msgstr ""
112−
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr ""
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
11994msgstr ""
12095
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
12399msgstr ""
124100
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
101+#: qml/Components/Dialogs.qml:128
102+msgid "Are you sure you want to reboot?"
127103msgstr ""
128104
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
131107msgstr ""
132108
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
135111msgstr ""
136112
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
115+msgid "Power"
139116msgstr ""
140117
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
118+#: qml/Components/Dialogs.qml:151
119+msgid ""
120+"Are you sure you would like\n"
121+"to power off?"
143122msgstr ""
144123
145−#: qml/Components/EdgeDemo.qml:242
146−msgid "Well done"
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
126+msgid "Power off"
147127msgstr ""
148128
149−#: qml/Components/EdgeDemo.qml:243
150−msgid ""
151−"You have now mastered the edge gestures and can start using the "
152−"phone<br><br>Tap on the screen to start"
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
131+msgid "Restart"
153132msgstr ""
154133
155134#: qml/Components/Lockscreen.qml:238
@@ -164,32 +143,39 @@ msgstr ""
164143msgid "OK"
165144msgstr ""
166145
167−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
168147msgid "See less"
169148msgstr ""
170149
171−#: qml/Dash/GenericScopeView.qml:485
150+#: qml/Dash/GenericScopeView.qml:533
172151msgid "See all"
173152msgstr ""
174153
175−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176−#: qml/Panel/SearchIndicator.qml:27
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
177156msgid "Search"
178157msgstr ""
179158
180−#: qml/Dash/PageHeader.qml:267
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
181161msgid "Store"
182162msgstr ""
183163
184−#: qml/Dash/PageHeader.qml:284
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
185171msgid "Settings"
186172msgstr ""
187173
188−#: qml/Dash/PageHeader.qml:291
174+#: qml/Dash/PageHeader.qml:293
189175msgid "Remove from Favorites"
190176msgstr ""
191177
192−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
193179msgid "Add to Favorites"
194180msgstr ""
195181
@@ -221,6 +207,10 @@ msgstr ""
221207msgid "Release to refresh…"
222208msgstr ""
223209
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
224214#: qml/Dash/ScopesList.qml:66
225215msgid "Manage"
226216msgstr ""
@@ -233,10 +223,72 @@ msgstr ""
233223msgid "Also installed"
234224msgstr ""
235225
236−#: qml/Greeter/Greeter.qml:133
226+#: qml/Greeter/CoverPage.qml:107
237227msgid "Unlock"
238228msgstr ""
239229
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr ""
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+
256+#: qml/Greeter/NarrowView.qml:58
257+msgid ""
258+"If passcode is entered incorrectly, your phone will conduct a factory reset "
259+"and all personal data will be deleted."
260+msgstr ""
261+
262+#: qml/Greeter/NarrowView.qml:115
263+#, qt-format
264+msgid "Enter %1"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
268+msgid "Enter passphrase"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:117
272+msgid "Enter passcode"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:118
276+#, qt-format
277+msgid "Sorry, incorrect %1"
278+msgstr ""
279+
280+#: qml/Greeter/NarrowView.qml:119
281+msgid "Sorry, incorrect passphrase"
282+msgstr ""
283+
284+#: qml/Greeter/NarrowView.qml:120
285+msgid "Please re-enter"
286+msgstr ""
287+
288+#: qml/Greeter/NarrowView.qml:121
289+msgid "Sorry, incorrect passcode"
290+msgstr ""
291+
240292#: qml/Notifications/NotificationMenuItemFactory.qml:128
241293msgid "Show password"
242294msgstr ""
@@ -278,6 +330,7 @@ msgid "Failed, tap to retry"
278330msgstr ""
279331
280332#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
333+msgctxt "Label: Hint in message indicator line edit"
281334msgid "Reply"
282335msgstr ""
283336
@@ -289,61 +342,60 @@ msgstr ""
289342msgid "Roaming"
290343msgstr ""
291344
292−#: qml/Shell.qml:390
293−#, qt-format
294−msgid "Enter %1"
345+#: qml/Tutorial/TutorialBottomFinish.qml:24
346+msgid "This action does different things for different apps"
295347msgstr ""
296348
297−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
298−msgid "Enter passphrase"
349+#: qml/Tutorial/TutorialBottomFinish.qml:25
350+msgid "Tap here to finish."
299351msgstr ""
300352
301−#: qml/Shell.qml:392
302−msgid "Enter passcode"
353+#: qml/Tutorial/TutorialBottom.qml:28
354+msgid "Open special menus"
303355msgstr ""
304356
305−#: qml/Shell.qml:393
306−#, qt-format
307−msgid "Sorry, incorrect %1"
357+#: qml/Tutorial/TutorialBottom.qml:29
358+msgid "Swipe up from the bottom edge."
308359msgstr ""
309360
310−#: qml/Shell.qml:394
311−msgid "Sorry, incorrect passphrase"
361+#: qml/Tutorial/TutorialLeftFinish.qml:24
362+msgid "These are the shortcuts to favorite apps"
312363msgstr ""
313364
314−#: qml/Shell.qml:395
315−msgid "Please re-enter"
365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
366+msgid "Tap here to continue."
316367msgstr ""
317368
318−#: qml/Shell.qml:396
319−msgid "Sorry, incorrect passcode"
369+#: qml/Tutorial/TutorialLeft.qml:26
370+msgid "Open the launcher"
320371msgstr ""
321372
322−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323−msgid "Sorry, incorrect passphrase."
373+#: qml/Tutorial/TutorialLeft.qml:27
374+msgid "Short swipe from the left edge."
324375msgstr ""
325376
326−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327−msgid "Sorry, incorrect passcode."
377+#: qml/Tutorial/TutorialPage.qml:178
378+msgid "You almost got it!"
328379msgstr ""
329380
330−#: qml/Shell.qml:492
331−msgid "This will be your last attempt."
381+#: qml/Tutorial/TutorialPage.qml:195
382+msgid "Try again."
332383msgstr ""
333384
334−#: qml/Shell.qml:494
335−msgid ""
336−"If passphrase is entered incorrectly, your phone will conduct a factory "
337−"reset and all personal data will be deleted."
385+#: qml/Tutorial/TutorialRight.qml:31
386+msgid "To view open apps"
338387msgstr ""
339388
340−#: qml/Shell.qml:495
341−msgid ""
342−"If passcode is entered incorrectly, your phone will conduct a factory reset "
343−"and all personal data will be deleted."
389+#: qml/Tutorial/TutorialRight.qml:32
390+msgid "Long swipe from the right edge."
391+msgstr ""
392+
393+#: qml/Tutorial/TutorialRight.qml:122
394+msgid "View all your running tasks."
344395msgstr ""
345396
346397#: qml/Wizard/Page.qml:89
398+msgctxt "Button: Go back one page in the Wizard"
347399msgid "Back"
348400msgstr ""
349401
@@ -360,7 +412,7 @@ msgid "Let’s get started."
360412msgstr ""
361413
362414#: 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
415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
364416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365417#: qml/Wizard/Pages/passwd-set.qml:90
366418msgid "Continue"
@@ -370,11 +422,11 @@ msgstr ""
370422msgid "Add a SIM card and restart your device"
371423msgstr ""
372424
373−#: qml/Wizard/Pages/20-sim.qml:55
425+#: qml/Wizard/Pages/20-sim.qml:59
374426msgid "Without it, you won’t be able to make calls or use text messaging."
375427msgstr ""
376428
377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
378430msgid "Skip"
379431msgstr ""
380432
@@ -387,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."
387439msgstr ""
388440
389441#: qml/Wizard/Pages/30-passwd-type.qml:97
442+msgctxt "Label: Type of security method"
390443msgid "Swipe"
391444msgstr ""
392445
393446#: qml/Wizard/Pages/30-passwd-type.qml:98
447+msgctxt "Label: Description of security method"
394448msgid "No security"
395449msgstr ""
396450
397451#: qml/Wizard/Pages/30-passwd-type.qml:100
452+msgctxt "Label: Type of security method"
398453msgid "Passcode"
399454msgstr ""
400455
401456#: qml/Wizard/Pages/30-passwd-type.qml:101
457+msgctxt "Label: Description of security method"
402458msgid "4 digits only"
403459msgstr ""
404460
405461#: qml/Wizard/Pages/30-passwd-type.qml:103
462+msgctxt "Label: Type of security method"
406463msgid "Passphrase"
407464msgstr ""
408465
409466#: qml/Wizard/Pages/30-passwd-type.qml:104
467+msgctxt "Label: Description of security method"
410468msgid "Numbers and letters"
411469msgstr ""
412470
413−#: qml/Wizard/Pages/40-wifi.qml:28
471+#: qml/Wizard/Pages/40-wifi.qml:29
414472msgid "Connect to Wi‑Fi"
415473msgstr ""
416474
417−#: qml/Wizard/Pages/40-wifi.qml:147
475+#: qml/Wizard/Pages/40-wifi.qml:168
418476msgid "Available networks…"
419477msgstr ""
420478
421−#: qml/Wizard/Pages/40-wifi.qml:148
479+#: qml/Wizard/Pages/40-wifi.qml:169
422480msgid "No available networks."
423481msgstr ""
424482
po/es.po+270−150
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-02-01 03:20+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-27 21:24+0000\n"
1212"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
1313"Language-Team: Spanish <es@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-02-02 06:54+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-28 05:32+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
@@ -31,138 +31,112 @@ msgstr "Anclar"
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Dispositivo bloqueado"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "
4242"el dispositivo."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "
4848"desbloqueo."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
5555msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
5960msgstr "Cerrar la sesión"
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
63−msgstr "̉¿Está seguro de que quiere cerrar la sesión?"
64+msgstr "¿Seguro que quiere cerrar la sesión?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "No"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr "Bloquear"
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Sí"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr "Cerrar la sesión"
7475
75−#: qml/Components/Dialogs.qml:108
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Cancelar"
80+
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
7784msgstr "Apagar"
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "¿Está seguro de que quiere apagar?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
8492msgid "Reboot"
8593msgstr "Reiniciar"
8694
87−#: qml/Components/Dialogs.qml:132
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr "Apagar"
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
102+msgid "Reboot"
103+msgstr "Reiniciar"
104+
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89−msgstr "¿Esta seguro de que quiere reiniciar?"
107+msgstr "¿Seguro que quiere reiniciar?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "No"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Sí"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93120msgstr "Apagar"
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
99126msgstr ""
100−"¿Está seguro de que quiere\n"
127+"¿Seguro que quiere\n"
101128"apagar?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105133msgstr "Apagar"
106134
107−#: qml/Components/Dialogs.qml:166
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
108137msgid "Restart"
109138msgstr "Reiniciar"
110139
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Cancelar"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Omitir la introducción"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Borde derecho"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
126−
127−#: qml/Components/EdgeDemo.qml:157
128−msgid "Top edge"
129−msgstr "Borde superior"
130−
131−#: qml/Components/EdgeDemo.qml:158
132−msgid "Try swiping from the top edge to access the indicators"
133−msgstr ""
134−"Deslice el dedo desde el borde superior para acceder a los indicadores"
135−
136−#: qml/Components/EdgeDemo.qml:183
137−msgid "Close"
138−msgstr "Cerrar"
139−
140−#: qml/Components/EdgeDemo.qml:184
141−msgid "Swipe up again to close the settings screen"
142−msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
143−
144−#: qml/Components/EdgeDemo.qml:214
145−msgid "Left edge"
146−msgstr "Borde izquierdo"
147−
148−#: qml/Components/EdgeDemo.qml:215
149−msgid "Swipe from the left to reveal the launcher for quick access to apps"
150−msgstr ""
151−"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
152−"rápidamente a las aplicaciones"
153−
154−#: qml/Components/EdgeDemo.qml:242
155−msgid "Well done"
156−msgstr "Bien hecho"
157−
158−#: qml/Components/EdgeDemo.qml:243
159−msgid ""
160−"You have now mastered the edge gestures and can start using the "
161−"phone<br><br>Tap on the screen to start"
162−msgstr ""
163−"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
164−"la pantalla para comenzar"
165−
166140#: qml/Components/Lockscreen.qml:238
167141msgid "Return to Call"
168142msgstr "Volver a la llamada"
@@ -175,32 +149,39 @@ msgstr "Llamada de emergencia"
175149msgid "OK"
176150msgstr "Aceptar"
177151
178−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
179153msgid "See less"
180154msgstr "Ver menos"
181155
182−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
183157msgid "See all"
184158msgstr "Ver todo"
185159
186−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
188162msgid "Search"
189−msgstr "Buscar"
163+msgstr "Búsqueda"
190164
191−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
192167msgid "Store"
193168msgstr "Tienda"
194169
195−#: qml/Dash/PageHeader.qml:284
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr "Buscar"
174+
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
196177msgid "Settings"
197−msgstr "Configuración"
178+msgstr "Ajustes"
198179
199−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
200181msgid "Remove from Favorites"
201182msgstr "Quitar de favoritos"
202183
203−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
204185msgid "Add to Favorites"
205186msgstr "Añadir a favoritos"
206187
@@ -232,6 +213,10 @@ msgstr "Deslice para actualizar…"
232213msgid "Release to refresh…"
233214msgstr "Suelte para actualizar…"
234215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Activar datos de ubicación"
219+
235220#: qml/Dash/ScopesList.qml:66
236221msgid "Manage"
237222msgstr "Administrar"
@@ -244,17 +229,83 @@ msgstr "Inicio"
244229msgid "Also installed"
245230msgstr "También instalados"
246231
247−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
248233msgid "Unlock"
249234msgstr "Desbloquear"
250235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Reintentar"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Toque para desbloquear"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "La contraseña es incorrecta."
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "Código de acceso incorrecto."
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Este será su último intento."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Si se introduce la frase incorrectamente, el teléfono volverá a la "
262+"configuración de fábrica y se perderán todos los datos personales."
263+
264+#: qml/Greeter/NarrowView.qml:58
265+msgid ""
266+"If passcode is entered incorrectly, your phone will conduct a factory reset "
267+"and all personal data will be deleted."
268+msgstr ""
269+"Si se introduce el código incorrectamente, el teléfono volverá a la "
270+"configuración de fábrica y se perderán todos los datos personales."
271+
272+#: qml/Greeter/NarrowView.qml:115
273+#, qt-format
274+msgid "Enter %1"
275+msgstr "Introduzca %1"
276+
277+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
278+msgid "Enter passphrase"
279+msgstr "Introduzca la contraseña"
280+
281+#: qml/Greeter/NarrowView.qml:117
282+msgid "Enter passcode"
283+msgstr "Introduzca el código"
284+
285+#: qml/Greeter/NarrowView.qml:118
286+#, qt-format
287+msgid "Sorry, incorrect %1"
288+msgstr "Incorrecto (%1)"
289+
290+#: qml/Greeter/NarrowView.qml:119
291+msgid "Sorry, incorrect passphrase"
292+msgstr "La contraseña es incorrecta"
293+
294+#: qml/Greeter/NarrowView.qml:120
295+msgid "Please re-enter"
296+msgstr "Reintroduzca"
297+
298+#: qml/Greeter/NarrowView.qml:121
299+msgid "Sorry, incorrect passcode"
300+msgstr "El código es incorrecto"
301+
251302#: qml/Notifications/NotificationMenuItemFactory.qml:128
252303msgid "Show password"
253304msgstr "Mostrar contraseña"
254305
255306#: qml/Panel/ActiveCallHint.qml:79
256307msgid "Tap to return to call..."
257−msgstr "Toque para volver a llamar..."
308+msgstr "Toque para volver a la llamada…"
258309
259310#: qml/Panel/ActiveCallHint.qml:92
260311msgid "Conference"
@@ -289,6 +340,7 @@ msgid "Failed, tap to retry"
289340msgstr "Falló, toque para reintentar"
290341
291342#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
343+msgctxt "Label: Hint in message indicator line edit"
292344msgid "Reply"
293345msgstr "Responder"
294346
@@ -300,67 +352,62 @@ msgstr "Desbloquear SIM"
300352msgid "Roaming"
301353msgstr "Itinerancia"
302354
303−#: qml/Shell.qml:390
304−#, qt-format
305−msgid "Enter %1"
306−msgstr "Introduzca %1"
355+#: qml/Tutorial/TutorialBottomFinish.qml:24
356+msgid "This action does different things for different apps"
357+msgstr "Esta acción tiene efectos diferentes en cada aplicación"
307358
308−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
309−msgid "Enter passphrase"
310−msgstr "Introduzca la contraseña"
359+#: qml/Tutorial/TutorialBottomFinish.qml:25
360+msgid "Tap here to finish."
361+msgstr "Toque aquí para finalizar."
311362
312−#: qml/Shell.qml:392
313−msgid "Enter passcode"
314−msgstr "Introduzca el código"
363+#: qml/Tutorial/TutorialBottom.qml:28
364+msgid "Open special menus"
365+msgstr "Abrir menús especiales"
315366
316−#: qml/Shell.qml:393
317−#, qt-format
318−msgid "Sorry, incorrect %1"
319−msgstr "Incorrecto (%1)"
367+#: qml/Tutorial/TutorialBottom.qml:29
368+msgid "Swipe up from the bottom edge."
369+msgstr "Deslizar hacia arriba desde el borde inferior."
320370
321−#: qml/Shell.qml:394
322−msgid "Sorry, incorrect passphrase"
323−msgstr "La contraseña es incorrecta"
371+#: qml/Tutorial/TutorialLeftFinish.qml:24
372+msgid "These are the shortcuts to favorite apps"
373+msgstr "Esto son atajos a las aplicaciones favoritas"
324374
325−#: qml/Shell.qml:395
326−msgid "Please re-enter"
327−msgstr "Reintroduzca"
375+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
376+msgid "Tap here to continue."
377+msgstr "Toque aquí para continuar."
328378
329−#: qml/Shell.qml:396
330−msgid "Sorry, incorrect passcode"
331−msgstr "El código es incorrecto"
379+#: qml/Tutorial/TutorialLeft.qml:26
380+msgid "Open the launcher"
381+msgstr "Abrir el lanzador"
332382
333−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
334−msgid "Sorry, incorrect passphrase."
335−msgstr "La contraseña es incorrecta."
383+#: qml/Tutorial/TutorialLeft.qml:27
384+msgid "Short swipe from the left edge."
385+msgstr "Deslizamiento corto desde el borde izquierdo."
336386
337−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338−msgid "Sorry, incorrect passcode."
339−msgstr "Código de acceso incorrecto."
387+#: qml/Tutorial/TutorialPage.qml:178
388+msgid "You almost got it!"
389+msgstr "¡Casi lo tiene!"
340390
341−#: qml/Shell.qml:492
342−msgid "This will be your last attempt."
343−msgstr "Este será su último intento."
391+#: qml/Tutorial/TutorialPage.qml:195
392+msgid "Try again."
393+msgstr "Inténtelo de nuevo."
344394
345−#: qml/Shell.qml:494
346−msgid ""
347−"If passphrase is entered incorrectly, your phone will conduct a factory "
348−"reset and all personal data will be deleted."
349−msgstr ""
350−"Si se introduce la frase incorrectamente, el teléfono volverá a la "
351−"configuración de fábrica y se perderán todos los datos personales."
395+#: qml/Tutorial/TutorialRight.qml:31
396+msgid "To view open apps"
397+msgstr "Para ver las aplicaciones abiertas"
352398
353−#: qml/Shell.qml:495
354−msgid ""
355−"If passcode is entered incorrectly, your phone will conduct a factory reset "
356−"and all personal data will be deleted."
357−msgstr ""
358−"Si se introduce el código incorrectamente, el teléfono volverá a la "
359−"configuración de fábrica y se perderán todos los datos personales."
399+#: qml/Tutorial/TutorialRight.qml:32
400+msgid "Long swipe from the right edge."
401+msgstr "Deslizamiento largo desde el borde derecho."
402+
403+#: qml/Tutorial/TutorialRight.qml:122
404+msgid "View all your running tasks."
405+msgstr "Ver todas las tareas en ejecución."
360406
361407#: qml/Wizard/Page.qml:89
408+msgctxt "Button: Go back one page in the Wizard"
362409msgid "Back"
363−msgstr "Atrás"
410+msgstr "Atrás"
364411
365412#: qml/Wizard/Pages/10-welcome.qml:27
366413msgid "Hi!"
@@ -375,7 +422,7 @@ msgid "Let’s get started."
375422msgstr "Comencemos."
376423
377424#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
378−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
425+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
379426#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380427#: qml/Wizard/Pages/passwd-set.qml:90
381428msgid "Continue"
@@ -385,11 +432,11 @@ msgstr "Continuar"
385432msgid "Add a SIM card and restart your device"
386433msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
387434
388−#: qml/Wizard/Pages/20-sim.qml:55
435+#: qml/Wizard/Pages/20-sim.qml:59
389436msgid "Without it, you won’t be able to make calls or use text messaging."
390437msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
391438
392−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
439+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
393440msgid "Skip"
394441msgstr "Omitir"
395442
@@ -402,38 +449,44 @@ msgid "Please select how you’d like to unlock your phone."
402449msgstr "Seleccione el método de desbloqueo del teléfono."
403450
404451#: qml/Wizard/Pages/30-passwd-type.qml:97
452+msgctxt "Label: Type of security method"
405453msgid "Swipe"
406454msgstr "Deslizar"
407455
408456#: qml/Wizard/Pages/30-passwd-type.qml:98
457+msgctxt "Label: Description of security method"
409458msgid "No security"
410459msgstr "Sin seguridad"
411460
412461#: qml/Wizard/Pages/30-passwd-type.qml:100
462+msgctxt "Label: Type of security method"
413463msgid "Passcode"
414464msgstr "Código"
415465
416466#: qml/Wizard/Pages/30-passwd-type.qml:101
467+msgctxt "Label: Description of security method"
417468msgid "4 digits only"
418469msgstr "Solo 4 dígitos"
419470
420471#: qml/Wizard/Pages/30-passwd-type.qml:103
472+msgctxt "Label: Type of security method"
421473msgid "Passphrase"
422474msgstr "Contraseña"
423475
424476#: qml/Wizard/Pages/30-passwd-type.qml:104
477+msgctxt "Label: Description of security method"
425478msgid "Numbers and letters"
426479msgstr "Números y letras"
427480
428−#: qml/Wizard/Pages/40-wifi.qml:28
481+#: qml/Wizard/Pages/40-wifi.qml:29
429482msgid "Connect to Wi‑Fi"
430483msgstr "Conectar con wifi"
431484
432−#: qml/Wizard/Pages/40-wifi.qml:147
485+#: qml/Wizard/Pages/40-wifi.qml:168
433486msgid "Available networks…"
434487msgstr "Redes disponibles…"
435488
436−#: qml/Wizard/Pages/40-wifi.qml:148
489+#: qml/Wizard/Pages/40-wifi.qml:169
437490msgid "No available networks."
438491msgstr "No hay redes disponibles."
439492
@@ -556,14 +609,81 @@ msgstr "%1 〉"
556609#~ msgid "Speaking..."
557610#~ msgstr "Hablando…"
558611
612+#~ msgid "Search"
613+#~ msgstr "Buscar"
614+
615+#~ msgid "Top edge"
616+#~ msgstr "Borde superior"
617+
618+#~ msgid "Close"
619+#~ msgstr "Cerrar"
620+
621+#~ msgid "Left edge"
622+#~ msgstr "Borde izquierdo"
623+
624+#~ msgid "Skip intro"
625+#~ msgstr "Omitir la introducción"
626+
627+#~ msgid "Right edge"
628+#~ msgstr "Borde derecho"
629+
630+#~ msgid "Well done"
631+#~ msgstr "Bien hecho"
632+
633+#~ msgid "Swipe up again to close the settings screen"
634+#~ msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
635+
636+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
637+#~ msgstr ""
638+#~ "Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
639+#~ "rápidamente a las aplicaciones"
640+
641+#~ msgid "Try swiping from the right edge to unlock the phone"
642+#~ msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
643+
644+#~ msgid "Try swiping from the top edge to access the indicators"
645+#~ msgstr ""
646+#~ "Deslice el dedo desde el borde superior para acceder a los indicadores"
647+
648+#~ msgid ""
649+#~ "You have now mastered the edge gestures and can start using the "
650+#~ "phone<br><br>Tap on the screen to start"
651+#~ msgstr ""
652+#~ "Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
653+#~ "la pantalla para comenzar"
654+
655+#~ msgid "Power off"
656+#~ msgstr "Apagar"
657+
559658#~ msgid "All"
560659#~ msgstr "Todo"
561660
562661#~ msgid "Favorites"
563662#~ msgstr "Favoritos"
564663
664+#~ msgid "Store"
665+#~ msgstr "Tienda"
666+
565667#~ msgid "Done"
566668#~ msgstr "Hecho"
567669
670+#~ msgid "Reboot"
671+#~ msgstr "Reiniciar"
672+
673+#~ msgid "Shut down"
674+#~ msgstr "Apagar"
675+
676+#~ msgid "Settings"
677+#~ msgstr "Configuración"
678+
679+#~ msgid "Log out"
680+#~ msgstr "Cerrar la sesión"
681+
682+#~ msgid "Restart"
683+#~ msgstr "Reiniciar"
684+
685+#~ msgid "Power"
686+#~ msgstr "Apagar"
687+
568688#~ msgid "Manage Scopes"
569689#~ msgstr "Administrar Scopes"
po/eu.po+275−155
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
1111"PO-Revision-Date: 2015-01-22 21:40+0000\n"
1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
1313"Language-Team: Basque <eu@li.org>\n"
@@ -15,10 +15,10 @@ 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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:04+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Pasahitza: "
2424
@@ -31,134 +31,108 @@ msgstr "Ainguratu lasterbidea"
3131msgid "Unpin shortcut"
3232msgstr "Askatu lasterbidea"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Gailua blokeatuta"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "
4242"dituzulako."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."
4848
49−#: qml/Components/DelayedLockscreen.qml:72
49+#: qml/Components/DelayedLockscreen.qml:74
5050#, qt-format
5151msgid "Please wait %1 minute and then try again…"
5252msgid_plural "Please wait %1 minutes and then try again…"
5353msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
5454msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
5555
56−#: qml/Components/Dialogs.qml:86
56+#: qml/Components/Dialogs.qml:67
57+msgctxt "Title: Lock/Log out dialog"
5758msgid "Log out"
58−msgstr "Amaitu saioa"
59+msgstr ""
5960
60−#: qml/Components/Dialogs.qml:87
61+#: qml/Components/Dialogs.qml:68
6162msgid "Are you sure you want to log out?"
6263msgstr "Ziur saioa amaitu nahi duzula?"
6364
64−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
65−#: qml/Components/Dialogs.qml:134
66−msgid "No"
67−msgstr "Ez"
65+#: qml/Components/Dialogs.qml:70
66+msgctxt "Button: Lock the system"
67+msgid "Lock"
68+msgstr ""
6869
69−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
70−#: qml/Components/Dialogs.qml:140
71−msgid "Yes"
72−msgstr "Bai"
70+#: qml/Components/Dialogs.qml:77
71+msgctxt "Button: Log out from the system"
72+msgid "Log Out"
73+msgstr ""
7374
74−#: qml/Components/Dialogs.qml:108
75+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
76+#: qml/Components/Dialogs.qml:171
77+msgid "Cancel"
78+msgstr "Utzi"
79+
80+#: qml/Components/Dialogs.qml:96
81+msgctxt "Title: Reboot/Shut down dialog"
7582msgid "Shut down"
76−msgstr "Itzali"
83+msgstr ""
7784
78−#: qml/Components/Dialogs.qml:109
85+#: qml/Components/Dialogs.qml:97
7986msgid "Are you sure you want to shut down?"
8087msgstr "Ziur itzali nahi duzula?"
8188
82−#: qml/Components/Dialogs.qml:131
89+#: qml/Components/Dialogs.qml:99
90+msgctxt "Button: Reboot the system"
8391msgid "Reboot"
84−msgstr "Berrabiarazi"
92+msgstr ""
93+
94+#: qml/Components/Dialogs.qml:107
95+msgctxt "Button: Shut down the system"
96+msgid "Shut down"
97+msgstr ""
8598
86−#: qml/Components/Dialogs.qml:132
99+#: qml/Components/Dialogs.qml:127
100+msgctxt "Title: Reboot dialog"
101+msgid "Reboot"
102+msgstr ""
103+
104+#: qml/Components/Dialogs.qml:128
87105msgid "Are you sure you want to reboot?"
88106msgstr "Ziur berrabiarazi nahi duzula?"
89107
90−#: qml/Components/Dialogs.qml:154
108+#: qml/Components/Dialogs.qml:130
109+msgid "No"
110+msgstr "Ez"
111+
112+#: qml/Components/Dialogs.qml:136
113+msgid "Yes"
114+msgstr "Bai"
115+
116+#: qml/Components/Dialogs.qml:150
117+msgctxt "Title: Power off/Restart dialog"
91118msgid "Power"
92−msgstr "Piztu/itzali"
119+msgstr ""
93120
94−#: qml/Components/Dialogs.qml:155
121+#: qml/Components/Dialogs.qml:151
95122msgid ""
96123"Are you sure you would like\n"
97124"to power off?"
98125msgstr "Ziur itzali nahi duzula?"
99126
100−#: qml/Components/Dialogs.qml:157
127+#: qml/Components/Dialogs.qml:153
128+msgctxt "Button: Power off the system"
101129msgid "Power off"
102−msgstr "Itzali"
103−
104−#: qml/Components/Dialogs.qml:166
105−msgid "Restart"
106−msgstr "Berrabiarazi"
107−
108−#: qml/Components/Dialogs.qml:175
109−msgid "Cancel"
110−msgstr "Utzi"
111−
112−#: qml/Components/EdgeDemoOverlay.qml:151
113−msgid "Skip intro"
114−msgstr "Saltatu aurkezpena"
115−
116−#: qml/Components/EdgeDemo.qml:125
117−msgid "Right edge"
118−msgstr "Eskuineko ertza"
119−
120−#: qml/Components/EdgeDemo.qml:126
121−msgid "Try swiping from the right edge to unlock the phone"
122130msgstr ""
123−"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
124131
125−#: qml/Components/EdgeDemo.qml:157
126−msgid "Top edge"
127−msgstr "Goiko ertza"
128−
129−#: qml/Components/EdgeDemo.qml:158
130−msgid "Try swiping from the top edge to access the indicators"
131−msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
132−
133−#: qml/Components/EdgeDemo.qml:183
134−msgid "Close"
135−msgstr "Itxi"
136−
137−#: qml/Components/EdgeDemo.qml:184
138−msgid "Swipe up again to close the settings screen"
139−msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
140−
141−#: qml/Components/EdgeDemo.qml:214
142−msgid "Left edge"
143−msgstr "Ezkerreko ertza"
144−
145−#: qml/Components/EdgeDemo.qml:215
146−msgid "Swipe from the left to reveal the launcher for quick access to apps"
147−msgstr ""
148−"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
149−"izateko"
150−
151−#: qml/Components/EdgeDemo.qml:242
152−msgid "Well done"
153−msgstr "Bikain"
154−
155−#: qml/Components/EdgeDemo.qml:243
156−msgid ""
157−"You have now mastered the edge gestures and can start using the "
158−"phone<br><br>Tap on the screen to start"
132+#: qml/Components/Dialogs.qml:162
133+msgctxt "Button: Restart the system"
134+msgid "Restart"
159135msgstr ""
160−"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
161−"zaitezke<br><br>Sakatu pantailan hasteko"
162136
163137#: qml/Components/Lockscreen.qml:238
164138msgid "Return to Call"
@@ -172,32 +146,39 @@ msgstr "Larrialdi-deia"
172146msgid "OK"
173147msgstr "Ados"
174148
175−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
149+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
176150msgid "See less"
177151msgstr "Ikusi gutxiago"
178152
179−#: qml/Dash/GenericScopeView.qml:485
153+#: qml/Dash/GenericScopeView.qml:533
180154msgid "See all"
181155msgstr "Ikusi guztiak"
182156
183−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
184−#: qml/Panel/SearchIndicator.qml:27
157+#: qml/Dash/GenericScopeView.qml:595
158+msgctxt "Label: Hint for dash search line edit"
185159msgid "Search"
186−msgstr "Bilatu"
160+msgstr ""
187161
188−#: qml/Dash/PageHeader.qml:267
162+#: qml/Dash/PageHeader.qml:269
163+msgctxt "Button: Open the Ubuntu Store"
189164msgid "Store"
190−msgstr "Denda"
165+msgstr ""
166+
167+#: qml/Dash/PageHeader.qml:276
168+msgctxt "Button: Start a search in the current dash scope"
169+msgid "Search"
170+msgstr ""
191171
192−#: qml/Dash/PageHeader.qml:284
172+#: qml/Dash/PageHeader.qml:286
173+msgctxt "Button: Show the current dash scope settings"
193174msgid "Settings"
194−msgstr "Ezarpenak"
175+msgstr ""
195176
196−#: qml/Dash/PageHeader.qml:291
177+#: qml/Dash/PageHeader.qml:293
197178msgid "Remove from Favorites"
198179msgstr "Kendu gogokoetatik"
199180
200−#: qml/Dash/PageHeader.qml:291
181+#: qml/Dash/PageHeader.qml:293
201182msgid "Add to Favorites"
202183msgstr "Gehitu gogokoetara"
203184
@@ -229,6 +210,10 @@ msgstr "Tiratu freskatzeko…"
229210msgid "Release to refresh…"
230211msgstr "Askatu freskatzeko…"
231212
213+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
214+msgid "Enable location data"
215+msgstr ""
216+
232217#: qml/Dash/ScopesList.qml:66
233218msgid "Manage"
234219msgstr "Kudeatu"
@@ -241,10 +226,76 @@ msgstr "Hasiera"
241226msgid "Also installed"
242227msgstr "Hau ere instalatuta"
243228
244−#: qml/Greeter/Greeter.qml:133
229+#: qml/Greeter/CoverPage.qml:107
245230msgid "Unlock"
246231msgstr "Desblokeatu"
247232
233+#: qml/Greeter/LoginList.qml:236
234+msgid "Retry"
235+msgstr ""
236+
237+#: qml/Greeter/LoginList.qml:237
238+msgid "Tap to unlock"
239+msgstr ""
240+
241+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
242+msgid "Sorry, incorrect passphrase."
243+msgstr "Sentitzen dugu, pasaesaldia okerra da."
244+
245+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
246+msgid "Sorry, incorrect passcode."
247+msgstr "Sentitzen dugu, pasakodea okerra da."
248+
249+#: qml/Greeter/NarrowView.qml:55
250+msgid "This will be your last attempt."
251+msgstr "Hau duzu azken saiakera."
252+
253+#: qml/Greeter/NarrowView.qml:57
254+msgid ""
255+"If passphrase is entered incorrectly, your phone will conduct a factory "
256+"reset and all personal data will be deleted."
257+msgstr ""
258+"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
259+"berrezarri eta datu pertsonal guztiak ezabatuko dira."
260+
261+#: qml/Greeter/NarrowView.qml:58
262+msgid ""
263+"If passcode is entered incorrectly, your phone will conduct a factory reset "
264+"and all personal data will be deleted."
265+msgstr ""
266+"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
267+"berrezarri eta datu pertsonal guztiak ezabatuko dira."
268+
269+#: qml/Greeter/NarrowView.qml:115
270+#, qt-format
271+msgid "Enter %1"
272+msgstr "Sartu %1"
273+
274+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
275+msgid "Enter passphrase"
276+msgstr "Sartu pasaesaldia"
277+
278+#: qml/Greeter/NarrowView.qml:117
279+msgid "Enter passcode"
280+msgstr "Sartu pasakodea"
281+
282+#: qml/Greeter/NarrowView.qml:118
283+#, qt-format
284+msgid "Sorry, incorrect %1"
285+msgstr "Sentitzen dugu, %1 okerra da"
286+
287+#: qml/Greeter/NarrowView.qml:119
288+msgid "Sorry, incorrect passphrase"
289+msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
290+
291+#: qml/Greeter/NarrowView.qml:120
292+msgid "Please re-enter"
293+msgstr "Errepikatu"
294+
295+#: qml/Greeter/NarrowView.qml:121
296+msgid "Sorry, incorrect passcode"
297+msgstr "Sentitzen dugu, pasakodea okerra da"
298+
248299#: qml/Notifications/NotificationMenuItemFactory.qml:128
249300msgid "Show password"
250301msgstr "Erakutsi pasahitza"
@@ -286,6 +337,7 @@ msgid "Failed, tap to retry"
286337msgstr "Huts egin du, sakatu berriro saiatzeko"
287338
288339#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
340+msgctxt "Label: Hint in message indicator line edit"
289341msgid "Reply"
290342msgstr ""
291343
@@ -297,67 +349,62 @@ msgstr "Desblokeatu SIMa"
297349msgid "Roaming"
298350msgstr "Ibiltaritza"
299351
300−#: qml/Shell.qml:390
301−#, qt-format
302−msgid "Enter %1"
303−msgstr "Sartu %1"
352+#: qml/Tutorial/TutorialBottomFinish.qml:24
353+msgid "This action does different things for different apps"
354+msgstr ""
304355
305−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
306−msgid "Enter passphrase"
307−msgstr "Sartu pasaesaldia"
356+#: qml/Tutorial/TutorialBottomFinish.qml:25
357+msgid "Tap here to finish."
358+msgstr ""
308359
309−#: qml/Shell.qml:392
310−msgid "Enter passcode"
311−msgstr "Sartu pasakodea"
360+#: qml/Tutorial/TutorialBottom.qml:28
361+msgid "Open special menus"
362+msgstr ""
312363
313−#: qml/Shell.qml:393
314−#, qt-format
315−msgid "Sorry, incorrect %1"
316−msgstr "Sentitzen dugu, %1 okerra da"
364+#: qml/Tutorial/TutorialBottom.qml:29
365+msgid "Swipe up from the bottom edge."
366+msgstr ""
317367
318−#: qml/Shell.qml:394
319−msgid "Sorry, incorrect passphrase"
320−msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
368+#: qml/Tutorial/TutorialLeftFinish.qml:24
369+msgid "These are the shortcuts to favorite apps"
370+msgstr ""
321371
322−#: qml/Shell.qml:395
323−msgid "Please re-enter"
324−msgstr "Errepikatu"
372+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
373+msgid "Tap here to continue."
374+msgstr ""
325375
326−#: qml/Shell.qml:396
327−msgid "Sorry, incorrect passcode"
328−msgstr "Sentitzen dugu, pasakodea okerra da"
376+#: qml/Tutorial/TutorialLeft.qml:26
377+msgid "Open the launcher"
378+msgstr ""
329379
330−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
331−msgid "Sorry, incorrect passphrase."
332−msgstr "Sentitzen dugu, pasaesaldia okerra da."
380+#: qml/Tutorial/TutorialLeft.qml:27
381+msgid "Short swipe from the left edge."
382+msgstr ""
333383
334−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
335−msgid "Sorry, incorrect passcode."
336−msgstr "Sentitzen dugu, pasakodea okerra da."
384+#: qml/Tutorial/TutorialPage.qml:178
385+msgid "You almost got it!"
386+msgstr ""
337387
338−#: qml/Shell.qml:492
339−msgid "This will be your last attempt."
340−msgstr "Hau duzu azken saiakera."
388+#: qml/Tutorial/TutorialPage.qml:195
389+msgid "Try again."
390+msgstr ""
341391
342−#: qml/Shell.qml:494
343−msgid ""
344−"If passphrase is entered incorrectly, your phone will conduct a factory "
345−"reset and all personal data will be deleted."
392+#: qml/Tutorial/TutorialRight.qml:31
393+msgid "To view open apps"
346394msgstr ""
347−"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
348−"berrezarri eta datu pertsonal guztiak ezabatuko dira."
349395
350−#: qml/Shell.qml:495
351−msgid ""
352−"If passcode is entered incorrectly, your phone will conduct a factory reset "
353−"and all personal data will be deleted."
396+#: qml/Tutorial/TutorialRight.qml:32
397+msgid "Long swipe from the right edge."
398+msgstr ""
399+
400+#: qml/Tutorial/TutorialRight.qml:122
401+msgid "View all your running tasks."
354402msgstr ""
355−"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
356−"berrezarri eta datu pertsonal guztiak ezabatuko dira."
357403
358404#: qml/Wizard/Page.qml:89
405+msgctxt "Button: Go back one page in the Wizard"
359406msgid "Back"
360−msgstr "Atzera"
407+msgstr ""
361408
362409#: qml/Wizard/Pages/10-welcome.qml:27
363410msgid "Hi!"
@@ -372,7 +419,7 @@ msgid "Let’s get started."
372419msgstr "Has gaitezen."
373420
374421#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
375−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
422+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
376423#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
377424#: qml/Wizard/Pages/passwd-set.qml:90
378425msgid "Continue"
@@ -382,11 +429,11 @@ msgstr "Jarraitu"
382429msgid "Add a SIM card and restart your device"
383430msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
384431
385−#: qml/Wizard/Pages/20-sim.qml:55
432+#: qml/Wizard/Pages/20-sim.qml:59
386433msgid "Without it, you won’t be able to make calls or use text messaging."
387434msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."
388435
389−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
390437msgid "Skip"
391438msgstr "Saltatu"
392439
@@ -399,38 +446,44 @@ msgid "Please select how you’d like to unlock your phone."
399446msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
400447
401448#: qml/Wizard/Pages/30-passwd-type.qml:97
449+msgctxt "Label: Type of security method"
402450msgid "Swipe"
403−msgstr "Pasatu hatza"
451+msgstr ""
404452
405453#: qml/Wizard/Pages/30-passwd-type.qml:98
454+msgctxt "Label: Description of security method"
406455msgid "No security"
407−msgstr "Segurtasunik gabe"
456+msgstr ""
408457
409458#: qml/Wizard/Pages/30-passwd-type.qml:100
459+msgctxt "Label: Type of security method"
410460msgid "Passcode"
411−msgstr "Pasakodea"
461+msgstr ""
412462
413463#: qml/Wizard/Pages/30-passwd-type.qml:101
464+msgctxt "Label: Description of security method"
414465msgid "4 digits only"
415−msgstr "4 digitu soilik"
466+msgstr ""
416467
417468#: qml/Wizard/Pages/30-passwd-type.qml:103
469+msgctxt "Label: Type of security method"
418470msgid "Passphrase"
419−msgstr "Pasaesaldia"
471+msgstr ""
420472
421473#: qml/Wizard/Pages/30-passwd-type.qml:104
474+msgctxt "Label: Description of security method"
422475msgid "Numbers and letters"
423−msgstr "Zenbakiak eta hizkiak"
476+msgstr ""
424477
425−#: qml/Wizard/Pages/40-wifi.qml:28
478+#: qml/Wizard/Pages/40-wifi.qml:29
426479msgid "Connect to Wi‑Fi"
427480msgstr "Konektatu wifira"
428481
429−#: qml/Wizard/Pages/40-wifi.qml:147
482+#: qml/Wizard/Pages/40-wifi.qml:168
430483msgid "Available networks…"
431484msgstr "Sare erabilgarriak…"
432485
433−#: qml/Wizard/Pages/40-wifi.qml:148
486+#: qml/Wizard/Pages/40-wifi.qml:169
434487msgid "No available networks."
435488msgstr "Ez dago sare erabilgarririk."
436489
@@ -540,6 +593,24 @@ msgstr "〈 %1"
540593msgid "%1 〉"
541594msgstr "%1 〉"
542595
596+#~ msgid "Top edge"
597+#~ msgstr "Goiko ertza"
598+
599+#~ msgid "Close"
600+#~ msgstr "Itxi"
601+
602+#~ msgid "Left edge"
603+#~ msgstr "Ezkerreko ertza"
604+
605+#~ msgid "Well done"
606+#~ msgstr "Bikain"
607+
608+#~ msgid "Skip intro"
609+#~ msgstr "Saltatu aurkezpena"
610+
611+#~ msgid "Right edge"
612+#~ msgstr "Eskuineko ertza"
613+
543614#~ msgid "Type or say a command"
544615#~ msgstr "Idatzi edo esan agindu bat"
545616
@@ -552,6 +623,41 @@ msgstr "%1 〉"
552623#~ msgid "Speaking..."
553624#~ msgstr "Hitz egiten..."
554625
626+#~ msgid "Search"
627+#~ msgstr "Bilatu"
628+
629+#~ msgid ""
630+#~ "You have now mastered the edge gestures and can start using the "
631+#~ "phone<br><br>Tap on the screen to start"
632+#~ msgstr ""
633+#~ "Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
634+#~ "zaitezke<br><br>Sakatu pantailan hasteko"
635+
636+#~ msgid "Try swiping from the top edge to access the indicators"
637+#~ msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
638+
639+#~ msgid "Swipe up again to close the settings screen"
640+#~ msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
641+
642+#~ msgid "Try swiping from the right edge to unlock the phone"
643+#~ msgstr ""
644+#~ "Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
645+
646+#~ msgid "Log out"
647+#~ msgstr "Amaitu saioa"
648+
649+#~ msgid "Reboot"
650+#~ msgstr "Berrabiarazi"
651+
652+#~ msgid "Shut down"
653+#~ msgstr "Itzali"
654+
655+#~ msgid "Settings"
656+#~ msgstr "Ezarpenak"
657+
658+#~ msgid "Power off"
659+#~ msgstr "Itzali"
660+
555661#~ msgid "Done"
556662#~ msgstr "Eginda"
557663
@@ -561,6 +667,20 @@ msgstr "%1 〉"
561667#~ msgid "Favorites"
562668#~ msgstr "Gogokoak"
563669
670+#~ msgid "Store"
671+#~ msgstr "Denda"
672+
673+#~ msgid "Restart"
674+#~ msgstr "Berrabiarazi"
675+
676+#~ msgid "Power"
677+#~ msgstr "Piztu/itzali"
678+
679+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
680+#~ msgstr ""
681+#~ "Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
682+#~ "izateko"
683+
564684#~ msgid "Confirm"
565685#~ msgstr "Berretsi"
566686
po/fa.po+266−146
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-02-04 01:20+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-04-10 03:18+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: 2015-02-05 07:41+0000\n"
19−"X-Generator: Launchpad (build 17331)\n"
18+"X-Launchpad-Export-Date: 2015-04-14 05:33+0000\n"
19+"X-Generator: Launchpad (build 17423)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "گذرواژه: "
2424
@@ -31,64 +31,91 @@ msgstr "سنجاق کردن میانبر"
3131msgid "Unpin shortcut"
3232msgstr "برداشتن سنجاق میانبر"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "دستگاه قفل شد"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."
4242
43−#: qml/Components/DelayedLockscreen.qml:63
43+#: qml/Components/DelayedLockscreen.qml:65
4444msgid "You have been locked out due to too many failed passcode attempts."
4545msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."
4646
47−#: qml/Components/DelayedLockscreen.qml:72
47+#: qml/Components/DelayedLockscreen.qml:74
4848#, qt-format
4949msgid "Please wait %1 minute and then try again…"
5050msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr "خروج از حساب"
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr "مطمئنید که می‌خواهید از حساب خارج شوید"
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
64−msgstr "خیر"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
65+msgstr "قفل"
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
69−msgstr "بله"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr "خروج"
7071
71−#: qml/Components/Dialogs.qml:108
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
75+msgstr "لغو"
76+
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr "خاموش کردن"
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
88+msgid "Reboot"
89+msgstr "راه‌اندازی دوباره"
90+
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
94+msgstr "خاموش"
95+
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
8098msgid "Reboot"
81−msgstr "راه‌اندازی مجدّد"
99+msgstr "راه‌اندازی دوباره"
82100
83−#: qml/Components/Dialogs.qml:132
101+#: qml/Components/Dialogs.qml:128
84102msgid "Are you sure you want to reboot?"
85103msgstr "مطمئنید که می‌خواهید مجدّداً راه‌اندازی کنسد؟"
86104
87−#: qml/Components/Dialogs.qml:154
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
107+msgstr "خیر"
108+
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
111+msgstr "بله"
112+
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
88115msgid "Power"
89−msgstr "توان"
116+msgstr "انرژی"
90117
91−#: qml/Components/Dialogs.qml:155
118+#: qml/Components/Dialogs.qml:151
92119msgid ""
93120"Are you sure you would like\n"
94121"to power off?"
@@ -96,65 +123,15 @@ msgstr ""
96123"آیا مطمئن هستید که\n"
97124"می‌خواهید خاموش کنید؟"
98125
99−#: qml/Components/Dialogs.qml:157
126+#: qml/Components/Dialogs.qml:153
127+msgctxt "Button: Power off the system"
100128msgid "Power off"
101129msgstr "خاموش کردن"
102130
103−#: qml/Components/Dialogs.qml:166
131+#: qml/Components/Dialogs.qml:162
132+msgctxt "Button: Restart the system"
104133msgid "Restart"
105−msgstr "شروع مجدّد"
106−
107−#: qml/Components/Dialogs.qml:175
108−msgid "Cancel"
109−msgstr "لغو"
110−
111−#: qml/Components/EdgeDemoOverlay.qml:151
112−msgid "Skip intro"
113−msgstr "پرش از مقدّمه"
114−
115−#: qml/Components/EdgeDemo.qml:125
116−msgid "Right edge"
117−msgstr "لبه‌ی راست"
118−
119−#: qml/Components/EdgeDemo.qml:126
120−msgid "Try swiping from the right edge to unlock the phone"
121−msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
122−
123−#: qml/Components/EdgeDemo.qml:157
124−msgid "Top edge"
125−msgstr "لبه‌ی بالا"
126−
127−#: qml/Components/EdgeDemo.qml:158
128−msgid "Try swiping from the top edge to access the indicators"
129−msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
130−
131−#: qml/Components/EdgeDemo.qml:183
132−msgid "Close"
133−msgstr "بستن"
134−
135−#: qml/Components/EdgeDemo.qml:184
136−msgid "Swipe up again to close the settings screen"
137−msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
138−
139−#: qml/Components/EdgeDemo.qml:214
140−msgid "Left edge"
141−msgstr "لبه‌ی چپ"
142−
143−#: qml/Components/EdgeDemo.qml:215
144−msgid "Swipe from the left to reveal the launcher for quick access to apps"
145−msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
146−
147−#: qml/Components/EdgeDemo.qml:242
148−msgid "Well done"
149−msgstr "عالی بود"
150−
151−#: qml/Components/EdgeDemo.qml:243
152−msgid ""
153−"You have now mastered the edge gestures and can start using the "
154−"phone<br><br>Tap on the screen to start"
155−msgstr ""
156−"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
157−"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
134+msgstr "راه‌اندازی دوباره"
158135
159136#: qml/Components/Lockscreen.qml:238
160137msgid "Return to Call"
@@ -168,32 +145,39 @@ msgstr "تماس اضطراری"
168145msgid "OK"
169146msgstr "قبول"
170147
171−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
148+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
172149msgid "See less"
173150msgstr "کم‌تر ببینید"
174151
175−#: qml/Dash/GenericScopeView.qml:485
152+#: qml/Dash/GenericScopeView.qml:533
176153msgid "See all"
177154msgstr "دیدن همه"
178155
179−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180−#: qml/Panel/SearchIndicator.qml:27
156+#: qml/Dash/GenericScopeView.qml:595
157+msgctxt "Label: Hint for dash search line edit"
181158msgid "Search"
182159msgstr "جست‌وجو"
183160
184−#: qml/Dash/PageHeader.qml:267
161+#: qml/Dash/PageHeader.qml:269
162+msgctxt "Button: Open the Ubuntu Store"
185163msgid "Store"
186−msgstr "فروشگاه"
164+msgstr "ذخیره"
165+
166+#: qml/Dash/PageHeader.qml:276
167+msgctxt "Button: Start a search in the current dash scope"
168+msgid "Search"
169+msgstr "جست‌وجو"
187170
188−#: qml/Dash/PageHeader.qml:284
171+#: qml/Dash/PageHeader.qml:286
172+msgctxt "Button: Show the current dash scope settings"
189173msgid "Settings"
190174msgstr "تنظیمات"
191175
192−#: qml/Dash/PageHeader.qml:291
176+#: qml/Dash/PageHeader.qml:293
193177msgid "Remove from Favorites"
194178msgstr "برداشتن از برگزیده‌ها"
195179
196−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
197181msgid "Add to Favorites"
198182msgstr "افزودن به برگزیده‌ها"
199183
@@ -225,6 +209,10 @@ msgstr "برای تازه‌سازی بکشید…"
225209msgid "Release to refresh…"
226210msgstr "برای تازه‌سازی رها کنید…"
227211
212+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
213+msgid "Enable location data"
214+msgstr "فعّال کردن داده‌های موقعیّت"
215+
228216#: qml/Dash/ScopesList.qml:66
229217msgid "Manage"
230218msgstr "مدیریت"
@@ -237,10 +225,76 @@ msgstr "خانه"
237225msgid "Also installed"
238226msgstr "هم‌چنین نصب شده"
239227
240−#: qml/Greeter/Greeter.qml:133
228+#: qml/Greeter/CoverPage.qml:107
241229msgid "Unlock"
242230msgstr "بازکردن قفل"
243231
232+#: qml/Greeter/LoginList.qml:236
233+msgid "Retry"
234+msgstr "تلاش دوباره"
235+
236+#: qml/Greeter/LoginList.qml:237
237+msgid "Tap to unlock"
238+msgstr "برای باز کردن قفل ضربه بزنید"
239+
240+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
241+msgid "Sorry, incorrect passphrase."
242+msgstr "متأسّفیم، عبارت‌عبور نادرست است."
243+
244+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
245+msgid "Sorry, incorrect passcode."
246+msgstr "متأسّفیم، رمزعبور نادرست است."
247+
248+#: qml/Greeter/NarrowView.qml:55
249+msgid "This will be your last attempt."
250+msgstr "این آخرین تلاش شما خواهد بود."
251+
252+#: qml/Greeter/NarrowView.qml:57
253+msgid ""
254+"If passphrase is entered incorrectly, your phone will conduct a factory "
255+"reset and all personal data will be deleted."
256+msgstr ""
257+"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
258+"اطّلاعات شخصی حذف خواهند شد."
259+
260+#: qml/Greeter/NarrowView.qml:58
261+msgid ""
262+"If passcode is entered incorrectly, your phone will conduct a factory reset "
263+"and all personal data will be deleted."
264+msgstr ""
265+"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
266+"اطّلاعات شخصی حذف خواهند شد."
267+
268+#: qml/Greeter/NarrowView.qml:115
269+#, qt-format
270+msgid "Enter %1"
271+msgstr "%1 را وارد کنید"
272+
273+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
274+msgid "Enter passphrase"
275+msgstr "عبارت‌عبور را وارد کنید"
276+
277+#: qml/Greeter/NarrowView.qml:117
278+msgid "Enter passcode"
279+msgstr "رمزعبور را وارد کنید"
280+
281+#: qml/Greeter/NarrowView.qml:118
282+#, qt-format
283+msgid "Sorry, incorrect %1"
284+msgstr "متأسّفیم، %1 نادرست بود"
285+
286+#: qml/Greeter/NarrowView.qml:119
287+msgid "Sorry, incorrect passphrase"
288+msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
289+
290+#: qml/Greeter/NarrowView.qml:120
291+msgid "Please re-enter"
292+msgstr "لطفاً دوباره وارد کنید"
293+
294+#: qml/Greeter/NarrowView.qml:121
295+msgid "Sorry, incorrect passcode"
296+msgstr "متأسّفیم، رمزعبور نادرست بود"
297+
244298#: qml/Notifications/NotificationMenuItemFactory.qml:128
245299msgid "Show password"
246300msgstr "نمایش گذرواژه"
@@ -282,8 +336,9 @@ msgid "Failed, tap to retry"
282336msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
283337
284338#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
339+msgctxt "Label: Hint in message indicator line edit"
285340msgid "Reply"
286−msgstr "پاسخ"
341+msgstr "پاسخ دادن"
287342
288343#: qml/Panel/Indicators/ModemInfoItem.qml:105
289344msgid "Unlock SIM"
@@ -293,65 +348,60 @@ msgstr "باز کردن قفل سیم‌کارت"
293348msgid "Roaming"
294349msgstr "رومینگ"
295350
296−#: qml/Shell.qml:390
297−#, qt-format
298−msgid "Enter %1"
299−msgstr "%1 را وارد کنید"
351+#: qml/Tutorial/TutorialBottomFinish.qml:24
352+msgid "This action does different things for different apps"
353+msgstr "این عمل برای اپ‌های مختلف، کارهای متفاوتی انجام می‌دهد"
300354
301−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
302−msgid "Enter passphrase"
303−msgstr "عبارت‌عبور را وارد کنید"
355+#: qml/Tutorial/TutorialBottomFinish.qml:25
356+msgid "Tap here to finish."
357+msgstr "برای پایان این‌جا را بزنید"
304358
305−#: qml/Shell.qml:392
306−msgid "Enter passcode"
307−msgstr "رمزعبور را وارد کنید"
359+#: qml/Tutorial/TutorialBottom.qml:28
360+msgid "Open special menus"
361+msgstr "باز کردن فهرست‌های مخصوص"
308362
309−#: qml/Shell.qml:393
310−#, qt-format
311−msgid "Sorry, incorrect %1"
312−msgstr "متأسّفیم، %1 نادرست بود"
363+#: qml/Tutorial/TutorialBottom.qml:29
364+msgid "Swipe up from the bottom edge."
365+msgstr "از لبه‌ی پایینی به سمت بالا بکشید."
313366
314−#: qml/Shell.qml:394
315−msgid "Sorry, incorrect passphrase"
316−msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
367+#: qml/Tutorial/TutorialLeftFinish.qml:24
368+msgid "These are the shortcuts to favorite apps"
369+msgstr "این‌ها میان‌برهایی به برنامه‌های برگزیده هستند"
317370
318−#: qml/Shell.qml:395
319−msgid "Please re-enter"
320−msgstr "لطفاً دوباره وارد کنید"
371+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
372+msgid "Tap here to continue."
373+msgstr "برای ادامه این‌جا را بزنید"
321374
322−#: qml/Shell.qml:396
323−msgid "Sorry, incorrect passcode"
324−msgstr "متأسّفیم، رمزعبور نادرست بود"
375+#: qml/Tutorial/TutorialLeft.qml:26
376+msgid "Open the launcher"
377+msgstr "گشودن اجراگر"
325378
326−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327−msgid "Sorry, incorrect passphrase."
328−msgstr "متأسّفیم، عبارت‌عبور نادرست است."
379+#: qml/Tutorial/TutorialLeft.qml:27
380+msgid "Short swipe from the left edge."
381+msgstr "از لبه‌ی چپ، کوتاه بکشید."
329382
330−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331−msgid "Sorry, incorrect passcode."
332−msgstr "متأسّفیم، رمزعبور نادرست است."
383+#: qml/Tutorial/TutorialPage.qml:178
384+msgid "You almost got it!"
385+msgstr "تقریباً یاد گرفتید!"
333386
334−#: qml/Shell.qml:492
335−msgid "This will be your last attempt."
336−msgstr "این آخرین تلاش شما خواهد بود."
387+#: qml/Tutorial/TutorialPage.qml:195
388+msgid "Try again."
389+msgstr "دوباره تلاش کنید."
337390
338−#: qml/Shell.qml:494
339−msgid ""
340−"If passphrase is entered incorrectly, your phone will conduct a factory "
341−"reset and all personal data will be deleted."
342−msgstr ""
343−"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
344−"اطّلاعات شخصی حذف خواهند شد."
391+#: qml/Tutorial/TutorialRight.qml:31
392+msgid "To view open apps"
393+msgstr "برای دیدن برنامه‌های باز"
345394
346−#: qml/Shell.qml:495
347−msgid ""
348−"If passcode is entered incorrectly, your phone will conduct a factory reset "
349−"and all personal data will be deleted."
350−msgstr ""
351−"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
352−"اطّلاعات شخصی حذف خواهند شد."
395+#: qml/Tutorial/TutorialRight.qml:32
396+msgid "Long swipe from the right edge."
397+msgstr "از لبه‌ی راست، بلند بکشید."
398+
399+#: qml/Tutorial/TutorialRight.qml:122
400+msgid "View all your running tasks."
401+msgstr "همه‌ی وظایف در حال اجرایتان را ببینید."
353402
354403#: qml/Wizard/Page.qml:89
404+msgctxt "Button: Go back one page in the Wizard"
355405msgid "Back"
356406msgstr "بازگشت"
357407
@@ -368,7 +418,7 @@ msgid "Let’s get started."
368418msgstr "بیایید شروع کینم."
369419
370420#: 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
421+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
372422#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373423#: qml/Wizard/Pages/passwd-set.qml:90
374424msgid "Continue"
@@ -378,12 +428,12 @@ msgstr "ادامه"
378428msgid "Add a SIM card and restart your device"
379429msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"
380430
381−#: qml/Wizard/Pages/20-sim.qml:55
431+#: qml/Wizard/Pages/20-sim.qml:59
382432msgid "Without it, you won’t be able to make calls or use text messaging."
383433msgstr ""
384434"بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."
385435
386−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
436+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
387437msgid "Skip"
388438msgstr "پرش"
389439
@@ -396,38 +446,44 @@ msgid "Please select how you’d like to unlock your phone."
396446msgstr "لطفاً برگزینید که می‌خواهید چگونه قفل تلفنتان را باز کنید."
397447
398448#: qml/Wizard/Pages/30-passwd-type.qml:97
449+msgctxt "Label: Type of security method"
399450msgid "Swipe"
400451msgstr "لغزش"
401452
402453#: qml/Wizard/Pages/30-passwd-type.qml:98
454+msgctxt "Label: Description of security method"
403455msgid "No security"
404−msgstr "بدون امنیت"
456+msgstr "هیچ امنیتی نیست"
405457
406458#: qml/Wizard/Pages/30-passwd-type.qml:100
459+msgctxt "Label: Type of security method"
407460msgid "Passcode"
408461msgstr "رمزعبور"
409462
410463#: qml/Wizard/Pages/30-passwd-type.qml:101
464+msgctxt "Label: Description of security method"
411465msgid "4 digits only"
412466msgstr "فقط ۴ رقم"
413467
414468#: qml/Wizard/Pages/30-passwd-type.qml:103
469+msgctxt "Label: Type of security method"
415470msgid "Passphrase"
416471msgstr "عبارت‌عبور"
417472
418473#: qml/Wizard/Pages/30-passwd-type.qml:104
474+msgctxt "Label: Description of security method"
419475msgid "Numbers and letters"
420476msgstr "اعداد و حروف"
421477
422−#: qml/Wizard/Pages/40-wifi.qml:28
478+#: qml/Wizard/Pages/40-wifi.qml:29
423479msgid "Connect to Wi‑Fi"
424480msgstr "اتّصال به بی‌سیم"
425481
426−#: qml/Wizard/Pages/40-wifi.qml:147
482+#: qml/Wizard/Pages/40-wifi.qml:168
427483msgid "Available networks…"
428484msgstr "شبکه‌های موجود…"
429485
430−#: qml/Wizard/Pages/40-wifi.qml:148
486+#: qml/Wizard/Pages/40-wifi.qml:169
431487msgid "No available networks."
432488msgstr "هیچ شبکه‌ای موجود نیست."
433489
@@ -536,9 +592,46 @@ msgstr "〈 %1"
536592msgid "%1 〉"
537593msgstr "%1 〉"
538594
595+#~ msgid "Right edge"
596+#~ msgstr "لبه‌ی راست"
597+
598+#~ msgid "Top edge"
599+#~ msgstr "لبه‌ی بالا"
600+
601+#~ msgid "Well done"
602+#~ msgstr "عالی بود"
603+
539604#~ msgid "Type or say a command"
540605#~ msgstr "دستوری را بنویسید یا بگویید"
541606
607+#~ msgid "Left edge"
608+#~ msgstr "لبه‌ی چپ"
609+
610+#~ msgid "Try swiping from the top edge to access the indicators"
611+#~ msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
612+
613+#~ msgid "Close"
614+#~ msgstr "بستن"
615+
616+#~ msgid "Swipe up again to close the settings screen"
617+#~ msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
618+
619+#~ msgid "Skip intro"
620+#~ msgstr "پرش از مقدّمه"
621+
622+#~ msgid "Try swiping from the right edge to unlock the phone"
623+#~ msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
624+
625+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
626+#~ msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
627+
628+#~ msgid ""
629+#~ "You have now mastered the edge gestures and can start using the "
630+#~ "phone<br><br>Tap on the screen to start"
631+#~ msgstr ""
632+#~ "هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
633+#~ "از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
634+
542635#~ msgid "Confirm"
543636#~ msgstr "تأیید"
544637
@@ -551,14 +644,41 @@ msgstr "%1 〉"
551644#~ msgid "Speak Now..."
552645#~ msgstr "اکنون صحبت کنید…"
553646
647+#~ msgid "Search"
648+#~ msgstr "جست‌وجو"
649+
554650#~ msgid "All"
555651#~ msgstr "همه"
556652
557653#~ msgid "Favorites"
558654#~ msgstr "برگزیده‌ها"
559655
656+#~ msgid "Store"
657+#~ msgstr "فروشگاه"
658+
659+#~ msgid "Power off"
660+#~ msgstr "خاموش کردن"
661+
560662#~ msgid "Done"
561663#~ msgstr "انجام شد"
562664
665+#~ msgid "Power"
666+#~ msgstr "توان"
667+
668+#~ msgid "Log out"
669+#~ msgstr "خروج از حساب"
670+
671+#~ msgid "Reboot"
672+#~ msgstr "راه‌اندازی مجدّد"
673+
674+#~ msgid "Shut down"
675+#~ msgstr "خاموش کردن"
676+
677+#~ msgid "Settings"
678+#~ msgstr "تنظیمات"
679+
680+#~ msgid "Restart"
681+#~ msgstr "شروع مجدّد"
682+
563683#~ msgid "Manage Scopes"
564684#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+262−142
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-01-29 09:21+0000\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-25 07:55+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: 2015-01-30 07:08+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-26 05:27+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Salasana: "
2424
@@ -31,66 +31,93 @@ msgstr "Kiinnitä pikakuvake"
3131msgid "Unpin shortcut"
3232msgstr "Poista pikakuvakkeen kiinnitys"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Laite on lukittu"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."
4242
43−#: qml/Components/DelayedLockscreen.qml:63
43+#: qml/Components/DelayedLockscreen.qml:65
4444msgid "You have been locked out due to too many failed passcode attempts."
4545msgstr ""
4646"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."
4747
48−#: qml/Components/DelayedLockscreen.qml:72
48+#: qml/Components/DelayedLockscreen.qml:74
4949#, qt-format
5050msgid "Please wait %1 minute and then try again…"
5151msgid_plural "Please wait %1 minutes and then try again…"
5252msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
5353msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
5454
55−#: qml/Components/Dialogs.qml:86
55+#: qml/Components/Dialogs.qml:67
56+msgctxt "Title: Lock/Log out dialog"
5657msgid "Log out"
5758msgstr "Kirjaudu ulos"
5859
59−#: qml/Components/Dialogs.qml:87
60+#: qml/Components/Dialogs.qml:68
6061msgid "Are you sure you want to log out?"
6162msgstr "Haluatko varmasti kirjautua ulos?"
6263
63−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
64−#: qml/Components/Dialogs.qml:134
65−msgid "No"
66−msgstr "Ei"
64+#: qml/Components/Dialogs.qml:70
65+msgctxt "Button: Lock the system"
66+msgid "Lock"
67+msgstr "Lukitse"
6768
68−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
69−#: qml/Components/Dialogs.qml:140
70−msgid "Yes"
71−msgstr "Kyllä"
69+#: qml/Components/Dialogs.qml:77
70+msgctxt "Button: Log out from the system"
71+msgid "Log Out"
72+msgstr "Kirjaudu ulos"
7273
73−#: qml/Components/Dialogs.qml:108
74+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
75+#: qml/Components/Dialogs.qml:171
76+msgid "Cancel"
77+msgstr "Peru"
78+
79+#: qml/Components/Dialogs.qml:96
80+msgctxt "Title: Reboot/Shut down dialog"
7481msgid "Shut down"
7582msgstr "Sammuta"
7683
77−#: qml/Components/Dialogs.qml:109
84+#: qml/Components/Dialogs.qml:97
7885msgid "Are you sure you want to shut down?"
7986msgstr "Haluatko varmasti sammuttaa laitteen?"
8087
81−#: qml/Components/Dialogs.qml:131
88+#: qml/Components/Dialogs.qml:99
89+msgctxt "Button: Reboot the system"
90+msgid "Reboot"
91+msgstr "Käynnistä uudelleen"
92+
93+#: qml/Components/Dialogs.qml:107
94+msgctxt "Button: Shut down the system"
95+msgid "Shut down"
96+msgstr "Sammuta"
97+
98+#: qml/Components/Dialogs.qml:127
99+msgctxt "Title: Reboot dialog"
82100msgid "Reboot"
83101msgstr "Käynnistä uudelleen"
84102
85−#: qml/Components/Dialogs.qml:132
103+#: qml/Components/Dialogs.qml:128
86104msgid "Are you sure you want to reboot?"
87105msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"
88106
89−#: qml/Components/Dialogs.qml:154
107+#: qml/Components/Dialogs.qml:130
108+msgid "No"
109+msgstr "Ei"
110+
111+#: qml/Components/Dialogs.qml:136
112+msgid "Yes"
113+msgstr "Kyllä"
114+
115+#: qml/Components/Dialogs.qml:150
116+msgctxt "Title: Power off/Restart dialog"
90117msgid "Power"
91−msgstr "Virran katkaisu"
118+msgstr "Sammutus"
92119
93−#: qml/Components/Dialogs.qml:155
120+#: qml/Components/Dialogs.qml:151
94121msgid ""
95122"Are you sure you would like\n"
96123"to power off?"
@@ -98,66 +125,16 @@ msgstr ""
98125"Haluatko varmasti\n"
99126"sammuttaa laitteen?"
100127
101−#: qml/Components/Dialogs.qml:157
128+#: qml/Components/Dialogs.qml:153
129+msgctxt "Button: Power off the system"
102130msgid "Power off"
103131msgstr "Sammuta"
104132
105−#: qml/Components/Dialogs.qml:166
133+#: qml/Components/Dialogs.qml:162
134+msgctxt "Button: Restart the system"
106135msgid "Restart"
107136msgstr "Käynnistä uudelleen"
108137
109−#: qml/Components/Dialogs.qml:175
110−msgid "Cancel"
111−msgstr "Peru"
112−
113−#: qml/Components/EdgeDemoOverlay.qml:151
114−msgid "Skip intro"
115−msgstr "Ohita esittely"
116−
117−#: qml/Components/EdgeDemo.qml:125
118−msgid "Right edge"
119−msgstr "Oikea reuna"
120−
121−#: qml/Components/EdgeDemo.qml:126
122−msgid "Try swiping from the right edge to unlock the phone"
123−msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
124−
125−#: qml/Components/EdgeDemo.qml:157
126−msgid "Top edge"
127−msgstr "Yläreuna"
128−
129−#: qml/Components/EdgeDemo.qml:158
130−msgid "Try swiping from the top edge to access the indicators"
131−msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
132−
133−#: qml/Components/EdgeDemo.qml:183
134−msgid "Close"
135−msgstr "Sulje"
136−
137−#: qml/Components/EdgeDemo.qml:184
138−msgid "Swipe up again to close the settings screen"
139−msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
140−
141−#: qml/Components/EdgeDemo.qml:214
142−msgid "Left edge"
143−msgstr "Vasen reuna"
144−
145−#: qml/Components/EdgeDemo.qml:215
146−msgid "Swipe from the left to reveal the launcher for quick access to apps"
147−msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
148−
149−#: qml/Components/EdgeDemo.qml:242
150−msgid "Well done"
151−msgstr "Hyvin tehty"
152−
153−#: qml/Components/EdgeDemo.qml:243
154−msgid ""
155−"You have now mastered the edge gestures and can start using the "
156−"phone<br><br>Tap on the screen to start"
157−msgstr ""
158−"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
159−"käytön<br><br>Napauta näyttöä aloittaaksesi"
160−
161138#: qml/Components/Lockscreen.qml:238
162139msgid "Return to Call"
163140msgstr "Palaa puheluun"
@@ -170,32 +147,39 @@ msgstr "Hätäpuhelu"
170147msgid "OK"
171148msgstr "OK"
172149
173−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
150+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
174151msgid "See less"
175152msgstr "Näytä vähemmän"
176153
177−#: qml/Dash/GenericScopeView.qml:485
154+#: qml/Dash/GenericScopeView.qml:533
178155msgid "See all"
179156msgstr "Näytä kaikki"
180157
181−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
182−#: qml/Panel/SearchIndicator.qml:27
158+#: qml/Dash/GenericScopeView.qml:595
159+msgctxt "Label: Hint for dash search line edit"
183160msgid "Search"
184−msgstr "Hae"
161+msgstr "Etsi"
185162
186−#: qml/Dash/PageHeader.qml:267
163+#: qml/Dash/PageHeader.qml:269
164+msgctxt "Button: Open the Ubuntu Store"
187165msgid "Store"
188166msgstr "Kauppa"
189167
190−#: qml/Dash/PageHeader.qml:284
168+#: qml/Dash/PageHeader.qml:276
169+msgctxt "Button: Start a search in the current dash scope"
170+msgid "Search"
171+msgstr "Etsi"
172+
173+#: qml/Dash/PageHeader.qml:286
174+msgctxt "Button: Show the current dash scope settings"
191175msgid "Settings"
192176msgstr "Asetukset"
193177
194−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
195179msgid "Remove from Favorites"
196180msgstr "Poista suosikeista"
197181
198−#: qml/Dash/PageHeader.qml:291
182+#: qml/Dash/PageHeader.qml:293
199183msgid "Add to Favorites"
200184msgstr "Lisää suosikkeihin"
201185
@@ -227,6 +211,10 @@ msgstr "Vedä päivittääksesi…"
227211msgid "Release to refresh…"
228212msgstr "Vapauta päivittääksesi…"
229213
214+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
215+msgid "Enable location data"
216+msgstr "Käytä sijaintitietoa"
217+
230218#: qml/Dash/ScopesList.qml:66
231219msgid "Manage"
232220msgstr "Hallitse"
@@ -239,10 +227,76 @@ msgstr "Koti"
239227msgid "Also installed"
240228msgstr "Myös asennettu"
241229
242−#: qml/Greeter/Greeter.qml:133
230+#: qml/Greeter/CoverPage.qml:107
243231msgid "Unlock"
244232msgstr "Avaa lukitus"
245233
234+#: qml/Greeter/LoginList.qml:236
235+msgid "Retry"
236+msgstr "Yritä uudelleen"
237+
238+#: qml/Greeter/LoginList.qml:237
239+msgid "Tap to unlock"
240+msgstr "Napauta avataksesi lukituksen"
241+
242+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
243+msgid "Sorry, incorrect passphrase."
244+msgstr "Virheellinen tunnuslause."
245+
246+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
247+msgid "Sorry, incorrect passcode."
248+msgstr "Virheellinen suojakoodi."
249+
250+#: qml/Greeter/NarrowView.qml:55
251+msgid "This will be your last attempt."
252+msgstr "Tämä on viimeinen yritys."
253+
254+#: qml/Greeter/NarrowView.qml:57
255+msgid ""
256+"If passphrase is entered incorrectly, your phone will conduct a factory "
257+"reset and all personal data will be deleted."
258+msgstr ""
259+"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
260+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
261+
262+#: qml/Greeter/NarrowView.qml:58
263+msgid ""
264+"If passcode is entered incorrectly, your phone will conduct a factory reset "
265+"and all personal data will be deleted."
266+msgstr ""
267+"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
268+"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
269+
270+#: qml/Greeter/NarrowView.qml:115
271+#, qt-format
272+msgid "Enter %1"
273+msgstr "Anna %1"
274+
275+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
276+msgid "Enter passphrase"
277+msgstr "Anna tunnuslause"
278+
279+#: qml/Greeter/NarrowView.qml:117
280+msgid "Enter passcode"
281+msgstr "Anna suojakoodi"
282+
283+#: qml/Greeter/NarrowView.qml:118
284+#, qt-format
285+msgid "Sorry, incorrect %1"
286+msgstr "Väärä %1"
287+
288+#: qml/Greeter/NarrowView.qml:119
289+msgid "Sorry, incorrect passphrase"
290+msgstr "Virheellinen tunnuslause"
291+
292+#: qml/Greeter/NarrowView.qml:120
293+msgid "Please re-enter"
294+msgstr "Anna uudelleen"
295+
296+#: qml/Greeter/NarrowView.qml:121
297+msgid "Sorry, incorrect passcode"
298+msgstr "Väärä suojakoodi"
299+
246300#: qml/Notifications/NotificationMenuItemFactory.qml:128
247301msgid "Show password"
248302msgstr "Näytä salasana"
@@ -284,6 +338,7 @@ msgid "Failed, tap to retry"
284338msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
285339
286340#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
341+msgctxt "Label: Hint in message indicator line edit"
287342msgid "Reply"
288343msgstr "Vastaa"
289344
@@ -295,65 +350,60 @@ msgstr "Avaa SIM-kortin lukitus"
295350msgid "Roaming"
296351msgstr "Verkkovierailu"
297352
298−#: qml/Shell.qml:390
299−#, qt-format
300−msgid "Enter %1"
301−msgstr "Anna %1"
353+#: qml/Tutorial/TutorialBottomFinish.qml:24
354+msgid "This action does different things for different apps"
355+msgstr "Tämä toiminto tekee eri asioita eri sovelluksissa"
302356
303−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
304−msgid "Enter passphrase"
305−msgstr "Anna tunnuslause"
357+#: qml/Tutorial/TutorialBottomFinish.qml:25
358+msgid "Tap here to finish."
359+msgstr "Napauta tästä viimeistelläksesi."
306360
307−#: qml/Shell.qml:392
308−msgid "Enter passcode"
309−msgstr "Anna suojakoodi"
361+#: qml/Tutorial/TutorialBottom.qml:28
362+msgid "Open special menus"
363+msgstr "Avaa erikoisvalikot"
310364
311−#: qml/Shell.qml:393
312−#, qt-format
313−msgid "Sorry, incorrect %1"
314−msgstr "Väärä %1"
365+#: qml/Tutorial/TutorialBottom.qml:29
366+msgid "Swipe up from the bottom edge."
367+msgstr "Vedä pyyhkäisy alareunasta."
315368
316−#: qml/Shell.qml:394
317−msgid "Sorry, incorrect passphrase"
318−msgstr "Virheellinen tunnuslause"
369+#: qml/Tutorial/TutorialLeftFinish.qml:24
370+msgid "These are the shortcuts to favorite apps"
371+msgstr "Nämä ovat pikakuvakkeet suosikkisovelluksiisi."
319372
320−#: qml/Shell.qml:395
321−msgid "Please re-enter"
322−msgstr "Anna uudelleen"
373+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
374+msgid "Tap here to continue."
375+msgstr "Napauta tästä jatkaaksesi."
323376
324−#: qml/Shell.qml:396
325−msgid "Sorry, incorrect passcode"
326−msgstr "Väärä suojakoodi"
377+#: qml/Tutorial/TutorialLeft.qml:26
378+msgid "Open the launcher"
379+msgstr "Avaa käynnistin"
327380
328−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
329−msgid "Sorry, incorrect passphrase."
330−msgstr "Virheellinen tunnuslause."
381+#: qml/Tutorial/TutorialLeft.qml:27
382+msgid "Short swipe from the left edge."
383+msgstr "Lyhyt pyyhkäisy vasemmasta reunasta."
331384
332−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
333−msgid "Sorry, incorrect passcode."
334−msgstr "Virheellinen suojakoodi."
385+#: qml/Tutorial/TutorialPage.qml:178
386+msgid "You almost got it!"
387+msgstr "Melkein!"
335388
336−#: qml/Shell.qml:492
337−msgid "This will be your last attempt."
338−msgstr "Tämä on viimeinen yritys."
389+#: qml/Tutorial/TutorialPage.qml:195
390+msgid "Try again."
391+msgstr "Yritä uudelleen."
339392
340−#: qml/Shell.qml:494
341−msgid ""
342−"If passphrase is entered incorrectly, your phone will conduct a factory "
343−"reset and all personal data will be deleted."
344−msgstr ""
345−"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
346−"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
393+#: qml/Tutorial/TutorialRight.qml:31
394+msgid "To view open apps"
395+msgstr "Nähdäksesi avoinna olevat sovellukset"
347396
348−#: qml/Shell.qml:495
349−msgid ""
350−"If passcode is entered incorrectly, your phone will conduct a factory reset "
351−"and all personal data will be deleted."
352−msgstr ""
353−"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
354−"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
397+#: qml/Tutorial/TutorialRight.qml:32
398+msgid "Long swipe from the right edge."
399+msgstr "Pitkä pyyhkäisy oikeasta reunasta."
400+
401+#: qml/Tutorial/TutorialRight.qml:122
402+msgid "View all your running tasks."
403+msgstr "Näytä kaikki käynnissä olevat tehtävät."
355404
356405#: qml/Wizard/Page.qml:89
406+msgctxt "Button: Go back one page in the Wizard"
357407msgid "Back"
358408msgstr "Takaisin"
359409
@@ -370,7 +420,7 @@ msgid "Let’s get started."
370420msgstr "Aloitetaanpa."
371421
372422#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
373−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
423+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
374424#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375425#: qml/Wizard/Pages/passwd-set.qml:90
376426msgid "Continue"
@@ -380,13 +430,13 @@ msgstr "Jatka"
380430msgid "Add a SIM card and restart your device"
381431msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
382432
383−#: qml/Wizard/Pages/20-sim.qml:55
433+#: qml/Wizard/Pages/20-sim.qml:59
384434msgid "Without it, you won’t be able to make calls or use text messaging."
385435msgstr ""
386436"Ilman sitä et voi soittaa tai vastaanottaa puheluja tai käyttää "
387437"tekstiviestejä."
388438
389−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
439+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
390440msgid "Skip"
391441msgstr "Ohita"
392442
@@ -399,38 +449,44 @@ msgid "Please select how you’d like to unlock your phone."
399449msgstr "Valitse puhelimen lukituksen avaustapa."
400450
401451#: qml/Wizard/Pages/30-passwd-type.qml:97
452+msgctxt "Label: Type of security method"
402453msgid "Swipe"
403454msgstr "Pyyhkäisy"
404455
405456#: qml/Wizard/Pages/30-passwd-type.qml:98
457+msgctxt "Label: Description of security method"
406458msgid "No security"
407459msgstr "Ei suojausta"
408460
409461#: qml/Wizard/Pages/30-passwd-type.qml:100
462+msgctxt "Label: Type of security method"
410463msgid "Passcode"
411464msgstr "Suojakoodi"
412465
413466#: qml/Wizard/Pages/30-passwd-type.qml:101
467+msgctxt "Label: Description of security method"
414468msgid "4 digits only"
415469msgstr "Vain 4 numeroa"
416470
417471#: qml/Wizard/Pages/30-passwd-type.qml:103
472+msgctxt "Label: Type of security method"
418473msgid "Passphrase"
419474msgstr "Salasana"
420475
421476#: qml/Wizard/Pages/30-passwd-type.qml:104
477+msgctxt "Label: Description of security method"
422478msgid "Numbers and letters"
423479msgstr "Numerot ja kirjaimet"
424480
425−#: qml/Wizard/Pages/40-wifi.qml:28
481+#: qml/Wizard/Pages/40-wifi.qml:29
426482msgid "Connect to Wi‑Fi"
427483msgstr "Yhdistä wifi-verkkoon"
428484
429−#: qml/Wizard/Pages/40-wifi.qml:147
485+#: qml/Wizard/Pages/40-wifi.qml:168
430486msgid "Available networks…"
431487msgstr "Käytettävissä olevat verkot…"
432488
433−#: qml/Wizard/Pages/40-wifi.qml:148
489+#: qml/Wizard/Pages/40-wifi.qml:169
434490msgid "No available networks."
435491msgstr "Ei käytettävissä olevia verkkoja."
436492
@@ -549,17 +605,81 @@ msgstr "%1 〉"
549605#~ msgid "Speaking..."
550606#~ msgstr "Puhutaan..."
551607
608+#~ msgid "Search"
609+#~ msgstr "Hae"
610+
552611#~ msgid "Loading. Please Wait..."
553612#~ msgstr "Ladataan, pieni hetki..."
554613
614+#~ msgid "Top edge"
615+#~ msgstr "Yläreuna"
616+
617+#~ msgid "Try swiping from the top edge to access the indicators"
618+#~ msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
619+
620+#~ msgid "Close"
621+#~ msgstr "Sulje"
622+
623+#~ msgid "Swipe up again to close the settings screen"
624+#~ msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
625+
626+#~ msgid "Left edge"
627+#~ msgstr "Vasen reuna"
628+
629+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
630+#~ msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
631+
632+#~ msgid "Well done"
633+#~ msgstr "Hyvin tehty"
634+
635+#~ msgid "Skip intro"
636+#~ msgstr "Ohita esittely"
637+
638+#~ msgid "Try swiping from the right edge to unlock the phone"
639+#~ msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
640+
641+#~ msgid "Right edge"
642+#~ msgstr "Oikea reuna"
643+
644+#~ msgid ""
645+#~ "You have now mastered the edge gestures and can start using the "
646+#~ "phone<br><br>Tap on the screen to start"
647+#~ msgstr ""
648+#~ "Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
649+#~ "käytön<br><br>Napauta näyttöä aloittaaksesi"
650+
555651#~ msgid "All"
556652#~ msgstr "Kaikki"
557653
558654#~ msgid "Favorites"
559655#~ msgstr "Suosikit"
560656
657+#~ msgid "Store"
658+#~ msgstr "Kauppa"
659+
660+#~ msgid "Power off"
661+#~ msgstr "Sammuta"
662+
561663#~ msgid "Done"
562664#~ msgstr "Valmis"
563665
666+#~ msgid "Log out"
667+#~ msgstr "Kirjaudu ulos"
668+
669+#~ msgid "Reboot"
670+#~ msgstr "Käynnistä uudelleen"
671+
672+#~ msgid "Shut down"
673+#~ msgstr "Sammuta"
674+
675+#~ msgid "Settings"
676+#~ msgstr "Asetukset"
677+
678+#~ msgid "Power"
679+#~ msgstr "Virran katkaisu"
680+
681+#~ msgid "Restart"
682+#~ msgstr "Käynnistä uudelleen"
683+
564684#~ msgid "Manage Scopes"
565685#~ msgstr "Näkymien hallinta"
po/fo.po+186−119
@@ -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: 2015-01-22 11:09+0100\n"
10+"POT-Creation-Date: 2015-03-19 16:03+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,10 +15,10 @@ 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: 2015-01-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17306)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr ""
2424
@@ -31,125 +31,104 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:67
54+msgctxt "Title: Lock/Log out dialog"
5455msgid "Log out"
5556msgstr ""
5657
57−#: qml/Components/Dialogs.qml:87
58+#: qml/Components/Dialogs.qml:68
5859msgid "Are you sure you want to log out?"
5960msgstr ""
6061
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
62+#: qml/Components/Dialogs.qml:70
63+msgctxt "Button: Lock the system"
64+msgid "Lock"
6465msgstr ""
6566
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
67+#: qml/Components/Dialogs.qml:77
68+msgctxt "Button: Log out from the system"
69+msgid "Log Out"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
73+#: qml/Components/Dialogs.qml:171
74+msgid "Cancel"
6975msgstr ""
7076
71−#: qml/Components/Dialogs.qml:108
77+#: qml/Components/Dialogs.qml:96
78+msgctxt "Title: Reboot/Shut down dialog"
7279msgid "Shut down"
7380msgstr ""
7481
75−#: qml/Components/Dialogs.qml:109
82+#: qml/Components/Dialogs.qml:97
7683msgid "Are you sure you want to shut down?"
7784msgstr ""
7885
79−#: qml/Components/Dialogs.qml:131
86+#: qml/Components/Dialogs.qml:99
87+msgctxt "Button: Reboot the system"
8088msgid "Reboot"
8189msgstr ""
8290
83−#: qml/Components/Dialogs.qml:132
84−msgid "Are you sure you want to reboot?"
85−msgstr ""
86−
87−#: qml/Components/Dialogs.qml:154
88−msgid "Power"
89−msgstr ""
90−
91−#: qml/Components/Dialogs.qml:155
92−msgid ""
93−"Are you sure you would like\n"
94−"to power off?"
95−msgstr ""
96−
97−#: qml/Components/Dialogs.qml:157
98−msgid "Power off"
99−msgstr ""
100−
101−#: qml/Components/Dialogs.qml:166
102−msgid "Restart"
103−msgstr ""
104−
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109−#: qml/Components/EdgeDemoOverlay.qml:151
110−msgid "Skip intro"
91+#: qml/Components/Dialogs.qml:107
92+msgctxt "Button: Shut down the system"
93+msgid "Shut down"
11194msgstr ""
11295
113−#: qml/Components/EdgeDemo.qml:125
114−msgid "Right edge"
115−msgstr "Høgra kant"
116−
117−#: qml/Components/EdgeDemo.qml:126
118−msgid "Try swiping from the right edge to unlock the phone"
96+#: qml/Components/Dialogs.qml:127
97+msgctxt "Title: Reboot dialog"
98+msgid "Reboot"
11999msgstr ""
120100
121−#: qml/Components/EdgeDemo.qml:157
122−msgid "Top edge"
123−msgstr "Topp kantur"
124−
125−#: qml/Components/EdgeDemo.qml:158
126−msgid "Try swiping from the top edge to access the indicators"
101+#: qml/Components/Dialogs.qml:128
102+msgid "Are you sure you want to reboot?"
127103msgstr ""
128104
129−#: qml/Components/EdgeDemo.qml:183
130−msgid "Close"
105+#: qml/Components/Dialogs.qml:130
106+msgid "No"
131107msgstr ""
132108
133−#: qml/Components/EdgeDemo.qml:184
134−msgid "Swipe up again to close the settings screen"
109+#: qml/Components/Dialogs.qml:136
110+msgid "Yes"
135111msgstr ""
136112
137−#: qml/Components/EdgeDemo.qml:214
138−msgid "Left edge"
113+#: qml/Components/Dialogs.qml:150
114+msgctxt "Title: Power off/Restart dialog"
115+msgid "Power"
139116msgstr ""
140117
141−#: qml/Components/EdgeDemo.qml:215
142−msgid "Swipe from the left to reveal the launcher for quick access to apps"
118+#: qml/Components/Dialogs.qml:151
119+msgid ""
120+"Are you sure you would like\n"
121+"to power off?"
143122msgstr ""
144123
145−#: qml/Components/EdgeDemo.qml:242
146−msgid "Well done"
124+#: qml/Components/Dialogs.qml:153
125+msgctxt "Button: Power off the system"
126+msgid "Power off"
147127msgstr ""
148128
149−#: qml/Components/EdgeDemo.qml:243
150−msgid ""
151−"You have now mastered the edge gestures and can start using the "
152−"phone<br><br>Tap on the screen to start"
129+#: qml/Components/Dialogs.qml:162
130+msgctxt "Button: Restart the system"
131+msgid "Restart"
153132msgstr ""
154133
155134#: qml/Components/Lockscreen.qml:238
@@ -164,32 +143,39 @@ msgstr ""
164143msgid "OK"
165144msgstr ""
166145
167−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
146+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
168147msgid "See less"
169148msgstr ""
170149
171−#: qml/Dash/GenericScopeView.qml:485
150+#: qml/Dash/GenericScopeView.qml:533
172151msgid "See all"
173152msgstr ""
174153
175−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176−#: qml/Panel/SearchIndicator.qml:27
154+#: qml/Dash/GenericScopeView.qml:595
155+msgctxt "Label: Hint for dash search line edit"
177156msgid "Search"
178−msgstr "Leita"
157+msgstr ""
179158
180−#: qml/Dash/PageHeader.qml:267
159+#: qml/Dash/PageHeader.qml:269
160+msgctxt "Button: Open the Ubuntu Store"
181161msgid "Store"
182162msgstr ""
183163
184−#: qml/Dash/PageHeader.qml:284
164+#: qml/Dash/PageHeader.qml:276
165+msgctxt "Button: Start a search in the current dash scope"
166+msgid "Search"
167+msgstr ""
168+
169+#: qml/Dash/PageHeader.qml:286
170+msgctxt "Button: Show the current dash scope settings"
185171msgid "Settings"
186172msgstr ""
187173
188−#: qml/Dash/PageHeader.qml:291
174+#: qml/Dash/PageHeader.qml:293
189175msgid "Remove from Favorites"
190176msgstr ""
191177
192−#: qml/Dash/PageHeader.qml:291
178+#: qml/Dash/PageHeader.qml:293
193179msgid "Add to Favorites"
194180msgstr ""
195181
@@ -221,6 +207,10 @@ msgstr ""
221207msgid "Release to refresh…"
222208msgstr ""
223209
210+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
211+msgid "Enable location data"
212+msgstr ""
213+
224214#: qml/Dash/ScopesList.qml:66
225215msgid "Manage"
226216msgstr ""
@@ -233,10 +223,72 @@ msgstr ""
233223msgid "Also installed"
234224msgstr ""
235225
236−#: qml/Greeter/Greeter.qml:133
226+#: qml/Greeter/CoverPage.qml:107
237227msgid "Unlock"
238228msgstr ""
239229
230+#: qml/Greeter/LoginList.qml:236
231+msgid "Retry"
232+msgstr ""
233+
234+#: qml/Greeter/LoginList.qml:237
235+msgid "Tap to unlock"
236+msgstr ""
237+
238+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
239+msgid "Sorry, incorrect passphrase."
240+msgstr ""
241+
242+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
243+msgid "Sorry, incorrect passcode."
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:55
247+msgid "This will be your last attempt."
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:57
251+msgid ""
252+"If passphrase is entered incorrectly, your phone will conduct a factory "
253+"reset and all personal data will be deleted."
254+msgstr ""
255+
256+#: qml/Greeter/NarrowView.qml:58
257+msgid ""
258+"If passcode is entered incorrectly, your phone will conduct a factory reset "
259+"and all personal data will be deleted."
260+msgstr ""
261+
262+#: qml/Greeter/NarrowView.qml:115
263+#, qt-format
264+msgid "Enter %1"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
268+msgid "Enter passphrase"
269+msgstr ""
270+
271+#: qml/Greeter/NarrowView.qml:117
272+msgid "Enter passcode"
273+msgstr ""
274+
275+#: qml/Greeter/NarrowView.qml:118
276+#, qt-format
277+msgid "Sorry, incorrect %1"
278+msgstr ""
279+
280+#: qml/Greeter/NarrowView.qml:119
281+msgid "Sorry, incorrect passphrase"
282+msgstr ""
283+
284+#: qml/Greeter/NarrowView.qml:120
285+msgid "Please re-enter"
286+msgstr ""
287+
288+#: qml/Greeter/NarrowView.qml:121
289+msgid "Sorry, incorrect passcode"
290+msgstr ""
291+
240292#: qml/Notifications/NotificationMenuItemFactory.qml:128
241293msgid "Show password"
242294msgstr ""
@@ -278,6 +330,7 @@ msgid "Failed, tap to retry"
278330msgstr ""
279331
280332#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
333+msgctxt "Label: Hint in message indicator line edit"
281334msgid "Reply"
282335msgstr ""
283336
@@ -289,61 +342,60 @@ msgstr ""
289342msgid "Roaming"
290343msgstr ""
291344
292−#: qml/Shell.qml:390
293−#, qt-format
294−msgid "Enter %1"
345+#: qml/Tutorial/TutorialBottomFinish.qml:24
346+msgid "This action does different things for different apps"
295347msgstr ""
296348
297−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
298−msgid "Enter passphrase"
349+#: qml/Tutorial/TutorialBottomFinish.qml:25
350+msgid "Tap here to finish."
299351msgstr ""
300352
301−#: qml/Shell.qml:392
302−msgid "Enter passcode"
353+#: qml/Tutorial/TutorialBottom.qml:28
354+msgid "Open special menus"
303355msgstr ""
304356
305−#: qml/Shell.qml:393
306−#, qt-format
307−msgid "Sorry, incorrect %1"
357+#: qml/Tutorial/TutorialBottom.qml:29
358+msgid "Swipe up from the bottom edge."
308359msgstr ""
309360
310−#: qml/Shell.qml:394
311−msgid "Sorry, incorrect passphrase"
361+#: qml/Tutorial/TutorialLeftFinish.qml:24
362+msgid "These are the shortcuts to favorite apps"
312363msgstr ""
313364
314−#: qml/Shell.qml:395
315−msgid "Please re-enter"
365+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
366+msgid "Tap here to continue."
316367msgstr ""
317368
318−#: qml/Shell.qml:396
319−msgid "Sorry, incorrect passcode"
369+#: qml/Tutorial/TutorialLeft.qml:26
370+msgid "Open the launcher"
320371msgstr ""
321372
322−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323−msgid "Sorry, incorrect passphrase."
373+#: qml/Tutorial/TutorialLeft.qml:27
374+msgid "Short swipe from the left edge."
324375msgstr ""
325376
326−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327−msgid "Sorry, incorrect passcode."
377+#: qml/Tutorial/TutorialPage.qml:178
378+msgid "You almost got it!"
328379msgstr ""
329380
330−#: qml/Shell.qml:492
331−msgid "This will be your last attempt."
381+#: qml/Tutorial/TutorialPage.qml:195
382+msgid "Try again."
332383msgstr ""
333384
334−#: qml/Shell.qml:494
335−msgid ""
336−"If passphrase is entered incorrectly, your phone will conduct a factory "
337−"reset and all personal data will be deleted."
385+#: qml/Tutorial/TutorialRight.qml:31
386+msgid "To view open apps"
338387msgstr ""
339388
340−#: qml/Shell.qml:495
341−msgid ""
342−"If passcode is entered incorrectly, your phone will conduct a factory reset "
343−"and all personal data will be deleted."
389+#: qml/Tutorial/TutorialRight.qml:32
390+msgid "Long swipe from the right edge."
391+msgstr ""
392+
393+#: qml/Tutorial/TutorialRight.qml:122
394+msgid "View all your running tasks."
344395msgstr ""
345396
346397#: qml/Wizard/Page.qml:89
398+msgctxt "Button: Go back one page in the Wizard"
347399msgid "Back"
348400msgstr ""
349401
@@ -360,7 +412,7 @@ msgid "Let’s get started."
360412msgstr ""
361413
362414#: 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
415+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
364416#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365417#: qml/Wizard/Pages/passwd-set.qml:90
366418msgid "Continue"
@@ -370,11 +422,11 @@ msgstr ""
370422msgid "Add a SIM card and restart your device"
371423msgstr ""
372424
373−#: qml/Wizard/Pages/20-sim.qml:55
425+#: qml/Wizard/Pages/20-sim.qml:59
374426msgid "Without it, you won’t be able to make calls or use text messaging."
375427msgstr ""
376428
377−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
429+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
378430msgid "Skip"
379431msgstr ""
380432
@@ -387,38 +439,44 @@ msgid "Please select how you’d like to unlock your phone."
387439msgstr ""
388440
389441#: qml/Wizard/Pages/30-passwd-type.qml:97
442+msgctxt "Label: Type of security method"
390443msgid "Swipe"
391444msgstr ""
392445
393446#: qml/Wizard/Pages/30-passwd-type.qml:98
447+msgctxt "Label: Description of security method"
394448msgid "No security"
395449msgstr ""
396450
397451#: qml/Wizard/Pages/30-passwd-type.qml:100
452+msgctxt "Label: Type of security method"
398453msgid "Passcode"
399454msgstr ""
400455
401456#: qml/Wizard/Pages/30-passwd-type.qml:101
457+msgctxt "Label: Description of security method"
402458msgid "4 digits only"
403459msgstr ""
404460
405461#: qml/Wizard/Pages/30-passwd-type.qml:103
462+msgctxt "Label: Type of security method"
406463msgid "Passphrase"
407464msgstr ""
408465
409466#: qml/Wizard/Pages/30-passwd-type.qml:104
467+msgctxt "Label: Description of security method"
410468msgid "Numbers and letters"
411469msgstr ""
412470
413−#: qml/Wizard/Pages/40-wifi.qml:28
471+#: qml/Wizard/Pages/40-wifi.qml:29
414472msgid "Connect to Wi‑Fi"
415473msgstr ""
416474
417−#: qml/Wizard/Pages/40-wifi.qml:147
475+#: qml/Wizard/Pages/40-wifi.qml:168
418476msgid "Available networks…"
419477msgstr ""
420478
421−#: qml/Wizard/Pages/40-wifi.qml:148
479+#: qml/Wizard/Pages/40-wifi.qml:169
422480msgid "No available networks."
423481msgstr ""
424482
@@ -534,3 +592,12 @@ msgstr ""
534592
535593#~ msgid "Speaking..."
536594#~ msgstr "Snakkar..."
595+
596+#~ msgid "Search"
597+#~ msgstr "Leita"
598+
599+#~ msgid "Top edge"
600+#~ msgstr "Topp kantur"
601+
602+#~ msgid "Right edge"
603+#~ msgstr "Høgra kant"
po/fr.po+282−154
@@ -7,18 +7,18 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11−"PO-Revision-Date: 2015-02-03 20:11+0000\n"
12−"Last-Translator: Jean Marc <Unknown>\n"
10+"POT-Creation-Date: 2015-03-19 16:03+0100\n"
11+"PO-Revision-Date: 2015-03-19 21:55+0000\n"
12+"Last-Translator: Anne <anneonyme017@gmail.com>\n"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-02-04 07:13+0000\n"
19−"X-Generator: Launchpad (build 17331)\n"
18+"X-Launchpad-Export-Date: 2015-03-25 06:05+0000\n"
19+"X-Generator: Launchpad (build 17413)\n"
2020
21−#: plugins/LightDM/Greeter.cpp:130
21+#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
2323msgstr "Mot de passe : "
2424
@@ -31,68 +31,95 @@ msgstr "Épingler le raccourci"
3131msgid "Unpin shortcut"
3232msgstr "Détacher le raccourci"
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr "Périphérique verrouillé"
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
4242"d'une phrase de passe erronée."
4343
44−#: qml/Components/DelayedLockscreen.qml:63
44+#: qml/Components/DelayedLockscreen.qml:65
4545msgid "You have been locked out due to too many failed passcode attempts."
4646msgstr ""
4747"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
4848"d'un mot de passe erroné."
4949
50−#: qml/Components/DelayedLockscreen.qml:72
50+#: qml/Components/DelayedLockscreen.qml:74
5151#, qt-format
5252msgid "Please wait %1 minute and then try again…"
5353msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Veuillez patienter %1 minute et réessayer..."
5555msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
5656
57−#: qml/Components/Dialogs.qml:86
57+#: qml/Components/Dialogs.qml:67
58+msgctxt "Title: Lock/Log out dialog"
5859msgid "Log out"
59−msgstr "Se déconnecter"
60+msgstr "Fermer la session"
6061
61−#: qml/Components/Dialogs.qml:87
62+#: qml/Components/Dialogs.qml:68
6263msgid "Are you sure you want to log out?"
6364msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
6465
65−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66−#: qml/Components/Dialogs.qml:134
67−msgid "No"
68−msgstr "Non"
66+#: qml/Components/Dialogs.qml:70
67+msgctxt "Button: Lock the system"
68+msgid "Lock"
69+msgstr "Verrouiller"
6970
70−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71−#: qml/Components/Dialogs.qml:140
72−msgid "Yes"
73−msgstr "Oui"
71+#: qml/Components/Dialogs.qml:77
72+msgctxt "Button: Log out from the system"
73+msgid "Log Out"
74+msgstr "Fermer la session"
75+
76+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
77+#: qml/Components/Dialogs.qml:171
78+msgid "Cancel"
79+msgstr "Annuler"
7480
75−#: qml/Components/Dialogs.qml:108
81+#: qml/Components/Dialogs.qml:96
82+msgctxt "Title: Reboot/Shut down dialog"
7683msgid "Shut down"
7784msgstr "Éteindre"
7885
79−#: qml/Components/Dialogs.qml:109
86+#: qml/Components/Dialogs.qml:97
8087msgid "Are you sure you want to shut down?"
8188msgstr "Êtes-vous sûr de vouloir éteindre ?"
8289
83−#: qml/Components/Dialogs.qml:131
90+#: qml/Components/Dialogs.qml:99
91+msgctxt "Button: Reboot the system"
92+msgid "Reboot"
93+msgstr "Redémarrer"
94+
95+#: qml/Components/Dialogs.qml:107
96+msgctxt "Button: Shut down the system"
97+msgid "Shut down"
98+msgstr "Éteindre"
99+
100+#: qml/Components/Dialogs.qml:127
101+msgctxt "Title: Reboot dialog"
84102msgid "Reboot"
85103msgstr "Redémarrer"
86104
87−#: qml/Components/Dialogs.qml:132
105+#: qml/Components/Dialogs.qml:128
88106msgid "Are you sure you want to reboot?"
89107msgstr "Êtes-vous sûr de vouloir redémarrer ?"
90108
91−#: qml/Components/Dialogs.qml:154
109+#: qml/Components/Dialogs.qml:130
110+msgid "No"
111+msgstr "Non"
112+
113+#: qml/Components/Dialogs.qml:136
114+msgid "Yes"
115+msgstr "Oui"
116+
117+#: qml/Components/Dialogs.qml:150
118+msgctxt "Title: Power off/Restart dialog"
92119msgid "Power"
93120msgstr "Alimentation"
94121
95−#: qml/Components/Dialogs.qml:155
122+#: qml/Components/Dialogs.qml:151
96123msgid ""
97124"Are you sure you would like\n"
98125"to power off?"
@@ -100,73 +127,16 @@ msgstr ""
100127"Êtes-vous sûr de vouloir\n"
101128"couper l'alimentation ?"
102129
103−#: qml/Components/Dialogs.qml:157
130+#: qml/Components/Dialogs.qml:153
131+msgctxt "Button: Power off the system"
104132msgid "Power off"
105133msgstr "Éteindre"
106134
107−#: qml/Components/Dialogs.qml:166
135+#: qml/Components/Dialogs.qml:162
136+msgctxt "Button: Restart the system"
108137msgid "Restart"
109138msgstr "Redémarrer"
110139
111−#: qml/Components/Dialogs.qml:175
112−msgid "Cancel"
113−msgstr "Annuler"
114−
115−#: qml/Components/EdgeDemoOverlay.qml:151
116−msgid "Skip intro"
117−msgstr "Passer l'intro"
118−
119−#: qml/Components/EdgeDemo.qml:125
120−msgid "Right edge"
121−msgstr "Bord droit"
122−
123−#: qml/Components/EdgeDemo.qml:126
124−msgid "Try swiping from the right edge to unlock the phone"
125−msgstr ""
126−"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
127−
128−#: qml/Components/EdgeDemo.qml:157
129−msgid "Top edge"
130−msgstr "Bord supérieur"
131−
132−#: qml/Components/EdgeDemo.qml:158
133−msgid "Try swiping from the top edge to access the indicators"
134−msgstr ""
135−"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
136−"indicateurs."
137−
138−#: qml/Components/EdgeDemo.qml:183
139−msgid "Close"
140−msgstr "Fermer"
141−
142−#: qml/Components/EdgeDemo.qml:184
143−msgid "Swipe up again to close the settings screen"
144−msgstr ""
145−"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
146−"l'écran des paramètres"
147−
148−#: qml/Components/EdgeDemo.qml:214
149−msgid "Left edge"
150−msgstr "Bord gauche"
151−
152−#: qml/Components/EdgeDemo.qml:215
153−msgid "Swipe from the left to reveal the launcher for quick access to apps"
154−msgstr ""
155−"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
156−"d'applications."
157−
158−#: qml/Components/EdgeDemo.qml:242
159−msgid "Well done"
160−msgstr "Félicitations"
161−
162−#: qml/Components/EdgeDemo.qml:243
163−msgid ""
164−"You have now mastered the edge gestures and can start using the "
165−"phone<br><br>Tap on the screen to start"
166−msgstr ""
167−"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
168−"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
169−
170140#: qml/Components/Lockscreen.qml:238
171141msgid "Return to Call"
172142msgstr "Retourner à l'appel"
@@ -179,32 +149,39 @@ msgstr "Appel d'urgence"
179149msgid "OK"
180150msgstr "OK"
181151
182−#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
152+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
183153msgid "See less"
184154msgstr "Voir moins"
185155
186−#: qml/Dash/GenericScopeView.qml:485
156+#: qml/Dash/GenericScopeView.qml:533
187157msgid "See all"
188158msgstr "Tout voir"
189159
190−#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
191−#: qml/Panel/SearchIndicator.qml:27
160+#: qml/Dash/GenericScopeView.qml:595
161+msgctxt "Label: Hint for dash search line edit"
192162msgid "Search"
193163msgstr "Rechercher"
194164
195−#: qml/Dash/PageHeader.qml:267
165+#: qml/Dash/PageHeader.qml:269
166+msgctxt "Button: Open the Ubuntu Store"
196167msgid "Store"
197−msgstr "Logithèque"
168+msgstr ""
198169
199−#: qml/Dash/PageHeader.qml:284
170+#: qml/Dash/PageHeader.qml:276
171+msgctxt "Button: Start a search in the current dash scope"
172+msgid "Search"
173+msgstr ""
174+
175+#: qml/Dash/PageHeader.qml:286
176+msgctxt "Button: Show the current dash scope settings"
200177msgid "Settings"
201−msgstr "Paramètres"
178+msgstr ""
202179
203−#: qml/Dash/PageHeader.qml:291
180+#: qml/Dash/PageHeader.qml:293
204181msgid "Remove from Favorites"
205182msgstr "Retirer des favoris"
206183
207−#: qml/Dash/PageHeader.qml:291
184+#: qml/Dash/PageHeader.qml:293
208185msgid "Add to Favorites"
209186msgstr "Ajouter aux favoris"
210187
@@ -236,6 +213,10 @@ msgstr "Tirer pour actualiser..."
236213msgid "Release to refresh…"
237214msgstr "Relâcher pour actualiser..."
238215
216+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
217+msgid "Enable location data"
218+msgstr "Activer les données de localisation"
219+
239220#: qml/Dash/ScopesList.qml:66
240221msgid "Manage"
241222msgstr "Gérer"
@@ -248,10 +229,78 @@ msgstr "Accueil"
248229msgid "Also installed"
249230msgstr "Également installées"
250231
251−#: qml/Greeter/Greeter.qml:133
232+#: qml/Greeter/CoverPage.qml:107
252233msgid "Unlock"
253234msgstr "Déverrouiller"
254235
236+#: qml/Greeter/LoginList.qml:236
237+msgid "Retry"
238+msgstr "Réessayer"
239+
240+#: qml/Greeter/LoginList.qml:237
241+msgid "Tap to unlock"
242+msgstr "Appuyer pour déverrouiller"
243+
244+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
245+msgid "Sorry, incorrect passphrase."
246+msgstr "Désolé, phrase secrète incorrecte."
247+
248+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
249+msgid "Sorry, incorrect passcode."
250+msgstr "Désolé, code incorrect."
251+
252+#: qml/Greeter/NarrowView.qml:55
253+msgid "This will be your last attempt."
254+msgstr "Ceci sera votre dernière tentative."
255+
256+#: qml/Greeter/NarrowView.qml:57
257+msgid ""
258+"If passphrase is entered incorrectly, your phone will conduct a factory "
259+"reset and all personal data will be deleted."
260+msgstr ""
261+"Si la phrase secrète est saisie de manière incorrecte, votre téléphone "
262+"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
263+"personnelles seront supprimées."
264+
265+#: qml/Greeter/NarrowView.qml:58
266+msgid ""
267+"If passcode is entered incorrectly, your phone will conduct a factory reset "
268+"and all personal data will be deleted."
269+msgstr ""
270+"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "
271+"réinitialisation aux paramètres d'usine et toutes les données personnelles "
272+"seront supprimées."
273+
274+#: qml/Greeter/NarrowView.qml:115
275+#, qt-format
276+msgid "Enter %1"
277+msgstr "Saisissez %1"
278+
279+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
280+msgid "Enter passphrase"
281+msgstr "Saisissez la phrase de passe"
282+
283+#: qml/Greeter/NarrowView.qml:117
284+msgid "Enter passcode"
285+msgstr "Saisissez le mot de passe"
286+
287+#: qml/Greeter/NarrowView.qml:118
288+#, qt-format
289+msgid "Sorry, incorrect %1"
290+msgstr "Désolé, %1 incorrect"
291+
292+#: qml/Greeter/NarrowView.qml:119
293+msgid "Sorry, incorrect passphrase"
294+msgstr "Désolé, phrase secrète incorrecte"
295+
296+#: qml/Greeter/NarrowView.qml:120
297+msgid "Please re-enter"
298+msgstr "Veuillez ressaisir"
299+
300+#: qml/Greeter/NarrowView.qml:121
301+msgid "Sorry, incorrect passcode"
302+msgstr "Désolé, code incorrect"
303+
255304#: qml/Notifications/NotificationMenuItemFactory.qml:128
256305msgid "Show password"
257306msgstr "Afficher le mot de passe"
@@ -293,6 +342,7 @@ msgid "Failed, tap to retry"
293342msgstr "Échec, appuyez pour réessayer"
294343
295344#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
345+msgctxt "Label: Hint in message indicator line edit"
296346msgid "Reply"
297347msgstr "Répondre"
298348
@@ -304,69 +354,62 @@ msgstr "Déverrouiller la carte SIM"
304354msgid "Roaming"
305355msgstr "Roaming"
306356
307−#: qml/Shell.qml:390
308−#, qt-format
309−msgid "Enter %1"
310−msgstr "Saisissez %1"
357+#: qml/Tutorial/TutorialBottomFinish.qml:24
358+msgid "This action does different things for different apps"
359+msgstr "Cette action fait différentes choses pour différentes applications"
311360
312−#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
313−msgid "Enter passphrase"
314−msgstr "Saisissez la phrase de passe"
361+#: qml/Tutorial/TutorialBottomFinish.qml:25
362+msgid "Tap here to finish."
363+msgstr "Appuyez ici pour terminer."
315364
316−#: qml/Shell.qml:392
317−msgid "Enter passcode"
318−msgstr "Saisissez le mot de passe"
365+#: qml/Tutorial/TutorialBottom.qml:28
366+msgid "Open special menus"
367+msgstr "Ouvrir les menus spéciaux"
319368
320−#: qml/Shell.qml:393
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr "Désolé, %1 incorrect"
369+#: qml/Tutorial/TutorialBottom.qml:29
370+msgid "Swipe up from the bottom edge."
371+msgstr "Glissez vers le haut à partir du bord inférieur."
324372
325−#: qml/Shell.qml:394
326−msgid "Sorry, incorrect passphrase"
327−msgstr "Désolé, phrase secrète incorrecte"
373+#: qml/Tutorial/TutorialLeftFinish.qml:24
374+msgid "These are the shortcuts to favorite apps"
375+msgstr "Ce sont les raccourcis vers vos applications favorites"
328376
329−#: qml/Shell.qml:395
330−msgid "Please re-enter"
331−msgstr "Veuillez ressaisir"
377+#: qml/Tutorial/TutorialLeftFinish.qml:25 qml/Tutorial/TutorialRight.qml:144
378+msgid "Tap here to continue."
379+msgstr "Appuyez ici pour continuer."
332380
333−#: qml/Shell.qml:396
334−msgid "Sorry, incorrect passcode"
335−msgstr "Désolé, code incorrect"
381+#: qml/Tutorial/TutorialLeft.qml:26
382+msgid "Open the launcher"
383+msgstr "Ouvrez le lanceur"
336384
337−#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
338−msgid "Sorry, incorrect passphrase."
339−msgstr "Désolé, phrase secrète incorrecte."
385+#: qml/Tutorial/TutorialLeft.qml:27
386+msgid "Short swipe from the left edge."
387+msgstr "Glissez doucement à partir du bord gauche."
340388
341−#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
342−msgid "Sorry, incorrect passcode."
343−msgstr "Désolé, code incorrect."
389+#: qml/Tutorial/TutorialPage.qml:178
390+msgid "You almost got it!"
391+msgstr "Vous y êtes presque !"
344392
345−#: qml/Shell.qml:492
346−msgid "This will be your last attempt."
347−msgstr "Ceci sera votre dernière tentative."
393+#: qml/Tutorial/TutorialPage.qml:195
394+msgid "Try again."
395+msgstr "Réessayez."
348396
349−#: qml/Shell.qml:494
350−msgid ""
351−"If passphrase is entered incorrectly, your phone will conduct a factory "
352−"reset and all personal data will be deleted."
353−msgstr ""
354−"Si la phrase secrète est saisie de manière incorrecte, votre téléphone "
355−"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
356−"personnelles seront supprimées."
397+#: qml/Tutorial/TutorialRight.qml:31
398+msgid "To view open apps"
399+msgstr "Pour voir les applications ouvertes"
357400
358−#: qml/Shell.qml:495
359−msgid ""
360−"If passcode is entered incorrectly, your phone will conduct a factory reset "
361−"and all personal data will be deleted."
362−msgstr ""
363−"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "
364−"réinitialisation aux paramètres d'usine et toutes les données personnelles "
365−"seront supprimées."
401+#: qml/Tutorial/TutorialRight.qml:32
402+msgid "Long swipe from the right edge."
403+msgstr "Glissez en maintenant à partir du bord droit."
404+
405+#: qml/Tutorial/TutorialRight.qml:122
406+msgid "View all your running tasks."
407+msgstr "Voir toutes les tâches en cours."
366408
367409#: qml/Wizard/Page.qml:89
410+msgctxt "Button: Go back one page in the Wizard"
368411msgid "Back"
369−msgstr "Retour"
412+msgstr "Précédent"
370413
371414#: qml/Wizard/Pages/10-welcome.qml:27
372415msgid "Hi!"
@@ -381,7 +424,7 @@ msgid "Let’s get started."
381424msgstr "Commençons."
382425
383426#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
384−#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
427+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
385428#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
386429#: qml/Wizard/Pages/passwd-set.qml:90
387430msgid "Continue"
@@ -391,13 +434,13 @@ msgstr "Continuer"
391434msgid "Add a SIM card and restart your device"
392435msgstr "Ajoutez une carte SIM et redémarrez votre appareil"
393436
394−#: qml/Wizard/Pages/20-sim.qml:55
437+#: qml/Wizard/Pages/20-sim.qml:59
395438msgid "Without it, you won’t be able to make calls or use text messaging."
396439msgstr ""
397440"Sans elle, vous ne serez pas en mesure de passer des appels ou d'envoyer des "
398441"SMS."
399442
400−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
443+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
401444msgid "Skip"
402445msgstr "Passer"
403446
@@ -411,38 +454,44 @@ msgstr ""
411454"Veuillez sélectionner comment vous souhaitez déverrouiller votre téléphone."
412455
413456#: qml/Wizard/Pages/30-passwd-type.qml:97
457+msgctxt "Label: Type of security method"
414458msgid "Swipe"
415459msgstr "Glissement"
416460
417461#: qml/Wizard/Pages/30-passwd-type.qml:98
462+msgctxt "Label: Description of security method"
418463msgid "No security"
419464msgstr "Aucune sécurité"
420465
421466#: qml/Wizard/Pages/30-passwd-type.qml:100
467+msgctxt "Label: Type of security method"
422468msgid "Passcode"
423469msgstr "Code"
424470
425471#: qml/Wizard/Pages/30-passwd-type.qml:101
472+msgctxt "Label: Description of security method"
426473msgid "4 digits only"
427474msgstr "4 chiffres seulement"
428475
429476#: qml/Wizard/Pages/30-passwd-type.qml:103
477+msgctxt "Label: Type of security method"
430478msgid "Passphrase"
431479msgstr "Phrase de passe"
432480
433481#: qml/Wizard/Pages/30-passwd-type.qml:104
482+msgctxt "Label: Description of security method"
434483msgid "Numbers and letters"
435484msgstr "Chiffres et lettres"
436485
437−#: qml/Wizard/Pages/40-wifi.qml:28
486+#: qml/Wizard/Pages/40-wifi.qml:29
438487msgid "Connect to Wi‑Fi"
439488msgstr "Se connecter au Wi-Fi"
440489
441−#: qml/Wizard/Pages/40-wifi.qml:147
490+#: qml/Wizard/Pages/40-wifi.qml:168
442491msgid "Available networks…"
443492msgstr "Réseaux disponibles..."
444493
445−#: qml/Wizard/Pages/40-wifi.qml:148
494+#: qml/Wizard/Pages/40-wifi.qml:169
446495msgid "No available networks."
447496msgstr "Aucun réseau disponible."
448497
@@ -553,29 +602,108 @@ msgstr "〈 %1"
553602msgid "%1 〉"
554603msgstr "%1 〉"
555604
605+#~ msgid "Skip intro"
606+#~ msgstr "Passer l'intro"
607+
608+#~ msgid "Right edge"
609+#~ msgstr "Bord droit"
610+
611+#~ msgid "Top edge"
612+#~ msgstr "Bord supérieur"
613+
614+#~ msgid "Close"
615+#~ msgstr "Fermer"
616+
617+#~ msgid "Left edge"
618+#~ msgstr "Bord gauche"
619+
556620#~ msgid "Speaking..."
557621#~ msgstr "En cours d'écoute..."
558622
559623#~ msgid "Loading. Please Wait..."
560624#~ msgstr "Chargement. Veuillez patienter…"
561625
626+#~ msgid "Search"
627+#~ msgstr "Rechercher"
628+
562629#~ msgid "Confirm"
563630#~ msgstr "Confirmez"
564631
565632#~ msgid "Type or say a command"
566633#~ msgstr "Rédigez ou dictez une commande"
567634
635+#~ msgid "Well done"
636+#~ msgstr "Félicitations"
637+
568638#~ msgid "Speak Now..."
569639#~ msgstr "Parlez maintenant…"
570640
641+#~ msgid ""
642+#~ "You have now mastered the edge gestures and can start using the "
643+#~ "phone<br><br>Tap on the screen to start"
644+#~ msgstr ""
645+#~ "Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
646+#~ "utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
647+
648+#~ msgid "Try swiping from the right edge to unlock the phone"
649+#~ msgstr ""
650+#~ "Faites glisser votre doigt à partir du bord droit pour déverrouiller."
651+
652+#~ msgid "Try swiping from the top edge to access the indicators"
653+#~ msgstr ""
654+#~ "Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
655+#~ "indicateurs."
656+
657+#~ msgid "Swipe up again to close the settings screen"
658+#~ msgstr ""
659+#~ "Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
660+#~ "l'écran des paramètres"
661+
662+#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"
663+#~ msgstr ""
664+#~ "Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
665+#~ "d'applications."
666+
667+#~ msgid "Power off"
668+#~ msgstr "Éteindre"
669+
571670#~ msgid "All"
572671#~ msgstr "Toutes"
573672
673+#~ msgid "Store"
674+#~ msgstr "Logithèque"
675+
574676#~ msgid "Done"
575677#~ msgstr "Terminé"
576678
577679#~ msgid "Favorites"
578680#~ msgstr "Favorites"
579681
682+#~ msgid "Log out"
683+#~ msgstr "Se déconnecter"
684+
685+#~ msgid "Reboot"
686+#~ msgstr "Redémarrer"
687+
688+#~ msgid "Shut down"
689+#~ msgstr "Éteindre"
690+
691+#~ msgid "Settings"
692+#~ msgstr "Paramètres"
693+
694+#~ msgid "Power"
695+#~ msgstr "Alimentation"
696+
697+#~ msgid "Restart"
698+#~ msgstr "Redémarrer"
699+
580700#~ msgid "Manage Scopes"
581701#~ msgstr "Gérer les moteurs de recherche"
702+
703+#~ msgctxt "Button: Shown in Page Header Menu"
704+#~ msgid "Search"
705+#~ msgstr "Rechercher"
706+
707+#~ msgctxt "Button: The Ubuntu Store"
708+#~ msgid "Store"
709+#~ msgstr "Logithèque"
po/gd.po+319−188

This diff is too big to show here.

po/gl.po+270−150

This diff is too big to show here.

po/gv.ponew file+649

This diff is too big to show here.

po/he.po+230−128

This diff is too big to show here.

po/hi.po+198−119

This diff is too big to show here.

po/hr.po+180−119

This diff is too big to show here.

po/hu.po+263−143

This diff is too big to show here.

po/hy.po+242−139

This diff is too big to show here.

po/id.po+265−145

This diff is too big to show here.

po/is.po+266−146

This diff is too big to show here.

po/it.po+278−150

This diff is too big to show here.

po/ja.po+262−142

This diff is too big to show here.

po/km.po+265−145

This diff is too big to show here.

po/kn.po+180−119

This diff is too big to show here.

po/ko.po+315−187

This diff is too big to show here.

po/ku.po+257−140

This diff is too big to show here.

po/ky.po+180−119

This diff is too big to show here.

po/lo.po+186−119

This diff is too big to show here.

po/lt.po+213−122

This diff is too big to show here.

po/lv.po+317−195

This diff is too big to show here.

po/ml.po+213−122

This diff is too big to show here.

po/mr.po+207−119

This diff is too big to show here.

po/ms.po+265−145

This diff is too big to show here.

po/my.po+198−119

This diff is too big to show here.

po/nb.po+272−144

This diff is too big to show here.

po/nl.po+266−144

This diff is too big to show here.

po/oc.po+178−120

This diff is too big to show here.

po/or.ponew file+579

This diff is too big to show here.

po/pa.po+315−210

This diff is too big to show here.

po/pl.po+334−199

This diff is too big to show here.

po/pt.po+292−167

This diff is too big to show here.

po/pt_BR.po+312−181

This diff is too big to show here.

po/ro.po+267−147

This diff is too big to show here.

po/ru.po+266−146

This diff is too big to show here.

po/shn.po+176−118

This diff is too big to show here.

po/si.po+176−118

This diff is too big to show here.

po/sk.ponew file+579

This diff is too big to show here.

po/sl.po+276−148

This diff is too big to show here.

po/sq.po+195−119

This diff is too big to show here.

po/sr.po+323−193

This diff is too big to show here.

po/sv.po+277−157

This diff is too big to show here.

po/sw.po+183−119

This diff is too big to show here.

po/ta.po+213−122

This diff is too big to show here.

po/te.po+204−119

This diff is too big to show here.

po/th.po+176−118

This diff is too big to show here.

po/tr.po+277−157

This diff is too big to show here.

po/ug.po+265−145

This diff is too big to show here.

po/uk.po+276−148

This diff is too big to show here.

po/unity8.pot+189−126

This diff is too big to show here.

po/update-unity-pot+1

This diff is too big to show here.

po/vi.po+176−118

This diff is too big to show here.

po/xh.po+176−118

This diff is too big to show here.

po/zh_CN.po+224−122

This diff is too big to show here.

po/zh_HK.po+216−120

This diff is too big to show here.

po/zh_TW.po+307−186

This diff is too big to show here.

qml/CMakeLists.txt+3−2

This diff is too big to show here.

qml/Components/DelayedLockscreen.qml+3−1

This diff is too big to show here.

qml/Components/Dialogs.qml+32−33

This diff is too big to show here.

qml/Components/EdgeDemo.qmldeleted−254

This diff is too big to show here.

qml/Components/EdgeDemoOverlay.qmldeleted−273

This diff is too big to show here.

qml/Components/Lockscreen.qml+14−7

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qml+7−7

This diff is too big to show here.

qml/Components/PhysicalKeysMapper.qmlnew file+113

This diff is too big to show here.

qml/Components/PinLockscreen.qml+156−145

This diff is too big to show here.

qml/Components/PinPadButton.qml+3−2

This diff is too big to show here.

qml/Components/VolumeKeyFilter.qmldeleted−63

This diff is too big to show here.

qml/Dash/Dash.qml+35−23

This diff is too big to show here.

qml/Dash/DashBackground.qml+2

This diff is too big to show here.

qml/Dash/DashContent.qml+1−7

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+14−9

This diff is too big to show here.

qml/Dash/PageHeader.qml+5−3

This diff is too big to show here.

qml/Dash/Previews/Preview.qml+1

This diff is too big to show here.

qml/Dash/Previews/PreviewImageGallery.qml+25−6

This diff is too big to show here.

qml/Dash/Previews/PreviewOverlay.qml+77−26

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qml+2−3

This diff is too big to show here.

qml/Dash/Previews/PreviewZoomableImage.qml+3−3

This diff is too big to show here.

qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+3−1

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qml+1

This diff is too big to show here.

qml/Greeter/CoverPage.qmlnew file+216

This diff is too big to show here.

qml/Greeter/Greeter.qml+330−147

This diff is too big to show here.

qml/Greeter/GreeterContent.qmldeleted−162

This diff is too big to show here.

qml/Greeter/Infographics.qml+1

This diff is too big to show here.

qml/Greeter/LoginList.qml+67−85

This diff is too big to show here.

qml/Greeter/NarrowView.qmlnew file+170

This diff is too big to show here.

qml/Greeter/WideView.qmlnew file+134

This diff is too big to show here.

qml/Launcher/Launcher.qml+52−9

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+12−8

This diff is too big to show here.

qml/Notifications/Notification.qml+36−6

This diff is too big to show here.

qml/Notifications/Notifications.qml+2−6

This diff is too big to show here.

qml/Notifications/SwipeToAct.qml+178−247

This diff is too big to show here.

qml/Notifications/grip-large.svgnew file+150

This diff is too big to show here.

qml/Panel/IndicatorItem.qml+2

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+48−52

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsList.qml+2−2

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+20

This diff is too big to show here.

qml/Panel/Panel.qml+7−4

This diff is too big to show here.

qml/Panel/SearchIndicator.qmldeleted−82

This diff is too big to show here.

qml/Shell.qml+136−403

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+19−3

This diff is too big to show here.

qml/Stages/DecoratedWindow.qml+5−4

This diff is too big to show here.

qml/Stages/DesktopStage.qml+17−5

This diff is too big to show here.

qml/Stages/PhoneStage.qml+68−34

This diff is too big to show here.

qml/Stages/SessionContainer.qml+22−7

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+2−1

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+17−28

This diff is too big to show here.

qml/Stages/TabletStage.qml+14

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qml+27−21

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qml+1−1

This diff is too big to show here.

qml/Stages/WindowDecoration.qml+1

This diff is too big to show here.

qml/Stages/WindowMoveResizeArea.qml+36−25

This diff is too big to show here.

qml/Tutorial/Arrow.qmlnew file+56

This diff is too big to show here.

qml/Tutorial/Slider.qmlnew file+123

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoManager.qml → qml/Tutorial/Tick.qmlrenamed+11−5

This diff is too big to show here.

qml/Tutorial/Tutorial.qmlnew file+85

This diff is too big to show here.

qml/Tutorial/TutorialBottom.qmlnew file+104

This diff is too big to show here.

qml/Tutorial/TutorialBottomFinish.qmlnew file+41

This diff is too big to show here.

qml/Tutorial/TutorialContent.qmlnew file+125

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qmlnew file+91

This diff is too big to show here.

qml/Tutorial/TutorialLeftFinish.qmlnew file+41

This diff is too big to show here.

qml/Tutorial/TutorialPage.qmlnew file+245

This diff is too big to show here.

qml/Tutorial/TutorialRight.qmlnew file+223

This diff is too big to show here.

qml/Tutorial/graphics/camera.pngnew file

Binary file not shown.

qml/Tutorial/graphics/chevron.pngnew file

Binary file not shown.

qml/Tutorial/graphics/dialer.pngnew file

Binary file not shown.

qml/Tutorial/graphics/facebook.pngnew file

Binary file not shown.

qml/Tutorial/graphics/gallery.pngnew file

Binary file not shown.

qml/Tutorial/graphics/tick.pngnew file

Binary file not shown.

qml/Wizard/Page.qml+1−1

This diff is too big to show here.

qml/Wizard/Pages.qml+14−1

This diff is too big to show here.

qml/Wizard/Pages/20-sim.qml+5−1

This diff is too big to show here.

qml/Wizard/Pages/30-passwd-type.qml+6−6

This diff is too big to show here.

qml/Wizard/Wizard.qml+6−1

This diff is too big to show here.

run.sh+1−1

This diff is too big to show here.

src/ApplicationArguments.h+2−3

This diff is too big to show here.

src/CMakeLists.txt+1

This diff is too big to show here.

src/Dash/main.cpp+3−3

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+40−4

This diff is too big to show here.

src/MouseTouchAdaptor.h+18−5

This diff is too big to show here.

src/Panel/Indicators/client/CMakeLists.txt−2

This diff is too big to show here.

src/UnityCommandLineParser.cppnew file+118

This diff is too big to show here.

src/UnityCommandLineParser.hnew file+50

This diff is too big to show here.

src/main.cpp+10−45

This diff is too big to show here.

tests/autopilot/setup.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/__init__.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+4−10

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+2−2

This diff is too big to show here.

tests/autopilot/unity8/fixture_setup.py+52−5

This diff is too big to show here.

tests/autopilot/unity8/greeter/__init__.pynew file

No changes to the content.

tests/autopilot/unity8/greeter/tests/__init__.pynew file+28

This diff is too big to show here.

tests/autopilot/unity8/greeter/tests/test_args.pynew file+54

This diff is too big to show here.

tests/autopilot/unity8/indicators/__init__.py+92−12

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/__init__.py+12−2

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_action_latency.pynew file+235

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_display_indicator.py+3−4

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.py+4−6

This diff is too big to show here.

tests/autopilot/unity8/process_helpers.py+49−23

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/create_interactive_notification.py+2−3

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+19−15

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/edges_demo.pydeleted−140

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/greeter.py+18−3

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.py+17−6

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/tutorial.pynew file+73

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.py+8−8

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+18−32

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_edges_demo.pydeleted−51

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_emulators.py+8−6

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+20−29

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+49−27

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_system_integration.py+5−3

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_tutorial.pynew file+57

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_upstart.py+4−9

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypes+3

This diff is too big to show here.

tests/mocks/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.cpp+58−22

This diff is too big to show here.

tests/mocks/GSettings.1.0/fake_gsettings.h+16−6

This diff is too big to show here.

tests/mocks/GSettings.1.0/plugin.cpp−6

This diff is too big to show here.

tests/mocks/LightDM/CMakeLists.txt+2−5

This diff is too big to show here.

tests/mocks/LightDM/LightDM.qmltypes+33−13

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/Greeter.h−2

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+12−2

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.cpp+41−5

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfono.h+12−3

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.cppnew file+66

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockQOfonoManager.hnew file+49

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/QOfono.qmltypesnew file+30

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.cpp+3−1

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/qmldir−1

This diff is too big to show here.

tests/mocks/QMenuModel/QMenuModel.qmltypes+33

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/LanguagePlugin.qmltypesnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/SecurityPrivacy.qmltypesnew file+39

This diff is too big to show here.

tests/mocks/Unity/Application/Application.qmltypes+42

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp−19

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h+3−33

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+6

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.h+5

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.qml+16−1

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Indicators/CMakeLists.txt+1−3

This diff is too big to show here.

tests/mocks/Unity/Indicators/Indicators.qmltypes+7−33

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp+13−1

This diff is too big to show here.

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h+6

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Launcher/Launcher.qmltypes+3

This diff is too big to show here.

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

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+2−1

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.cpp+7−5

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockActionModel.h+4−2

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.cppnew file+182

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotification.hnew file+95

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.cppnew file+172

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationModel.hnew file+72

This diff is too big to show here.

tests/mocks/Unity/Notifications/Notifications.qmltypes+139

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.cpp+5−3

This diff is too big to show here.

tests/mocks/Unity/Notifications/plugin.h+1−2

This diff is too big to show here.

tests/mocks/Unity/Unity.qmltypes+21

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.cpp+15−1

This diff is too big to show here.

tests/mocks/Unity/fake_previewmodel.h+7−1

This diff is too big to show here.

tests/mocks/Unity/fake_previewstack.cpp+2−2

This diff is too big to show here.

tests/mocks/Unity/fake_previewstack.h+3−1

This diff is too big to show here.

tests/mocks/Unity/fake_previewwidgetmodel.cpp+11

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/fake_scope.h+4−2

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cpp+12

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.h+5

This diff is too big to show here.

tests/mocks/Unity/fake_scopesoverview.cpp+1

This diff is too big to show here.

tests/mocks/Wizard/Wizard.qmltypes+4−3

This diff is too big to show here.

tests/mocks/data/unity/indicators/com.canonical.indicator.mocknew file+10

This diff is too big to show here.

tests/mocks/indicator-service/CMakeLists.txtnew file+20

This diff is too big to show here.

tests/mocks/indicator-service/mock-indicator-service.cnew file+261

This diff is too big to show here.

tests/mocks/libusermetrics/ColorTheme.h+2−1

This diff is too big to show here.

tests/mocks/libusermetrics/UserMetrics.cpp+8

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.cpp+23−7

This diff is too big to show here.

tests/plugins/AccountsService/AccountsServer.h+11−1

This diff is too big to show here.

tests/plugins/AccountsService/CMakeLists.txt+8

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cpp+43−6

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.h+8−1

This diff is too big to show here.

tests/plugins/AccountsService/client.cpp+186−7

This diff is too big to show here.

tests/plugins/AccountsService/interfaces.xml+21

This diff is too big to show here.

tests/plugins/AccountsService/server.cpp+11−6

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.res+1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res+1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res+1

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.res+2

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.res+1

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cpp+11

This diff is too big to show here.

tests/plugins/Greeter/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/plugins/Greeter/Unity/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.cppnew file+48

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/AccountsServiceDBusAdaptor.hnew file+53

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txtnew file+56

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cppnew file+169

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txt+17−4

This diff is too big to show here.

tests/plugins/LightDM/usersmodel.cppnew file+84

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+9

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+7

This diff is too big to show here.

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp+30−7

This diff is too big to show here.

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+6−5

This diff is too big to show here.

tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp+2−2

This diff is too big to show here.

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.cppnew file+42

This diff is too big to show here.

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.hnew file+47

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+4−2

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+122−1

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cpp+82−10

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+8−6

This diff is too big to show here.

tests/qmltests/Components/tst_Dialogs.qml+4−2

This diff is too big to show here.

tests/qmltests/Components/tst_EdgeDemoOverlay.qmldeleted−123

This diff is too big to show here.

tests/qmltests/Components/tst_Lockscreen.qml+26

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qmlnew file+131

This diff is too big to show here.

tests/qmltests/Components/tst_ZoomableImage.qml+7

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_Preview.qml+29

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+1−1

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+1−1

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTable.qml+15−4

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+138−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/TestView.qmlnew file+99

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qmlnew file+487

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qmldeleted−475

This diff is too big to show here.

tests/qmltests/Greeter/tst_NarrowView.qmlnew file+522

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qmldeleted−244

This diff is too big to show here.

tests/qmltests/Greeter/tst_WideView.qmlnew file+526

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+127−23

This diff is too big to show here.

tests/mocks/Unity/Notifications/MockNotificationTypes.cpp → tests/qmltests/Notifications/Notification.qmlrenamed+11−6

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+279−213

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+11−6

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+4

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+147−4

This diff is too big to show here.

tests/qmltests/Panel/tst_SearchIndicator.qmldeleted−61

This diff is too big to show here.

tests/qmltests/Stages/ApplicationCheckBox.qmlnew file+64

This diff is too big to show here.

tests/qmltests/Stages/RecursingChildSessionControl.qml+3

This diff is too big to show here.

tests/qmltests/Stages/tst_ApplicationWindow.qml+6−1

This diff is too big to show here.

tests/qmltests/Stages/tst_DesktopStage.qmlnew file+201

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+5−1

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qml+14−7

This diff is too big to show here.

tests/qmltests/Stages/tst_SurfaceContainer.qml+32−5

This diff is too big to show here.

tests/qmltests/Stages/tst_TabletStage.qmlnew file+154

This diff is too big to show here.

tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+117−18

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qmlnew file+366

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+66−6

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+498−94

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+113−48

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qmldeleted−314

This diff is too big to show here.

tests/uqmlscene/ActiveFocusLogger.cppnew file+48

This diff is too big to show here.

tests/uqmlscene/ActiveFocusLogger.hnew file+37

This diff is too big to show here.

tests/uqmlscene/CMakeLists.txt+1−1

This diff is too big to show here.

tests/uqmlscene/main.cpp+13−4

This diff is too big to show here.

tests/utils/modules/Unity/Test/CMakeLists.txt+3

This diff is too big to show here.

tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qmlnew file+43

This diff is too big to show here.

tests/utils/modules/Unity/Test/Test.qmltypes+1

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp+10−1

This diff is too big to show here.

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+4−1

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+42−17

This diff is too big to show here.

tests/utils/modules/Unity/Test/plugin.cpp+15−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/qmldir+1

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.cpp+2−2

This diff is too big to show here.

tests/utils/modules/Unity/Test/testutil.h+1−1

This diff is too big to show here.

tools/registry-tracker.cpp+2

This diff is too big to show here.