on xenial help sign in
Merge from trunk
commitd0b854799464c029a9b28b0978d211962e00c1bc authorMichael Terry <michael.terry@canonical.com> dateFri 6 Feb 2015, 15:06 (12 years ago) parentd1fdad3958eebf
379 files changed+29675−8618
CMakeLists.txt+5 build.sh+5−1 cmake/modules/QmlTest.cmake+3 com.canonical.Unity8.gschema.xml+14 debian/changelog+258 debian/control+19−7 debian/unity8-common.install+2 debian/unity8-private.install+1 debian/unity8.install+1 include/paths.h.in+2 plugins/AccountsService/AccountsService.cpp+61−2 plugins/AccountsService/AccountsService.h+20 plugins/CMakeLists.txt+1 plugins/Dash/CardCreator.js+2−1 plugins/Dash/abstractdashview.cpp+24−5 plugins/Dash/abstractdashview.h+6 plugins/Dash/listviewwithpageheader.cpp+7−2 plugins/Dash/listviewwithpageheader.h+4−4 plugins/LightDM/CMakeLists.txt+4−4 plugins/LightDM/Greeter.cpp+1−19 plugins/LightDM/Greeter.h+1−1 plugins/LightDM/GreeterPrivate.h+39 plugins/LightDM/UsersModel.cpp+1−1 plugins/LightDM/UsersModel.h+2−2 tests/mocks/LightDM/demo/CMakeLists.txt → plugins/LightDM/liblightdm/CMakeLists.txt+6−5 tests/mocks/LightDM/Greeter.cpp → plugins/LightDM/liblightdm/Greeter.cpp+7−1 tests/mocks/LightDM/Greeter.h → plugins/LightDM/liblightdm/Greeter.h+4 tests/mocks/LightDM/demo/GreeterPrivate.cpp → plugins/LightDM/liblightdm/GreeterPrivate.cpp+2−2 tests/mocks/LightDM/GreeterPrivate.h → plugins/LightDM/liblightdm/GreeterPrivate.h−1 tests/mocks/LightDM/UsersModel.cpp → plugins/LightDM/liblightdm/UsersModel.cpp+6 tests/mocks/LightDM/UsersModel.h → plugins/LightDM/liblightdm/UsersModel.h+4 tests/mocks/LightDM/demo/UsersModelPrivate.cpp → plugins/LightDM/liblightdm/UsersModelPrivate.cpp+1−1 tests/mocks/LightDM/UsersModelPrivate.h → plugins/LightDM/liblightdm/UsersModelPrivate.h plugins/Lights/CMakeLists.txt−2 plugins/Lights/Lights.cpp+9−24 plugins/Powerd/CMakeLists.txt−2 plugins/Ubuntu/Gestures/Direction.cpp+6−2 plugins/Ubuntu/Gestures/Direction.h+2−1 plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+27−37 plugins/Unity/DashCommunicator/dashconnection.cpp+30 plugins/Unity/DashCommunicator/dashconnection.h+4−1 plugins/Unity/Indicators/CMakeLists.txt+3−2 plugins/Unity/Indicators/Indicators.qmltypes+18−7 plugins/Unity/Indicators/actionrootstate.cpp+97 plugins/Unity/Indicators/actionrootstate.h+55 plugins/Unity/Indicators/indicators.h+1−2 plugins/Unity/Indicators/modelactionrootstate.cpp+129 plugins/Unity/Indicators/modelactionrootstate.h+61 plugins/Unity/Indicators/plugin.cpp+4−4 plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpp+74−143 plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.h+18−34 plugins/Unity/Indicators/visibleindicatorsmodel.cpp−90 plugins/Unity/Indicators/visibleindicatorsmodel.h−56 plugins/Unity/Launcher/CMakeLists.txt−1 plugins/Unity/Launcher/desktopfilehandler.cpp+1−1 plugins/Unity/Launcher/launcheritem.cpp+11−4 plugins/Unity/Launcher/launchermodel.cpp+1 plugins/Unity/Launcher/launchermodel.h+1−1 plugins/Unity/Session/CMakeLists.txt−2 plugins/Unity/Session/dbusunitysessionservice.h+5 plugins/Utils/CMakeLists.txt+1−4 plugins/Utils/plugin.cpp+2−2 plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpp+15−15 plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.h+5−5 plugins/Wizard/50-com.canonical.unity.wizard.pkla+6 plugins/Wizard/CMakeLists.txt+11 plugins/Wizard/PageList.cpp+112 plugins/Wizard/PageList.h+53 plugins/Wizard/System.cpp+99 plugins/Wizard/System.h+50 plugins/Wizard/Wizard.qmltypes+36 plugins/Wizard/plugin.cpp+35 plugins/Wizard/plugin.h+32 plugins/Wizard/qmldir+3 po/am.po+272−80 po/ar.po+251−74 po/ast.po+268−79 po/az.po+263−77 po/be.po+356−142 po/bg.po+251−74 po/br.po+277−80 po/bs.po+251−74 po/ca.po+278−80 po/ca@valencia.po+277−88 po/ckb.po+251−74 po/cs.po+251−74 po/da.po+251−74 po/de.po+279−82 po/el.po+265−79 po/en_AU.po+276−81 po/en_GB.po+275−80 po/eo.po+251−74 po/es.po+276−81 po/eu.po+277−80 po/fa.po+277−80 po/fi.po+276−80 po/fo.po+251−74 po/fr.po+282−81 po/gd.po+268−79 po/gl.po+276−80 po/he.po+263−77 po/hi.po+251−74 po/hr.po+251−74 po/hu.po+283−86 po/hy.po+264−78 po/id.po+353−140 po/is.po+277−88 po/it.po+281−82 po/ja.po+277−88 po/km.po+264−78 po/kn.po+251−74 po/ko.po+268−79 po/ku.po+264−78 po/ky.po+251−74 po/lo.po+251−74 po/lt.po+251−74 po/lv.po+262−76 po/ml.po+251−74 po/mr.po+251−74 po/ms.po+268−79 po/my.po+251−74 po/nb.po+285−90 po/nl.po+276−80 po/pa.po+251−74 po/pl.po+251−74 po/pt.po+271−81 po/pt_BR.po+275−86 po/ro.po+290−90 po/ru.po+280−82 po/shn.po+251−74 po/si.po+251−74 po/sl.po+274−80 po/sq.po+251−74 po/sr.po+264−78 po/sv.po+277−80 po/sw.po+251−74 po/ta.po+251−74 po/te.po+251−74 po/th.po+251−74 po/tr.po+295−105 po/ug.po+269−80 po/uk.po+277−79 po/unity8.pot+249−72 po/vi.po+251−74 po/xh.po+251−74 po/zh_CN.po+265−79 po/zh_HK.po+251−74 po/zh_TW.po+273−87 qml/CMakeLists.txt+1 qml/Components/Carousel.qml+6−2 qml/Components/Dialogs.qml+77−87 qml/Components/DragHandle.qml+10−2 qml/Components/EdgeDemo.qml+19−6 qml/Components/EdgeDragEvaluator.qml+11−5 tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp → qml/Components/PanelState/PanelState.qml+10−14 qml/Components/PanelState/qmldir+1 qml/Components/ResponsiveVerticalJournal.qml+1 tests/mocks/LightDM/single-pin/GreeterPrivate.cpp → qml/Components/ShellDialog.qml+15−24 qml/Components/Showable.qml+13 qml/Components/WindowControlButtons.qml+60 qml/Dash/CardCarousel.qml+6−2 qml/Dash/CardGrid.qml+1−2 qml/Dash/CardHorizontalList.qml+7−2 qml/Dash/CardVerticalJournal.qml+1 qml/Dash/Dash.qml+95−139 qml/Dash/DashContent.qml+15−3 qml/Dash/DashNavigation.qml+4 qml/Dash/DashNavigationButton.qml+30−23 qml/Dash/DashRenderer.qml+8−1 qml/Dash/GenericScopeView.qml+124−27 qml/Dash/PageHeader.qml+18−1 qml/Dash/Previews/PreviewTable.qml+6 qml/Dash/ScopeListView.qml+4−2 qml/Dash/ScopesList.qml+132 qml/Dash/ScopesListCategory.qml+176 qml/Dash/ScopesListCategoryItem.qml+107 qml/Dash/ScopesOverview.qml−575 qml/Dash/ScopesOverviewAll.qml−54 qml/Dash/ScopesOverviewFavorites.qml−73 qml/Dash/ScopesOverviewTab.qml−74 qml/Greeter/Clock.qml+11−1 qml/Greeter/Greeter.qml+99−82 qml/Greeter/GreeterContent.qml+11−2 qml/Greeter/Infographics.qml+9−10 qml/Launcher/Launcher.qml+13−4 qml/Launcher/LauncherPanel.qml+2−1 qml/Notifications/Notifications.qml+1−1 qml/Panel/IndicatorItem.qml−8 qml/Panel/Indicators/IndicatorBase.qml+1−1 qml/Panel/Indicators/IndicatorsLight.qml+19−1 qml/Panel/Indicators/MessageMenuItemFactory.qml+1 qml/Panel/Indicators/VisibleIndicators.qml → qml/Panel/Indicators/VisibleIndicators.qml.THIS qml/Panel/IndicatorsBar.qml+29−20 qml/Panel/IndicatorsMenu.qml+5 qml/Panel/Panel.qml+17−2 qml/Shell.qml+95−37 qml/Stages/DecoratedWindow.qml+60 qml/Stages/DesktopStage.qml+139 qml/Stages/PhoneStage.qml+2−2 qml/Stages/TabletStage.qml+2−2 qml/Stages/TransformedSpreadDelegate.qml+10−3 qml/Stages/WindowDecoration.qml+65 qml/Stages/WindowMoveResizeArea.qml+98 qml/Wizard/CheckableSetting.qml+84 qml/Wizard/Page.qml+108 qml/Wizard/Pages.qml+138 qml/Wizard/Pages/10-welcome.qml+99 qml/Wizard/Pages/20-sim.qml+73 qml/Wizard/Pages/30-passwd-type.qml+135 qml/Wizard/Pages/40-wifi.qml+219 qml/Wizard/Pages/50-location.qml+150 qml/Wizard/Pages/60-reporting.qml+54 qml/Wizard/Pages/80-finished.qml+57 qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png qml/Wizard/Pages/here-terms.qml+121 qml/Wizard/Pages/passwd-confirm.qml+86 qml/Wizard/Pages/passwd-set.qml+94 qml/Wizard/StackButton.qml+47 qml/Wizard/Wizard.qml+55 run.sh+3−26 src/libunity8-private/abstractdbusservicemonitor.cpp+21−8 src/libunity8-private/abstractdbusservicemonitor.h+9−5 src/main.cpp−6 tests/autopilot/unity8/fixture_setup.py+35−1 tests/autopilot/unity8/indicators/__init__.py+124 tests/autopilot/unity8/indicators/tests/__init__.py+18−1 tests/autopilot/unity8/indicators/tests/test_display_indicator.py+53 tests/autopilot/unity8/indicators/tests/test_indicators.py+6−19 tests/autopilot/unity8/shell/__init__.py−13 tests/autopilot/unity8/shell/emulators/create_interactive_notification.py−1 tests/autopilot/unity8/shell/emulators/dash.py+22−8 tests/autopilot/unity8/shell/emulators/edges_demo.py+140 tests/autopilot/unity8/shell/emulators/main_window.py+11−1 tests/autopilot/unity8/shell/fixture_setup.py+38 tests/autopilot/unity8/shell/tests/__init__.py+8−11 tests/autopilot/unity8/shell/tests/test_edges_demo.py+51 tests/autopilot/unity8/shell/tests/test_lock_screen.py+6−5 tests/mocks/AccountsService/AccountsService.cpp+37−1 tests/mocks/AccountsService/AccountsService.h+20 tests/mocks/CMakeLists.txt+3 tests/mocks/LightDM/CMakeLists.txt+9−10 tests/mocks/LightDM/single/GreeterPrivate.cpp → tests/mocks/LightDM/MockGreeter.cpp+12−23 tests/mocks/LightDM/MockGreeter.h+37 tests/mocks/LightDM/MockUsersModel.cpp+39 tests/mocks/LightDM/MockUsersModel.h+37 tests/mocks/LightDM/QLightDM/Greeter+17−1 tests/mocks/LightDM/QLightDM/InfographicModel−1 tests/mocks/LightDM/QLightDM/UsersModel+17−1 tests/mocks/LightDM/full/CMakeLists.txt−18 tests/mocks/LightDM/liblightdm/CMakeLists.txt+18 tests/mocks/LightDM/liblightdm/Greeter.cpp+199 tests/mocks/LightDM/liblightdm/Greeter.h+118 tests/mocks/LightDM/full/GreeterPrivate.cpp → tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp+40−6 tests/mocks/LightDM/liblightdm/GreeterPrivate.h+54 tests/mocks/LightDM/liblightdm/UsersModel.cpp+134 tests/mocks/LightDM/liblightdm/UsersModel.h+69 tests/mocks/LightDM/full/UsersModelPrivate.cpp → tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp+58−6 tests/mocks/LightDM/liblightdm/UsersModelPrivate.h+63 tests/mocks/LightDM/plugin.cpp+68 tests/mocks/LightDM/plugin.h+32 tests/mocks/LightDM/single-passphrase/CMakeLists.txt−19 tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp−46 tests/mocks/LightDM/single-pin/CMakeLists.txt−19 tests/mocks/LightDM/single/CMakeLists.txt−18 tests/mocks/Lights/CMakeLists.txt+8 tests/mocks/Lights/Lights.cpp+84 tests/mocks/Lights/Lights.h+66 tests/mocks/Lights/Lights.qmltypes+45 tests/mocks/Lights/plugin.cpp+33 tests/mocks/Lights/plugin.h+32 tests/mocks/Lights/qmldir+3 tests/mocks/MeeGo/CMakeLists.txt+1 tests/mocks/MeeGo/QOfono/CMakeLists.txt+10 tests/mocks/MeeGo/QOfono/MockOfonoManager.qml+23 tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+42 tests/mocks/MeeGo/QOfono/MockQOfono.cpp+54 tests/mocks/MeeGo/QOfono/MockQOfono.h+52 tests/mocks/MeeGo/QOfono/plugin.cpp+33 tests/mocks/MeeGo/QOfono/plugin.h+31 tests/mocks/MeeGo/QOfono/qmldir+4 tests/mocks/QMenuModel/CMakeLists.txt+2 tests/mocks/QMenuModel/QDBusActionGroup.qml+21−56 tests/mocks/QMenuModel/actiondata.h+52 tests/mocks/QMenuModel/dbus-enums.h+52 tests/mocks/QMenuModel/plugin.cpp+13 tests/mocks/Ubuntu/CMakeLists.txt+1 tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt+2 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/CMakeLists.txt+1 tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp → tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+6−16 tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+2 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/CMakeLists.txt+10 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+28 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+42 tests/mocks/LightDM/single/UsersModelPrivate.cpp → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpp+7−14 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h+31 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/qmldir+2 tests/mocks/Unity/Application/ApplicationManager.cpp+7 tests/mocks/Unity/CMakeLists.txt+4−1 tests/mocks/Unity/Indicators/ActionRootState.qml+46 tests/mocks/Unity/Indicators/CMakeLists.txt−1 tests/mocks/Unity/Indicators/RootActionState.qml → tests/mocks/Unity/Indicators/ModelActionRootState.qml tests/mocks/Unity/Indicators/fakeplugin.cpp−2 tests/mocks/Unity/Indicators/qmldir+2−1 tests/mocks/Unity/fake_navigation.cpp+1−1 tests/mocks/Unity/fake_scope.cpp+2−7 tests/mocks/Unity/fake_scopes.cpp+70−4 tests/mocks/Unity/fake_scopes.h+9−3 tests/mocks/Unity/fake_scopesoverview.cpp+77−11 tests/mocks/Unity/fake_scopesoverview.h+18−3 tests/mocks/Wizard/CMakeLists.txt+12 tests/mocks/Wizard/MockSystem.cpp+39 tests/mocks/Wizard/MockSystem.h+47 tests/mocks/Wizard/Wizard.qmltypes+36 tests/mocks/Wizard/mockplugin.cpp+35 tests/mocks/Wizard/mockplugin.h+32 tests/mocks/Wizard/qmldir+3 tests/plugins/CMakeLists.txt+1 tests/plugins/Dash/horizontaljournaltest.qml+1 tests/plugins/Dash/listviewwithpageheadertest.cpp+1−1 tests/plugins/Dash/organicgridtest.qml+1 tests/plugins/Dash/verticaljournaltest.qml+1 tests/plugins/LightDM/CMakeLists.txt+6−11 tests/plugins/LightDM/dbus.cpp+11−2 tests/plugins/LightDM/greeter.qml+5 tests/plugins/Unity/Indicators/rootactionstatetest.cpp+4−4 tests/plugins/Utils/CMakeLists.txt+1−1 tests/plugins/Utils/qsortfilterproxymodeltest.cpp → tests/plugins/Utils/unitysortfilterproxymodeltest.cpp+14−14 tests/plugins/Wizard/CMakeLists.txt+18 tests/plugins/Wizard/tst_pagelist.cpp+154 tests/plugins/Wizard/tst_system.cpp+124 tests/qmltests/CMakeLists.txt+23−19 tests/qmltests/Components/tst_Carousel.qml+5−5 tests/qmltests/Components/tst_Dialogs.qml+104 tests/qmltests/Components/tst_DragHandle.cpp+4 tests/qmltests/Components/tst_DragHandle.qml+43−8 tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+69 tests/qmltests/Components/tst_Lockscreen.qml+1−1 tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewActions.qml+3−3 tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+5−5 tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+2−2 tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+6−6 tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+5−5 tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+2−2 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5 tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+2−2 tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml+2−2 tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml+3−3 tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml+2−2 tests/qmltests/Dash/tst_Card.qml+11−5 tests/qmltests/Dash/tst_Dash.qml+248−154 tests/qmltests/Dash/tst_DashContent.qml+117−32 tests/qmltests/Dash/tst_GenericScopeView.qml+27−26 tests/qmltests/Dash/tst_PageHeader.qml+1−1 tests/qmltests/Dash/tst_PreviewListView.qml+2−2 tests/qmltests/Greeter/tst_Infographics.qml+10 tests/qmltests/Greeter/tst_MultiGreeter.qml+106−17 tests/qmltests/Greeter/tst_SingleGreeter.qml+104−16 tests/qmltests/Launcher/tst_Launcher.qml+8−13 tests/qmltests/Notifications/tst_Notifications.qml+6−6 tests/qmltests/Notifications/tst_OptionToggle.qml+7−7 tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1 tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+2−2 tests/qmltests/Panel/IndicatorTest.qml+1−7 tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+129 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+52−1 tests/qmltests/Panel/tst_IndicatorsBar.qml+27−2 tests/qmltests/Panel/tst_MenuContent.qml+1−1 tests/qmltests/Stages/tst_PhoneStage.qml+26 tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+138 tests/qmltests/Wizard/licenses/en_US.html+1 tests/qmltests/Wizard/licenses/fr_CA.html+1 tests/qmltests/Wizard/licenses/fr_FR.html+1 tests/qmltests/Wizard/tst_Wizard.qml+503 tests/qmltests/tst_Shell.qml+18−15 tests/qmltests/tst_ShellWithPin.qml+87 tests/qmltests/tst_TabletShell.qml+24−13 tests/utils/modules/Unity/Test/UnityTestCase.qml+88−69
CMakeLists.txt+5
@@ -61,6 +61,11 @@ include(GNUInstallDirs)
6161set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
6262set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
6363
64+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
65+if(USS_PRIVATE_PLUGINDIR STREQUAL "")
66+ message(FATAL_ERROR "Could not determine USS private plugin installation dir.")
67+endif()
68+
6469execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
6570if(SHELL_INSTALL_QML STREQUAL "")
6671 message(FATAL_ERROR "Could not determine plugin installation dir.")
build.sh+5−1
@@ -54,13 +54,17 @@ install_dependencies() {
5454 qtdeclarative5-unity-notifications-plugin \
5555 qml-module-ubuntu-connectivity \
5656 ubuntu-mobile-icons \
57+ ubuntu-system-settings \
5758 unity-plugin-scopes \
5859 xvfb \
5960 || exit 5
6061}
6162
6263mk_build_deps() {
63− [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
64+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
65+ sed 's/\:native//g' $CODE_DIR/debian/control > control
66+ mk-build-deps --install --root-cmd sudo control
67+ fi
6468}
6569
6670if [ -f "/usr/bin/ccache" ] ; then
cmake/modules/QmlTest.cmake+3
@@ -153,7 +153,9 @@ endmacro(add_qml_test_internal)
153153
154154macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
155155 set(testCommand
156+ ${ENVVAR}
156157 LD_LIBRARY_PATH=${LD_PATH}
158+ dbus-launch
157159 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
158160 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
159161 -o -,txt)
@@ -171,6 +173,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
171173 ${ENVVAR}
172174 LD_LIBRARY_PATH=${LD_PATH}
173175 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
176+ dbus-launch
174177 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
175178 -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
176179 -o -,txt)
com.canonical.Unity8.gschema.xmlnew file+14
@@ -0,0 +1,14 @@
1+<schemalist>
2+ <enum id="usage-mode-enum">
3+ <value nick="Staged" value="0" />
4+ <value nick="Windowed" value="1" />
5+ </enum>
6+
7+ <schema path="/com/canonical/unity8/" id="com.canonical.Unity8" gettext-domain="unity8">
8+ <key enum="usage-mode-enum" name="usage-mode">
9+ <default>"Staged"</default>
10+ <summary>The usage mode.</summary>
11+ <description>The usage mode chosen will affect the Window Management behaviour.</description>
12+ </key>
13+ </schema>
14+</schemalist>
debian/changelog+258
@@ -1,3 +1,261 @@
1+unity8 (8.02+15.04.20150205-0ubuntu1) vivid; urgency=medium
2+
3+ [ 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)
8+
9+ [ CI Train Bot ]
10+ * Resync trunk
11+
12+ [ Michał Sawicz ]
13+ * Add workaround for gcc ICE.
14+
15+ [ Albert Astals ]
16+ * Implement proper updateRanges for horizontal items (i.e. Carousel,
17+ Horizontal List)
18+
19+ [ Michael Terry ]
20+ * Don't accept multiple "Finish" clicks during the last step of the
21+ wizard
22+
23+ [ 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
27+
28+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Feb 2015 10:30:13 +0000
29+
30+unity8 (8.02+15.04.20150123.3-0ubuntu1) vivid; urgency=low
31+
32+ [ Sebastien Bacher ]
33+ * Set text hint property for the messaging menus inline reply widget
34+ (LP: #1389234)
35+
36+ [ Ying-Chun Liu ]
37+ * Added an initial set of autopilot tests for the display indicator.
38+
39+ [ Nick Dedekind ]
40+ * Removed filtering the indicator model by visibility.
41+
42+ [ Michael Zanetti ]
43+ * fixes left edge drag when in spread
44+
45+ [ Albert Astals Cid ]
46+ * Fix ninja build in a different way The previous one was adding rpath
47+ to some .so that broke our tests that use LD_LIBRARY_PATH to change
48+ which one is picked up
49+
50+ [ Leo Arias ]
51+ * Added an initial set of autopilot tests for the display indicator.
52+
53+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 23 Jan 2015 12:12:41 +0000
54+
55+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low
56+
57+ [ Michael Terry ]
58+ * Don't show any power dialogs while the screen is off. This is a
59+ band-aid to avoid the symptom, while we still investigate the source
60+ of why the screen doesn't turn on (and why we seem to not handle the
61+ power-button-release event). (LP: #1409003, #1410830)
62+ * Don't refocus the dialer-app when a call is started by the user.
63+ Because of how qtmir works, this would cause the dialer-app to
64+ unfocus momentarily, causing interface oddities for the user. (LP:
65+ #1413065)
66+
67+ [ CI Train Bot ]
68+ * Resync trunk
69+
70+ [ Albert Astals Cid ]
71+ * Build with ninja
72+ * Fixes for Table Preview Widget (LP: #1410420)
73+
74+ [ Michael Zanetti ]
75+ * Add support for earpiece media buttons (LP: #1398427)
76+ * Add a WindowMoveResizeArea and tests for it
77+
78+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000
79+
80+unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
81+
82+ [ Andrea Cimitan ]
83+ * support background on horizontal cards with summary (LP: #1393008)
84+
85+ [ Gerry Boland ]
86+ * DashCommunicator: replace QDBusInterface with a non-blocking
87+ simplification which does not introspect the service on creation
88+ (LP: #1403508)
89+
90+ [ Leo Arias ]
91+ * Added an autopilot test for the edges demo.
92+
93+ [ Albert Astals ]
94+ * Don't show the manage dash pull up arrow on temp scopes (LP:
95+ #1401869)
96+ * Remove hack, newer Qt already support keyClick(char)
97+ * Tests: Add Qt 5.5 removal TODOs
98+ * Make sure we use fPIC when compiling files for the static library
99+ too
100+ * Make sure changing a scope doesn't trigger creation/destruction of
101+ delegates until it's finished (LP: #1410122)
102+
103+ [ Michael Zanetti ]
104+ * patch debian/control file before using it to make it work with mk-
105+ build-deps
106+
107+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 Jan 2015 20:58:08 +0000
108+
109+unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low
110+
111+ [ Michał Sawicz ]
112+ * We don't need the SIGSTOP in main() any more.
113+ * Add a test to make sure the shell always starts disabled until it is
114+ enabled by a complete PAM interaction.
115+
116+ [ Leo Arias ]
117+ * Added an autopilot test for the edges demo.
118+
119+ [ Nick Dedekind ]
120+ * Unhook Lights interface from indicator widgets (LP: #1385331)
121+
122+ [ Albert Astals ]
123+ * Fix going to scopes when the Manage Dash is open (LP: #1403464)
124+ * QSortFilterProxyModelQML -> UnitySortFilterProxyModelQML
125+ * Clip the Scopes List header
126+ * Fix ScopesList not being under finger
127+ * Make waitForRendering with no item fail instead of crash
128+ * Disable Dash horizontal scroll while Navigation InverseMouseArea is
129+ pressed (LP: #1403048)
130+ * Test: Make sure the mouse area is enabled before clicking into it
131+ * Test: We actually need to click on the customBackButton and not on
132+ backButton
133+ * Test: By default mouseX act on the middle
134+
135+ [ Michael Terry ]
136+ * Don't block handling power events on loading the greeter's qml and
137+ the background image.
138+ * Show OSK above the wizard. (LP: #1401213)
139+ * Unify the name of the Greeter DBus test, make it use our standard
140+ binary test macro (which also nicely exports xml results), and make
141+ the test a little more robust against timing issues.
142+ * Add a test to make sure the shell always starts disabled until it is
143+ enabled by a complete PAM interaction.
144+
145+ [ Martin Pitt ]
146+ * tests: Fix Notify.Notification.add_action invocation to work also
147+ with unpatched libnotify API. (LP: #1223401)
148+
149+ [ Rodney Dawes ]
150+ * Depend on :native version of g++ to allow cross-compiling to work.
151+ (LP: #1353855)
152+
153+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 09 Jan 2015 10:43:06 +0000
154+
155+unity8 (8.02+15.04.20141216.1-0ubuntu1) vivid; urgency=low
156+
157+ [ Ubuntu daily release ]
158+ * New rebuild forced
159+
160+ [ Albert Astals ]
161+ * Need to wait until loaded is true to use the count property
162+ * Manage Dash: Ellide properly
163+
164+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 16 Dec 2014 11:03:37 +0000
165+
166+unity8 (8.02+15.04.20141215.3-0ubuntu1) vivid; urgency=low
167+
168+ [ Albert Astals Cid ]
169+ * ScopesList: Use the default scope style for the header
170+
171+ [ Daniel d'Andrada ]
172+ * Refactor Dialogs.qml to use proper in-scene dialogs
173+ * Make Greeter nicely handle being resized
174+
175+ [ Albert Astals ]
176+ * Rework how we set the ranges so we get some more asynchronousity
177+ from item views (LP: #1384374)
178+ * clickscope is back to being unfavoritable (LP: #1400762)
179+ * Fix clicking on the manage dash list after having moved the current
180+ scope
181+ * Make the drag range be a multiple of the drag "rate" value.
182+ Workarounds https://bugs.launchpad.net/mir/+bug/1399690
183+
184+ [ Gerry Boland ]
185+ * MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)
186+
187+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 15 Dec 2014 22:43:16 +0000
188+
189+unity8 (8.02+15.04.20141212.1-0ubuntu1) vivid; urgency=low
190+
191+ [ Ubuntu daily release ]
192+ * New rebuild forced
193+
194+ [ Albert Astals ]
195+ * Make Navigation work when "jumping" to the non root
196+
197+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 12 Dec 2014 12:28:10 +0000
198+
199+unity8 (8.02+15.04.20141211.2-0ubuntu1) vivid; urgency=medium
200+
201+ [ Michał Sawicz ]
202+ * Bump version due to new Manage Dash
203+
204+ [ Gerry Boland ]
205+ * [indicators] Fix positioning on panel resize.
206+
207+ [ Nick Dedekind ]
208+ * [indicators] Fix positioning on panel resize.
209+
210+ [ Albert Astals ]
211+ * Fix the Dash Header hamburger menu background color
212+ * Fix tests (LP: #1400449)
213+ * Allow pulling manage dash if there's no favorite scopes (LP:
214+ #1400774)
215+ * Manage Dash: Make store button work even if you have no favorites
216+ (LP: #1400771)
217+ * Make pot_file
218+
219+ [ CI Train Bot ]
220+ * Resync trunk
221+
222+ [ Andrea Cimitan ]
223+ * Remove dismiss timer in Launcher (LP: #1368778)
224+
225+ [ Michael Zanetti ]
226+ * decrease opacity changes in spread, move it to a separate surface.
227+ * Add an initial, rudimentary DesktopStage to get started
228+ * Uninvert Launcher in Desktop Mode
229+ * Add support for Wallpaper in Desktop stage
230+ * Add window control buttons to panel for fullscreen applications
231+
232+ [ Rodney Dawes ]
233+ * Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.
234+ (LP: #1400437)
235+
236+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 11 Dec 2014 13:25:44 +0000
237+
238+unity8 (8.01+15.04.20141205-0ubuntu1) vivid; urgency=low
239+
240+ [ CI Train Bot ]
241+ * Resync trunk
242+
243+ [ Albert Astals ]
244+ * Replace Scopes Overview by the new Manage Dash (LP: #1386698,
245+ #1368670)
246+
247+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 05 Dec 2014 10:55:50 +0000
248+
249+unity8 (8.01+15.04.20141204-0ubuntu1) vivid; urgency=low
250+
251+ [ Michael Terry ]
252+ * Import wizard code from ubuntu-system-settings.
253+ * Convert the welcome wizard from a separate executable into a qml
254+ plugin (with a small C++ plugin for support).
255+ * Add tests for welcome wizard.
256+
257+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 04 Dec 2014 20:55:11 +0000
258+
1259unity8 (8.01+15.04.20141202-0ubuntu1) vivid; urgency=low
2260
3261 [ Michael Terry ]
debian/control+19−7
@@ -10,8 +10,10 @@ Build-Depends: cmake,
1010 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1111# We rely on C++11 features, and to prevent from ABI breaks
1212# in libstdc++ causing us issues, we explicitly select a G++
13−# version.
14− g++-4.9,
13+# version. To allow cross-compiling to work, we also must
14+# append :native to g++-4.9 so we don't try to run armhf g++
15+# on an x86 CPU for eaxmple, when cross-compiling.
16+ g++-4.9:native,
1517 libconnectivity-qt1-dev,
1618 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1719 libgl1-mesa-dri,
@@ -22,9 +24,10 @@ Build-Depends: cmake,
2224 libpam0g-dev,
2325 libpay2-dev,
2426 libpulse-dev,
25− libqmenumodel-dev (>= 0.2.8),
27+ libqmenumodel-dev (>= 0.2.9),
2628 libqt5xmlpatterns5-dev,
27− libunity-api-dev (>= 7.93),
29+ libsystemsettings-dev,
30+ libunity-api-dev (>= 7.94),
2831 libusermetricsoutput1-dev,
2932 libxcb1-dev,
3033 pkg-config,
@@ -32,9 +35,11 @@ Build-Depends: cmake,
3235 python3-all:any,
3336 python3-setuptools,
3437 python:any (>= 2.7),
38+ qml-module-qt-labs-folderlistmodel,
3539 qml-module-qtquick-layouts,
3640 qml-module-qtquick-xmllistmodel,
3741 qml-module-qtquick2,
42+ qml-module-qtsysteminfo,
3843 qml-module-qttest,
3944 qt5-default,
4045 qtbase5-dev (>= 5.2.1),
@@ -44,8 +49,9 @@ Build-Depends: cmake,
4449 qtdeclarative5-dev-tools,
4550 qtdeclarative5-private-dev (>= 5.2.1),
4651 qtdeclarative5-qtmultimedia-plugin,
47− qtdeclarative5-ubuntu-settings-components (>= 0.4),
52+ qtdeclarative5-ubuntu-settings-components (>= 0.5),
4853 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
54+ qtdeclarative5-ubuntu-web-plugin,
4955 ttf-ubuntu-font-family,
5056Standards-Version: 3.9.4
5157Homepage: http://launchpad.net/unity
@@ -58,7 +64,7 @@ X-Ubuntu-Use-Langpack: yes
5864
5965Package: indicators-client
6066Architecture: amd64 armhf i386
61−Depends: qmenumodel-qml (>= 0.2.8),
67+Depends: qmenumodel-qml (>= 0.2.9),
6268 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
6369 unity8 (= ${binary:Version}),
6470 ${misc:Depends},
@@ -82,11 +88,15 @@ Provides: indicator-renderer,
8288Depends: gsettings-desktop-schemas,
8389 libcap2-bin,
8490 libglib2.0-bin,
85− qmenumodel-qml (>= 0.2.8),
91+ qmenumodel-qml (>= 0.2.9),
92+ qml-module-qt-labs-folderlistmodel,
8693 qml-module-qtquick-xmllistmodel,
94+ qml-module-qtsysteminfo,
8795 qtdeclarative5-gsettings1.0,
8896 qtdeclarative5-qtmir-plugin (>= 0.4.4),
8997 qtdeclarative5-ubuntu-telephony0.1,
98+ qtdeclarative5-ubuntu-web-plugin,
99+ ubuntu-system-settings,
90100 unity-launcher-impl-4,
91101 unity8-common (= ${source:Version}),
92102 unity8-private (= ${binary:Version}),
@@ -101,6 +111,7 @@ Breaks: indicator-network (<< 0.5.1+14.10.20141014),
101111 unity8-greeter (<< 7.89),
102112Replaces: ubuntu-touch-session (<< 0.82~),
103113 unity8-greeter (<< 7.89),
114+Conflicts: ubuntu-system-settings-wizard,
104115Description: Unity 8 shell
105116 The Unity 8 shell is the primary user interface for Ubuntu devices.
106117
@@ -129,6 +140,7 @@ Description: Unity 8 shell (common files)
129140Package: unity8-autopilot
130141Architecture: all
131142Depends: gir1.2-glib-2.0,
143+ gir1.2-notify-0.7,
132144 libautopilot-qt (>= 1.4),
133145 libqt5test5,
134146 libqt5widgets5,
debian/unity8-common.install+2
@@ -3,3 +3,5 @@ usr/share/unity8/Components
33usr/share/unity8/Dash
44usr/share/unity8/Notifications
55usr/share/unity8/graphics
6+com.canonical.Unity8.gschema.xml usr/share/glib-2.0/schemas/
7+var/lib/polkit-1/localauthority/10-vendor.d
debian/unity8-private.install+1
@@ -9,6 +9,7 @@ usr/lib/*/unity8/qml/ScreenGrabber
99usr/lib/*/unity8/qml/Ubuntu
1010usr/lib/*/unity8/qml/Unity
1111usr/lib/*/unity8/qml/Utils
12+usr/lib/*/unity8/qml/Wizard
1213usr/lib/*/unity8/libUbuntuGestures*
1314usr/share/accountsservice/interfaces
1415usr/share/dbus-1/interfaces
debian/unity8.install+1
@@ -10,4 +10,5 @@ usr/share/unity8/Launcher
1010usr/share/unity8/Panel
1111usr/share/unity8/Shell.qml
1212usr/share/unity8/Stages
13+usr/share/unity8/Wizard
1314usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
include/paths.h.in+2
@@ -71,9 +71,11 @@ inline QStringList fallbackImportPaths() {
7171 QStringList paths;
7272 if (isRunningInstalled()) {
7373 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
74+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
7475 paths << QString("@SHELL_PLUGINDIR@");
7576 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
7677 } else {
78+ paths << QString("@USS_PRIVATE_PLUGINDIR@");
7779 paths << QString("@SHELL_PLUGINDIR@");
7880 paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
7981 }
plugins/AccountsService/AccountsService.cpp+61−2
@@ -19,23 +19,28 @@
1919#include "AccountsService.h"
2020#include "AccountsServiceDBusAdaptor.h"
2121
22+#include <QFile>
2223#include <QStringList>
2324
2425AccountsService::AccountsService(QObject* parent)
2526 : QObject(parent),
2627 m_service(new AccountsServiceDBusAdaptor(this)),
27− m_user(qgetenv("USER")),
28+ m_user(""),
2829 m_demoEdges(false),
2930 m_enableLauncherWhileLocked(false),
3031 m_enableIndicatorsWhileLocked(false),
3132 m_statsWelcomeScreen(false),
3233 m_passwordDisplayHint(Keyboard),
33− m_failedLogins(0)
34+ m_failedLogins(0),
35+ m_hereEnabled(false),
36+ m_hereLicensePath() // null means not set yet
3437{
3538 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
3639 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
3740 connect(m_service, SIGNAL(maybeChanged(const QString &)),
3841 this, SLOT(maybeChanged(const QString &)));
42+
43+ setUser(qgetenv("USER"));
3944}
4045
4146QString AccountsService::user() const
@@ -45,6 +50,9 @@ QString AccountsService::user() const
4550
4651void AccountsService::setUser(const QString &user)
4752{
53+ if (user.isEmpty() || m_user == user)
54+ return;
55+
4856 m_user = user;
4957 Q_EMIT userChanged();
5058
@@ -55,6 +63,8 @@ void AccountsService::setUser(const QString &user)
5563 updateStatsWelcomeScreen();
5664 updatePasswordDisplayHint();
5765 updateFailedLogins();
66+ updateHereEnabled();
67+ updateHereLicensePath();
5868}
5969
6070bool AccountsService::demoEdges() const
@@ -93,6 +103,26 @@ AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() cons
93103 return m_passwordDisplayHint;
94104}
95105
106+bool AccountsService::hereEnabled() const
107+{
108+ return m_hereEnabled;
109+}
110+
111+void AccountsService::setHereEnabled(bool enabled)
112+{
113+ m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
114+}
115+
116+QString AccountsService::hereLicensePath() const
117+{
118+ return m_hereLicensePath;
119+}
120+
121+bool AccountsService::hereLicensePathValid() const
122+{
123+ return !m_hereLicensePath.isNull();
124+}
125+
96126void AccountsService::updateDemoEdges()
97127{
98128 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
@@ -156,6 +186,28 @@ void AccountsService::updateFailedLogins()
156186 }
157187}
158188
189+void AccountsService::updateHereEnabled()
190+{
191+ bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();
192+ if (m_hereEnabled != hereEnabled) {
193+ m_hereEnabled = hereEnabled;
194+ Q_EMIT hereEnabledChanged();
195+ }
196+}
197+
198+void AccountsService::updateHereLicensePath()
199+{
200+ QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();
201+
202+ if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
203+ hereLicensePath = "";
204+
205+ if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
206+ m_hereLicensePath = hereLicensePath;
207+ Q_EMIT hereLicensePathChanged();
208+ }
209+}
210+
159211uint AccountsService::failedLogins() const
160212{
161213 return m_failedLogins;
@@ -195,6 +247,13 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
195247 if (changed.contains("EnableIndicatorsWhileLocked")) {
196248 updateEnableIndicatorsWhileLocked();
197249 }
250+ } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {
251+ if (changed.contains("LicenseAccepted")) {
252+ updateHereEnabled();
253+ }
254+ if (changed.contains("LicenseBasePath")) {
255+ updateHereLicensePath();
256+ }
198257 }
199258}
200259
plugins/AccountsService/AccountsService.h+20
@@ -55,6 +55,16 @@ class AccountsService: public QObject
5555 READ failedLogins
5656 WRITE setFailedLogins
5757 NOTIFY failedLoginsChanged)
58+ Q_PROPERTY(bool hereEnabled
59+ READ hereEnabled
60+ WRITE setHereEnabled
61+ NOTIFY hereEnabledChanged)
62+ Q_PROPERTY(QString hereLicensePath
63+ READ hereLicensePath
64+ NOTIFY hereLicensePathChanged)
65+ Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
66+ READ hereLicensePathValid
67+ NOTIFY hereLicensePathChanged)
5868
5969public:
6070 enum PasswordDisplayHint {
@@ -75,6 +85,10 @@ public:
7585 PasswordDisplayHint passwordDisplayHint() const;
7686 uint failedLogins() const;
7787 void setFailedLogins(uint failedLogins);
88+ bool hereEnabled() const;
89+ void setHereEnabled(bool enabled);
90+ QString hereLicensePath() const;
91+ bool hereLicensePathValid() const;
7892
7993Q_SIGNALS:
8094 void userChanged();
@@ -85,6 +99,8 @@ Q_SIGNALS:
8599 void statsWelcomeScreenChanged();
86100 void passwordDisplayHintChanged();
87101 void failedLoginsChanged();
102+ void hereEnabledChanged();
103+ void hereLicensePathChanged();
88104
89105private Q_SLOTS:
90106 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -98,6 +114,8 @@ private:
98114 void updateStatsWelcomeScreen();
99115 void updatePasswordDisplayHint();
100116 void updateFailedLogins();
117+ void updateHereEnabled();
118+ void updateHereLicensePath();
101119
102120 AccountsServiceDBusAdaptor *m_service;
103121 QString m_user;
@@ -108,6 +126,8 @@ private:
108126 bool m_statsWelcomeScreen;
109127 PasswordDisplayHint m_passwordDisplayHint;
110128 uint m_failedLogins;
129+ bool m_hereEnabled;
130+ QString m_hereLicensePath;
111131};
112132
113133#endif
plugins/CMakeLists.txt+1
@@ -21,3 +21,4 @@ add_subdirectory(ScreenGrabber)
2121add_subdirectory(Ubuntu)
2222add_subdirectory(Unity)
2323add_subdirectory(Utils)
24+add_subdirectory(Wizard)
plugins/Dash/CardCreator.js+2−1
@@ -320,7 +320,8 @@ function cardString(template, components) {
320320 var hasSummary = components["summary"] || false;
321321 var artAndSummary = hasArt && hasSummary;
322322 var isHorizontal = template["card-layout"] === "horizontal";
323− var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
323+ var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
324+ (hasSummary && (template["card-background"] || components["background"]));
324325 var hasTitle = components["title"] || false;
325326 var hasMascot = components["mascot"] || false;
326327 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
plugins/Dash/abstractdashview.cpp+24−5
@@ -16,13 +16,12 @@
1616
1717#include "abstractdashview.h"
1818
19−static const qreal bufferRatio = 0.5;
20−
2119AbstractDashView::AbstractDashView()
2220 : m_delegateModel(nullptr)
2321 , m_asyncRequestedIndex(-1)
2422 , m_columnSpacing(0)
2523 , m_rowSpacing(0)
24+ , m_buffer(320) // Same value used in qquickitemview.cpp in Qt 5.4
2625 , m_displayMarginBeginning(0)
2726 , m_displayMarginEnd(0)
2827 , m_needsRelayout(false)
@@ -112,6 +111,27 @@ void AbstractDashView::setRowSpacing(qreal rowSpacing)
112111 }
113112}
114113
114+int AbstractDashView::cacheBuffer() const
115+{
116+ return m_buffer;
117+}
118+
119+void AbstractDashView::setCacheBuffer(int buffer)
120+{
121+ if (buffer < 0) {
122+ qmlInfo(this) << "Cannot set a negative cache buffer";
123+ return;
124+ }
125+
126+ if (m_buffer != buffer) {
127+ m_buffer = buffer;
128+ if (isComponentComplete()) {
129+ polish();
130+ }
131+ emit cacheBufferChanged();
132+ }
133+}
134+
115135qreal AbstractDashView::displayMarginBeginning() const
116136{
117137 return m_displayMarginBeginning;
@@ -160,9 +180,8 @@ void AbstractDashView::refill()
160180
161181 const qreal from = -m_displayMarginBeginning;
162182 const qreal to = height() + m_displayMarginEnd;
163− const qreal buffer = (to - from) * bufferRatio;
164− const qreal bufferFrom = from - buffer;
165− const qreal bufferTo = to + buffer;
183+ const qreal bufferFrom = from - m_buffer;
184+ const qreal bufferTo = to + m_buffer;
166185
167186 bool added = addVisibleItems(from, to, false);
168187 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
plugins/Dash/abstractdashview.h+6
@@ -35,6 +35,7 @@ class AbstractDashView : public QQuickItem
3535 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
3636 Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)
3737 Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)
38+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
3839 Q_PROPERTY(qreal displayMarginBeginning READ displayMarginBeginning
3940 WRITE setDisplayMarginBeginning
4041 NOTIFY displayMarginBeginningChanged)
@@ -61,6 +62,9 @@ public:
6162 qreal rowSpacing() const;
6263 void setRowSpacing(qreal rowSpacing);
6364
65+ int cacheBuffer() const;
66+ void setCacheBuffer(int);
67+
6468 qreal displayMarginBeginning() const;
6569 void setDisplayMarginBeginning(qreal);
6670
@@ -72,6 +76,7 @@ Q_SIGNALS:
7276 void delegateChanged();
7377 void columnSpacingChanged();
7478 void rowSpacingChanged();
79+ void cacheBufferChanged();
7580 void displayMarginBeginningChanged();
7681 void displayMarginEndChanged();
7782
@@ -117,6 +122,7 @@ private:
117122
118123 int m_columnSpacing;
119124 int m_rowSpacing;
125+ int m_buffer;
120126 qreal m_displayMarginBeginning;
121127 qreal m_displayMarginEnd;
122128 bool m_needsRelayout;
plugins/Dash/listviewwithpageheader.cpp+7−2
@@ -334,13 +334,18 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
334334 return m_headerItemShownHeight;
335335}
336336
337−qreal ListViewWithPageHeader::cacheBuffer() const
337+int ListViewWithPageHeader::cacheBuffer() const
338338{
339339 return m_cacheBuffer;
340340}
341341
342−void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
342+void ListViewWithPageHeader::setCacheBuffer(int cacheBuffer)
343343{
344+ if (cacheBuffer < 0) {
345+ qmlInfo(this) << "Cannot set a negative cache buffer";
346+ return;
347+ }
348+
344349 if (cacheBuffer != m_cacheBuffer) {
345350 m_cacheBuffer = cacheBuffer;
346351 Q_EMIT cacheBufferChanged();
plugins/Dash/listviewwithpageheader.h+4−4
@@ -54,7 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
5656 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57− Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
57+ Q_PROPERTY(int cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
5858
5959 friend class ListViewWithPageHeaderTest;
6060 friend class ListViewWithPageHeaderTestSection;
@@ -85,8 +85,8 @@ public:
8585 int stickyHeaderHeight() const;
8686 qreal headerItemShownHeight() const;
8787
88− qreal cacheBuffer() const;
89− void setCacheBuffer(qreal cacheBuffer);
88+ int cacheBuffer() const;
89+ void setCacheBuffer(int cacheBuffer);
9090
9191 Q_INVOKABLE void positionAtBeginning();
9292 Q_INVOKABLE void showHeader();
@@ -204,7 +204,7 @@ private:
204204 bool m_forceNoClip;
205205 bool m_inLayout;
206206 bool m_inContentHeightKeepHeaderShown;
207− qreal m_cacheBuffer;
207+ int m_cacheBuffer;
208208
209209 // Qt 5.0 doesn't like releasing the items just after itemCreated
210210 // so we delay the releasing until the next updatePolish
plugins/LightDM/CMakeLists.txt+4−4
@@ -1,9 +1,9 @@
1−# Dependencies
2−include(FindPkgConfig)
31pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
42# TODO: Once we split out a separate greeter process, uncomment these lines
53#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
64
5+add_subdirectory(liblightdm)
6+
77include_directories(
88 ${CMAKE_CURRENT_SOURCE_DIR}
99 ${CMAKE_CURRENT_BINARY_DIR}
@@ -15,7 +15,7 @@ include_directories(
1515)
1616
1717set(QMLPLUGIN_SRC
18− ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
18+ ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
1919 DBusGreeter.cpp
2020 DBusGreeterList.cpp
2121 Greeter.cpp
@@ -28,7 +28,7 @@ add_library(LightDM-qml MODULE
2828 )
2929
3030target_link_libraries(LightDM-qml
31− MockLightDM-demo
31+ integratedLightDM
3232 unity8-private
3333# TODO: Once we split out a separate greeter process, uncomment these lines
3434# ${LIBLIGHTDM_LDFLAGS}
plugins/LightDM/Greeter.cpp+1−19
@@ -17,26 +17,8 @@
1717 */
1818
1919#include "Greeter.h"
20+#include "GreeterPrivate.h"
2021#include <libintl.h>
21−#include <QLightDM/Greeter>
22−
23−class GreeterPrivate
24−{
25−public:
26− explicit GreeterPrivate(Greeter *parent);
27−
28− QLightDM::Greeter *m_greeter;
29− bool m_active;
30− bool wasPrompted;
31− bool promptless;
32−
33−protected:
34− Greeter * const q_ptr;
35−
36−private:
37− Q_DECLARE_PUBLIC(Greeter)
38−};
39−
4022
4123GreeterPrivate::GreeterPrivate(Greeter* parent)
4224 : m_greeter(new QLightDM::Greeter(parent)),
plugins/LightDM/Greeter.h+1−1
@@ -68,7 +68,7 @@ Q_SIGNALS:
6868 // should switch to this user if possible.
6969 void requestAuthenticationUser(const QString &user);
7070
71−private:
71+protected:
7272 GreeterPrivate * const d_ptr;
7373
7474 Q_DECLARE_PRIVATE(Greeter)
plugins/LightDM/GreeterPrivate.hnew file+39
@@ -0,0 +1,39 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef UNITY_GREETER_PRIVATE_H
18+#define UNITY_GREETER_PRIVATE_H
19+
20+#include <QLightDM/Greeter>
21+
22+class GreeterPrivate
23+{
24+public:
25+ explicit GreeterPrivate(Greeter *parent);
26+
27+ QLightDM::Greeter *m_greeter;
28+ bool m_active;
29+ bool wasPrompted;
30+ bool promptless;
31+
32+protected:
33+ Greeter * const q_ptr;
34+
35+private:
36+ Q_DECLARE_PUBLIC(Greeter)
37+};
38+
39+#endif // UNITY_GREETER_PRIVATE_H
plugins/LightDM/UsersModel.cpp+1−1
@@ -58,7 +58,7 @@ QVariant MangleModel::data(const QModelIndex &index, int role) const
5858// **** Now we continue with actual UsersModel class ****
5959
6060UsersModel::UsersModel(QObject* parent)
61− : QSortFilterProxyModelQML(parent)
61+ : UnitySortFilterProxyModelQML(parent)
6262{
6363 setModel(new MangleModel(this));
6464 setSortCaseSensitivity(Qt::CaseInsensitive);
plugins/LightDM/UsersModel.h+2−2
@@ -23,10 +23,10 @@
2323#ifndef UNITY_USERSMODEL_H
2424#define UNITY_USERSMODEL_H
2525
26−#include <qsortfilterproxymodelqml.h>
26+#include <unitysortfilterproxymodelqml.h>
2727#include <QtCore/QObject>
2828
29−class UsersModel : public QSortFilterProxyModelQML
29+class UsersModel : public UnitySortFilterProxyModelQML
3030{
3131 Q_OBJECT
3232
tests/mocks/LightDM/demo/CMakeLists.txt → plugins/LightDM/liblightdm/CMakeLists.txtrenamed+6−5
@@ -1,14 +1,14 @@
11pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
22
33set(LibLightDM_SOURCES
4− ../Greeter.cpp
5− ../UsersModel.cpp
4+ Greeter.cpp
5+ UsersModel.cpp
66 GreeterPrivate.cpp
77 UsersModelPrivate.cpp
88 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
99 )
1010
11−add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
11+add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
1212add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
1313
1414include_directories(
@@ -16,7 +16,7 @@ include_directories(
1616 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
1717)
1818
19−target_link_libraries(MockLightDM-demo
19+target_link_libraries(integratedLightDM
2020 ${LIBUSERMETRICSOUTPUT_LDFLAGS}
2121 -lpam
2222)
@@ -25,9 +25,10 @@ target_link_libraries(MockLightDM-demo-shared
2525 -lpam
2626)
2727
28−qt5_use_modules(MockLightDM-demo Concurrent Gui)
28+qt5_use_modules(integratedLightDM Concurrent Gui)
2929qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
3030
31+set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
3132set_target_properties(MockLightDM-demo-shared PROPERTIES
3233 OUTPUT_NAME lightdm-qt5-2)
3334
tests/mocks/LightDM/Greeter.cpp → plugins/LightDM/liblightdm/Greeter.cpprenamed+7−1
@@ -16,6 +16,13 @@
1616 * Author: Michael Terry <michael.terry@canonical.com>
1717 */
1818
19+
20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
24+
25+
1926#include "Greeter.h"
2027#include "GreeterPrivate.h"
2128#include <QtCore/QCoreApplication>
@@ -128,7 +135,6 @@ void Greeter::authenticate(const QString &username)
128135
129136 d->authenticated = false;
130137 d->authenticationUser = username;
131− d->twoFactorDone = false;
132138 d->handleAuthenticate();
133139}
134140
tests/mocks/LightDM/Greeter.h → plugins/LightDM/liblightdm/Greeter.hrenamed+4
@@ -24,6 +24,10 @@
2424#include <QtCore/QObject>
2525#include <QtCore/QVariant>
2626
27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
2731
2832namespace QLightDM
2933{
tests/mocks/LightDM/demo/GreeterPrivate.cpp → plugins/LightDM/liblightdm/GreeterPrivate.cpprenamed+2−2
@@ -16,8 +16,8 @@
1616 * Author: Michael Terry <michael.terry@canonical.com>
1717 */
1818
19−#include "../Greeter.h"
20−#include "../GreeterPrivate.h"
19+#include "Greeter.h"
20+#include "GreeterPrivate.h"
2121#include <QFuture>
2222#include <QFutureInterface>
2323#include <QFutureWatcher>
tests/mocks/LightDM/GreeterPrivate.h → plugins/LightDM/liblightdm/GreeterPrivate.hrenamed−1
@@ -35,7 +35,6 @@ public:
3535 // These variables may not be used by all subclasses, that's no problem
3636 bool authenticated;
3737 QString authenticationUser;
38− bool twoFactorDone;
3938
4039 void handleAuthenticate();
4140 void handleRespond(const QString &response);
tests/mocks/LightDM/UsersModel.cpp → plugins/LightDM/liblightdm/UsersModel.cpprenamed+6
@@ -16,6 +16,12 @@
1616 * Author: Michael Terry <michael.terry@canonical.com>
1717 */
1818
19+
20+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
21+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
22+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
23+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
24+
1925// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
2026// To use the same method of setting role name that it does, we
2127// set our compatibility to Qt4 here too.
tests/mocks/LightDM/UsersModel.h → plugins/LightDM/liblightdm/UsersModel.hrenamed+4
@@ -24,6 +24,10 @@
2424#include <QtCore/QSharedDataPointer>
2525#include <QAbstractListModel>
2626
27+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB
29+ * COUNTERPART IN tests/mocks/Lightdm/liblightdm
30+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
2731
2832namespace QLightDM
2933{
tests/mocks/LightDM/demo/UsersModelPrivate.cpp → plugins/LightDM/liblightdm/UsersModelPrivate.cpprenamed+1−1
@@ -16,7 +16,7 @@
1616 * Author: Michael Terry <michael.terry@canonical.com>
1717 */
1818
19−#include "../UsersModelPrivate.h"
19+#include "UsersModelPrivate.h"
2020
2121#include <QDir>
2222#include <QSettings>
tests/mocks/LightDM/UsersModelPrivate.h → plugins/LightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

plugins/Lights/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
31pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
42pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
53
plugins/Lights/Lights.cpp+9−24
@@ -44,12 +44,20 @@ Lights::~Lights()
4444
4545void Lights::setState(Lights::State newState)
4646{
47+ if (!init()) {
48+ qWarning() << "No lights device";
49+ return;
50+ }
51+
4752 if (m_state != newState) {
4853 if (newState == Lights::On) {
4954 turnOn();
5055 } else {
5156 turnOff();
5257 }
58+
59+ m_state = newState;
60+ Q_EMIT stateChanged(m_state);
5361 }
5462}
5563
@@ -115,6 +123,7 @@ bool Lights::init()
115123 err = module->methods->open(module, LIGHT_ID_NOTIFICATIONS, &device);
116124 if (err == 0) {
117125 m_lightDevice = (light_device_t*)device;
126+ turnOff();
118127 return true;
119128 } else {
120129 qWarning() << "Failed to access notification lights";
@@ -127,15 +136,6 @@ bool Lights::init()
127136
128137void Lights::turnOn()
129138{
130− if (!init()) {
131− qWarning() << "No lights device";
132− return;
133− }
134−
135− if (m_state == Lights::On) {
136− return;
137− }
138−
139139 // pulse
140140 light_state_t state;
141141 memset(&state, 0, sizeof(light_state_t));
@@ -147,23 +147,11 @@ void Lights::turnOn()
147147
148148 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
149149 qWarning() << "Failed to turn the light off";
150− } else {
151− m_state = Lights::On;
152− Q_EMIT stateChanged(m_state);
153150 }
154151}
155152
156153void Lights::turnOff()
157154{
158− if (!init()) {
159− qWarning() << "No lights device";
160− return;
161− }
162−
163− if (m_state == Lights::Off) {
164− return;
165− }
166−
167155 light_state_t state;
168156 memset(&state, 0, sizeof(light_state_t));
169157 state.color = 0x00000000;
@@ -174,8 +162,5 @@ void Lights::turnOff()
174162
175163 if (m_lightDevice->set_light(m_lightDevice, &state) != 0) {
176164 qWarning() << "Failed to turn the light off";
177− } else {
178− m_state = Lights::Off;
179− Q_EMIT stateChanged(m_state);
180165 }
181166}
plugins/Powerd/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
31pkg_search_module(GIO REQUIRED gio-2.0)
42
53include_directories(
plugins/Ubuntu/Gestures/Direction.cpp+6−2
@@ -18,7 +18,9 @@
1818
1919bool Direction::isHorizontal(Direction::Type type)
2020{
21− return type == Direction::Leftwards || type == Direction::Rightwards;
21+ return type == Direction::Leftwards
22+ || type == Direction::Rightwards
23+ || type == Direction::Horizontal;
2224}
2325
2426bool Direction::isVertical(Direction::Type type)
@@ -28,5 +30,7 @@ bool Direction::isVertical(Direction::Type type)
2830
2931bool Direction::isPositive(Direction::Type type)
3032{
31− return type == Rightwards || type == Downwards;
33+ return type == Rightwards
34+ || type == Downwards
35+ || type == Horizontal;
3236}
plugins/Ubuntu/Gestures/Direction.h+2−1
@@ -33,7 +33,8 @@ public:
3333 Rightwards, // Along the positive direction of the X axis
3434 Leftwards, // Along the negative direction of the X axis
3535 Downwards, // Along the positive direction of the Y axis
36− Upwards // Along the negative direction of the Y axis
36+ Upwards, // Along the negative direction of the Y axis
37+ Horizontal // Along the X axis, in any direction
3738 };
3839
3940 Q_INVOKABLE static bool isHorizontal(Direction::Type type);
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+27−37
@@ -36,7 +36,7 @@
3636using namespace UbuntuGestures;
3737
3838#if DIRECTIONALDRAGAREA_DEBUG
39−#define DDA_DEBUG(msg) qDebug("[DDA] " msg)
39+#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params
4040#include "DebugHelpers.h"
4141
4242namespace {
@@ -53,7 +53,7 @@ const char *statusToString(DirectionalDragArea::Status status)
5353
5454} // namespace {
5555#else // DIRECTIONALDRAGAREA_DEBUG
56−#define DDA_DEBUG(msg) do{}while(0)
56+#define ddaDebug(params) ((void)0)
5757#endif // DIRECTIONALDRAGAREA_DEBUG
5858
5959
@@ -253,7 +253,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
253253 if (event->gained()) {
254254 QVector<int> ids;
255255 ids.append(event->touchId());
256− DDA_DEBUG("grabbing touch");
256+ ddaDebug("grabbing touch");
257257 grabTouchPoints(ids);
258258
259259 // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
@@ -265,7 +265,7 @@ void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
265265 if (window()) {
266266 QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
267267 if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
268− DDA_DEBUG("removing mouse grabber");
268+ ddaDebug("removing mouse grabber");
269269 window()->mouseGrabberItem()->ungrabMouse();
270270 }
271271 }
@@ -283,11 +283,7 @@ void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent
283283
284284 Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
285285
286− #if DIRECTIONALDRAGAREA_DEBUG
287− // TODO Consider using qCDebug() when available (Qt 5.2)
288− qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()
289− << qPrintable(touchEventToString(event));
290− #endif
286+ ddaDebug("Unowned " << m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
291287
292288 switch (m_status) {
293289 case WaitingForTouch:
@@ -322,7 +318,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
322318
323319 if (touchPoint->state() == Qt::TouchPointReleased) {
324320 // touch has ended before recognition concluded
325− DDA_DEBUG("Touch has ended before recognition concluded");
321+ ddaDebug("Touch has ended before recognition concluded");
326322 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
327323 emitSignalIfTapped();
328324 setStatus(WaitingForTouch);
@@ -335,7 +331,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
335331 updateVelocityCalculator(touchScenePos);
336332
337333 if (!pointInsideAllowedArea()) {
338− DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
334+ ddaDebug("Rejecting gesture because touch point is outside allowed area.");
339335 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
340336 // We still wanna know when it ends for keeping the composition time window up-to-date
341337 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -344,7 +340,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
344340 }
345341
346342 if (!movingInRightDirection()) {
347− DDA_DEBUG("Rejecting gesture because touch point is moving in the wrong direction.");
343+ ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");
348344 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
349345 // We still wanna know when it ends for keeping the composition time window up-to-date
350346 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
@@ -358,7 +354,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
358354 if (isWithinTouchCompositionWindow()) {
359355 // There's still time for some new touch to appear and ruin our party as it would be combined
360356 // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
361− DDA_DEBUG("Sill within composition window. Let's wait more.");
357+ ddaDebug("Sill within composition window. Let's wait more.");
362358 return;
363359 }
364360
@@ -366,7 +362,7 @@ void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unowned
366362 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
367363 setStatus(Recognized);
368364 } else {
369− DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
365+ ddaDebug("Didn't move far enough yet. Let's wait more.");
370366 }
371367}
372368
@@ -375,11 +371,7 @@ void DirectionalDragArea::touchEvent(QTouchEvent *event)
375371 // TODO: Consider when more than one touch starts in the same event (although it's not possible
376372 // with Mir's android-input). Have to track them all. Consider it a plus/bonus.
377373
378− #if DIRECTIONALDRAGAREA_DEBUG
379− // TODO Consider using qCDebug() when available (Qt 5.2)
380− qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()
381− << qPrintable(touchEventToString(event));
382− #endif
374+ ddaDebug(m_timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));
383375
384376 if (!isEnabled() || !isVisible()) {
385377 QQuickItem::touchEvent(event);
@@ -416,9 +408,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
416408 if (isWithinTouchCompositionWindow()) {
417409 // too close to the last touch start. So we consider them as starting roughly at the same time.
418410 // Can't be a single-touch gesture.
419− #if DIRECTIONALDRAGAREA_DEBUG
420− qDebug("[DDA] A new touch point came in but we're still within time composition window. Ignoring it.");
421− #endif
411+ ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");
422412 allGood = false;
423413 }
424414
@@ -456,6 +446,7 @@ void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
456446
457447 if (recognitionIsDisabled()) {
458448 // Behave like a dumb TouchArea
449+ ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
459450 TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
460451 setStatus(Recognized);
461452 event->accept();
@@ -487,7 +478,7 @@ void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
487478
488479 if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
489480 // multi-finger drags are not accepted
490− DDA_DEBUG("Multi-finger drags are not accepted");
481+ ddaDebug("Multi-finger drags are not accepted");
491482
492483 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
493484 // We still wanna know when it ends for keeping the composition time window up-to-date
@@ -581,12 +572,16 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
581572
582573bool DirectionalDragArea::movingInRightDirection() const
583574{
584− QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
585− m_dampedScenePos.y() - m_previousDampedScenePos.y());
575+ if (m_direction == Direction::Horizontal) {
576+ return true;
577+ } else {
578+ QPointF movementVector(m_dampedScenePos.x() - m_previousDampedScenePos.x(),
579+ m_dampedScenePos.y() - m_previousDampedScenePos.y());
586580
587− qreal scalarProjection = projectOntoDirectionVector(movementVector);
581+ qreal scalarProjection = projectOntoDirectionVector(movementVector);
588582
589− return scalarProjection >= 0.;
583+ return scalarProjection >= 0.;
584+ }
590585}
591586
592587bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
@@ -614,7 +609,7 @@ void DirectionalDragArea::checkSpeed()
614609 qreal minSpeedMsecs = m_minSpeed / 1000.0;
615610
616611 if (speed < minSpeedMsecs) {
617− DDA_DEBUG("Rejecting gesture because it's below minimum speed.");
612+ ddaDebug("Rejecting gesture because it's below minimum speed.");
618613 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
619614 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
620615 setStatus(WaitingForTouch);
@@ -625,7 +620,7 @@ void DirectionalDragArea::checkSpeed()
625620 m_silenceTime += m_recognitionTimer->interval();
626621
627622 if (m_silenceTime > m_maxSilenceTime) {
628− DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");
623+ ddaDebug("Rejecting gesture because its silence time has been exceeded.");
629624 TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
630625 TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
631626 setStatus(WaitingForTouch);
@@ -646,7 +641,7 @@ void DirectionalDragArea::giveUpIfDisabledOrInvisible()
646641 }
647642
648643 if (m_status != WaitingForTouch) {
649− DDA_DEBUG("Resetting status because got disabled or made invisible");
644+ ddaDebug("Resetting status because got disabled or made invisible");
650645 setStatus(WaitingForTouch);
651646 }
652647 }
@@ -666,9 +661,7 @@ void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
666661 m_status = newStatus;
667662 Q_EMIT statusChanged(m_status);
668663
669− #if DIRECTIONALDRAGAREA_DEBUG
670− qDebug() << "[DDA]" << statusToString(oldStatus) << "->" << statusToString(newStatus);
671− #endif
664+ ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
672665
673666 switch (newStatus) {
674667 case WaitingForTouch:
@@ -875,7 +868,7 @@ void DirectionalDragArea::updateSceneDirectionVector()
875868 localDirection.rx() = -1.;
876869 localDirection.ry() = 0.;
877870 break;
878− default: // Direction::Rightwards:
871+ default: // Direction::Rightwards || Direction.Horizontal
879872 localDirection.rx() = 1.;
880873 localDirection.ry() = 0.;
881874 break;
@@ -891,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector
891884 return sceneVector.x() * m_sceneDirectionVector.x() +
892885 sceneVector.y() * m_sceneDirectionVector.y();
893886}
894−
895−// Because we are defining a new QObject-based class (RecognitionTimer) here.
896−#include "DirectionalDragArea.moc"
plugins/Unity/DashCommunicator/dashconnection.cpp+30
@@ -19,12 +19,42 @@
1919#include <QDBusInterface>
2020#include <QDBusPendingCall>
2121
22+/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service
23+ * appears on the bus.
24+ *
25+ * On construction QDBusInterface synchronously introspects the service, which will block the GUI
26+ * thread of this process if the service is busy. QDBusAbstractInterface does not perform this
27+ * introspection, so let's subclass that and avoid the blocking scenario.
28+ *
29+ * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we
30+ * cannot easily connect to DBus signals with the usual connect() calls. So this approach only
31+ * suited to push communication with the DBus service.
32+ */
33+class AsyncDBusInterface : public QDBusAbstractInterface
34+{
35+public:
36+ AsyncDBusInterface(const QString &service, const QString &path,
37+ const QString &interface, const QDBusConnection &connection,
38+ QObject *parent = 0)
39+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
40+ {}
41+ ~AsyncDBusInterface() = default;
42+};
43+
44+
2245DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
2346 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
2447{
2548
2649}
2750
51+/* Override the default implementation to create a non-blocking DBus interface (see note above). */
52+QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,
53+ const QString &interface, const QDBusConnection &connection)
54+{
55+ return new AsyncDBusInterface(service, path, interface, connection);
56+}
57+
2858void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
2959{
3060 if (dbusInterface()) {
plugins/Unity/DashCommunicator/dashconnection.h+4−1
@@ -20,7 +20,6 @@
2020// local
2121#include "abstractdbusservicemonitor.h"
2222
23−
2423class DashConnection: public AbstractDBusServiceMonitor
2524{
2625 Q_OBJECT
@@ -29,6 +28,10 @@ public:
2928
3029public Q_SLOTS:
3130 void setCurrentScope(int index, bool animate, bool isSwipe);
31+
32+private:
33+ QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
34+ const QString &interface, const QDBusConnection &connection) override;
3235};
3336
3437#endif
plugins/Unity/Indicators/CMakeLists.txt+3−2
@@ -16,18 +16,19 @@ include_directories(
1616)
1717
1818set(IndicatorsQML_SOURCES
19+ actionrootstate.cpp
1920 indicator.cpp
2021 indicators.h
2122 indicatorsmanager.cpp
2223 indicatorsmodel.cpp
2324 menucontentactivator.cpp
25+ modelactionrootstate.cpp
2426 modelprinter.cpp
2527 plugin.cpp
26− rootactionstate.cpp
28+ rootstateparser.cpp
2729 sharedunitymenumodel.cpp
2830 unitymenumodelcache.cpp
2931 unitymenumodelstack.cpp
30− visibleindicatorsmodel.cpp
3132)
3233add_definitions(-DUNITYINDICATORS_LIBRARY)
3334
plugins/Unity/Indicators/Indicators.qmltypes+18−7
@@ -7,6 +7,14 @@ import QtQuick.tooling 1.1
77// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'
88
99Module {
10+ Component {
11+ name: "ActionRootState"
12+ prototype: "RootStateObject"
13+ exports: ["Unity.Indicators/ActionRootState 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }
16+ Property { name: "actionName"; type: "string" }
17+ }
1018 Component {
1119 name: "ActionState"
1220 prototype: "QObject"
@@ -23,7 +31,6 @@ Module {
2331 }
2432 }
2533 }
26− Component { name: "ActionStateParser"; prototype: "QObject" }
2734 Component {
2835 name: "FlatMenuProxyModelRole"
2936 prototype: "QObject"
@@ -146,6 +153,14 @@ Module {
146153 exportMetaObjectRevisions: [0]
147154 Property { name: "active"; type: "bool"; isReadonly: true }
148155 }
156+ Component {
157+ name: "ModelActionRootState"
158+ prototype: "RootStateObject"
159+ exports: ["Unity.Indicators/ModelActionRootState 0.1"]
160+ exportMetaObjectRevisions: [0]
161+ Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
162+ Signal { name: "indexChanged" }
163+ }
149164 Component {
150165 name: "ModelPrinter"
151166 prototype: "QObject"
@@ -192,11 +207,8 @@ Module {
192207 }
193208 Component { name: "QIdentityProxyModel"; prototype: "QAbstractProxyModel" }
194209 Component {
195− name: "RootActionState"
196− prototype: "ActionStateParser"
197− exports: ["Unity.Indicators/RootActionState 0.1"]
198− exportMetaObjectRevisions: [0]
199− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }
210+ name: "RootStateObject"
211+ prototype: "QObject"
200212 Property { name: "valid"; type: "bool"; isReadonly: true }
201213 Property { name: "title"; type: "string"; isReadonly: true }
202214 Property { name: "leftLabel"; type: "string"; isReadonly: true }
@@ -205,7 +217,6 @@ Module {
205217 Property { name: "accessibleName"; type: "string"; isReadonly: true }
206218 Property { name: "visible"; type: "bool"; isReadonly: true }
207219 Signal { name: "updated" }
208− Signal { name: "indexChanged" }
209220 }
210221 Component {
211222 name: "SharedUnityMenuModel"
plugins/Unity/Indicators/actionrootstate.cppnew file+97
@@ -0,0 +1,97 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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 "actionrootstate.h"
18+
19+#include <qdbusactiongroup.h>
20+#include <QDebug>
21+
22+ActionRootState::ActionRootState(QObject *parent)
23+ : RootStateObject(parent)
24+ , m_actionGroup(nullptr)
25+{
26+}
27+
28+QDBusActionGroup *ActionRootState::actionGroup() const
29+{
30+ return m_actionGroup;
31+}
32+
33+void ActionRootState::setActionGroup(QDBusActionGroup *actionGroup)
34+{
35+ if (m_actionGroup != actionGroup) {
36+ bool wasValid = valid();
37+
38+ if (m_actionGroup) {
39+ disconnect(m_actionGroup, 0, this, 0);
40+ }
41+ m_actionGroup = actionGroup;
42+
43+ if (m_actionGroup) {
44+ connect(m_actionGroup, &QDBusActionGroup::statusChanged, this, [&](bool) { updateActionState(); });
45+ connect(m_actionGroup, &QDBusActionGroup::actionAppear, this, [&](const QString&) { updateActionState(); });
46+ connect(m_actionGroup, &QDBusActionGroup::actionVanish, this, [&](const QString&) { updateActionState(); });
47+ connect(m_actionGroup, &QDBusActionGroup::actionStateChanged, this, [&](QVariant) { updateActionState(); });
48+
49+ connect(m_actionGroup, &QObject::destroyed, this, [&](QObject*) { updateActionState(); });
50+ }
51+ updateActionState();
52+ Q_EMIT actionGroupChanged();
53+
54+ if (wasValid != valid()) Q_EMIT validChanged();
55+ }
56+}
57+
58+QString ActionRootState::actionName() const
59+{
60+ return m_actionName;
61+}
62+
63+void ActionRootState::setActionName(const QString &actionName)
64+{
65+ if (m_actionName != actionName) {
66+ bool wasValid = valid();
67+
68+ m_actionName = actionName;
69+ updateActionState();
70+
71+ Q_EMIT actionNameChanged();
72+
73+ if (wasValid != valid()) Q_EMIT validChanged();
74+ }
75+}
76+
77+bool ActionRootState::valid() const
78+{
79+ return m_actionGroup && m_actionGroup->status() == DBusEnums::Connected &&
80+ !m_actionName.isEmpty() && m_actionGroup->hasAction(m_actionName);
81+}
82+
83+void ActionRootState::updateActionState()
84+{
85+ if (valid()) {
86+ ActionStateParser* oldParser = m_actionGroup->actionStateParser();
87+ m_actionGroup->setActionStateParser(&m_parser);
88+
89+ QVariantMap state = m_actionGroup->actionState(m_actionName).toMap();
90+
91+ m_actionGroup->setActionStateParser(oldParser);
92+
93+ setCurrentState(state);
94+ } else {
95+ setCurrentState(QVariantMap());
96+ }
97+}
plugins/Unity/Indicators/actionrootstate.hnew file+55
@@ -0,0 +1,55 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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 ACTIONROOTSTATE_H
18+#define ACTIONROOTSTATE_H
19+
20+#include "unityindicatorsglobal.h"
21+
22+#include "rootstateparser.h"
23+
24+class QDBusActionGroup;
25+
26+class UNITYINDICATORS_EXPORT ActionRootState : public RootStateObject
27+{
28+ Q_OBJECT
29+ Q_PROPERTY(QDBusActionGroup* actionGroup READ actionGroup WRITE setActionGroup NOTIFY actionGroupChanged)
30+ Q_PROPERTY(QString actionName READ actionName WRITE setActionName NOTIFY actionNameChanged)
31+
32+public:
33+ ActionRootState(QObject *parent = 0);
34+
35+ QDBusActionGroup *actionGroup() const;
36+ void setActionGroup(QDBusActionGroup *actionGroup);
37+
38+ QString actionName() const;
39+ void setActionName(const QString& actionName);
40+
41+ bool valid() const override;
42+
43+Q_SIGNALS:
44+ void actionGroupChanged();
45+ void actionNameChanged();
46+
47+private Q_SLOTS:
48+ void updateActionState();
49+
50+private:
51+ QDBusActionGroup* m_actionGroup;
52+ QString m_actionName;
53+};
54+
55+#endif // ACTIONROOTSTATE_H
plugins/Unity/Indicators/indicators.h+1−2
@@ -74,8 +74,7 @@ public:
7474 enum Roles {
7575 Identifier = 0,
7676 Position,
77− IndicatorProperties,
78− IsVisible
77+ IndicatorProperties
7978 };
8079
8180 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
plugins/Unity/Indicators/modelactionrootstate.cppnew file+129
@@ -0,0 +1,129 @@
1+/*
2+ * Copyright 2013 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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+ * Authors:
17+ * Nick Dedekind <nick.dedekind@canonical.com>
18+ */
19+
20+#include "modelactionrootstate.h"
21+#include "indicators.h"
22+
23+#include <unitymenumodel.h>
24+#include <QVariant>
25+#include <QIcon>
26+
27+extern "C" {
28+#include <glib.h>
29+#include <gio/gio.h>
30+}
31+
32+ModelActionRootState::ModelActionRootState(QObject *parent)
33+ : RootStateObject(parent),
34+ m_menu(nullptr)
35+{
36+}
37+
38+ModelActionRootState::~ModelActionRootState()
39+{
40+}
41+
42+UnityMenuModel* ModelActionRootState::menu() const
43+{
44+ return m_menu;
45+}
46+
47+void ModelActionRootState::setMenu(UnityMenuModel* menu)
48+{
49+ if (m_menu != menu) {
50+ bool wasValid = valid();
51+
52+ if (m_menu) {
53+ m_menu->disconnect(this);
54+ }
55+ m_menu = menu;
56+
57+ if (m_menu) {
58+ connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
59+ connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
60+ connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
61+
62+ connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
63+ }
64+ updateActionState();
65+ Q_EMIT menuChanged();
66+
67+ if (wasValid != valid())
68+ Q_EMIT validChanged();
69+ }
70+}
71+
72+bool ModelActionRootState::valid() const
73+{
74+ return !currentState().empty();
75+}
76+
77+void ModelActionRootState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
78+{
79+ Q_UNUSED(parent);
80+ if (start == 0 && end >= 0) {
81+ updateActionState();
82+ }
83+}
84+
85+void ModelActionRootState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
86+{
87+ Q_UNUSED(parent);
88+ if (start == 0 && end >= 0) {
89+ updateActionState();
90+ }
91+}
92+
93+void ModelActionRootState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
94+{
95+ Q_UNUSED(roles);
96+ if (!topLeft.isValid() || !bottomRight.isValid()) {
97+ return;
98+ }
99+
100+ if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
101+ updateActionState();
102+ }
103+}
104+
105+void ModelActionRootState::reset()
106+{
107+ m_menu = nullptr;
108+
109+ Q_EMIT menuChanged();
110+ setCurrentState(QVariantMap());
111+}
112+
113+void ModelActionRootState::updateActionState()
114+{
115+ if (m_menu && m_menu->rowCount() > 0) {
116+ ActionStateParser* oldParser = m_menu->actionStateParser();
117+ m_menu->setActionStateParser(&m_parser);
118+
119+ QVariantMap state = m_menu->get(0, "actionState").toMap();
120+
121+ m_menu->setActionStateParser(oldParser);
122+
123+ setCurrentState(state);
124+ } else if (!m_menu) {
125+ setCurrentState(QVariantMap());
126+ }
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
129+}
plugins/Unity/Indicators/modelactionrootstate.hnew file+61
@@ -0,0 +1,61 @@
1+/*
2+ * Copyright 2013 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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+ * Authors:
17+ * Nick Dedekind <nick.dedekind@canonical.com>
18+ */
19+
20+#ifndef MODELACTIONROOTSTATE_H
21+#define MODELACTIONROOTSTATE_H
22+
23+#include "unityindicatorsglobal.h"
24+
25+#include "rootstateparser.h"
26+
27+class UnityMenuModel;
28+
29+class UNITYINDICATORS_EXPORT ModelActionRootState : public RootStateObject
30+{
31+ Q_OBJECT
32+ Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
33+public:
34+ ModelActionRootState(QObject *parent = 0);
35+ virtual ~ModelActionRootState();
36+
37+ UnityMenuModel* menu() const;
38+ void setMenu(UnityMenuModel* menu);
39+
40+ int index() const;
41+ void setIndex(int index);
42+
43+ bool valid() const override;
44+
45+Q_SIGNALS:
46+ void menuChanged();
47+ void indexChanged();
48+
49+private Q_SLOTS:
50+ void onModelRowsAdded(const QModelIndex& parent, int start, int end);
51+ void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
52+ void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
53+ void reset();
54+
55+private:
56+ void updateActionState();
57+
58+ UnityMenuModel* m_menu;
59+};
60+
61+#endif // MODELACTIONROOTSTATE_H
plugins/Unity/Indicators/plugin.cpp+4−4
@@ -24,16 +24,16 @@
2424#include "plugin.h"
2525
2626// local
27+#include "actionrootstate.h"
2728#include "indicators.h"
2829#include "indicatorsmanager.h"
2930#include "indicatorsmodel.h"
3031#include "menucontentactivator.h"
32+#include "modelactionrootstate.h"
3133#include "modelprinter.h"
32−#include "rootactionstate.h"
3334#include "sharedunitymenumodel.h"
3435#include "unitymenumodelcache.h"
3536#include "unitymenumodelstack.h"
36−#include "visibleindicatorsmodel.h"
3737
3838#include <unitymenumodel.h>
3939
@@ -51,9 +51,9 @@ void IndicatorsPlugin::registerTypes(const char *uri)
5151 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
5252 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
5353 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
54− qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");
54+ qmlRegisterType<ModelActionRootState>(uri, 0, 1, "ModelActionRootState");
55+ qmlRegisterType<ActionRootState>(uri, 0, 1, "ActionRootState");
5556 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
56− qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
5757 qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
5858
5959 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
plugins/Unity/Indicators/rootactionstate.cpp → plugins/Unity/Indicators/rootstateparser.cpprenamed+74−143
@@ -12,157 +12,18 @@
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− * Nick Dedekind <nick.dedekind@canonical.com>
1815 */
1916
20−#include "rootactionstate.h"
21−#include "indicators.h"
22−
23−#include <unitymenumodel.h>
24−#include <QVariant>
25−#include <QIcon>
17+#include "rootstateparser.h"
2618
2719extern "C" {
2820#include <glib.h>
2921#include <gio/gio.h>
3022}
3123
32−RootActionState::RootActionState(QObject *parent)
33− : ActionStateParser(parent),
34− m_menu(nullptr)
35−{
36−}
37−
38−RootActionState::~RootActionState()
39−{
40−}
41−
42−UnityMenuModel* RootActionState::menu() const
43−{
44− return m_menu;
45−}
46−
47−void RootActionState::setMenu(UnityMenuModel* menu)
48−{
49− if (m_menu != menu) {
50− if (m_menu) {
51− m_menu->disconnect(this);
52− }
53− m_menu = menu;
54−
55− if (m_menu) {
56− connect(m_menu, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SLOT(onModelRowsAdded(const QModelIndex&, int, int)));
57− connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
58− connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
59−
60− connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
61− }
62− updateActionState();
63− Q_EMIT menuChanged();
64− }
65−}
66−
67−void RootActionState::onModelRowsAdded(const QModelIndex& parent, int start, int end)
24+RootStateParser::RootStateParser(QObject* parent)
25+ : ActionStateParser(parent)
6826{
69− Q_UNUSED(parent);
70− if (start == 0 && end >= 0) {
71− updateActionState();
72− }
73−}
74−
75−void RootActionState::onModelRowsRemoved(const QModelIndex& parent, int start, int end)
76−{
77− Q_UNUSED(parent);
78− if (start == 0 && end >= 0) {
79− updateActionState();
80− }
81−}
82−
83−void RootActionState::onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles)
84−{
85− Q_UNUSED(roles);
86− if (!topLeft.isValid() || !bottomRight.isValid()) {
87− return;
88− }
89−
90− if (topLeft.row() <= 0 && bottomRight.row() >= 0) {
91− updateActionState();
92− }
93−}
94−
95−void RootActionState::reset()
96−{
97− m_cachedState.clear();
98− m_menu = nullptr;
99−
100− Q_EMIT menuChanged();
101− Q_EMIT updated();
102−}
103−
104−void RootActionState::updateActionState()
105−{
106− if (m_menu && m_menu->rowCount() > 0) {
107− ActionStateParser* oldParser = m_menu->actionStateParser();
108− m_menu->setActionStateParser(this);
109−
110− m_cachedState = m_menu->get(0, "actionState").toMap();
111−
112− m_menu->setActionStateParser(oldParser);
113− } else if (!m_menu) {
114− m_cachedState.clear();
115− }
116− // else if m_menu->rowCount() == 0, let's leave existing cache in place
117− // until the new menu comes in, to avoid flashing the UI empty for a moment
118− Q_EMIT updated();
119−}
120−
121−bool RootActionState::isValid() const
122−{
123− return !m_cachedState.empty();
124−}
125−
126−QString RootActionState::title() const
127−{
128− if (!isValid()) return QString();
129−
130− return m_cachedState.value("title", QVariant::fromValue(QString())).toString();
131−}
132−
133−QString RootActionState::leftLabel() const
134−{
135− if (!isValid()) return QString();
136−
137− return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();
138−}
139−
140−QString RootActionState::rightLabel() const
141−{
142− if (!isValid()) return QString();
143−
144− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();
145−}
146−
147−QStringList RootActionState::icons() const
148−{
149− if (!isValid()) return QStringList();
150−
151− return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();
152−}
153−
154−QString RootActionState::accessibleName() const
155−{
156− if (!isValid()) return QString();
157−
158− return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();
159−}
160−
161−bool RootActionState::indicatorVisible() const
162−{
163− if (!isValid()) return false;
164−
165− return m_cachedState.value("visible", QVariant::fromValue(true)).toBool();
16627}
16728
16829static QString iconUri(GIcon *icon)
@@ -211,7 +72,7 @@ static QString iconUri(GIcon *icon)
21172 return uri;
21273}
21374
214−QVariant RootActionState::toQVariant(GVariant* state) const
75+QVariant RootStateParser::toQVariant(GVariant* state) const
21576{
21677 if (!state) {
21778 return QVariant();
@@ -298,3 +159,73 @@ QVariant RootActionState::toQVariant(GVariant* state) const
298159 }
299160 return ActionStateParser::toQVariant(state);
300161}
162+
163+
164+RootStateObject::RootStateObject(QObject* parent)
165+ : QObject(parent)
166+{
167+}
168+
169+QString RootStateObject::title() const
170+{
171+ if (!valid()) return QString();
172+
173+ return m_currentState.value("title", QVariant::fromValue(QString())).toString();
174+}
175+
176+QString RootStateObject::leftLabel() const
177+{
178+ if (!valid()) return QString();
179+
180+ return m_currentState.value("pre-label", QVariant::fromValue(QString())).toString();
181+}
182+
183+QString RootStateObject::rightLabel() const
184+{
185+ if (!valid()) return QString();
186+
187+ return m_currentState.value("label", QVariant::fromValue(QString())).toString();
188+}
189+
190+QStringList RootStateObject::icons() const
191+{
192+ if (!valid()) return QStringList();
193+
194+ return m_currentState.value("icons", QVariant::fromValue(QStringList())).toStringList();
195+}
196+
197+QString RootStateObject::accessibleName() const
198+{
199+ if (!valid()) return QString();
200+
201+ return m_currentState.value("accessible-desc", QVariant::fromValue(QString())).toString();
202+}
203+
204+bool RootStateObject::indicatorVisible() const
205+{
206+ if (!valid()) return false;
207+
208+ return m_currentState.value("visible", QVariant::fromValue(true)).toBool();
209+}
210+
211+void RootStateObject::setCurrentState(const QVariantMap& newState)
212+{
213+ QString oldTitle = title();
214+ QString oldLeftLabel = leftLabel();
215+ QString oldRightLabel = rightLabel();
216+ QStringList oldIcons = icons();
217+ QString oldAccessibleName = accessibleName();
218+ bool oldIndicatorVisible = indicatorVisible();
219+
220+ if (m_currentState != newState) {
221+ m_currentState = newState;
222+ Q_EMIT updated();
223+
224+ if (oldTitle != title()) Q_EMIT titleChanged();
225+ if (oldLeftLabel != leftLabel()) Q_EMIT leftLabelChanged();
226+ if (oldRightLabel != rightLabel()) Q_EMIT rightLabelChanged();
227+ if (oldIcons != icons()) Q_EMIT iconsChanged();
228+ if (oldAccessibleName != accessibleName()) Q_EMIT accessibleNameChanged();
229+ if (oldIndicatorVisible != indicatorVisible()) Q_EMIT indicatorVisibleChanged();
230+ }
231+}
plugins/Unity/Indicators/rootactionstate.h → plugins/Unity/Indicators/rootstateparser.hrenamed+18−34
@@ -12,26 +12,27 @@
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− * Nick Dedekind <nick.dedekind@canonical.com>
1815 */
1916
20−#ifndef ROOTACTIONSTATE_H
21−#define ROOTACTIONSTATE_H
17+#ifndef ROOTSTATEPARSER_H
18+#define ROOTSTATEPARSER_H
2219
2320#include "unityindicatorsglobal.h"
2421
2522#include <actionstateparser.h>
2623
27−class UnityMenuModel;
24+class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
25+{
26+public:
27+ RootStateParser(QObject* parent = nullptr);
28+ virtual QVariant toQVariant(GVariant* state) const override;
29+};
2830
29−class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
31+class UNITYINDICATORS_EXPORT RootStateObject : public QObject
3032{
3133 Q_OBJECT
32− Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
3334
34− Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
35+ Q_PROPERTY(bool valid READ valid NOTIFY validChanged)
3536 Q_PROPERTY(QString title READ title NOTIFY titleChanged)
3637 Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
3738 Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
@@ -39,16 +40,10 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser
3940 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)
4041 Q_PROPERTY(bool indicatorVisible READ indicatorVisible NOTIFY indicatorVisibleChanged)
4142public:
42− RootActionState(QObject *parent = 0);
43− virtual ~RootActionState();
43+ RootStateObject(QObject* parent = 0);
4444
45− UnityMenuModel* menu() const;
46− void setMenu(UnityMenuModel* menu);
45+ virtual bool valid() const = 0;
4746
48− int index() const;
49− void setIndex(int index);
50−
51− bool isValid() const;
5247 QString title() const;
5348 QString leftLabel() const;
5449 QString rightLabel() const;
@@ -56,15 +51,12 @@ public:
5651 QString accessibleName() const;
5752 bool indicatorVisible() const;
5853
59− // from ActionStateParser
60− virtual QVariant toQVariant(GVariant* state) const override;
54+ QVariantMap currentState() const { return m_currentState; }
55+ void setCurrentState(const QVariantMap& currentState);
6156
6257Q_SIGNALS:
6358 void updated();
6459
65− void menuChanged();
66− void indexChanged();
67−
6860 void validChanged();
6961 void titleChanged();
7062 void leftLabelChanged();
@@ -73,17 +65,9 @@ Q_SIGNALS:
7365 void accessibleNameChanged();
7466 void indicatorVisibleChanged();
7567
76−private Q_SLOTS:
77− void onModelRowsAdded(const QModelIndex& parent, int start, int end);
78− void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
79− void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
80− void reset();
81−
82−private:
83− void updateActionState();
84−
85− UnityMenuModel* m_menu;
86− QVariantMap m_cachedState;
68+protected:
69+ RootStateParser m_parser;
70+ QVariantMap m_currentState;
8771};
8872
89−#endif // ROOTACTIONSTATE_H
73+#endif // ROOTSTATEPARSER_H
plugins/Unity/Indicators/visibleindicatorsmodel.cppdeleted−90
@@ -1,90 +0,0 @@
1−/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−// self
18−#include "visibleindicatorsmodel.h"
19−#include "indicators.h"
20−
21−VisibleIndicatorsModel::VisibleIndicatorsModel(QObject *parent)
22− : QIdentityProxyModel(parent),
23− m_inserting(false)
24−{
25− QObject::connect(this, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(onBeginRowInserted(QModelIndex, int, int)));
26− QObject::connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(onRowInserted(QModelIndex, int, int)));
27−}
28−
29−QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const
30−{
31− static QHash<int, QByteArray> roles;
32− if (roles.isEmpty())
33− {
34− roles[IndicatorsModelRole::Identifier] = "identifier";
35− roles[IndicatorsModelRole::Position] = "position";
36− roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
37− roles[IndicatorsModelRole::IsVisible] = "isVisible";
38− }
39− return roles;
40−}
41−
42−void VisibleIndicatorsModel::setSourceModel(QAbstractItemModel *model)
43−{
44− if (sourceModel() != model) {
45− QIdentityProxyModel::setSourceModel(model);
46− Q_EMIT modelChanged();
47− }
48−}
49−
50−QVariantMap VisibleIndicatorsModel::visible() const
51−{
52− return m_visible;
53−}
54−
55−void VisibleIndicatorsModel::onBeginRowInserted(const QModelIndex&, int, int)
56−{
57− m_inserting = true;
58−}
59−
60−void VisibleIndicatorsModel::onRowInserted(const QModelIndex&, int, int)
61−{
62− m_inserting = false;
63−}
64−
65−void VisibleIndicatorsModel::setVisible(const QVariantMap& visible)
66−{
67− if (m_visible != visible) {
68− m_visible = visible;
69− Q_EMIT visibleChanged();
70−
71− // need to tell the view that the visible data has changed.
72− if (!m_inserting && rowCount() > 0) {
73− Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), QVector<int>() << IndicatorsModelRole::IsVisible);
74− }
75− }
76−}
77−
78−QVariant VisibleIndicatorsModel::data(const QModelIndex &index, int role) const
79−{
80− if (role != IndicatorsModelRole::IsVisible) {
81− return QIdentityProxyModel::data(index, role);
82− }
83−
84− if (!index.isValid()) {
85− return false;
86− }
87−
88− QString ident = QIdentityProxyModel::data(index, IndicatorsModelRole::Identifier).toString();
89− return m_visible.value(ident, false).toBool();
90−}
plugins/Unity/Indicators/visibleindicatorsmodel.hdeleted−56
@@ -1,56 +0,0 @@
1−/*
2− * Copyright (C) 2012, 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18− */
19−
20−#ifndef VISIBLEINDICATORSMODEL_H
21−#define VISIBLEINDICATORSMODEL_H
22−
23−#include <QIdentityProxyModel>
24−
25−class VisibleIndicatorsModel : public QIdentityProxyModel
26−{
27− Q_OBJECT
28−
29− Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setSourceModel NOTIFY modelChanged)
30− Q_PROPERTY(QVariantMap visible READ visible WRITE setVisible NOTIFY visibleChanged)
31−
32−public:
33− explicit VisibleIndicatorsModel(QObject *parent = 0);
34−
35− virtual void setSourceModel(QAbstractItemModel *model);
36− virtual QHash<int, QByteArray> roleNames() const;
37− virtual QVariant data(const QModelIndex &index, int role) const;
38−
39− QVariantMap visible() const;
40− void setVisible(const QVariantMap& visible);
41−
42−public Q_SLOTS:
43− void onBeginRowInserted(const QModelIndex&, int start, int end);
44− void onRowInserted(const QModelIndex&, int start, int end);
45−
46−Q_SIGNALS:
47− void totalCountChanged();
48− void modelChanged();
49− void visibleChanged();
50−
51−private:
52− QVariantMap m_visible;
53− bool m_inserting;
54−};
55−
56−#endif // VISIBLEINDICATORSMODEL_H
plugins/Unity/Launcher/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−include(FindPkgConfig)
21pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=5)
32pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
43pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
plugins/Unity/Launcher/desktopfilehandler.cpp+1−1
@@ -110,7 +110,7 @@ QString DesktopFileHandler::displayName() const
110110 settings.beginGroup("Desktop Entry");
111111
112112 // First try to find Name[xx_YY] and Name[xx] in .desktop file
113− QString locale = QLocale::system().name();
113+ QString locale = QLocale().name();
114114 QString shortLocale = locale.split('_').first();
115115
116116 if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
plugins/Unity/Launcher/launcheritem.cpp+11−4
@@ -60,6 +60,10 @@ void LauncherItem::setName(const QString &name)
6060{
6161 if (m_name != name) {
6262 m_name = name;
63+ QuickListEntry entry;
64+ entry.setActionId("launch_item");
65+ entry.setText(m_name);
66+ m_quickList->updateAction(entry);
6367 Q_EMIT nameChanged(name);
6468 }
6569}
@@ -86,12 +90,15 @@ void LauncherItem::setPinned(bool pinned)
8690{
8791 if (m_pinned != pinned) {
8892 m_pinned = pinned;
89− QuickListEntry entry;
90− entry.setActionId("pin_item");
91− entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
92− m_quickList->updateAction(entry);
9393 Q_EMIT pinnedChanged(pinned);
9494 }
95+
96+ // Even if pinned status didn't change, we want to update text in case
97+ // the locale has changed since we last set pinned status.
98+ QuickListEntry entry;
99+ entry.setActionId("pin_item");
100+ entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
101+ m_quickList->updateAction(entry);
95102}
96103
97104bool LauncherItem::running() const
plugins/Unity/Launcher/launchermodel.cpp+1
@@ -370,6 +370,7 @@ void LauncherModel::refresh()
370370 int idx = m_list.indexOf(item);
371371 item->setName(desktopFile.displayName());
372372 item->setIcon(desktopFile.icon());
373+ item->setPinned(item->pinned()); // update pinned text if needed
373374 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
374375 }
375376 }
plugins/Unity/Launcher/launchermodel.h+1−1
@@ -58,6 +58,7 @@ public:
5858
5959public Q_SLOTS:
6060 void requestRemove(const QString &appId);
61+ Q_INVOKABLE void refresh();
6162
6263private:
6364 void storeAppList();
@@ -68,7 +69,6 @@ private Q_SLOTS:
6869 void countChanged(const QString &appId, int count);
6970 void countVisibleChanged(const QString &appId, int count);
7071 void progressChanged(const QString &appId, int progress);
71− void refresh();
7272
7373 void applicationAdded(const QModelIndex &parent, int row);
7474 void applicationRemoved(const QModelIndex &parent, int row);
plugins/Unity/Session/CMakeLists.txt−2
@@ -1,5 +1,3 @@
1−include(FindPkgConfig)
2−
31pkg_search_module(GIO REQUIRED gio-2.0)
42
53include_directories(
plugins/Unity/Session/dbusunitysessionservice.h+5
@@ -35,6 +35,11 @@ public:
3535 DBusUnitySessionService();
3636 ~DBusUnitySessionService();
3737
38+ // For use in QML. Javascript doesn't accept functions beginning with capital letters
39+ Q_INVOKABLE void logout() { Logout(); }
40+ Q_INVOKABLE void reboot() { Reboot(); }
41+ Q_INVOKABLE void shutdown() { Shutdown(); }
42+
3843Q_SIGNALS:
3944 /**
4045 * logoutRequested signal
plugins/Utils/CMakeLists.txt+1−4
@@ -1,6 +1,3 @@
1−# Dependencies
2−include(FindPkgConfig)
3−
41pkg_search_module(GIO REQUIRED gio-2.0)
52
63include_directories(
@@ -12,7 +9,7 @@ include_directories(
129
1310set(QMLPLUGIN_SRC
1411 qlimitproxymodelqml.cpp
15− qsortfilterproxymodelqml.cpp
12+ unitysortfilterproxymodelqml.cpp
1613 relativetimeformatter.cpp
1714 timeformatter.cpp
1815 unitymenumodelpaths.cpp
plugins/Utils/plugin.cpp+2−2
@@ -27,7 +27,7 @@
2727
2828// local
2929#include "qlimitproxymodelqml.h"
30−#include "qsortfilterproxymodelqml.h"
30+#include "unitysortfilterproxymodelqml.h"
3131#include "relativetimeformatter.h"
3232#include "timeformatter.h"
3333#include "unitymenumodelpaths.h"
@@ -39,7 +39,7 @@ void UtilsPlugin::registerTypes(const char *uri)
3939 Q_ASSERT(uri == QLatin1String("Utils"));
4040 qmlRegisterType<QAbstractItemModel>();
4141 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
42− qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
42+ qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
4343 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
4444 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");
4545 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
plugins/Utils/qsortfilterproxymodelqml.cpp → plugins/Utils/unitysortfilterproxymodelqml.cpprenamed+15−15
@@ -15,12 +15,12 @@
1515 */
1616
1717// self
18−#include "qsortfilterproxymodelqml.h"
18+#include "unitysortfilterproxymodelqml.h"
1919
2020// Qt
2121#include <QDebug>
2222
23−QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
23+UnitySortFilterProxyModelQML::UnitySortFilterProxyModelQML(QObject *parent)
2424 : QSortFilterProxyModel(parent)
2525 , m_invertMatch(false)
2626{
@@ -32,7 +32,7 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
3232/*
3333 * Enter row index of filtered/sorted model, returns row index of source model
3434 */
35−int QSortFilterProxyModelQML::mapRowToSource(int row)
35+int UnitySortFilterProxyModelQML::mapRowToSource(int row)
3636{
3737 if (sourceModel() == nullptr)
3838 return -1;
@@ -40,13 +40,13 @@ int QSortFilterProxyModelQML::mapRowToSource(int row)
4040 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
4141}
4242
43−QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const
43+QHash<int, QByteArray> UnitySortFilterProxyModelQML::roleNames() const
4444{
4545 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
4646}
4747
4848void
49−QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
49+UnitySortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
5050{
5151 if (itemModel == nullptr) {
5252 return;
@@ -69,7 +69,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
6969}
7070
7171QVariantMap
72−QSortFilterProxyModelQML::get(int row)
72+UnitySortFilterProxyModelQML::get(int row)
7373{
7474 QVariantMap res;
7575 const QHash<int, QByteArray> roles = roleNames();
@@ -81,7 +81,7 @@ QSortFilterProxyModelQML::get(int row)
8181}
8282
8383QVariant
84−QSortFilterProxyModelQML::data(int row, int role)
84+UnitySortFilterProxyModelQML::data(int row, int role)
8585{
8686 if (sourceModel() == nullptr) {
8787 return QVariant();
@@ -91,7 +91,7 @@ QSortFilterProxyModelQML::data(int row, int role)
9191}
9292
9393int
94−QSortFilterProxyModelQML::totalCount() const
94+UnitySortFilterProxyModelQML::totalCount() const
9595{
9696 if (sourceModel() != nullptr) {
9797 return sourceModel()->rowCount();
@@ -101,19 +101,19 @@ QSortFilterProxyModelQML::totalCount() const
101101}
102102
103103int
104−QSortFilterProxyModelQML::count()
104+UnitySortFilterProxyModelQML::count()
105105{
106106 return rowCount();
107107}
108108
109109bool
110−QSortFilterProxyModelQML::invertMatch() const
110+UnitySortFilterProxyModelQML::invertMatch() const
111111{
112112 return m_invertMatch;
113113}
114114
115115void
116−QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
116+UnitySortFilterProxyModelQML::setInvertMatch(bool invertMatch)
117117{
118118 if (invertMatch != m_invertMatch) {
119119 m_invertMatch = invertMatch;
@@ -123,7 +123,7 @@ QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
123123}
124124
125125bool
126−QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
126+UnitySortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
127127 const QModelIndex &sourceParent) const
128128{
129129 // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
@@ -136,7 +136,7 @@ QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
136136}
137137
138138int
139−QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
139+UnitySortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
140140{
141141 QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
142142 if (!matches.isEmpty()) {
@@ -147,7 +147,7 @@ QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
147147}
148148
149149int
150−QSortFilterProxyModelQML::mapFromSource(int row)
150+UnitySortFilterProxyModelQML::mapFromSource(int row)
151151{
152152 if (sourceModel() != nullptr) {
153153 return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
@@ -157,7 +157,7 @@ QSortFilterProxyModelQML::mapFromSource(int row)
157157}
158158
159159int
160−QSortFilterProxyModelQML::mapToSource(int row)
160+UnitySortFilterProxyModelQML::mapToSource(int row)
161161{
162162 if (sourceModel() != nullptr) {
163163 return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
plugins/Utils/qsortfilterproxymodelqml.h → plugins/Utils/unitysortfilterproxymodelqml.hrenamed+5−5
@@ -14,12 +14,12 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−#ifndef QSORTFILTERPROXYMODELQML_H
18−#define QSORTFILTERPROXYMODELQML_H
17+#ifndef UNITYSORTFILTERPROXYMODELQML_H
18+#define UNITYSORTFILTERPROXYMODELQML_H
1919
2020#include <QSortFilterProxyModel>
2121
22−class QSortFilterProxyModelQML : public QSortFilterProxyModel
22+class UnitySortFilterProxyModelQML : public QSortFilterProxyModel
2323{
2424 Q_OBJECT
2525
@@ -29,7 +29,7 @@ class QSortFilterProxyModelQML : public QSortFilterProxyModel
2929 Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
3030
3131public:
32− explicit QSortFilterProxyModelQML(QObject *parent = 0);
32+ explicit UnitySortFilterProxyModelQML(QObject *parent = 0);
3333
3434 Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
3535 Q_INVOKABLE QVariant data(int row, int role);
@@ -60,4 +60,4 @@ private:
6060 bool m_invertMatch;
6161};
6262
63−#endif // QSORTFILTERPROXYMODELQML_H
63+#endif // UNITYSORTFILTERPROXYMODELQML_H
plugins/Wizard/50-com.canonical.unity.wizard.pklanew file+6
@@ -0,0 +1,6 @@
1+[Allow welcome wizard to set AccountsService fields]
2+Identity=unix-user:lightdm
3+Action=org.freedesktop.accounts.user-administration
4+ResultActive=yes
5+ResultInactive=no
6+ResultAny=no
plugins/Wizard/CMakeLists.txtnew file+11
@@ -0,0 +1,11 @@
1+add_library(Wizard-qml MODULE
2+ plugin.cpp
3+ PageList.cpp
4+ System.cpp
5+)
6+
7+qt5_use_modules(Wizard-qml DBus Qml)
8+add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
9+
10+set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
11+install(FILES 50-com.canonical.unity.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
plugins/Wizard/PageList.cppnew file+112
@@ -0,0 +1,112 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+/**
18+ * This class lets the list of wizard pages be dynamic.
19+ * - To add new ones, drop them into
20+ * $XDG_DATA_DIRS/Wizard/Pages with a numbered prefix,
21+ * like "21-custom-page.qml". The number determines the order in the page
22+ * sequence that your page will appear.
23+ * - To disable an existing page, add a file like "21-custom-page.qml.disabled"
24+ * - To go to the next page, use pageStack.next()
25+ * - To go back to the previous page, use pageStack.prev()
26+ * - To load a page outside of the normal flow (so that it doesn't affect the
27+ * back button), use pageStack.push(Qt.resolvedUrl("custom-page.qml")) in
28+ * your page.
29+ * - See default pages for plenty of examples.
30+ */
31+
32+#include "PageList.h"
33+#include <paths.h>
34+#include <QDir>
35+#include <QSet>
36+#include <QStandardPaths>
37+
38+PageList::PageList(QObject *parent)
39+ : QObject(parent),
40+ m_index(-1),
41+ m_pages()
42+{
43+ QString qmlSuffix = ".qml";
44+ QString disabledSuffix = ".disabled";
45+ QSet<QString> disabledPages;
46+ QStringList dataDirs;
47+
48+ if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
49+ dataDirs = QStringList() << qmlDirectory();
50+ } else {
51+ dataDirs = shellDataDirs();
52+ }
53+
54+ Q_FOREACH(const QString &dataDir, dataDirs) {
55+ QDir dir(dataDir + "/Wizard/Pages");
56+ QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
57+ Q_FOREACH(const QString &entry, entries) {
58+ if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
59+ m_pages.insert(entry, dir.absoluteFilePath(entry));
60+ else if (entry.endsWith(qmlSuffix + disabledSuffix))
61+ disabledPages.insert(entry.left(entry.size() - disabledSuffix.size()));
62+ }
63+ }
64+
65+ // Now remove any explicitly disabled entries
66+ Q_FOREACH(const QString &page, disabledPages) {
67+ m_pages.remove(page);
68+ }
69+}
70+
71+QStringList PageList::entries() const
72+{
73+ return m_pages.keys();
74+}
75+
76+QStringList PageList::paths() const
77+{
78+ return m_pages.values();
79+}
80+
81+int PageList::index() const
82+{
83+ return m_index;
84+}
85+
86+int PageList::numPages() const
87+{
88+ return m_pages.size();
89+}
90+
91+QString PageList::prev()
92+{
93+ if (m_index > 0)
94+ return m_pages.values()[setIndex(m_index - 1)];
95+ else
96+ return QString();
97+}
98+
99+QString PageList::next()
100+{
101+ if (m_index < m_pages.count() - 1)
102+ return m_pages.values()[setIndex(m_index + 1)];
103+ else
104+ return QString();
105+}
106+
107+int PageList::setIndex(int index)
108+{
109+ m_index = index;
110+ Q_EMIT indexChanged();
111+ return m_index;
112+}
plugins/Wizard/PageList.hnew file+53
@@ -0,0 +1,53 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_PAGELIST_H
18+#define WIZARD_PAGELIST_H
19+
20+#include <QMap>
21+#include <QObject>
22+#include <QString>
23+
24+class PageList : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(int index READ index NOTIFY indexChanged)
28+ Q_PROPERTY(int numPages READ numPages NOTIFY numPagesChanged)
29+
30+public:
31+ explicit PageList(QObject *parent = 0);
32+
33+ QStringList entries() const;
34+ QStringList paths() const;
35+ int index() const;
36+ int numPages() const;
37+
38+public Q_SLOTS:
39+ QString prev();
40+ QString next();
41+
42+Q_SIGNALS:
43+ void indexChanged();
44+ void numPagesChanged(); // never emitted, just here to quiet Qml warnings
45+
46+private:
47+ int setIndex(int index);
48+
49+ int m_index;
50+ QMap<QString, QString> m_pages;
51+};
52+
53+#endif // WIZARD_PAGELIST_H
plugins/Wizard/System.cppnew file+99
@@ -0,0 +1,99 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "System.h"
18+
19+#include <QDBusInterface>
20+#include <QDBusMetaType>
21+#include <QDir>
22+#include <QFile>
23+#include <QLocale>
24+#include <QMap>
25+#include <QProcess>
26+
27+System::System()
28+ : QObject(),
29+ m_fsWatcher()
30+{
31+ // Register the argument needed for UpdateActivationEnvironment below
32+ qDBusRegisterMetaType<QMap<QString,QString>>();
33+
34+ m_fsWatcher.addPath(wizardEnabledPath());
35+ connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),
36+ this, SIGNAL(wizardEnabledChanged()));
37+}
38+
39+QString System::wizardEnabledPath()
40+{
41+ // Uses ubuntu-system-settings namespace for historic compatibility reasons
42+ return QDir::home().filePath(".config/ubuntu-system-settings/wizard-has-run");
43+}
44+
45+bool System::wizardEnabled() const
46+{
47+ return !QFile::exists(wizardEnabledPath());
48+}
49+
50+void System::setWizardEnabled(bool enabled)
51+{
52+ if (wizardEnabled() == enabled)
53+ return;
54+
55+ if (enabled) {
56+ QFile::remove(wizardEnabledPath());
57+ } else {
58+ QDir(wizardEnabledPath()).mkpath("..");
59+ QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
60+ m_fsWatcher.addPath(wizardEnabledPath());
61+ wizardEnabledChanged();
62+ }
63+}
64+
65+void System::setSessionVariable(const QString &variable, const QString &value)
66+{
67+ // We need to update both upstart's and DBus's environment
68+ QProcess::execute(QString("initctl set-env --global %1=%2").arg(variable, value));
69+
70+ QDBusInterface iface("org.freedesktop.DBus",
71+ "/org/freedesktop/DBus",
72+ "org.freedesktop.DBus",
73+ QDBusConnection::sessionBus());
74+
75+ QMap<QString,QString> valueMap;
76+ valueMap.insert(variable, value);
77+ iface.call("UpdateActivationEnvironment", QVariant::fromValue(valueMap));
78+}
79+
80+void System::updateSessionLanguage(const QString &locale)
81+{
82+ QString language = locale.split(".")[0];
83+
84+ setSessionVariable("LANGUAGE", language);
85+ setSessionVariable("LANG", locale);
86+ setSessionVariable("LC_ALL", locale);
87+
88+ // QLocale caches the default locale on startup, and Qt uses that cached
89+ // copy when formatting dates. So manually update it here.
90+ QLocale::setDefault(QLocale(locale));
91+
92+ // Restart bits of the session to pick up new language.
93+ QProcess::startDetached("sh -c \"initctl emit indicator-services-end; \
94+ initctl stop scope-registry; \
95+ initctl stop smart-scopes-proxy; \
96+ initctl emit --no-wait indicator-services-start; \
97+ initctl restart --no-wait maliit-server; \
98+ initctl restart --no-wait unity8-dash\"");
99+}
plugins/Wizard/System.hnew file+50
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_SYSTEM_H
18+#define WIZARD_SYSTEM_H
19+
20+#include <QFileSystemWatcher>
21+#include <QObject>
22+#include <QString>
23+
24+class System : public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)
28+
29+public:
30+ System();
31+
32+ bool wizardEnabled() const;
33+ void setWizardEnabled(bool enabled);
34+
35+public Q_SLOTS:
36+ void updateSessionLanguage(const QString &locale);
37+
38+Q_SIGNALS:
39+ void wizardEnabledChanged();
40+
41+private:
42+ Q_DISABLE_COPY(System)
43+
44+ static QString wizardEnabledPath();
45+ static void setSessionVariable(const QString &variable, const QString &value);
46+
47+ QFileSystemWatcher m_fsWatcher;
48+};
49+
50+#endif
plugins/Wizard/Wizard.qmltypesnew file+36
@@ -0,0 +1,36 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Wizard 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "PageList"
12+ prototype: "QObject"
13+ exports: ["Wizard/PageList 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Property { name: "index"; type: "int"; isReadonly: true }
18+ Property { name: "numPages"; type: "int"; isReadonly: true }
19+ Method { name: "prev"; type: "string" }
20+ Method { name: "next"; type: "string" }
21+ }
22+ Component {
23+ name: "System"
24+ prototype: "QObject"
25+ exports: ["Wizard/System 0.1"]
26+ isCreatable: false
27+ isSingleton: true
28+ exportMetaObjectRevisions: [0]
29+ Property { name: "wizardEnabled"; type: "bool" }
30+ Method {
31+ name: "updateSessionLanguage"
32+ Parameter { name: "locale"; type: "string" }
33+ }
34+ }
35+}
36+
plugins/Wizard/plugin.cppnew file+35
@@ -0,0 +1,35 @@
1+/*
2+ * Copyright (C) 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "plugin.h"
18+#include "PageList.h"
19+#include "System.h"
20+
21+#include <QtQml/qqml.h>
22+
23+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24+{
25+ Q_UNUSED(engine)
26+ Q_UNUSED(scriptEngine)
27+ return new System();
28+}
29+
30+void WizardPlugin::registerTypes(const char *uri)
31+{
32+ Q_ASSERT(uri == QLatin1String("Wizard"));
33+ qmlRegisterType<PageList>(uri, 0, 1, "PageList");
34+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
35+}
plugins/Wizard/plugin.hnew file+32
@@ -0,0 +1,32 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_PLUGIN_H
18+#define WIZARD_PLUGIN_H
19+
20+#include <QtQml/QQmlEngine>
21+#include <QtQml/QQmlExtensionPlugin>
22+
23+class WizardPlugin : public QQmlExtensionPlugin
24+{
25+ Q_OBJECT
26+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27+
28+public:
29+ void registerTypes(const char *uri);
30+};
31+
32+#endif
plugins/Wizard/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Wizard
2+plugin Wizard-qml
3+typeinfo Wizard.qmltypes
po/am.po+272−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-06 00:53+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-29 00:07+0000\n"
1212"Last-Translator: samson <Unknown>\n"
1313"Language-Team: Amharic <am@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "የ መግቢያ ቃል: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "አቋራጭ ማጣበቂያ"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "አቋራጭ መለያያ"
3333
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
5151msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "መውጫ"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "አይ"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "አዎ"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "ማጥፊያ"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "እንደገና ማስነሻ"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "ሐይል"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"በእርግጥ ሐይሉን ማጥፋት\n"
9797"ይፈልጋሉ?"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100100msgid "Power off"
101101msgstr "ማጥፊያ"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104104msgid "Restart"
105105msgstr "እንደገና ማስጀመሪያ"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108108msgid "Cancel"
109109msgstr "መሰረዣ"
110110
@@ -112,83 +112,87 @@ msgstr "መሰረዣ"
112112msgid "Skip intro"
113113msgstr "መግቢያውን መዝለያ"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "የቀኝ ጠርዝ"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "የላይ ጠርዝ"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "መዝጊያ"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "የግራ ጠርዝ"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "ጥሩ አድረገዋል"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
155155msgstr ""
156156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
157157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159159msgid "Return to Call"
160160msgstr "ወደ ጥሪ መመለሻ"
161161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163163msgid "Emergency Call"
164164msgstr "የ ድንገተኛ ጥሪ"
165165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167167msgid "OK"
168168msgstr "እሺ"
169169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171171msgid "See less"
172172msgstr "አነስተኛ መመልከቻ"
173173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175175msgid "See all"
176176msgstr "ሁሉንም መመልከቻ"
177177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179179#: qml/Panel/SearchIndicator.qml:27
180180msgid "Search"
181181msgstr "መፈለጊያ"
182182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr "ማስቀመጫ"
186+
187+#: qml/Dash/PageHeader.qml:284
184188msgid "Settings"
185189msgstr "ማሰናጃ"
186190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188192msgid "Remove from Favorites"
189193msgstr "ከምወዳቸው ማስወገጃ"
190194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192196msgid "Add to Favorites"
193197msgstr "ወደምወዳቸው መጨመሪያ"
194198
@@ -220,31 +224,23 @@ msgstr "ይሳቡ ለማነቃቃት…"
220224msgid "Release to refresh…"
221225msgstr "ይልቀቁ ለማነቃቃት…"
222226
223−#: qml/Dash/ScopesOverview.qml:215
224−msgid "Manage Scopes"
225−msgstr "የ ክልል አስተዳዳሪ"
227+#: qml/Dash/ScopesList.qml:66
228+msgid "Manage"
229+msgstr "አስተዳዳሪ"
226230
227−#: qml/Dash/ScopesOverview.qml:437
228−msgid "Done"
229−msgstr "ጨርሷል"
231+#: qml/Dash/ScopesList.qml:112
232+msgid "Home"
233+msgstr "ቤት"
230234
231−#: qml/Dash/ScopesOverview.qml:463
232−msgid "Store"
233−msgstr "ማስቀመጫ"
235+#: qml/Dash/ScopesList.qml:113
236+msgid "Also installed"
237+msgstr "እንዲሁም የተገጠሙ"
234238
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
237−msgstr "የምወዳቸው"
238−
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
241−msgstr "ሁሉንም"
242−
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244240msgid "Unlock"
245241msgstr "መክፈቻ"
246242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248244msgid "Show password"
249245msgstr "የመግቢያ ቃል ማሳያ"
250246
@@ -284,6 +280,10 @@ msgstr "ጨርሷል"
284280msgid "Failed, tap to retry"
285281msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
286282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr "መመለሻ"
286+
287287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288288msgid "Unlock SIM"
289289msgstr "ሲም መክፈቻ"
@@ -292,49 +292,49 @@ msgstr "ሲም መክፈቻ"
292292msgid "Roaming"
293293msgstr "ማዘዋወሪያ"
294294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr "ማስገቢያ %1"
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296301msgid "Enter passphrase"
297302msgstr "የ ማለፊያ ሀረግ ያስገቡ"
298303
299304#: qml/Shell.qml:392
305+msgid "Enter passcode"
306+msgstr "የ ማለፊያ ኮድ ያስገቡ"
307+
308+#: qml/Shell.qml:393
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr "አዝናለሁ: የተሳሳተ%1"
312+
313+#: qml/Shell.qml:394
300314msgid "Sorry, incorrect passphrase"
301315msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
302316
303−#: qml/Shell.qml:393
317+#: qml/Shell.qml:395
304318msgid "Please re-enter"
305319msgstr "እባክዎን እንደገና-ያስገቡ"
306320
307−#: qml/Shell.qml:395
308−msgid "Enter passcode"
309−msgstr "የ ማለፊያ ኮድ ያስገቡ"
310−
311321#: qml/Shell.qml:396
312322msgid "Sorry, incorrect passcode"
313323msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
314324
315−#: qml/Shell.qml:399
316−#, qt-format
317−msgid "Enter %1"
318−msgstr "ማስገቢያ %1"
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr "አዝናለሁ: የተሳሳተ%1"
324−
325−#: qml/Shell.qml:441
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326326msgid "Sorry, incorrect passphrase."
327327msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
328328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330330msgid "Sorry, incorrect passcode."
331331msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
332332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334334msgid "This will be your last attempt."
335335msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
336336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338338msgid ""
339339"If passphrase is entered incorrectly, your phone will conduct a factory "
340340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342342"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
343343"ይጠፋል"
344344
345−#: qml/Shell.qml:446
345+#: qml/Shell.qml:495
346346msgid ""
347347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348348"and all personal data will be deleted."
@@ -350,6 +350,186 @@ msgstr ""
350350"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
351351"ይጠፋል"
352352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr "ወደ ኋላ"
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr "ሰላም"
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr "ስራ እንጀምር"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr "ይቀጥሉ"
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr "መዝለያ"
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr "ደህንነት መቆለፊያ"
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr "መጥረጊያ"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr "ደህንነት አልተገኘም"
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr "ማለፊያ ኮድ"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr "4 ዲጂትስ ብቻ"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr "ማለፊያ ሐረግ"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr "ቁጥሮች እና ፊደሎች"
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr "ወደ ዋይ‑ፋይ መገናኛ"
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr "ዝግጁ ኔትዎርኮች…"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr "አካባቢ"
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr "አይደለም"
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr "የ እርስዎን ልምምድ ማሻሻያ"
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
473+"አምራቾች"
474+
475+#: qml/Wizard/Pages/60-reporting.qml:43
476+msgid ""
477+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
478+"Privacy</b>"
479+msgstr ""
480+"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
481+
482+#: qml/Wizard/Pages/80-finished.qml:24
483+msgid "All done"
484+msgstr "ሁሉም ተፈጽሟል"
485+
486+#: qml/Wizard/Pages/80-finished.qml:39
487+msgid "Nice work!"
488+msgstr "ጥሩ ሰርተዋል!"
489+
490+#: qml/Wizard/Pages/80-finished.qml:46
491+msgid "Your phone is now ready to use."
492+msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
493+
494+#: qml/Wizard/Pages/80-finished.qml:53
495+msgid "Finish"
496+msgstr "መጨረሻ"
497+
498+#: qml/Wizard/Pages/here-terms.qml:27
499+msgid "Terms & Conditions"
500+msgstr "ውሎች & ሁኔታዎች"
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:49
503+msgid "Confirm passphrase"
504+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:50
507+msgid "Confirm passcode"
508+msgstr "የማለፊያ ኮድ ማረጋገጫ"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:53
511+#: qml/Wizard/Pages/passwd-confirm.qml:54
512+msgid "Please try again."
513+msgstr "እባክዎን እንደገና ይሞክሩ"
514+
515+#: qml/Wizard/Pages/passwd-set.qml:61
516+msgid "Choose your passcode"
517+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
518+
519+#: qml/Wizard/Pages/passwd-set.qml:68
520+msgid "Passphrase must be 4 characters long"
521+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
522+
523+#: qml/Wizard/StackButton.qml:39
524+#, qt-format
525+msgid "〈 %1"
526+msgstr "〈 %1"
527+
528+#: qml/Wizard/StackButton.qml:42
529+#, qt-format
530+msgid "%1 〉"
531+msgstr "%1 〉"
532+
353533#~ msgid "Type or say a command"
354534#~ msgstr "ትእዛዝ ይናገሩ ወይንም ይጻፉ"
355535
@@ -364,3 +544,15 @@ msgstr ""
364544
365545#~ msgid "Confirm"
366546#~ msgstr "ማረጋገጫ"
547+
548+#~ msgid "Favorites"
549+#~ msgstr "የምወዳቸው"
550+
551+#~ msgid "All"
552+#~ msgstr "ሁሉንም"
553+
554+#~ msgid "Done"
555+#~ msgstr "ጨርሷል"
556+
557+#~ msgid "Manage Scopes"
558+#~ msgstr "የ ክልል አስተዳዳሪ"
po/ar.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
20+"X-Generator: Launchpad (build 17306)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
5555msgid "Log out"
5656msgstr ""
5757
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
5959msgid "Are you sure you want to log out?"
6060msgstr ""
6161
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63+#: qml/Components/Dialogs.qml:134
6464msgid "No"
6565msgstr ""
6666
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68+#: qml/Components/Dialogs.qml:140
6969msgid "Yes"
7070msgstr ""
7171
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
7373msgid "Shut down"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
7777msgid "Are you sure you want to shut down?"
7878msgstr ""
7979
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
8181msgid "Reboot"
8282msgstr ""
8383
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
8585msgid "Are you sure you want to reboot?"
8686msgstr ""
8787
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
8989msgid "Power"
9090msgstr ""
9191
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
9393msgid ""
9494"Are you sure you would like\n"
9595"to power off?"
9696msgstr ""
9797
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
9999msgid "Power off"
100100msgstr ""
101101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103103msgid "Restart"
104104msgstr ""
105105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107107msgid "Cancel"
108108msgstr ""
109109
@@ -111,44 +111,44 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr "تخطي المقدمة"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr "الحافة اليمنى"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr "الحافة العلوية"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr "أغلق"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
137137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr "الحافة اليسرى"
141141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "أحسنت!"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
157157"الشاشة للبدء"
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161161msgstr ""
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr "مكالمة طوارئ"
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr "شاهد أقل"
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr ""
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "ابحث"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr ""
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr ""
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr ""
195199
@@ -221,31 +225,23 @@ msgstr ""
221225msgid "Release to refresh…"
222226msgstr ""
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr ""
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
238234msgstr ""
239235
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
242238msgstr ""
243239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr ""
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "عرض كلمة السر"
251247
@@ -285,6 +281,10 @@ msgstr ""
285281msgid "Failed, tap to retry"
286282msgstr ""
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr ""
@@ -293,60 +293,237 @@ msgstr ""
293293msgid "Roaming"
294294msgstr ""
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr ""
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr ""
299304
300305#: qml/Shell.qml:392
301−msgid "Sorry, incorrect passphrase"
306+msgid "Enter passcode"
302307msgstr ""
303308
304309#: qml/Shell.qml:393
305−msgid "Please re-enter"
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr ""
313+
314+#: qml/Shell.qml:394
315+msgid "Sorry, incorrect passphrase"
306316msgstr ""
307317
308318#: qml/Shell.qml:395
309−msgid "Enter passcode"
319+msgid "Please re-enter"
310320msgstr ""
311321
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr ""
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr ""
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr ""
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr ""
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr ""
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr ""
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
342342msgstr ""
343343
344−#: qml/Shell.qml:446
344+#: qml/Shell.qml:495
345345msgid ""
346346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347347"and all personal data will be deleted."
348348msgstr ""
349349
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
350527#~ msgid "Confirm"
351528#~ msgstr "التأكيد"
352529
po/ast.po+268−79
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-11-08 18:24+0000\n"
1212"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Anclar"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
@@ -51,45 +51,45 @@ msgid_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:74
54+#: qml/Components/Dialogs.qml:86
5555msgid "Log out"
5656msgstr "Zarrar sesión"
5757
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
5959msgid "Are you sure you want to log out?"
6060msgstr "De xuru que quies zarrar la sesión?"
6161
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63+#: qml/Components/Dialogs.qml:134
6464msgid "No"
6565msgstr "Non"
6666
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68+#: qml/Components/Dialogs.qml:140
6969msgid "Yes"
7070msgstr "Sí"
7171
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
7373msgid "Shut down"
7474msgstr "Apagar"
7575
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
7777msgid "Are you sure you want to shut down?"
7878msgstr "De xuru que quies apagar?"
7979
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
8181msgid "Reboot"
8282msgstr "Reaniciar"
8383
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
8585msgid "Are you sure you want to reboot?"
8686msgstr "De xuru que quies reaniciar?"
8787
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
8989msgid "Power"
9090msgstr "Enerxía"
9191
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
9393msgid ""
9494"Are you sure you would like\n"
9595"to power off?"
@@ -97,15 +97,15 @@ msgstr ""
9797"De xuru que quies\n"
9898"apagar?"
9999
100−#: qml/Components/Dialogs.qml:151
100+#: qml/Components/Dialogs.qml:157
101101msgid "Power off"
102102msgstr "Apagar"
103103
104−#: qml/Components/Dialogs.qml:161
104+#: qml/Components/Dialogs.qml:166
105105msgid "Restart"
106106msgstr "Reaniciar"
107107
108−#: qml/Components/Dialogs.qml:171
108+#: qml/Components/Dialogs.qml:175
109109msgid "Cancel"
110110msgstr "Encaboxar"
111111
@@ -113,45 +113,45 @@ msgstr "Encaboxar"
113113msgid "Skip intro"
114114msgstr "Omitir la intro"
115115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117117msgid "Right edge"
118118msgstr "Berbesu drechu"
119119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121121msgid "Try swiping from the right edge to unlock the phone"
122122msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
123123
124−#: qml/Components/EdgeDemo.qml:144
124+#: qml/Components/EdgeDemo.qml:157
125125msgid "Top edge"
126126msgstr "Berbesu superior"
127127
128−#: qml/Components/EdgeDemo.qml:145
128+#: qml/Components/EdgeDemo.qml:158
129129msgid "Try swiping from the top edge to access the indicators"
130130msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
131131
132−#: qml/Components/EdgeDemo.qml:170
132+#: qml/Components/EdgeDemo.qml:183
133133msgid "Close"
134134msgstr "Zarrar"
135135
136−#: qml/Components/EdgeDemo.qml:171
136+#: qml/Components/EdgeDemo.qml:184
137137msgid "Swipe up again to close the settings screen"
138138msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
139139
140−#: qml/Components/EdgeDemo.qml:201
140+#: qml/Components/EdgeDemo.qml:214
141141msgid "Left edge"
142142msgstr "Berbesu esquierdu"
143143
144−#: qml/Components/EdgeDemo.qml:202
144+#: qml/Components/EdgeDemo.qml:215
145145msgid "Swipe from the left to reveal the launcher for quick access to apps"
146146msgstr ""
147147"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
148148"a les aplicaciones"
149149
150−#: qml/Components/EdgeDemo.qml:229
150+#: qml/Components/EdgeDemo.qml:242
151151msgid "Well done"
152152msgstr "Bien fecho"
153153
154−#: qml/Components/EdgeDemo.qml:230
154+#: qml/Components/EdgeDemo.qml:243
155155msgid ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
@@ -159,40 +159,44 @@ msgstr ""
159159"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
160160"teléfonu<br><br>Toca la pantalla pa comenzar"
161161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163163msgid "Return to Call"
164164msgstr "Tornar a la llamada"
165165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167167msgid "Emergency Call"
168168msgstr "Llamada d'emerxencia"
169169
170−#: qml/Components/Lockscreen.qml:255
170+#: qml/Components/Lockscreen.qml:270
171171msgid "OK"
172172msgstr "Aceutar"
173173
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
175175msgid "See less"
176176msgstr "Ver menos"
177177
178−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:485
179179msgid "See all"
180180msgstr "Ver too"
181181
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183183#: qml/Panel/SearchIndicator.qml:27
184184msgid "Search"
185185msgstr "Guetar"
186186
187−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:267
188+msgid "Store"
189+msgstr "Tienda"
190+
191+#: qml/Dash/PageHeader.qml:284
188192msgid "Settings"
189193msgstr "Axustes"
190194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192196msgid "Remove from Favorites"
193197msgstr "Desaniciar de favoritos"
194198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196200msgid "Add to Favorites"
197201msgstr "Amestar a favoritos"
198202
@@ -224,31 +228,23 @@ msgstr "Tirar p'anovar..."
224228msgid "Release to refresh…"
225229msgstr "Soltar p'anovar..."
226230
227−#: qml/Dash/ScopesOverview.qml:215
228−msgid "Manage Scopes"
229−msgstr "Xestionar ámbitos"
230−
231−#: qml/Dash/ScopesOverview.qml:437
232−msgid "Done"
233−msgstr "Fecho"
234−
235−#: qml/Dash/ScopesOverview.qml:463
236−msgid "Store"
237−msgstr "Tienda"
231+#: qml/Dash/ScopesList.qml:66
232+msgid "Manage"
233+msgstr ""
238234
239−#: qml/Dash/ScopesOverviewTab.qml:36
240−msgid "Favorites"
241−msgstr "Favoritos"
235+#: qml/Dash/ScopesList.qml:112
236+msgid "Home"
237+msgstr ""
242238
243−#: qml/Dash/ScopesOverviewTab.qml:54
244−msgid "All"
245−msgstr "Too"
239+#: qml/Dash/ScopesList.qml:113
240+msgid "Also installed"
241+msgstr ""
246242
247−#: qml/Greeter/Greeter.qml:174
243+#: qml/Greeter/Greeter.qml:133
248244msgid "Unlock"
249245msgstr "Desbloquiar"
250246
251−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
252248msgid "Show password"
253249msgstr "Amosar contraseña"
254250
@@ -288,6 +284,10 @@ msgstr "Finó"
288284msgid "Failed, tap to retry"
289285msgstr "Falló, toca pa reintentar"
290286
287+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
288+msgid "Reply"
289+msgstr ""
290+
291291#: qml/Panel/Indicators/ModemInfoItem.qml:105
292292msgid "Unlock SIM"
293293msgstr "Desbloquiar SIM"
@@ -296,49 +296,49 @@ msgstr "Desbloquiar SIM"
296296msgid "Roaming"
297297msgstr "Roaming"
298298
299−#: qml/Shell.qml:391
299+#: qml/Shell.qml:390
300+#, qt-format
301+msgid "Enter %1"
302+msgstr "Escribi %1"
303+
304+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
300305msgid "Enter passphrase"
301306msgstr "Escribi la frase contraseña"
302307
303308#: qml/Shell.qml:392
309+msgid "Enter passcode"
310+msgstr "Escribi'l códigu de pasu"
311+
312+#: qml/Shell.qml:393
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr "Sentímoslo, %1 incorreutu"
316+
317+#: qml/Shell.qml:394
304318msgid "Sorry, incorrect passphrase"
305319msgstr "Sentímoslo, contraseña incorreuta"
306320
307−#: qml/Shell.qml:393
321+#: qml/Shell.qml:395
308322msgid "Please re-enter"
309323msgstr "Vuelvi a escribila"
310324
311−#: qml/Shell.qml:395
312−msgid "Enter passcode"
313−msgstr "Escribi'l códigu de pasu"
314−
315325#: qml/Shell.qml:396
316326msgid "Sorry, incorrect passcode"
317327msgstr "Sentímoslo, códigu de pasu incorreutu"
318328
319−#: qml/Shell.qml:399
320−#, qt-format
321−msgid "Enter %1"
322−msgstr "Escribi %1"
323−
324−#: qml/Shell.qml:400
325−#, qt-format
326−msgid "Sorry, incorrect %1"
327−msgstr "Sentímoslo, %1 incorreutu"
328−
329−#: qml/Shell.qml:441
329+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
330330msgid "Sorry, incorrect passphrase."
331331msgstr "Fras de pasu incorreuta"
332332
333−#: qml/Shell.qml:442
333+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334334msgid "Sorry, incorrect passcode."
335335msgstr "Códigu de pasu incorreutu"
336336
337−#: qml/Shell.qml:443
337+#: qml/Shell.qml:492
338338msgid "This will be your last attempt."
339339msgstr "Esti ye'l caberu intentu."
340340
341−#: qml/Shell.qml:445
341+#: qml/Shell.qml:494
342342msgid ""
343343"If passphrase is entered incorrectly, your phone will conduct a factory "
344344"reset and all personal data will be deleted."
@@ -346,7 +346,7 @@ msgstr ""
346346"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
347347"configuración de fábrica y van perdese tolos datos personales."
348348
349−#: qml/Shell.qml:446
349+#: qml/Shell.qml:495
350350msgid ""
351351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352352"and all personal data will be deleted."
@@ -354,6 +354,183 @@ msgstr ""
354354"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
355355"configuración de fábrica y van perdese tolos datos personales."
356356
357+#: qml/Wizard/Page.qml:89
358+msgid "Back"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:27
362+msgid "Hi!"
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:44
366+msgid "Welcome to your Ubuntu phone."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:52
370+msgid "Let’s get started."
371+msgstr ""
372+
373+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
374+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
375+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376+#: qml/Wizard/Pages/passwd-set.qml:90
377+msgid "Continue"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:25
381+msgid "Add a SIM card and restart your device"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:55
385+msgid "Without it, you won’t be able to make calls or use text messaging."
386+msgstr ""
387+
388+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
389+msgid "Skip"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:39
393+msgid "Lock security"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:74
397+msgid "Please select how you’d like to unlock your phone."
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:97
401+msgid "Swipe"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:98
405+msgid "No security"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:100
409+msgid "Passcode"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:101
413+msgid "4 digits only"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:103
417+msgid "Passphrase"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:104
421+msgid "Numbers and letters"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:28
425+msgid "Connect to Wi‑Fi"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:147
429+msgid "Available networks…"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/40-wifi.qml:148
433+msgid "No available networks."
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:27
437+msgid "Location"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:62
441+msgid "Let the phone detect your location:"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:69
445+msgid "Using GPS only (less accurate)"
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:86
449+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450+msgstr ""
451+
452+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453+#: qml/Wizard/Pages/50-location.qml:103
454+msgid ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr ""
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+
477+#: qml/Wizard/Pages/60-reporting.qml:43
478+msgid ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:24
484+msgid "All done"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:39
488+msgid "Nice work!"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:46
492+msgid "Your phone is now ready to use."
493+msgstr ""
494+
495+#: qml/Wizard/Pages/80-finished.qml:53
496+msgid "Finish"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/here-terms.qml:27
500+msgid "Terms & Conditions"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:49
504+msgid "Confirm passphrase"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:50
508+msgid "Confirm passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:53
512+#: qml/Wizard/Pages/passwd-confirm.qml:54
513+msgid "Please try again."
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:61
517+msgid "Choose your passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-set.qml:68
521+msgid "Passphrase must be 4 characters long"
522+msgstr ""
523+
524+#: qml/Wizard/StackButton.qml:39
525+#, qt-format
526+msgid "〈 %1"
527+msgstr ""
528+
529+#: qml/Wizard/StackButton.qml:42
530+#, qt-format
531+msgid "%1 〉"
532+msgstr ""
533+
357534#~ msgid "Confirm"
358535#~ msgstr "Confirmar"
359536
@@ -368,3 +545,15 @@ msgstr ""
368545
369546#~ msgid "Speak Now..."
370547#~ msgstr "Fala agora…"
548+
549+#~ msgid "Done"
550+#~ msgstr "Fecho"
551+
552+#~ msgid "Favorites"
553+#~ msgstr "Favoritos"
554+
555+#~ msgid "All"
556+#~ msgstr "Too"
557+
558+#~ msgid "Manage Scopes"
559+#~ msgstr "Xestionar ámbitos"
po/az.po+263−77
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-09-03 16:39+0000\n"
1212"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
1313"Language-Team: Azerbaijani <az@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Şifrә: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin qısayolu"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Açma qısayolu"
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "Çıxış"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "Yox"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "Hə"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "Sistemi Söndür"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "Yenidən yüklə"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr "Söndür"
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr "İmtina"
108108
@@ -110,44 +110,44 @@ msgstr "İmtina"
110110msgid "Skip intro"
111111msgstr "Tәqdimatı keç"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Sağ Künc"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Yuxarı künc"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Bağla"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Sol künc"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
145145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr "Təbriklər"
149149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
@@ -155,40 +155,44 @@ msgstr ""
155155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
156156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
157157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159159msgid "Return to Call"
160160msgstr ""
161161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163163msgid "Emergency Call"
164164msgstr "Zərurət zəngi"
165165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167167msgid "OK"
168168msgstr "Oldu"
169169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171171msgid "See less"
172172msgstr "Daha azını gör"
173173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175175msgid "See all"
176176msgstr "Hamısını gör"
177177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179179#: qml/Panel/SearchIndicator.qml:27
180180msgid "Search"
181181msgstr "Axtar"
182182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:284
184188msgid "Settings"
185189msgstr "Tənzimləmələr"
186190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188192msgid "Remove from Favorites"
189193msgstr "Seçilmişlәrdәn çıxart"
190194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192196msgid "Add to Favorites"
193197msgstr "Seçilmişlәrә әlavә et"
194198
@@ -220,31 +224,23 @@ msgstr ""
220224msgid "Release to refresh…"
221225msgstr ""
222226
223−#: qml/Dash/ScopesOverview.qml:215
224−msgid "Manage Scopes"
227+#: qml/Dash/ScopesList.qml:66
228+msgid "Manage"
225229msgstr ""
226230
227−#: qml/Dash/ScopesOverview.qml:437
228−msgid "Done"
229−msgstr "Başa çatdı"
230−
231−#: qml/Dash/ScopesOverview.qml:463
232−msgid "Store"
231+#: qml/Dash/ScopesList.qml:112
232+msgid "Home"
233233msgstr ""
234234
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
237−msgstr "Seçilmişlər"
238−
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
241−msgstr "Hamısı"
235+#: qml/Dash/ScopesList.qml:113
236+msgid "Also installed"
237+msgstr ""
242238
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244240msgid "Unlock"
245241msgstr ""
246242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248244msgid "Show password"
249245msgstr "Şifrәni göstәr"
250246
@@ -284,6 +280,10 @@ msgstr "Bitdi"
284280msgid "Failed, tap to retry"
285281msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
286282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr ""
286+
287287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288288msgid "Unlock SIM"
289289msgstr "SIM kilidini aç"
@@ -292,49 +292,49 @@ msgstr "SIM kilidini aç"
292292msgid "Roaming"
293293msgstr "Rominq"
294294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr ""
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296301msgid "Enter passphrase"
297302msgstr ""
298303
299304#: qml/Shell.qml:392
300−msgid "Sorry, incorrect passphrase"
301−msgstr "Bağışlayın, açar söz yanlışdır"
305+msgid "Enter passcode"
306+msgstr ""
302307
303308#: qml/Shell.qml:393
304−msgid "Please re-enter"
305−msgstr ""
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr "Bağışlayın, %1 yanlışdır"
312+
313+#: qml/Shell.qml:394
314+msgid "Sorry, incorrect passphrase"
315+msgstr "Bağışlayın, açar söz yanlışdır"
306316
307317#: qml/Shell.qml:395
308−msgid "Enter passcode"
318+msgid "Please re-enter"
309319msgstr ""
310320
311321#: qml/Shell.qml:396
312322msgid "Sorry, incorrect passcode"
313323msgstr ""
314324
315−#: qml/Shell.qml:399
316−#, qt-format
317−msgid "Enter %1"
318−msgstr ""
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr "Bağışlayın, %1 yanlışdır"
324−
325−#: qml/Shell.qml:441
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326326msgid "Sorry, incorrect passphrase."
327327msgstr "Bağışlayın, açar söz yanlışdır."
328328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330330msgid "Sorry, incorrect passcode."
331331msgstr "Təəssüf ki, açar kod yanlışdır."
332332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334334msgid "This will be your last attempt."
335335msgstr "Bu sizin son cəhdiniz olacaq."
336336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338338msgid ""
339339"If passphrase is entered incorrectly, your phone will conduct a factory "
340340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342342"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
343343"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
344344
345−#: qml/Shell.qml:446
345+#: qml/Shell.qml:495
346346msgid ""
347347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348348"and all personal data will be deleted."
@@ -350,6 +350,183 @@ msgstr ""
350350"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
351351"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
352352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr ""
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:43
474+msgid ""
475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476+"Privacy</b>"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:24
480+msgid "All done"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:39
484+msgid "Nice work!"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:46
488+msgid "Your phone is now ready to use."
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:53
492+msgid "Finish"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/here-terms.qml:27
496+msgid "Terms & Conditions"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:49
500+msgid "Confirm passphrase"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:50
504+msgid "Confirm passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:53
508+#: qml/Wizard/Pages/passwd-confirm.qml:54
509+msgid "Please try again."
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:61
513+msgid "Choose your passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:68
517+msgid "Passphrase must be 4 characters long"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:39
521+#, qt-format
522+msgid "〈 %1"
523+msgstr ""
524+
525+#: qml/Wizard/StackButton.qml:42
526+#, qt-format
527+msgid "%1 〉"
528+msgstr ""
529+
353530#~ msgid "Confirm"
354531#~ msgstr "Təsdiqlə"
355532
@@ -362,5 +539,14 @@ msgstr ""
362539#~ msgid "Speak Now..."
363540#~ msgstr "Danışın..."
364541
542+#~ msgid "All"
543+#~ msgstr "Hamısı"
544+
545+#~ msgid "Favorites"
546+#~ msgstr "Seçilmişlər"
547+
548+#~ msgid "Done"
549+#~ msgstr "Başa çatdı"
550+
365551#~ msgid "Type or say a command"
366552#~ msgstr "Bir әmr söyləyin və ya yazın"
po/be.po+356−142
@@ -7,339 +7,553 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-09-24 17:12+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-02-03 22:02+0000\n"
12+"Last-Translator: Arsień Šachalevič <semen.shah@gmail.com>\n"
1313"Language-Team: Belarusian <be@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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-02-04 07:13+0000\n"
20+"X-Generator: Launchpad (build 17331)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
24−msgstr ""
24+msgstr "Пароль: "
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
29−msgstr ""
29+msgstr "Заблакаваць кнопку"
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
33−msgstr ""
33+msgstr "Разблакаваць кнопку"
3434
3535#: qml/Components/DelayedLockscreen.qml:47
3636msgid "Device Locked"
37−msgstr ""
37+msgstr "Прылада заблакаваная"
3838
3939#: qml/Components/DelayedLockscreen.qml:62
4040msgid "You have been locked out due to too many failed passphrase attempts."
4141msgstr ""
42+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."
4243
4344#: qml/Components/DelayedLockscreen.qml:63
4445msgid "You have been locked out due to too many failed passcode attempts."
4546msgstr ""
47+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў уводу "
48+"код доступу."
4649
4750#: qml/Components/DelayedLockscreen.qml:72
4851#, qt-format
4952msgid "Please wait %1 minute and then try again…"
5053msgid_plural "Please wait %1 minutes and then try again…"
51−msgstr[0] ""
52−msgstr[1] ""
54+msgstr[0] "Пачакайце %1 хвіліну і паўтарыце спробу…"
55+msgstr[1] "Пачакайце %1 хвіліны і паўтарыце спробу…"
56+msgstr[2] "Пачакайце %1 хвілінаў і паўтарыце спробу…"
5357
54−#: qml/Components/Dialogs.qml:74
58+#: qml/Components/Dialogs.qml:86
5559msgid "Log out"
56−msgstr ""
60+msgstr "Выйсці"
5761
58−#: qml/Components/Dialogs.qml:75
62+#: qml/Components/Dialogs.qml:87
5963msgid "Are you sure you want to log out?"
60−msgstr ""
64+msgstr "Вы насамрэч хочаце выйсці?"
6165
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
66+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
67+#: qml/Components/Dialogs.qml:134
6468msgid "No"
65−msgstr ""
69+msgstr "Не"
6670
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
71+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
72+#: qml/Components/Dialogs.qml:140
6973msgid "Yes"
70−msgstr ""
74+msgstr "Так"
7175
72−#: qml/Components/Dialogs.qml:98
76+#: qml/Components/Dialogs.qml:108
7377msgid "Shut down"
74−msgstr ""
78+msgstr "Выключыць"
7579
76−#: qml/Components/Dialogs.qml:99
80+#: qml/Components/Dialogs.qml:109
7781msgid "Are you sure you want to shut down?"
78−msgstr ""
82+msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
7983
80−#: qml/Components/Dialogs.qml:123
84+#: qml/Components/Dialogs.qml:131
8185msgid "Reboot"
82−msgstr ""
86+msgstr "Перазагрузіць"
8387
84−#: qml/Components/Dialogs.qml:124
88+#: qml/Components/Dialogs.qml:132
8589msgid "Are you sure you want to reboot?"
86−msgstr ""
90+msgstr "Вы ўпэўненыя, што жадаеце перазагрузіць?"
8791
88−#: qml/Components/Dialogs.qml:148
92+#: qml/Components/Dialogs.qml:154
8993msgid "Power"
90−msgstr ""
94+msgstr "Сілкаванне"
9195
92−#: qml/Components/Dialogs.qml:149
96+#: qml/Components/Dialogs.qml:155
9397msgid ""
9498"Are you sure you would like\n"
9599"to power off?"
96100msgstr ""
101+"Вы сапраўды хочаце выключыць\n"
102+"сілкаванне?"
97103
98−#: qml/Components/Dialogs.qml:151
104+#: qml/Components/Dialogs.qml:157
99105msgid "Power off"
100−msgstr ""
106+msgstr "Выключыць"
101107
102−#: qml/Components/Dialogs.qml:161
108+#: qml/Components/Dialogs.qml:166
103109msgid "Restart"
104−msgstr ""
110+msgstr "Перазапуск"
105111
106−#: qml/Components/Dialogs.qml:171
112+#: qml/Components/Dialogs.qml:175
107113msgid "Cancel"
108−msgstr ""
114+msgstr "Скасаваць"
109115
110116#: qml/Components/EdgeDemoOverlay.qml:151
111117msgid "Skip intro"
112−msgstr ""
118+msgstr "Прапусціць уводзіны"
113119
114−#: qml/Components/EdgeDemo.qml:112
120+#: qml/Components/EdgeDemo.qml:125
115121msgid "Right edge"
116−msgstr ""
122+msgstr "Правы край"
117123
118−#: qml/Components/EdgeDemo.qml:113
124+#: qml/Components/EdgeDemo.qml:126
119125msgid "Try swiping from the right edge to unlock the phone"
120−msgstr ""
126+msgstr "Правядзіце пальцам з правага краю, каб разблакаваць тэлефон"
121127
122−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
123129msgid "Top edge"
124−msgstr ""
130+msgstr "Верхні край"
125131
126−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
127133msgid "Try swiping from the top edge to access the indicators"
128134msgstr ""
135+"Паспрабуйце правесці пальцам ад верхняга краю, для доступу да індыкатараў"
129136
130−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
131138msgid "Close"
132−msgstr ""
139+msgstr "Зачыніць"
133140
134−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
135142msgid "Swipe up again to close the settings screen"
136−msgstr ""
143+msgstr "Правядзіце пальцам яшчэ раз, каб зачыніць акно параметраў"
137144
138−#: qml/Components/EdgeDemo.qml:201
145+#: qml/Components/EdgeDemo.qml:214
139146msgid "Left edge"
140−msgstr ""
147+msgstr "Левы край"
141148
142−#: qml/Components/EdgeDemo.qml:202
149+#: qml/Components/EdgeDemo.qml:215
143150msgid "Swipe from the left to reveal the launcher for quick access to apps"
144151msgstr ""
152+"Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "
153+"доступу да праграм"
145154
146−#: qml/Components/EdgeDemo.qml:229
155+#: qml/Components/EdgeDemo.qml:242
147156msgid "Well done"
148−msgstr ""
157+msgstr "Добра"
149158
150−#: qml/Components/EdgeDemo.qml:230
159+#: qml/Components/EdgeDemo.qml:243
151160msgid ""
152161"You have now mastered the edge gestures and can start using the "
153162"phone<br><br>Tap on the screen to start"
154163msgstr ""
164+"Вамі наладжаныя дзеянні на дакрананні па краях экрана. Цяпер тэлефон можна "
165+"выкарыстоўваць.<br><br>Дакраніцеся да экрана, каб пачаць."
155166
156−#: qml/Components/Lockscreen.qml:223
167+#: qml/Components/Lockscreen.qml:238
157168msgid "Return to Call"
158−msgstr ""
169+msgstr "Вярнуцца да Выкліку"
159170
160−#: qml/Components/Lockscreen.qml:223
171+#: qml/Components/Lockscreen.qml:238
161172msgid "Emergency Call"
162−msgstr ""
173+msgstr "Терміновы Выклік"
163174
164−#: qml/Components/Lockscreen.qml:255
175+#: qml/Components/Lockscreen.qml:270
165176msgid "OK"
166−msgstr ""
177+msgstr "Добра"
167178
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
179+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169180msgid "See less"
170−msgstr ""
181+msgstr "Карацей"
171182
172−#: qml/Dash/GenericScopeView.qml:434
183+#: qml/Dash/GenericScopeView.qml:485
173184msgid "See all"
174−msgstr ""
185+msgstr "Больш падрабязна"
175186
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
187+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177188#: qml/Panel/SearchIndicator.qml:27
178189msgid "Search"
179−msgstr ""
190+msgstr "Пошук"
180191
181−#: qml/Dash/PageHeader.qml:268
192+#: qml/Dash/PageHeader.qml:267
193+msgid "Store"
194+msgstr "Крама"
195+
196+#: qml/Dash/PageHeader.qml:284
182197msgid "Settings"
183−msgstr ""
198+msgstr "Параметры"
184199
185−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:291
186201msgid "Remove from Favorites"
187−msgstr ""
202+msgstr "Выдаліць з абранага"
188203
189−#: qml/Dash/PageHeader.qml:275
204+#: qml/Dash/PageHeader.qml:291
190205msgid "Add to Favorites"
191−msgstr ""
206+msgstr "Дадаць да абранага"
192207
193208#: qml/Dash/Previews/PreviewActionCombo.qml:35
194209msgid "More..."
195−msgstr ""
210+msgstr "Болей…"
196211
197212#: qml/Dash/Previews/PreviewActionCombo.qml:35
198213msgid "Less..."
199−msgstr ""
214+msgstr "Менш..."
200215
201216#: qml/Dash/Previews/PreviewRatingInput.qml:81
202217msgid "Rate this"
203−msgstr ""
218+msgstr "Ацаніць"
204219
205220#: qml/Dash/Previews/PreviewRatingInput.qml:126
206221msgid "Add a review"
207−msgstr ""
222+msgstr "Дадаць рэцэнзію"
208223
209224#: qml/Dash/Previews/PreviewRatingInput.qml:166
210225msgid "Send"
211−msgstr ""
226+msgstr "Адправіць"
212227
213228#: qml/Dash/PullToRefreshScopeStyle.qml:55
214229msgid "Pull to refresh…"
215−msgstr ""
230+msgstr "Пацягніце для абнаўлення ..."
216231
217232#: qml/Dash/PullToRefreshScopeStyle.qml:60
218233msgid "Release to refresh…"
219−msgstr ""
234+msgstr "Адпусціце для абнаўлення ..."
220235
221−#: qml/Dash/ScopesOverview.qml:215
222−msgid "Manage Scopes"
223−msgstr ""
236+#: qml/Dash/ScopesList.qml:66
237+msgid "Manage"
238+msgstr "Кіраванне"
224239
225−#: qml/Dash/ScopesOverview.qml:437
226−msgid "Done"
227−msgstr ""
240+#: qml/Dash/ScopesList.qml:112
241+msgid "Home"
242+msgstr "Дом"
228243
229−#: qml/Dash/ScopesOverview.qml:463
230−msgid "Store"
231−msgstr ""
244+#: qml/Dash/ScopesList.qml:113
245+msgid "Also installed"
246+msgstr "Таксама ўсталявана"
232247
233−#: qml/Dash/ScopesOverviewTab.qml:36
234−msgid "Favorites"
235−msgstr ""
236−
237−#: qml/Dash/ScopesOverviewTab.qml:54
238−msgid "All"
239−msgstr ""
240−
241−#: qml/Greeter/Greeter.qml:174
248+#: qml/Greeter/Greeter.qml:133
242249msgid "Unlock"
243−msgstr ""
250+msgstr "Разблакаваць"
244251
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
252+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246253msgid "Show password"
247−msgstr ""
254+msgstr "Паказаць пароль"
248255
249256#: qml/Panel/ActiveCallHint.qml:79
250257msgid "Tap to return to call..."
251−msgstr ""
258+msgstr "Націсніце, каб вярнуцца да выкліку..."
252259
253260#: qml/Panel/ActiveCallHint.qml:92
254261msgid "Conference"
255−msgstr ""
262+msgstr "Канферэнцыя"
256263
257264#: qml/Panel/Indicators/MenuItemFactory.qml:643
258265msgid "Nothing is playing"
259−msgstr ""
266+msgstr "Анічога не прайграецца"
260267
261268#: qml/Panel/Indicators/MenuItemFactory.qml:791
262269msgid "In queue…"
263−msgstr ""
270+msgstr "У чарзе..."
264271
265272#: qml/Panel/Indicators/MenuItemFactory.qml:795
266273msgid "Downloading"
267−msgstr ""
274+msgstr "Запампоўка"
268275
269276#: qml/Panel/Indicators/MenuItemFactory.qml:797
270277msgid "Paused, tap to resume"
271−msgstr ""
278+msgstr "Прыпынена, націсніце для працягу"
272279
273280#: qml/Panel/Indicators/MenuItemFactory.qml:799
274281msgid "Canceled"
275−msgstr ""
282+msgstr "Скасавана"
276283
277284#: qml/Panel/Indicators/MenuItemFactory.qml:801
278285msgid "Finished"
279−msgstr ""
286+msgstr "Скончана"
280287
281288#: qml/Panel/Indicators/MenuItemFactory.qml:803
282289msgid "Failed, tap to retry"
283−msgstr ""
290+msgstr "Памылка, націсніце для паўтору"
291+
292+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
293+msgid "Reply"
294+msgstr "Адказаць"
284295
285296#: qml/Panel/Indicators/ModemInfoItem.qml:105
286297msgid "Unlock SIM"
287−msgstr ""
298+msgstr "Разблакаваць SIM"
288299
289300#: qml/Panel/Indicators/RoamingIndication.qml:27
290301msgid "Roaming"
291−msgstr ""
302+msgstr "Роўмінг"
303+
304+#: qml/Shell.qml:390
305+#, qt-format
306+msgid "Enter %1"
307+msgstr "Увядзіце %1"
292308
293−#: qml/Shell.qml:391
309+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294310msgid "Enter passphrase"
295−msgstr ""
311+msgstr "Увядзіце парольную фразу"
296312
297313#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
299−msgstr ""
314+msgid "Enter passcode"
315+msgstr "Увядзіце код"
300316
301317#: qml/Shell.qml:393
302−msgid "Please re-enter"
303−msgstr ""
318+#, qt-format
319+msgid "Sorry, incorrect %1"
320+msgstr "Даруйце, некарэктны %1"
321+
322+#: qml/Shell.qml:394
323+msgid "Sorry, incorrect passphrase"
324+msgstr "Даруйце, няслушны пароль"
304325
305326#: qml/Shell.qml:395
306−msgid "Enter passcode"
307−msgstr ""
327+msgid "Please re-enter"
328+msgstr "Калі ласка паўтарыце ўвод"
308329
309330#: qml/Shell.qml:396
310331msgid "Sorry, incorrect passcode"
311−msgstr ""
332+msgstr "Даруйце, няслушны код"
312333
313−#: qml/Shell.qml:399
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
334+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324335msgid "Sorry, incorrect passphrase."
325−msgstr ""
336+msgstr "Даруце, няслушны пароль"
326337
327−#: qml/Shell.qml:442
338+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328339msgid "Sorry, incorrect passcode."
329−msgstr ""
340+msgstr "Даруйце, няслушны код"
330341
331−#: qml/Shell.qml:443
342+#: qml/Shell.qml:492
332343msgid "This will be your last attempt."
333−msgstr ""
344+msgstr "Апошняя спроба."
334345
335−#: qml/Shell.qml:445
346+#: qml/Shell.qml:494
336347msgid ""
337348"If passphrase is entered incorrectly, your phone will conduct a factory "
338349"reset and all personal data will be deleted."
339350msgstr ""
351+"Калі пароль паказаны няправільна, тэлефон вернецца ў зыходны стан, усе "
352+"асабістыя дадзеныя будуць выдаленыя."
340353
341−#: qml/Shell.qml:446
354+#: qml/Shell.qml:495
342355msgid ""
343356"If passcode is entered incorrectly, your phone will conduct a factory reset "
344357"and all personal data will be deleted."
345358msgstr ""
359+"Калі пароль уведзены няправільна, то ваш тэлефон будзе праводзіць скід да "
360+"завадскіх налад і ўсе асабістыя дадзеныя будуць выдаленыя."
361+
362+#: qml/Wizard/Page.qml:89
363+msgid "Back"
364+msgstr "Назад"
365+
366+#: qml/Wizard/Pages/10-welcome.qml:27
367+msgid "Hi!"
368+msgstr "Вітай!"
369+
370+#: qml/Wizard/Pages/10-welcome.qml:44
371+msgid "Welcome to your Ubuntu phone."
372+msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
373+
374+#: qml/Wizard/Pages/10-welcome.qml:52
375+msgid "Let’s get started."
376+msgstr "Пачнем."
377+
378+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
379+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
380+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
381+#: qml/Wizard/Pages/passwd-set.qml:90
382+msgid "Continue"
383+msgstr "Працягнуць"
384+
385+#: qml/Wizard/Pages/20-sim.qml:25
386+msgid "Add a SIM card and restart your device"
387+msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
388+
389+#: qml/Wizard/Pages/20-sim.qml:55
390+msgid "Without it, you won’t be able to make calls or use text messaging."
391+msgstr "Без яе вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
392+
393+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
394+msgid "Skip"
395+msgstr "Прапусціць"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:39
398+msgid "Lock security"
399+msgstr "Блакаванне бяспекі"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:74
402+msgid "Please select how you’d like to unlock your phone."
403+msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:97
406+msgid "Swipe"
407+msgstr "Свайп(Рух пальцам)"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:98
410+msgid "No security"
411+msgstr "Без абароны"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:100
414+msgid "Passcode"
415+msgstr "Код-пароль"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:101
418+msgid "4 digits only"
419+msgstr "Толькі 4 лічбы"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:103
422+msgid "Passphrase"
423+msgstr "Пароль"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:104
426+msgid "Numbers and letters"
427+msgstr "Лічбы і літары"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:28
430+msgid "Connect to Wi‑Fi"
431+msgstr "Злучыцца з Wi-Fi"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:147
434+msgid "Available networks…"
435+msgstr "Даступныя сеткі..."
436+
437+#: qml/Wizard/Pages/40-wifi.qml:148
438+msgid "No available networks."
439+msgstr "Няма даступных сетак."
440+
441+#: qml/Wizard/Pages/50-location.qml:27
442+msgid "Location"
443+msgstr "Месца"
444+
445+#: qml/Wizard/Pages/50-location.qml:62
446+msgid "Let the phone detect your location:"
447+msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
448+
449+#: qml/Wizard/Pages/50-location.qml:69
450+msgid "Using GPS only (less accurate)"
451+msgstr "З дапамогай толькі GPS (найменш дакладна)"
452+
453+#: qml/Wizard/Pages/50-location.qml:86
454+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
455+msgstr ""
456+"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
457+
458+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
459+#: qml/Wizard/Pages/50-location.qml:103
460+msgid ""
461+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
462+"conditions</a>."
463+msgstr ""
464+"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
465+"прадстаўлення паслуг Nokia HERE</a>."
466+
467+#: qml/Wizard/Pages/50-location.qml:112
468+msgid "Not at all"
469+msgstr "Не дазваляць"
470+
471+#: qml/Wizard/Pages/50-location.qml:124
472+msgid "You can change your mind later in <b>System Settings</b>."
473+msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных параметраў</b>."
474+
475+#: qml/Wizard/Pages/60-reporting.qml:24
476+msgid "Improving your experience"
477+msgstr "Спрашчэнне вашай працы"
478+
479+#: qml/Wizard/Pages/60-reporting.qml:36
480+msgid ""
481+"Your phone is set up to automatically report errors to Canonical and its "
482+"partners, the makers of the operating system."
483+msgstr ""
484+"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
485+"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
486+
487+#: qml/Wizard/Pages/60-reporting.qml:43
488+msgid ""
489+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
490+"Privacy</b>"
491+msgstr ""
492+"Гэтае можна адключыць у <b>Сістэмных параметрах</b>, <b>Бяспека &amp; "
493+"канфедэнцыйнасць</b>"
494+
495+#: qml/Wizard/Pages/80-finished.qml:24
496+msgid "All done"
497+msgstr "Зроблена"
498+
499+#: qml/Wizard/Pages/80-finished.qml:39
500+msgid "Nice work!"
501+msgstr "Выдатная праца!"
502+
503+#: qml/Wizard/Pages/80-finished.qml:46
504+msgid "Your phone is now ready to use."
505+msgstr "Цяпер Вашым тэлефонам можна карыстацца."
506+
507+#: qml/Wizard/Pages/80-finished.qml:53
508+msgid "Finish"
509+msgstr "Скончыць"
510+
511+#: qml/Wizard/Pages/here-terms.qml:27
512+msgid "Terms & Conditions"
513+msgstr "Умовы карыстання"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:49
516+msgid "Confirm passphrase"
517+msgstr "Пацвердзіце пароль"
518+
519+#: qml/Wizard/Pages/passwd-confirm.qml:50
520+msgid "Confirm passcode"
521+msgstr "Пацвердзіце код-пароль"
522+
523+#: qml/Wizard/Pages/passwd-confirm.qml:53
524+#: qml/Wizard/Pages/passwd-confirm.qml:54
525+msgid "Please try again."
526+msgstr "Калі ласка, паспрабуйце яшчэ раз."
527+
528+#: qml/Wizard/Pages/passwd-set.qml:61
529+msgid "Choose your passcode"
530+msgstr "Выберыце ваш код-пароль"
531+
532+#: qml/Wizard/Pages/passwd-set.qml:68
533+msgid "Passphrase must be 4 characters long"
534+msgstr "Пароль мусіць складацца мінімум з 4 сімвалаў"
535+
536+#: qml/Wizard/StackButton.qml:39
537+#, qt-format
538+msgid "〈 %1"
539+msgstr "〈 %1"
540+
541+#: qml/Wizard/StackButton.qml:42
542+#, qt-format
543+msgid "%1 〉"
544+msgstr "%1 〉"
545+
546+#~ msgid "Confirm"
547+#~ msgstr "Пацвердзіць"
548+
549+#~ msgid "Loading. Please Wait..."
550+#~ msgstr "Загрузка. Чакайце..."
551+
552+#~ msgid "Speaking..."
553+#~ msgstr "Кажа..."
554+
555+#~ msgid "Speak Now..."
556+#~ msgstr "Кажыце..."
557+
558+#~ msgid "Type or say a command"
559+#~ msgstr "Напішыце або вымавіце каманду"
po/bg.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-04-01 14:08+0000\n"
1212"Last-Translator: Atanas Kovachki <Unknown>\n"
1313"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,89 +110,93 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "Пропусни интрото"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Десен край"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
121121"отключите телефона"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Горен край"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr ""
130130"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
131131"получите достъп до индикаторите"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Затвори"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr ""
140140"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
141141
142−#: qml/Components/EdgeDemo.qml:201
142+#: qml/Components/EdgeDemo.qml:214
143143msgid "Left edge"
144144msgstr "Ляв край"
145145
146−#: qml/Components/EdgeDemo.qml:202
146+#: qml/Components/EdgeDemo.qml:215
147147msgid "Swipe from the left to reveal the launcher for quick access to apps"
148148msgstr ""
149149"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
150150"бърз достъп до приложенията"
151151
152−#: qml/Components/EdgeDemo.qml:229
152+#: qml/Components/EdgeDemo.qml:242
153153msgid "Well done"
154154msgstr "Великолепно"
155155
156−#: qml/Components/EdgeDemo.qml:230
156+#: qml/Components/EdgeDemo.qml:243
157157msgid ""
158158"You have now mastered the edge gestures and can start using the "
159159"phone<br><br>Tap on the screen to start"
160160msgstr ""
161161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163163msgid "Return to Call"
164164msgstr ""
165165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167167msgid "Emergency Call"
168168msgstr "Спешно повикване"
169169
170−#: qml/Components/Lockscreen.qml:255
170+#: qml/Components/Lockscreen.qml:270
171171msgid "OK"
172172msgstr ""
173173
174−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
174+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
175175msgid "See less"
176176msgstr ""
177177
178−#: qml/Dash/GenericScopeView.qml:434
178+#: qml/Dash/GenericScopeView.qml:485
179179msgid "See all"
180180msgstr ""
181181
182−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
183183#: qml/Panel/SearchIndicator.qml:27
184184msgid "Search"
185185msgstr "Търсене"
186186
187−#: qml/Dash/PageHeader.qml:268
187+#: qml/Dash/PageHeader.qml:267
188+msgid "Store"
189+msgstr ""
190+
191+#: qml/Dash/PageHeader.qml:284
188192msgid "Settings"
189193msgstr ""
190194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192196msgid "Remove from Favorites"
193197msgstr ""
194198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196200msgid "Add to Favorites"
197201msgstr ""
198202
@@ -224,31 +228,23 @@ msgstr ""
224228msgid "Release to refresh…"
225229msgstr ""
226230
227−#: qml/Dash/ScopesOverview.qml:215
228−msgid "Manage Scopes"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:437
232−msgid "Done"
233−msgstr ""
234−
235−#: qml/Dash/ScopesOverview.qml:463
236−msgid "Store"
231+#: qml/Dash/ScopesList.qml:66
232+msgid "Manage"
237233msgstr ""
238234
239−#: qml/Dash/ScopesOverviewTab.qml:36
240−msgid "Favorites"
235+#: qml/Dash/ScopesList.qml:112
236+msgid "Home"
241237msgstr ""
242238
243−#: qml/Dash/ScopesOverviewTab.qml:54
244−msgid "All"
239+#: qml/Dash/ScopesList.qml:113
240+msgid "Also installed"
245241msgstr ""
246242
247−#: qml/Greeter/Greeter.qml:174
243+#: qml/Greeter/Greeter.qml:133
248244msgid "Unlock"
249245msgstr ""
250246
251−#: qml/Notifications/NotificationMenuItemFactory.qml:116
247+#: qml/Notifications/NotificationMenuItemFactory.qml:128
252248msgid "Show password"
253249msgstr "Покажи паролата"
254250
@@ -288,6 +284,10 @@ msgstr ""
288284msgid "Failed, tap to retry"
289285msgstr ""
290286
287+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
288+msgid "Reply"
289+msgstr ""
290+
291291#: qml/Panel/Indicators/ModemInfoItem.qml:105
292292msgid "Unlock SIM"
293293msgstr ""
@@ -296,60 +296,237 @@ msgstr ""
296296msgid "Roaming"
297297msgstr ""
298298
299−#: qml/Shell.qml:391
299+#: qml/Shell.qml:390
300+#, qt-format
301+msgid "Enter %1"
302+msgstr ""
303+
304+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
300305msgid "Enter passphrase"
301306msgstr ""
302307
303308#: qml/Shell.qml:392
304−msgid "Sorry, incorrect passphrase"
309+msgid "Enter passcode"
305310msgstr ""
306311
307312#: qml/Shell.qml:393
308−msgid "Please re-enter"
313+#, qt-format
314+msgid "Sorry, incorrect %1"
315+msgstr ""
316+
317+#: qml/Shell.qml:394
318+msgid "Sorry, incorrect passphrase"
309319msgstr ""
310320
311321#: qml/Shell.qml:395
312−msgid "Enter passcode"
322+msgid "Please re-enter"
313323msgstr ""
314324
315325#: qml/Shell.qml:396
316326msgid "Sorry, incorrect passcode"
317327msgstr ""
318328
319−#: qml/Shell.qml:399
320−#, qt-format
321−msgid "Enter %1"
322−msgstr ""
323−
324−#: qml/Shell.qml:400
325−#, qt-format
326−msgid "Sorry, incorrect %1"
327−msgstr ""
328−
329−#: qml/Shell.qml:441
329+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
330330msgid "Sorry, incorrect passphrase."
331331msgstr ""
332332
333−#: qml/Shell.qml:442
333+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
334334msgid "Sorry, incorrect passcode."
335335msgstr ""
336336
337−#: qml/Shell.qml:443
337+#: qml/Shell.qml:492
338338msgid "This will be your last attempt."
339339msgstr ""
340340
341−#: qml/Shell.qml:445
341+#: qml/Shell.qml:494
342342msgid ""
343343"If passphrase is entered incorrectly, your phone will conduct a factory "
344344"reset and all personal data will be deleted."
345345msgstr ""
346346
347−#: qml/Shell.qml:446
347+#: qml/Shell.qml:495
348348msgid ""
349349"If passcode is entered incorrectly, your phone will conduct a factory reset "
350350"and all personal data will be deleted."
351351msgstr ""
352352
353+#: qml/Wizard/Page.qml:89
354+msgid "Back"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:27
358+msgid "Hi!"
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:44
362+msgid "Welcome to your Ubuntu phone."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:52
366+msgid "Let’s get started."
367+msgstr ""
368+
369+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
370+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
371+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
372+#: qml/Wizard/Pages/passwd-set.qml:90
373+msgid "Continue"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:25
377+msgid "Add a SIM card and restart your device"
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:55
381+msgid "Without it, you won’t be able to make calls or use text messaging."
382+msgstr ""
383+
384+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
385+msgid "Skip"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:39
389+msgid "Lock security"
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:74
393+msgid "Please select how you’d like to unlock your phone."
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:97
397+msgid "Swipe"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:98
401+msgid "No security"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:100
405+msgid "Passcode"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:101
409+msgid "4 digits only"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:103
413+msgid "Passphrase"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:104
417+msgid "Numbers and letters"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:28
421+msgid "Connect to Wi‑Fi"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:147
425+msgid "Available networks…"
426+msgstr ""
427+
428+#: qml/Wizard/Pages/40-wifi.qml:148
429+msgid "No available networks."
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:27
433+msgid "Location"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:62
437+msgid "Let the phone detect your location:"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:69
441+msgid "Using GPS only (less accurate)"
442+msgstr ""
443+
444+#: qml/Wizard/Pages/50-location.qml:86
445+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
446+msgstr ""
447+
448+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
449+#: qml/Wizard/Pages/50-location.qml:103
450+msgid ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:112
456+msgid "Not at all"
457+msgstr ""
458+
459+#: qml/Wizard/Pages/50-location.qml:124
460+msgid "You can change your mind later in <b>System Settings</b>."
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:24
464+msgid "Improving your experience"
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:36
468+msgid ""
469+"Your phone is set up to automatically report errors to Canonical and its "
470+"partners, the makers of the operating system."
471+msgstr ""
472+
473+#: qml/Wizard/Pages/60-reporting.qml:43
474+msgid ""
475+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
476+"Privacy</b>"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:24
480+msgid "All done"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:39
484+msgid "Nice work!"
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:46
488+msgid "Your phone is now ready to use."
489+msgstr ""
490+
491+#: qml/Wizard/Pages/80-finished.qml:53
492+msgid "Finish"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/here-terms.qml:27
496+msgid "Terms & Conditions"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:49
500+msgid "Confirm passphrase"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:50
504+msgid "Confirm passcode"
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:53
508+#: qml/Wizard/Pages/passwd-confirm.qml:54
509+msgid "Please try again."
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:61
513+msgid "Choose your passcode"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-set.qml:68
517+msgid "Passphrase must be 4 characters long"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:39
521+#, qt-format
522+msgid "〈 %1"
523+msgstr ""
524+
525+#: qml/Wizard/StackButton.qml:42
526+#, qt-format
527+msgid "%1 〉"
528+msgstr ""
529+
353530#~ msgid "Confirm"
354531#~ msgstr "Потвърди"
355532
po/br.po+277−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-05 07:24+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2014-12-16 07:27+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Ger-tremen : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Spilhennañ ar verradenn"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Dispilhennañ ar verradenn"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Digevreañ"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "N'on ket"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Ya"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Lazhañ ar benveg"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Adloc'hañ"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Tredan"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Ha sur oc'h e fell deoc'h\n"
101101"troc'hañ an tredan ?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Lazhañ"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Adloc'hañ"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Nullañ"
114114
@@ -116,48 +116,48 @@ msgstr "Nullañ"
116116msgid "Skip intro"
117117msgstr "Tremen hep sellet ouzh an digoradur"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Bord dehoù"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Bord uhelañ"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Serriñ"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
145145
146−#: qml/Components/EdgeDemo.qml:201
146+#: qml/Components/EdgeDemo.qml:214
147147msgid "Left edge"
148148msgstr "Bord kleiz"
149149
150−#: qml/Components/EdgeDemo.qml:202
150+#: qml/Components/EdgeDemo.qml:215
151151msgid "Swipe from the left to reveal the launcher for quick access to apps"
152152msgstr ""
153153"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
154154"prim."
155155
156−#: qml/Components/EdgeDemo.qml:229
156+#: qml/Components/EdgeDemo.qml:242
157157msgid "Well done"
158158msgstr "Gourc'hemennoù !"
159159
160−#: qml/Components/EdgeDemo.qml:230
160+#: qml/Components/EdgeDemo.qml:243
161161msgid ""
162162"You have now mastered the edge gestures and can start using the "
163163"phone<br><br>Tap on the screen to start"
@@ -165,40 +165,44 @@ msgstr ""
165165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
166166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
167167
168−#: qml/Components/Lockscreen.qml:223
168+#: qml/Components/Lockscreen.qml:238
169169msgid "Return to Call"
170170msgstr "Distreiñ d'ar bellgomzadenn"
171171
172−#: qml/Components/Lockscreen.qml:223
172+#: qml/Components/Lockscreen.qml:238
173173msgid "Emergency Call"
174174msgstr "Pellgomzadenn vallus"
175175
176−#: qml/Components/Lockscreen.qml:255
176+#: qml/Components/Lockscreen.qml:270
177177msgid "OK"
178178msgstr "Mat eo"
179179
180−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
180+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
181181msgid "See less"
182182msgstr "Gwelet nebeutoc'h"
183183
184−#: qml/Dash/GenericScopeView.qml:434
184+#: qml/Dash/GenericScopeView.qml:485
185185msgid "See all"
186186msgstr "Gwelet pep tra"
187187
188−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
188+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
189189#: qml/Panel/SearchIndicator.qml:27
190190msgid "Search"
191191msgstr "Klask"
192192
193−#: qml/Dash/PageHeader.qml:268
193+#: qml/Dash/PageHeader.qml:267
194+msgid "Store"
195+msgstr "Enrollañ"
196+
197+#: qml/Dash/PageHeader.qml:284
194198msgid "Settings"
195199msgstr "Arventennoù"
196200
197−#: qml/Dash/PageHeader.qml:275
201+#: qml/Dash/PageHeader.qml:291
198202msgid "Remove from Favorites"
199203msgstr "Lemel eus ar sinedoù"
200204
201−#: qml/Dash/PageHeader.qml:275
205+#: qml/Dash/PageHeader.qml:291
202206msgid "Add to Favorites"
203207msgstr "Ouzhpennañ d'ar sinedoù"
204208
@@ -230,31 +234,23 @@ msgstr "Tennañ evit freskaat..."
230234msgid "Release to refresh…"
231235msgstr "Lezel da vont evit freskaat..."
232236
233−#: qml/Dash/ScopesOverview.qml:215
234−msgid "Manage Scopes"
235−msgstr "Merañ ar c'hefluskerioù enklask"
236−
237−#: qml/Dash/ScopesOverview.qml:437
238−msgid "Done"
239−msgstr "Graet eo"
240−
241−#: qml/Dash/ScopesOverview.qml:463
242−msgid "Store"
243−msgstr "Enrollañ"
237+#: qml/Dash/ScopesList.qml:66
238+msgid "Manage"
239+msgstr "Merañ"
244240
245−#: qml/Dash/ScopesOverviewTab.qml:36
246−msgid "Favorites"
247−msgstr "Gwellañ deuet"
241+#: qml/Dash/ScopesList.qml:112
242+msgid "Home"
243+msgstr "Er gêr"
248244
249−#: qml/Dash/ScopesOverviewTab.qml:54
250−msgid "All"
251−msgstr "An holl anezho"
245+#: qml/Dash/ScopesList.qml:113
246+msgid "Also installed"
247+msgstr "Staliet ivez"
252248
253−#: qml/Greeter/Greeter.qml:174
249+#: qml/Greeter/Greeter.qml:133
254250msgid "Unlock"
255251msgstr "Dibrennañ"
256252
257−#: qml/Notifications/NotificationMenuItemFactory.qml:116
253+#: qml/Notifications/NotificationMenuItemFactory.qml:128
258254msgid "Show password"
259255msgstr "Diskouez ar ger-tremen"
260256
@@ -294,6 +290,10 @@ msgstr "Echu"
294290msgid "Failed, tap to retry"
295291msgstr "C'hwitet, touchit evit adkregiñ"
296292
293+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
294+msgid "Reply"
295+msgstr ""
296+
297297#: qml/Panel/Indicators/ModemInfoItem.qml:105
298298msgid "Unlock SIM"
299299msgstr "Dibrennañ ar gartenn SIM"
@@ -302,49 +302,49 @@ msgstr "Dibrennañ ar gartenn SIM"
302302msgid "Roaming"
303303msgstr "O kantren"
304304
305−#: qml/Shell.qml:391
305+#: qml/Shell.qml:390
306+#, qt-format
307+msgid "Enter %1"
308+msgstr "Merkañ %1"
309+
310+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
306311msgid "Enter passphrase"
307312msgstr "Merkañ ar frazenn-dremen"
308313
309314#: qml/Shell.qml:392
315+msgid "Enter passcode"
316+msgstr "Merkañ ar c'hod-tremen"
317+
318+#: qml/Shell.qml:393
319+#, qt-format
320+msgid "Sorry, incorrect %1"
321+msgstr "Siwazh, %1 direizh"
322+
323+#: qml/Shell.qml:394
310324msgid "Sorry, incorrect passphrase"
311325msgstr "Siwazh, frazenn-dremen direizh"
312326
313−#: qml/Shell.qml:393
327+#: qml/Shell.qml:395
314328msgid "Please re-enter"
315329msgstr "Adverkañ, mar plij"
316330
317−#: qml/Shell.qml:395
318−msgid "Enter passcode"
319−msgstr "Merkañ ar c'hod-tremen"
320−
321331#: qml/Shell.qml:396
322332msgid "Sorry, incorrect passcode"
323333msgstr "Digarezit, kod-tremen direizh"
324334
325−#: qml/Shell.qml:399
326−#, qt-format
327−msgid "Enter %1"
328−msgstr "Merkañ %1"
329−
330−#: qml/Shell.qml:400
331−#, qt-format
332−msgid "Sorry, incorrect %1"
333−msgstr "Siwazh, %1 direizh"
334−
335−#: qml/Shell.qml:441
335+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
336336msgid "Sorry, incorrect passphrase."
337337msgstr "Siwazh, frazenn-dremen direizh"
338338
339−#: qml/Shell.qml:442
339+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
340340msgid "Sorry, incorrect passcode."
341341msgstr "Siwazh, kod-tremen direizh"
342342
343−#: qml/Shell.qml:443
343+#: qml/Shell.qml:492
344344msgid "This will be your last attempt."
345345msgstr "Ho taol-esae diwezhañ e vo."
346346
347−#: qml/Shell.qml:445
347+#: qml/Shell.qml:494
348348msgid ""
349349"If passphrase is entered incorrectly, your phone will conduct a factory "
350350"reset and all personal data will be deleted."
@@ -352,7 +352,7 @@ msgstr ""
352352"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
353353"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
354354
355−#: qml/Shell.qml:446
355+#: qml/Shell.qml:495
356356msgid ""
357357"If passcode is entered incorrectly, your phone will conduct a factory reset "
358358"and all personal data will be deleted."
@@ -360,6 +360,191 @@ msgstr ""
360360"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
361361"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
362362
363+#: qml/Wizard/Page.qml:89
364+msgid "Back"
365+msgstr "Distreiñ"
366+
367+#: qml/Wizard/Pages/10-welcome.qml:27
368+msgid "Hi!"
369+msgstr "Salud deoc'h !"
370+
371+#: qml/Wizard/Pages/10-welcome.qml:44
372+msgid "Welcome to your Ubuntu phone."
373+msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
374+
375+#: qml/Wizard/Pages/10-welcome.qml:52
376+msgid "Let’s get started."
377+msgstr "Krogomp ganti."
378+
379+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
380+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
381+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
382+#: qml/Wizard/Pages/passwd-set.qml:90
383+msgid "Continue"
384+msgstr "Kenderc'hel"
385+
386+#: qml/Wizard/Pages/20-sim.qml:25
387+msgid "Add a SIM card and restart your device"
388+msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
389+
390+#: qml/Wizard/Pages/20-sim.qml:55
391+msgid "Without it, you won’t be able to make calls or use text messaging."
392+msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
393+
394+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
395+msgid "Skip"
396+msgstr "Tremen hebiou"
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:39
399+msgid "Lock security"
400+msgstr "Surentez ar prennañ"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:74
403+msgid "Please select how you’d like to unlock your phone."
404+msgstr ""
405+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:97
408+msgid "Swipe"
409+msgstr "Riklañ"
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:98
412+msgid "No security"
413+msgstr "Tamm surentez ebet"
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:100
416+msgid "Passcode"
417+msgstr "Kod-tremen"
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:101
420+msgid "4 digits only"
421+msgstr "4 sifr hepken"
422+
423+#: qml/Wizard/Pages/30-passwd-type.qml:103
424+msgid "Passphrase"
425+msgstr "Frazenn-dremen"
426+
427+#: qml/Wizard/Pages/30-passwd-type.qml:104
428+msgid "Numbers and letters"
429+msgstr "Sifroù ha lizherennoù"
430+
431+#: qml/Wizard/Pages/40-wifi.qml:28
432+msgid "Connect to Wi‑Fi"
433+msgstr "Kevreañ ouzh ar Wi-Fi"
434+
435+#: qml/Wizard/Pages/40-wifi.qml:147
436+msgid "Available networks…"
437+msgstr "Rouedadoù a c'haller kaout..."
438+
439+#: qml/Wizard/Pages/40-wifi.qml:148
440+msgid "No available networks."
441+msgstr "N'eus rouedad ebet da gaout."
442+
443+#: qml/Wizard/Pages/50-location.qml:27
444+msgid "Location"
445+msgstr "Lec'h"
446+
447+#: qml/Wizard/Pages/50-location.qml:62
448+msgid "Let the phone detect your location:"
449+msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
450+
451+#: qml/Wizard/Pages/50-location.qml:69
452+msgid "Using GPS only (less accurate)"
453+msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
454+
455+#: qml/Wizard/Pages/50-location.qml:86
456+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
457+msgstr ""
458+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
459+
460+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
461+#: qml/Wizard/Pages/50-location.qml:103
462+msgid ""
463+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
464+"conditions</a>."
465+msgstr ""
466+"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
467+
468+#: qml/Wizard/Pages/50-location.qml:112
469+msgid "Not at all"
470+msgstr "Tamm ebet"
471+
472+#: qml/Wizard/Pages/50-location.qml:124
473+msgid "You can change your mind later in <b>System Settings</b>."
474+msgstr ""
475+"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
476+
477+#: qml/Wizard/Pages/60-reporting.qml:24
478+msgid "Improving your experience"
479+msgstr "Gwellaat ho skiant-prenet"
480+
481+#: qml/Wizard/Pages/60-reporting.qml:36
482+msgid ""
483+"Your phone is set up to automatically report errors to Canonical and its "
484+"partners, the makers of the operating system."
485+msgstr ""
486+"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
487+"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
488+
489+#: qml/Wizard/Pages/60-reporting.qml:43
490+msgid ""
491+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
492+"Privacy</b>"
493+msgstr ""
494+"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
495+"dindan <b>Surentez &amp; Prevezded</b>"
496+
497+#: qml/Wizard/Pages/80-finished.qml:24
498+msgid "All done"
499+msgstr "Echu penn-da-benn"
500+
501+#: qml/Wizard/Pages/80-finished.qml:39
502+msgid "Nice work!"
503+msgstr "Gwellat labour !"
504+
505+#: qml/Wizard/Pages/80-finished.qml:46
506+msgid "Your phone is now ready to use."
507+msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
508+
509+#: qml/Wizard/Pages/80-finished.qml:53
510+msgid "Finish"
511+msgstr "Echuiñ"
512+
513+#: qml/Wizard/Pages/here-terms.qml:27
514+msgid "Terms & Conditions"
515+msgstr "Penndivizoù implij"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:49
518+msgid "Confirm passphrase"
519+msgstr "Kadarnaat ar frazenn-dremen"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:50
522+msgid "Confirm passcode"
523+msgstr "Kadarnaat ar c'hod-tremen"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:53
526+#: qml/Wizard/Pages/passwd-confirm.qml:54
527+msgid "Please try again."
528+msgstr "Esaeit en-dro, mar plij."
529+
530+#: qml/Wizard/Pages/passwd-set.qml:61
531+msgid "Choose your passcode"
532+msgstr "Choaz ho kod-tremen"
533+
534+#: qml/Wizard/Pages/passwd-set.qml:68
535+msgid "Passphrase must be 4 characters long"
536+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
537+
538+#: qml/Wizard/StackButton.qml:39
539+#, qt-format
540+msgid "〈 %1"
541+msgstr "〈 %1"
542+
543+#: qml/Wizard/StackButton.qml:42
544+#, qt-format
545+msgid "%1 〉"
546+msgstr "%1 〉"
547+
363548#~ msgid "Loading. Please Wait..."
364549#~ msgstr "O kargañ. Gortozit, mar plij..."
365550
@@ -374,3 +559,15 @@ msgstr ""
374559
375560#~ msgid "Type or say a command"
376561#~ msgstr "Skrivit pe lavarit un urzhiad"
562+
563+#~ msgid "Done"
564+#~ msgstr "Graet eo"
565+
566+#~ msgid "All"
567+#~ msgstr "An holl anezho"
568+
569+#~ msgid "Favorites"
570+#~ msgstr "Gwellañ deuet"
571+
572+#~ msgid "Manage Scopes"
573+#~ msgstr "Merañ ar c'hefluskerioù enklask"
po/bs.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Bosnian <bs@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20+"X-Generator: Launchpad (build 17306)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
5555msgid "Log out"
5656msgstr ""
5757
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
5959msgid "Are you sure you want to log out?"
6060msgstr ""
6161
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63+#: qml/Components/Dialogs.qml:134
6464msgid "No"
6565msgstr ""
6666
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68+#: qml/Components/Dialogs.qml:140
6969msgid "Yes"
7070msgstr ""
7171
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
7373msgid "Shut down"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
7777msgid "Are you sure you want to shut down?"
7878msgstr ""
7979
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
8181msgid "Reboot"
8282msgstr ""
8383
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
8585msgid "Are you sure you want to reboot?"
8686msgstr ""
8787
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
8989msgid "Power"
9090msgstr ""
9191
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
9393msgid ""
9494"Are you sure you would like\n"
9595"to power off?"
9696msgstr ""
9797
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
9999msgid "Power off"
100100msgstr ""
101101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103103msgid "Restart"
104104msgstr ""
105105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107107msgid "Cancel"
108108msgstr ""
109109
@@ -111,82 +111,86 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr "Preskoči uvod"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr "Desna ivica"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr ""
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr "Gornja ivica"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr ""
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr "Zatvori"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr ""
137137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr ""
141141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr ""
149149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
154154msgstr ""
155155
156−#: qml/Components/Lockscreen.qml:223
156+#: qml/Components/Lockscreen.qml:238
157157msgid "Return to Call"
158158msgstr ""
159159
160−#: qml/Components/Lockscreen.qml:223
160+#: qml/Components/Lockscreen.qml:238
161161msgid "Emergency Call"
162162msgstr ""
163163
164−#: qml/Components/Lockscreen.qml:255
164+#: qml/Components/Lockscreen.qml:270
165165msgid "OK"
166166msgstr ""
167167
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169169msgid "See less"
170170msgstr ""
171171
172−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:485
173173msgid "See all"
174174msgstr ""
175175
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177177#: qml/Panel/SearchIndicator.qml:27
178178msgid "Search"
179179msgstr ""
180180
181−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:267
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:284
182186msgid "Settings"
183187msgstr ""
184188
185−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:291
186190msgid "Remove from Favorites"
187191msgstr ""
188192
189−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:291
190194msgid "Add to Favorites"
191195msgstr ""
192196
@@ -218,31 +222,23 @@ msgstr ""
218222msgid "Release to refresh…"
219223msgstr ""
220224
221−#: qml/Dash/ScopesOverview.qml:215
222−msgid "Manage Scopes"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:437
226−msgid "Done"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverview.qml:463
230−msgid "Store"
225+#: qml/Dash/ScopesList.qml:66
226+msgid "Manage"
231227msgstr ""
232228
233−#: qml/Dash/ScopesOverviewTab.qml:36
234−msgid "Favorites"
229+#: qml/Dash/ScopesList.qml:112
230+msgid "Home"
235231msgstr ""
236232
237−#: qml/Dash/ScopesOverviewTab.qml:54
238−msgid "All"
233+#: qml/Dash/ScopesList.qml:113
234+msgid "Also installed"
239235msgstr ""
240236
241−#: qml/Greeter/Greeter.qml:174
237+#: qml/Greeter/Greeter.qml:133
242238msgid "Unlock"
243239msgstr ""
244240
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246242msgid "Show password"
247243msgstr ""
248244
@@ -282,6 +278,10 @@ msgstr ""
282278msgid "Failed, tap to retry"
283279msgstr ""
284280
281+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
282+msgid "Reply"
283+msgstr ""
284+
285285#: qml/Panel/Indicators/ModemInfoItem.qml:105
286286msgid "Unlock SIM"
287287msgstr ""
@@ -290,56 +290,233 @@ msgstr ""
290290msgid "Roaming"
291291msgstr ""
292292
293−#: qml/Shell.qml:391
293+#: qml/Shell.qml:390
294+#, qt-format
295+msgid "Enter %1"
296+msgstr ""
297+
298+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294299msgid "Enter passphrase"
295300msgstr ""
296301
297302#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
303+msgid "Enter passcode"
299304msgstr ""
300305
301306#: qml/Shell.qml:393
302−msgid "Please re-enter"
307+#, qt-format
308+msgid "Sorry, incorrect %1"
309+msgstr ""
310+
311+#: qml/Shell.qml:394
312+msgid "Sorry, incorrect passphrase"
303313msgstr ""
304314
305315#: qml/Shell.qml:395
306−msgid "Enter passcode"
316+msgid "Please re-enter"
307317msgstr ""
308318
309319#: qml/Shell.qml:396
310320msgid "Sorry, incorrect passcode"
311321msgstr ""
312322
313−#: qml/Shell.qml:399
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
323+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324324msgid "Sorry, incorrect passphrase."
325325msgstr ""
326326
327−#: qml/Shell.qml:442
327+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328328msgid "Sorry, incorrect passcode."
329329msgstr ""
330330
331−#: qml/Shell.qml:443
331+#: qml/Shell.qml:492
332332msgid "This will be your last attempt."
333333msgstr ""
334334
335−#: qml/Shell.qml:445
335+#: qml/Shell.qml:494
336336msgid ""
337337"If passphrase is entered incorrectly, your phone will conduct a factory "
338338"reset and all personal data will be deleted."
339339msgstr ""
340340
341−#: qml/Shell.qml:446
341+#: qml/Shell.qml:495
342342msgid ""
343343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344344"and all personal data will be deleted."
345345msgstr ""
346+
347+#: qml/Wizard/Page.qml:89
348+msgid "Back"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:27
352+msgid "Hi!"
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:44
356+msgid "Welcome to your Ubuntu phone."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:52
360+msgid "Let’s get started."
361+msgstr ""
362+
363+#: 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
365+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
366+#: qml/Wizard/Pages/passwd-set.qml:90
367+msgid "Continue"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:25
371+msgid "Add a SIM card and restart your device"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:55
375+msgid "Without it, you won’t be able to make calls or use text messaging."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
379+msgid "Skip"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:39
383+msgid "Lock security"
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:74
387+msgid "Please select how you’d like to unlock your phone."
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:97
391+msgid "Swipe"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:98
395+msgid "No security"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:100
399+msgid "Passcode"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:101
403+msgid "4 digits only"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:103
407+msgid "Passphrase"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:104
411+msgid "Numbers and letters"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:28
415+msgid "Connect to Wi‑Fi"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:147
419+msgid "Available networks…"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/40-wifi.qml:148
423+msgid "No available networks."
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:27
427+msgid "Location"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:62
431+msgid "Let the phone detect your location:"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:69
435+msgid "Using GPS only (less accurate)"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/50-location.qml:86
439+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
440+msgstr ""
441+
442+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
443+#: qml/Wizard/Pages/50-location.qml:103
444+msgid ""
445+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
446+"conditions</a>."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:112
450+msgid "Not at all"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:124
454+msgid "You can change your mind later in <b>System Settings</b>."
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:24
458+msgid "Improving your experience"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/60-reporting.qml:36
462+msgid ""
463+"Your phone is set up to automatically report errors to Canonical and its "
464+"partners, the makers of the operating system."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:43
468+msgid ""
469+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
470+"Privacy</b>"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:24
474+msgid "All done"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:39
478+msgid "Nice work!"
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:46
482+msgid "Your phone is now ready to use."
483+msgstr ""
484+
485+#: qml/Wizard/Pages/80-finished.qml:53
486+msgid "Finish"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/here-terms.qml:27
490+msgid "Terms & Conditions"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:49
494+msgid "Confirm passphrase"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:50
498+msgid "Confirm passcode"
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-confirm.qml:53
502+#: qml/Wizard/Pages/passwd-confirm.qml:54
503+msgid "Please try again."
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:61
507+msgid "Choose your passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-set.qml:68
511+msgid "Passphrase must be 4 characters long"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:39
515+#, qt-format
516+msgid "〈 %1"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:42
520+#, qt-format
521+msgid "%1 〉"
522+msgstr ""
po/ca.po+278−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-10 09:22+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-28 08:52+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-11 07:11+0000\n"
19−"X-Generator: Launchpad (build 17241)\n"
18+"X-Launchpad-Export-Date: 2015-01-29 06:00+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Enganxa la drecera"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Surt"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Segur que voleu sortir?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "No"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Sí"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Apaga"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Segur que voleu apagar?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Reinicia"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Segur que voleu reiniciar?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Energia"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Segur que voleu\n"
101101"apagar?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Apaga"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Reinicia"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Cancel·la"
114114
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116116msgid "Skip intro"
117117msgstr "Omet la introducció"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Vora dreta"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Vora superior"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Tanca"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145145"configuració"
146146
147−#: qml/Components/EdgeDemo.qml:201
147+#: qml/Components/EdgeDemo.qml:214
148148msgid "Left edge"
149149msgstr "Vora esquerra"
150150
151−#: qml/Components/EdgeDemo.qml:202
151+#: qml/Components/EdgeDemo.qml:215
152152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153153msgstr ""
154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155155"ràpidament a les aplicacions"
156156
157−#: qml/Components/EdgeDemo.qml:229
157+#: qml/Components/EdgeDemo.qml:242
158158msgid "Well done"
159159msgstr "Enhorabona!"
160160
161−#: qml/Components/EdgeDemo.qml:230
161+#: qml/Components/EdgeDemo.qml:243
162162msgid ""
163163"You have now mastered the edge gestures and can start using the "
164164"phone<br><br>Tap on the screen to start"
@@ -166,40 +166,44 @@ msgstr ""
166166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
167167"telèfon<br><br>Feu un toc a la pantalla per començar"
168168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170170msgid "Return to Call"
171171msgstr "Torna a la trucada"
172172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174174msgid "Emergency Call"
175175msgstr "Trucada d'emergència"
176176
177−#: qml/Components/Lockscreen.qml:255
177+#: qml/Components/Lockscreen.qml:270
178178msgid "OK"
179179msgstr "D'acord"
180180
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
182182msgid "See less"
183183msgstr "Mostra'n menys"
184184
185−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:485
186186msgid "See all"
187187msgstr "Mostra-ho tot"
188188
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190190#: qml/Panel/SearchIndicator.qml:27
191191msgid "Search"
192192msgstr "Cerca"
193193
194−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:267
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:284
195199msgid "Settings"
196200msgstr "Paràmetres"
197201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199203msgid "Remove from Favorites"
200204msgstr "Suprimeix dels preferits"
201205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203207msgid "Add to Favorites"
204208msgstr "Afegeix als preferits"
205209
@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."
231235msgid "Release to refresh…"
232236msgstr "Deixeu anar per actualitzar..."
233237
234−#: qml/Dash/ScopesOverview.qml:215
235−msgid "Manage Scopes"
236−msgstr "Gestioneu les lents"
237−
238−#: qml/Dash/ScopesOverview.qml:437
239−msgid "Done"
240−msgstr "Fet"
241−
242−#: qml/Dash/ScopesOverview.qml:463
243−msgid "Store"
244−msgstr "Botiga"
238+#: qml/Dash/ScopesList.qml:66
239+msgid "Manage"
240+msgstr "Gestiona"
245241
246−#: qml/Dash/ScopesOverviewTab.qml:36
247−msgid "Favorites"
248−msgstr "Preferides"
242+#: qml/Dash/ScopesList.qml:112
243+msgid "Home"
244+msgstr "Inici"
249245
250−#: qml/Dash/ScopesOverviewTab.qml:54
251−msgid "All"
252−msgstr "Totes"
246+#: qml/Dash/ScopesList.qml:113
247+msgid "Also installed"
248+msgstr "També instal·lat"
253249
254−#: qml/Greeter/Greeter.qml:174
250+#: qml/Greeter/Greeter.qml:133
255251msgid "Unlock"
256252msgstr "Desbloca"
257253
258−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
259255msgid "Show password"
260256msgstr "Mostra la contrasenya"
261257
@@ -295,6 +291,10 @@ msgstr "S'ha finalitzat"
295291msgid "Failed, tap to retry"
296292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
297293
294+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
295+msgid "Reply"
296+msgstr "Respon"
297+
298298#: qml/Panel/Indicators/ModemInfoItem.qml:105
299299msgid "Unlock SIM"
300300msgstr "Desbloca la SIM"
@@ -303,49 +303,49 @@ msgstr "Desbloca la SIM"
303303msgid "Roaming"
304304msgstr "Itinerància"
305305
306−#: qml/Shell.qml:391
306+#: qml/Shell.qml:390
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Introduïu: %1"
310+
311+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
307312msgid "Enter passphrase"
308313msgstr "Introduïu la contrasenya"
309314
310315#: qml/Shell.qml:392
316+msgid "Enter passcode"
317+msgstr "Introduïu el codi d'accés"
318+
319+#: qml/Shell.qml:393
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Incorrecte (%1)"
323+
324+#: qml/Shell.qml:394
311325msgid "Sorry, incorrect passphrase"
312326msgstr "La contrasenya no és correcta"
313327
314−#: qml/Shell.qml:393
328+#: qml/Shell.qml:395
315329msgid "Please re-enter"
316330msgstr "Torneu-ho a introduir"
317331
318−#: qml/Shell.qml:395
319−msgid "Enter passcode"
320−msgstr "Introduïu el codi d'accés"
321−
322332#: qml/Shell.qml:396
323333msgid "Sorry, incorrect passcode"
324334msgstr "El codi d'accés no és correcte"
325335
326−#: qml/Shell.qml:399
327−#, qt-format
328−msgid "Enter %1"
329−msgstr "Introduïu: %1"
330−
331−#: qml/Shell.qml:400
332−#, qt-format
333−msgid "Sorry, incorrect %1"
334−msgstr "Incorrecte (%1)"
335−
336−#: qml/Shell.qml:441
336+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
337337msgid "Sorry, incorrect passphrase."
338338msgstr "La contrasenya és incorrecta"
339339
340−#: qml/Shell.qml:442
340+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341341msgid "Sorry, incorrect passcode."
342342msgstr "El codi d'accés no és correcte"
343343
344−#: qml/Shell.qml:443
344+#: qml/Shell.qml:492
345345msgid "This will be your last attempt."
346346msgstr "Aquest serà el darrer intent."
347347
348−#: qml/Shell.qml:445
348+#: qml/Shell.qml:494
349349msgid ""
350350"If passphrase is entered incorrectly, your phone will conduct a factory "
351351"reset and all personal data will be deleted."
@@ -354,7 +354,7 @@ msgstr ""
354354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355355"personals."
356356
357−#: qml/Shell.qml:446
357+#: qml/Shell.qml:495
358358msgid ""
359359"If passcode is entered incorrectly, your phone will conduct a factory reset "
360360"and all personal data will be deleted."
@@ -363,6 +363,192 @@ msgstr ""
363363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364364"personals."
365365
366+#: qml/Wizard/Page.qml:89
367+msgid "Back"
368+msgstr "Enrere"
369+
370+#: qml/Wizard/Pages/10-welcome.qml:27
371+msgid "Hi!"
372+msgstr "Hola!"
373+
374+#: qml/Wizard/Pages/10-welcome.qml:44
375+msgid "Welcome to your Ubuntu phone."
376+msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
377+
378+#: qml/Wizard/Pages/10-welcome.qml:52
379+msgid "Let’s get started."
380+msgstr "Comencem."
381+
382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385+#: qml/Wizard/Pages/passwd-set.qml:90
386+msgid "Continue"
387+msgstr "Continua"
388+
389+#: qml/Wizard/Pages/20-sim.qml:25
390+msgid "Add a SIM card and restart your device"
391+msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
392+
393+#: qml/Wizard/Pages/20-sim.qml:55
394+msgid "Without it, you won’t be able to make calls or use text messaging."
395+msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
396+
397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
398+msgid "Skip"
399+msgstr "Omet"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:39
402+msgid "Lock security"
403+msgstr "Seguretat del bloqueig"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:74
406+msgid "Please select how you’d like to unlock your phone."
407+msgstr "Seleccioneu com voleu desblocar el telèfon."
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:97
410+msgid "Swipe"
411+msgstr "Lliscament amb el dit"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:98
414+msgid "No security"
415+msgstr "Sense seguretat"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:100
418+msgid "Passcode"
419+msgstr "Codi d'accés"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:101
422+msgid "4 digits only"
423+msgstr "Només 4 dígits"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:103
426+msgid "Passphrase"
427+msgstr "Contrasenya"
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:104
430+msgid "Numbers and letters"
431+msgstr "Números i lletres"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:28
434+msgid "Connect to Wi‑Fi"
435+msgstr "Connecta't a la Wi-Fi"
436+
437+#: qml/Wizard/Pages/40-wifi.qml:147
438+msgid "Available networks…"
439+msgstr "Xarxes disponibles..."
440+
441+#: qml/Wizard/Pages/40-wifi.qml:148
442+msgid "No available networks."
443+msgstr "No hi ha xarxes disponibles"
444+
445+#: qml/Wizard/Pages/50-location.qml:27
446+msgid "Location"
447+msgstr "Ubicació"
448+
449+#: qml/Wizard/Pages/50-location.qml:62
450+msgid "Let the phone detect your location:"
451+msgstr "Fes que el telèfon detecti la meva ubicació:"
452+
453+#: qml/Wizard/Pages/50-location.qml:69
454+msgid "Using GPS only (less accurate)"
455+msgstr "Utilitza només el GPS (menys precís)"
456+
457+#: qml/Wizard/Pages/50-location.qml:86
458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459+msgstr ""
460+"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
461+"(recomanat)"
462+
463+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
464+#: qml/Wizard/Pages/50-location.qml:103
465+msgid ""
466+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
467+"conditions</a>."
468+msgstr ""
469+"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
470+"del servei Nokia HERE</a>."
471+
472+#: qml/Wizard/Pages/50-location.qml:112
473+msgid "Not at all"
474+msgstr "No"
475+
476+#: qml/Wizard/Pages/50-location.qml:124
477+msgid "You can change your mind later in <b>System Settings</b>."
478+msgstr ""
479+"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
480+
481+#: qml/Wizard/Pages/60-reporting.qml:24
482+msgid "Improving your experience"
483+msgstr "Millora de l'experiència"
484+
485+#: qml/Wizard/Pages/60-reporting.qml:36
486+msgid ""
487+"Your phone is set up to automatically report errors to Canonical and its "
488+"partners, the makers of the operating system."
489+msgstr ""
490+"Aquest telèfon està configurat per enviar errors de manera automàtica a "
491+"Canonical i associats, els creadors del sistema operatiu."
492+
493+#: qml/Wizard/Pages/60-reporting.qml:43
494+msgid ""
495+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
496+"Privacy</b>"
497+msgstr ""
498+"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
499+"<b>Seguretat i privadesa</b>"
500+
501+#: qml/Wizard/Pages/80-finished.qml:24
502+msgid "All done"
503+msgstr "Tot fet"
504+
505+#: qml/Wizard/Pages/80-finished.qml:39
506+msgid "Nice work!"
507+msgstr "Bona feina!"
508+
509+#: qml/Wizard/Pages/80-finished.qml:46
510+msgid "Your phone is now ready to use."
511+msgstr "Ja podeu utilitzar el vostre telèfon."
512+
513+#: qml/Wizard/Pages/80-finished.qml:53
514+msgid "Finish"
515+msgstr "Finalitza"
516+
517+#: qml/Wizard/Pages/here-terms.qml:27
518+msgid "Terms & Conditions"
519+msgstr "Condicions generals"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:49
522+msgid "Confirm passphrase"
523+msgstr "Confirmeu la contrasenya"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:50
526+msgid "Confirm passcode"
527+msgstr "Confirmeu el codi d'accés"
528+
529+#: qml/Wizard/Pages/passwd-confirm.qml:53
530+#: qml/Wizard/Pages/passwd-confirm.qml:54
531+msgid "Please try again."
532+msgstr "Torneu-ho a intentar."
533+
534+#: qml/Wizard/Pages/passwd-set.qml:61
535+msgid "Choose your passcode"
536+msgstr "Trieu el codi d'accés"
537+
538+#: qml/Wizard/Pages/passwd-set.qml:68
539+msgid "Passphrase must be 4 characters long"
540+msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
541+
542+#: qml/Wizard/StackButton.qml:39
543+#, qt-format
544+msgid "〈 %1"
545+msgstr "〈 %1"
546+
547+#: qml/Wizard/StackButton.qml:42
548+#, qt-format
549+msgid "%1 〉"
550+msgstr "%1 〉"
551+
366552#~ msgid "Confirm"
367553#~ msgstr "Confirma"
368554
@@ -377,3 +563,15 @@ msgstr ""
377563
378564#~ msgid "Speaking..."
379565#~ msgstr "S'està parlant..."
566+
567+#~ msgid "Done"
568+#~ msgstr "Fet"
569+
570+#~ msgid "Favorites"
571+#~ msgstr "Preferides"
572+
573+#~ msgid "All"
574+#~ msgstr "Totes"
575+
576+#~ msgid "Manage Scopes"
577+#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+277−88
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-11-23 07:17+0000\n"
1212"Last-Translator: Pau Iranzo <Unknown>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-24 06:20+0000\n"
19−"X-Generator: Launchpad (build 17252)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Apega la drecera"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Ix"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Segur que voleu eixir?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "No"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Sí"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Apaga"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Segur que voleu apagar?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Reinicia"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Segur que voleu reiniciar?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Energia"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Segur que voleu\n"
101101"apagar?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Apaga"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Reinicia"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Cancel·la"
114114
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116116msgid "Skip intro"
117117msgstr "Omet la introducció"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Vora dreta"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Vora superior"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136136
137−#: qml/Components/EdgeDemo.qml:170
137+#: qml/Components/EdgeDemo.qml:183
138138msgid "Close"
139139msgstr "Tanca"
140140
141−#: qml/Components/EdgeDemo.qml:171
141+#: qml/Components/EdgeDemo.qml:184
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145145"configuració"
146146
147−#: qml/Components/EdgeDemo.qml:201
147+#: qml/Components/EdgeDemo.qml:214
148148msgid "Left edge"
149149msgstr "Vora esquerra"
150150
151−#: qml/Components/EdgeDemo.qml:202
151+#: qml/Components/EdgeDemo.qml:215
152152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153153msgstr ""
154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155155"ràpidament a les aplicacions"
156156
157−#: qml/Components/EdgeDemo.qml:229
157+#: qml/Components/EdgeDemo.qml:242
158158msgid "Well done"
159159msgstr "Enhorabona!"
160160
161−#: qml/Components/EdgeDemo.qml:230
161+#: qml/Components/EdgeDemo.qml:243
162162msgid ""
163163"You have now mastered the edge gestures and can start using the "
164164"phone<br><br>Tap on the screen to start"
@@ -166,40 +166,44 @@ msgstr ""
166166"Ja heu aprés com utilitzar els gestos de les vores per fer servir el "
167167"telèfon<br><br>Feu un toc a la pantalla per començar"
168168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170170msgid "Return to Call"
171171msgstr "Torna a la trucada"
172172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174174msgid "Emergency Call"
175175msgstr "Cridada d'emergència"
176176
177−#: qml/Components/Lockscreen.qml:255
177+#: qml/Components/Lockscreen.qml:270
178178msgid "OK"
179179msgstr "D'acord"
180180
181−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
181+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
182182msgid "See less"
183183msgstr "Mostra'n menys"
184184
185−#: qml/Dash/GenericScopeView.qml:434
185+#: qml/Dash/GenericScopeView.qml:485
186186msgid "See all"
187187msgstr "Mostra-ho tot"
188188
189−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
190190#: qml/Panel/SearchIndicator.qml:27
191191msgid "Search"
192192msgstr "Cerca"
193193
194−#: qml/Dash/PageHeader.qml:268
194+#: qml/Dash/PageHeader.qml:267
195+msgid "Store"
196+msgstr "Botiga"
197+
198+#: qml/Dash/PageHeader.qml:284
195199msgid "Settings"
196200msgstr "Paràmetres"
197201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199203msgid "Remove from Favorites"
200204msgstr "Suprimeix dels preferits"
201205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203207msgid "Add to Favorites"
204208msgstr "Afig als preferits"
205209
@@ -231,31 +235,23 @@ msgstr "Estireu per actualitzar..."
231235msgid "Release to refresh…"
232236msgstr "Deixeu anar per actualitzar..."
233237
234−#: qml/Dash/ScopesOverview.qml:215
235−msgid "Manage Scopes"
236−msgstr "Gestioneu les lents"
237−
238−#: qml/Dash/ScopesOverview.qml:437
239−msgid "Done"
240−msgstr "Fet"
241−
242−#: qml/Dash/ScopesOverview.qml:463
243−msgid "Store"
244−msgstr "Botiga"
238+#: qml/Dash/ScopesList.qml:66
239+msgid "Manage"
240+msgstr ""
245241
246−#: qml/Dash/ScopesOverviewTab.qml:36
247−msgid "Favorites"
248−msgstr "Preferides"
242+#: qml/Dash/ScopesList.qml:112
243+msgid "Home"
244+msgstr ""
249245
250−#: qml/Dash/ScopesOverviewTab.qml:54
251−msgid "All"
252−msgstr "Totes"
246+#: qml/Dash/ScopesList.qml:113
247+msgid "Also installed"
248+msgstr ""
253249
254−#: qml/Greeter/Greeter.qml:174
250+#: qml/Greeter/Greeter.qml:133
255251msgid "Unlock"
256252msgstr "Desbloca"
257253
258−#: qml/Notifications/NotificationMenuItemFactory.qml:116
254+#: qml/Notifications/NotificationMenuItemFactory.qml:128
259255msgid "Show password"
260256msgstr "Mostra la contrasenya"
261257
@@ -267,34 +263,38 @@ msgstr "Feu un toc per tornar a la cridada..."
267263msgid "Conference"
268264msgstr "Conferència"
269265
270−#: qml/Panel/Indicators/MenuItemFactory.qml:615
266+#: qml/Panel/Indicators/MenuItemFactory.qml:643
271267msgid "Nothing is playing"
272268msgstr "No s'està reproduint res"
273269
274−#: qml/Panel/Indicators/MenuItemFactory.qml:763
270+#: qml/Panel/Indicators/MenuItemFactory.qml:791
275271msgid "In queue…"
276272msgstr "A la cua..."
277273
278−#: qml/Panel/Indicators/MenuItemFactory.qml:767
274+#: qml/Panel/Indicators/MenuItemFactory.qml:795
279275msgid "Downloading"
280276msgstr "S'està baixant"
281277
282−#: qml/Panel/Indicators/MenuItemFactory.qml:769
278+#: qml/Panel/Indicators/MenuItemFactory.qml:797
283279msgid "Paused, tap to resume"
284280msgstr "En pausa, feu un toc per continuar"
285281
286−#: qml/Panel/Indicators/MenuItemFactory.qml:771
282+#: qml/Panel/Indicators/MenuItemFactory.qml:799
287283msgid "Canceled"
288284msgstr "S'ha cancel·lat"
289285
290−#: qml/Panel/Indicators/MenuItemFactory.qml:773
286+#: qml/Panel/Indicators/MenuItemFactory.qml:801
291287msgid "Finished"
292288msgstr "S'ha finalitzat"
293289
294−#: qml/Panel/Indicators/MenuItemFactory.qml:775
290+#: qml/Panel/Indicators/MenuItemFactory.qml:803
295291msgid "Failed, tap to retry"
296292msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
297293
294+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
295+msgid "Reply"
296+msgstr ""
297+
298298#: qml/Panel/Indicators/ModemInfoItem.qml:105
299299msgid "Unlock SIM"
300300msgstr "Desbloca la SIM"
@@ -303,49 +303,49 @@ msgstr "Desbloca la SIM"
303303msgid "Roaming"
304304msgstr "Itinerància"
305305
306−#: qml/Shell.qml:381
306+#: qml/Shell.qml:390
307+#, qt-format
308+msgid "Enter %1"
309+msgstr "Introduïu: %1"
310+
311+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
307312msgid "Enter passphrase"
308313msgstr "Introduïu la contrasenya"
309314
310−#: qml/Shell.qml:382
315+#: qml/Shell.qml:392
316+msgid "Enter passcode"
317+msgstr "Introduïu el codi d'accés"
318+
319+#: qml/Shell.qml:393
320+#, qt-format
321+msgid "Sorry, incorrect %1"
322+msgstr "Incorrecte (%1)"
323+
324+#: qml/Shell.qml:394
311325msgid "Sorry, incorrect passphrase"
312326msgstr "La contrasenya no és correcta"
313327
314−#: qml/Shell.qml:383
328+#: qml/Shell.qml:395
315329msgid "Please re-enter"
316330msgstr "Torneu-ho a introduir"
317331
318−#: qml/Shell.qml:385
319−msgid "Enter passcode"
320−msgstr "Introduïu el codi d'accés"
321−
322−#: qml/Shell.qml:386
332+#: qml/Shell.qml:396
323333msgid "Sorry, incorrect passcode"
324334msgstr "El codi d'accés no és correcte"
325335
326−#: qml/Shell.qml:389
327−#, qt-format
328−msgid "Enter %1"
329−msgstr "Introduïu: %1"
330−
331−#: qml/Shell.qml:390
332−#, qt-format
333−msgid "Sorry, incorrect %1"
334−msgstr "Incorrecte (%1)"
335−
336−#: qml/Shell.qml:431
336+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
337337msgid "Sorry, incorrect passphrase."
338338msgstr "La contrasenya és incorrecta"
339339
340−#: qml/Shell.qml:432
340+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
341341msgid "Sorry, incorrect passcode."
342342msgstr "El codi d'accés no és correcte"
343343
344−#: qml/Shell.qml:433
344+#: qml/Shell.qml:492
345345msgid "This will be your last attempt."
346346msgstr "Este serà el darrer intent."
347347
348−#: qml/Shell.qml:435
348+#: qml/Shell.qml:494
349349msgid ""
350350"If passphrase is entered incorrectly, your phone will conduct a factory "
351351"reset and all personal data will be deleted."
@@ -354,7 +354,7 @@ msgstr ""
354354"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
355355"personals."
356356
357−#: qml/Shell.qml:436
357+#: qml/Shell.qml:495
358358msgid ""
359359"If passcode is entered incorrectly, your phone will conduct a factory reset "
360360"and all personal data will be deleted."
@@ -363,6 +363,195 @@ msgstr ""
363363"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
364364"personals."
365365
366+#: qml/Wizard/Page.qml:89
367+msgid "Back"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/10-welcome.qml:27
371+msgid "Hi!"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:44
375+msgid "Welcome to your Ubuntu phone."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:52
379+msgid "Let’s get started."
380+msgstr ""
381+
382+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
383+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
384+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
385+#: qml/Wizard/Pages/passwd-set.qml:90
386+msgid "Continue"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/20-sim.qml:25
390+msgid "Add a SIM card and restart your device"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:55
394+msgid "Without it, you won’t be able to make calls or use text messaging."
395+msgstr ""
396+
397+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
398+msgid "Skip"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:39
402+msgid "Lock security"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:74
406+msgid "Please select how you’d like to unlock your phone."
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:97
410+msgid "Swipe"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:98
414+msgid "No security"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:100
418+msgid "Passcode"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:101
422+msgid "4 digits only"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:103
426+msgid "Passphrase"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:104
430+msgid "Numbers and letters"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/40-wifi.qml:28
434+msgid "Connect to Wi‑Fi"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:147
438+msgid "Available networks…"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/40-wifi.qml:148
442+msgid "No available networks."
443+msgstr ""
444+
445+#: qml/Wizard/Pages/50-location.qml:27
446+msgid "Location"
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:62
450+msgid "Let the phone detect your location:"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:69
454+msgid "Using GPS only (less accurate)"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/50-location.qml:86
458+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
459+msgstr ""
460+
461+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
462+#: qml/Wizard/Pages/50-location.qml:103
463+msgid ""
464+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
465+"conditions</a>."
466+msgstr ""
467+
468+#: qml/Wizard/Pages/50-location.qml:112
469+msgid "Not at all"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/50-location.qml:124
473+msgid "You can change your mind later in <b>System Settings</b>."
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:24
477+msgid "Improving your experience"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/60-reporting.qml:36
481+msgid ""
482+"Your phone is set up to automatically report errors to Canonical and its "
483+"partners, the makers of the operating system."
484+msgstr ""
485+
486+#: qml/Wizard/Pages/60-reporting.qml:43
487+msgid ""
488+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
489+"Privacy</b>"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/80-finished.qml:24
493+msgid "All done"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:39
497+msgid "Nice work!"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:46
501+msgid "Your phone is now ready to use."
502+msgstr ""
503+
504+#: qml/Wizard/Pages/80-finished.qml:53
505+msgid "Finish"
506+msgstr ""
507+
508+#: qml/Wizard/Pages/here-terms.qml:27
509+msgid "Terms & Conditions"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:49
513+msgid "Confirm passphrase"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:50
517+msgid "Confirm passcode"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:53
521+#: qml/Wizard/Pages/passwd-confirm.qml:54
522+msgid "Please try again."
523+msgstr ""
524+
525+#: qml/Wizard/Pages/passwd-set.qml:61
526+msgid "Choose your passcode"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/passwd-set.qml:68
530+msgid "Passphrase must be 4 characters long"
531+msgstr ""
532+
533+#: qml/Wizard/StackButton.qml:39
534+#, qt-format
535+msgid "〈 %1"
536+msgstr ""
537+
538+#: qml/Wizard/StackButton.qml:42
539+#, qt-format
540+msgid "%1 〉"
541+msgstr ""
542+
543+#~ msgid "Manage Scopes"
544+#~ msgstr "Gestioneu les lents"
545+
546+#~ msgid "Done"
547+#~ msgstr "Fet"
548+
549+#~ msgid "Favorites"
550+#~ msgstr "Preferides"
551+
552+#~ msgid "All"
553+#~ msgstr "Totes"
554+
366555#~ msgid "Confirm"
367556#~ msgstr "Confirma"
368557
po/ckb.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"
1212"Last-Translator: Aras <aras.noori@gmail.com>\n"
1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,82 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "پێشەکیی بپەڕێنە"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "لێواری ڕاست"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "لێواری سەرەوە"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "داخستن"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "لێواری چەپ"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "دەستخۆش"
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156156msgid "Return to Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Emergency Call"
161161msgstr "هێڵی فریاگوزاری"
162162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164164msgid "OK"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168168msgid "See less"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172172msgid "See all"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176176#: qml/Panel/SearchIndicator.qml:27
177177msgid "Search"
178178msgstr "گەڕان"
179179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181185msgid "Settings"
182186msgstr ""
183187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185189msgid "Remove from Favorites"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Add to Favorites"
190194msgstr ""
191195
@@ -217,31 +221,23 @@ msgstr ""
217221msgid "Release to refresh…"
218222msgstr ""
219223
220−#: qml/Dash/ScopesOverview.qml:215
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
224+#: qml/Dash/ScopesList.qml:66
225+msgid "Manage"
230226msgstr ""
231227
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:112
229+msgid "Home"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
232+#: qml/Dash/ScopesList.qml:113
233+msgid "Also installed"
238234msgstr ""
239235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241237msgid "Unlock"
242238msgstr ""
243239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245241msgid "Show password"
246242msgstr "تێپەڕەوشە پیشان بدە"
247243
@@ -281,6 +277,10 @@ msgstr ""
281277msgid "Failed, tap to retry"
282278msgstr ""
283279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285285msgid "Unlock SIM"
286286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289289msgid "Roaming"
290290msgstr ""
291291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293298msgid "Enter passphrase"
294299msgstr ""
295300
296301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298303msgstr ""
299304
300305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302312msgstr ""
303313
304314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306316msgstr ""
307317
308318#: qml/Shell.qml:396
309319msgid "Sorry, incorrect passcode"
310320msgstr ""
311321
312−#: qml/Shell.qml:399
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323323msgid "Sorry, incorrect passphrase."
324324msgstr ""
325325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327327msgid "Sorry, incorrect passcode."
328328msgstr ""
329329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331331msgid "This will be your last attempt."
332332msgstr ""
333333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
338338msgstr ""
339339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341341msgid ""
342342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343343"and all personal data will be deleted."
344344msgstr ""
345345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346523#~ msgid "Speaking..."
347524#~ msgstr "قسە دەکات..."
348525
po/cs.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"
1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
1313"Language-Team: Czech <cs@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,82 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "Přeskočit intro"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Pravý okraj"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Horní okraj"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Uzavřít"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Levý okraj"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "Výborně"
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156156msgid "Return to Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Emergency Call"
161161msgstr "Tísňové volání"
162162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164164msgid "OK"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168168msgid "See less"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172172msgid "See all"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176176#: qml/Panel/SearchIndicator.qml:27
177177msgid "Search"
178178msgstr "Hledat"
179179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181185msgid "Settings"
182186msgstr ""
183187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185189msgid "Remove from Favorites"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Add to Favorites"
190194msgstr ""
191195
@@ -217,31 +221,23 @@ msgstr ""
217221msgid "Release to refresh…"
218222msgstr ""
219223
220−#: qml/Dash/ScopesOverview.qml:215
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
224+#: qml/Dash/ScopesList.qml:66
225+msgid "Manage"
230226msgstr ""
231227
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:112
229+msgid "Home"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
232+#: qml/Dash/ScopesList.qml:113
233+msgid "Also installed"
238234msgstr ""
239235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241237msgid "Unlock"
242238msgstr ""
243239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245241msgid "Show password"
246242msgstr "Zobrazit heslo"
247243
@@ -281,6 +277,10 @@ msgstr ""
281277msgid "Failed, tap to retry"
282278msgstr ""
283279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285285msgid "Unlock SIM"
286286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289289msgid "Roaming"
290290msgstr ""
291291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293298msgid "Enter passphrase"
294299msgstr ""
295300
296301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298303msgstr ""
299304
300305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302312msgstr ""
303313
304314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306316msgstr ""
307317
308318#: qml/Shell.qml:396
309319msgid "Sorry, incorrect passcode"
310320msgstr ""
311321
312−#: qml/Shell.qml:399
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323323msgid "Sorry, incorrect passphrase."
324324msgstr ""
325325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327327msgid "Sorry, incorrect passcode."
328328msgstr ""
329329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331331msgid "This will be your last attempt."
332332msgstr ""
333333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
338338msgstr ""
339339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341341msgid ""
342342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343343"and all personal data will be deleted."
344344msgstr ""
345345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346523#~ msgid "Loading. Please Wait..."
347524#~ msgstr "Načítám. Čekejte prosím..."
348525
po/da.po+251−74
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"
1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
1818"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20+"X-Generator: Launchpad (build 17306)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr "Fastgør genvej"
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr "Gør genvej flytbar"
3434
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
5555msgid "Log out"
5656msgstr ""
5757
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
5959msgid "Are you sure you want to log out?"
6060msgstr ""
6161
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63+#: qml/Components/Dialogs.qml:134
6464msgid "No"
6565msgstr ""
6666
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68+#: qml/Components/Dialogs.qml:140
6969msgid "Yes"
7070msgstr ""
7171
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
7373msgid "Shut down"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
7777msgid "Are you sure you want to shut down?"
7878msgstr ""
7979
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
8181msgid "Reboot"
8282msgstr ""
8383
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
8585msgid "Are you sure you want to reboot?"
8686msgstr ""
8787
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
8989msgid "Power"
9090msgstr ""
9191
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
9393msgid ""
9494"Are you sure you would like\n"
9595"to power off?"
9696msgstr ""
9797
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
9999msgid "Power off"
100100msgstr ""
101101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103103msgid "Restart"
104104msgstr ""
105105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107107msgid "Cancel"
108108msgstr ""
109109
@@ -111,43 +111,43 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr "Spring intro over"
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr "Højre kant"
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr "Øvre kant"
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr "Luk"
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr "Stryg op igen for at låse indstillingsskærmen"
137137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr "Venstre kant"
141141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
145145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr "Godt gjort"
149149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
@@ -155,40 +155,44 @@ msgstr ""
155155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
156156"på skærmen for at starte"
157157
158−#: qml/Components/Lockscreen.qml:223
158+#: qml/Components/Lockscreen.qml:238
159159msgid "Return to Call"
160160msgstr ""
161161
162−#: qml/Components/Lockscreen.qml:223
162+#: qml/Components/Lockscreen.qml:238
163163msgid "Emergency Call"
164164msgstr "Nødopkald"
165165
166−#: qml/Components/Lockscreen.qml:255
166+#: qml/Components/Lockscreen.qml:270
167167msgid "OK"
168168msgstr "O.k."
169169
170−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
171171msgid "See less"
172172msgstr "Vis mindre"
173173
174−#: qml/Dash/GenericScopeView.qml:434
174+#: qml/Dash/GenericScopeView.qml:485
175175msgid "See all"
176176msgstr "Se alle"
177177
178−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
179179#: qml/Panel/SearchIndicator.qml:27
180180msgid "Search"
181181msgstr "Søg"
182182
183−#: qml/Dash/PageHeader.qml:268
183+#: qml/Dash/PageHeader.qml:267
184+msgid "Store"
185+msgstr ""
186+
187+#: qml/Dash/PageHeader.qml:284
184188msgid "Settings"
185189msgstr ""
186190
187−#: qml/Dash/PageHeader.qml:275
191+#: qml/Dash/PageHeader.qml:291
188192msgid "Remove from Favorites"
189193msgstr ""
190194
191−#: qml/Dash/PageHeader.qml:275
195+#: qml/Dash/PageHeader.qml:291
192196msgid "Add to Favorites"
193197msgstr ""
194198
@@ -220,31 +224,23 @@ msgstr ""
220224msgid "Release to refresh…"
221225msgstr ""
222226
223−#: qml/Dash/ScopesOverview.qml:215
224−msgid "Manage Scopes"
225−msgstr ""
226−
227−#: qml/Dash/ScopesOverview.qml:437
228−msgid "Done"
229−msgstr ""
230−
231−#: qml/Dash/ScopesOverview.qml:463
232−msgid "Store"
227+#: qml/Dash/ScopesList.qml:66
228+msgid "Manage"
233229msgstr ""
234230
235−#: qml/Dash/ScopesOverviewTab.qml:36
236−msgid "Favorites"
231+#: qml/Dash/ScopesList.qml:112
232+msgid "Home"
237233msgstr ""
238234
239−#: qml/Dash/ScopesOverviewTab.qml:54
240−msgid "All"
235+#: qml/Dash/ScopesList.qml:113
236+msgid "Also installed"
241237msgstr ""
242238
243−#: qml/Greeter/Greeter.qml:174
239+#: qml/Greeter/Greeter.qml:133
244240msgid "Unlock"
245241msgstr ""
246242
247−#: qml/Notifications/NotificationMenuItemFactory.qml:116
243+#: qml/Notifications/NotificationMenuItemFactory.qml:128
248244msgid "Show password"
249245msgstr "Vis adgangskode"
250246
@@ -284,6 +280,10 @@ msgstr "Færdig"
284280msgid "Failed, tap to retry"
285281msgstr "Mislykkedes; tryk for at prøve igen"
286282
283+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
284+msgid "Reply"
285+msgstr ""
286+
287287#: qml/Panel/Indicators/ModemInfoItem.qml:105
288288msgid "Unlock SIM"
289289msgstr ""
@@ -292,60 +292,237 @@ msgstr ""
292292msgid "Roaming"
293293msgstr ""
294294
295−#: qml/Shell.qml:391
295+#: qml/Shell.qml:390
296+#, qt-format
297+msgid "Enter %1"
298+msgstr ""
299+
300+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
296301msgid "Enter passphrase"
297302msgstr ""
298303
299304#: qml/Shell.qml:392
300−msgid "Sorry, incorrect passphrase"
305+msgid "Enter passcode"
301306msgstr ""
302307
303308#: qml/Shell.qml:393
304−msgid "Please re-enter"
309+#, qt-format
310+msgid "Sorry, incorrect %1"
311+msgstr ""
312+
313+#: qml/Shell.qml:394
314+msgid "Sorry, incorrect passphrase"
305315msgstr ""
306316
307317#: qml/Shell.qml:395
308−msgid "Enter passcode"
318+msgid "Please re-enter"
309319msgstr ""
310320
311321#: qml/Shell.qml:396
312322msgid "Sorry, incorrect passcode"
313323msgstr ""
314324
315−#: qml/Shell.qml:399
316−#, qt-format
317−msgid "Enter %1"
318−msgstr ""
319−
320−#: qml/Shell.qml:400
321−#, qt-format
322−msgid "Sorry, incorrect %1"
323−msgstr ""
324−
325−#: qml/Shell.qml:441
325+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
326326msgid "Sorry, incorrect passphrase."
327327msgstr ""
328328
329−#: qml/Shell.qml:442
329+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
330330msgid "Sorry, incorrect passcode."
331331msgstr ""
332332
333−#: qml/Shell.qml:443
333+#: qml/Shell.qml:492
334334msgid "This will be your last attempt."
335335msgstr ""
336336
337−#: qml/Shell.qml:445
337+#: qml/Shell.qml:494
338338msgid ""
339339"If passphrase is entered incorrectly, your phone will conduct a factory "
340340"reset and all personal data will be deleted."
341341msgstr ""
342342
343−#: qml/Shell.qml:446
343+#: qml/Shell.qml:495
344344msgid ""
345345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346346"and all personal data will be deleted."
347347msgstr ""
348348
349+#: qml/Wizard/Page.qml:89
350+msgid "Back"
351+msgstr ""
352+
353+#: qml/Wizard/Pages/10-welcome.qml:27
354+msgid "Hi!"
355+msgstr ""
356+
357+#: qml/Wizard/Pages/10-welcome.qml:44
358+msgid "Welcome to your Ubuntu phone."
359+msgstr ""
360+
361+#: qml/Wizard/Pages/10-welcome.qml:52
362+msgid "Let’s get started."
363+msgstr ""
364+
365+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
366+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
367+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
368+#: qml/Wizard/Pages/passwd-set.qml:90
369+msgid "Continue"
370+msgstr ""
371+
372+#: qml/Wizard/Pages/20-sim.qml:25
373+msgid "Add a SIM card and restart your device"
374+msgstr ""
375+
376+#: qml/Wizard/Pages/20-sim.qml:55
377+msgid "Without it, you won’t be able to make calls or use text messaging."
378+msgstr ""
379+
380+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
381+msgid "Skip"
382+msgstr ""
383+
384+#: qml/Wizard/Pages/30-passwd-type.qml:39
385+msgid "Lock security"
386+msgstr ""
387+
388+#: qml/Wizard/Pages/30-passwd-type.qml:74
389+msgid "Please select how you’d like to unlock your phone."
390+msgstr ""
391+
392+#: qml/Wizard/Pages/30-passwd-type.qml:97
393+msgid "Swipe"
394+msgstr ""
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:98
397+msgid "No security"
398+msgstr ""
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:100
401+msgid "Passcode"
402+msgstr ""
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:101
405+msgid "4 digits only"
406+msgstr ""
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:103
409+msgid "Passphrase"
410+msgstr ""
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:104
413+msgid "Numbers and letters"
414+msgstr ""
415+
416+#: qml/Wizard/Pages/40-wifi.qml:28
417+msgid "Connect to Wi‑Fi"
418+msgstr ""
419+
420+#: qml/Wizard/Pages/40-wifi.qml:147
421+msgid "Available networks…"
422+msgstr ""
423+
424+#: qml/Wizard/Pages/40-wifi.qml:148
425+msgid "No available networks."
426+msgstr ""
427+
428+#: qml/Wizard/Pages/50-location.qml:27
429+msgid "Location"
430+msgstr ""
431+
432+#: qml/Wizard/Pages/50-location.qml:62
433+msgid "Let the phone detect your location:"
434+msgstr ""
435+
436+#: qml/Wizard/Pages/50-location.qml:69
437+msgid "Using GPS only (less accurate)"
438+msgstr ""
439+
440+#: qml/Wizard/Pages/50-location.qml:86
441+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
442+msgstr ""
443+
444+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
445+#: qml/Wizard/Pages/50-location.qml:103
446+msgid ""
447+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
448+"conditions</a>."
449+msgstr ""
450+
451+#: qml/Wizard/Pages/50-location.qml:112
452+msgid "Not at all"
453+msgstr ""
454+
455+#: qml/Wizard/Pages/50-location.qml:124
456+msgid "You can change your mind later in <b>System Settings</b>."
457+msgstr ""
458+
459+#: qml/Wizard/Pages/60-reporting.qml:24
460+msgid "Improving your experience"
461+msgstr ""
462+
463+#: qml/Wizard/Pages/60-reporting.qml:36
464+msgid ""
465+"Your phone is set up to automatically report errors to Canonical and its "
466+"partners, the makers of the operating system."
467+msgstr ""
468+
469+#: qml/Wizard/Pages/60-reporting.qml:43
470+msgid ""
471+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
472+"Privacy</b>"
473+msgstr ""
474+
475+#: qml/Wizard/Pages/80-finished.qml:24
476+msgid "All done"
477+msgstr ""
478+
479+#: qml/Wizard/Pages/80-finished.qml:39
480+msgid "Nice work!"
481+msgstr ""
482+
483+#: qml/Wizard/Pages/80-finished.qml:46
484+msgid "Your phone is now ready to use."
485+msgstr ""
486+
487+#: qml/Wizard/Pages/80-finished.qml:53
488+msgid "Finish"
489+msgstr ""
490+
491+#: qml/Wizard/Pages/here-terms.qml:27
492+msgid "Terms & Conditions"
493+msgstr ""
494+
495+#: qml/Wizard/Pages/passwd-confirm.qml:49
496+msgid "Confirm passphrase"
497+msgstr ""
498+
499+#: qml/Wizard/Pages/passwd-confirm.qml:50
500+msgid "Confirm passcode"
501+msgstr ""
502+
503+#: qml/Wizard/Pages/passwd-confirm.qml:53
504+#: qml/Wizard/Pages/passwd-confirm.qml:54
505+msgid "Please try again."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/passwd-set.qml:61
509+msgid "Choose your passcode"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/passwd-set.qml:68
513+msgid "Passphrase must be 4 characters long"
514+msgstr ""
515+
516+#: qml/Wizard/StackButton.qml:39
517+#, qt-format
518+msgid "〈 %1"
519+msgstr ""
520+
521+#: qml/Wizard/StackButton.qml:42
522+#, qt-format
523+msgid "%1 〉"
524+msgstr ""
525+
349526#~ msgid "Speaking..."
350527#~ msgstr "Taler..."
351528
po/de.po+279−82
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-10-21 11:26+0000\n"
12−"Last-Translator: Alexander Dobetsberger <Unknown>\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-29 21:52+0000\n"
12+"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Passwort: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Verknüpfung anheften"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Verknüpfung entfernen"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Abmelden"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "Nein"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Ja"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Herunterfahren"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Neustart"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Energie"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Sind Sie sicher, dass Sie das\n"
101101"Gerät ausschalten wollen?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Ausschalten"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Neustarten"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Abbrechen"
114114
@@ -116,46 +116,46 @@ msgstr "Abbrechen"
116116msgid "Skip intro"
117117msgstr "Einführung überspringen"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Rechter Bildschirmrand"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
126126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128128msgid "Top edge"
129129msgstr "Oberer Bildschirmrand"
130130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132132msgid "Try swiping from the top edge to access the indicators"
133133msgstr ""
134134"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
135135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137137msgid "Close"
138138msgstr "Schließen"
139139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141141msgid "Swipe up again to close the settings screen"
142142msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
143143
144−#: qml/Components/EdgeDemo.qml:201
144+#: qml/Components/EdgeDemo.qml:214
145145msgid "Left edge"
146146msgstr "Linker Rand"
147147
148−#: qml/Components/EdgeDemo.qml:202
148+#: qml/Components/EdgeDemo.qml:215
149149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150150msgstr ""
151151"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
152152"Schnellzugriff aufzurufen"
153153
154−#: qml/Components/EdgeDemo.qml:229
154+#: qml/Components/EdgeDemo.qml:242
155155msgid "Well done"
156156msgstr "Gut gemacht"
157157
158−#: qml/Components/EdgeDemo.qml:230
158+#: qml/Components/EdgeDemo.qml:243
159159msgid ""
160160"You have now mastered the edge gestures and can start using the "
161161"phone<br><br>Tap on the screen to start"
@@ -163,40 +163,44 @@ msgstr ""
163163"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
164164"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
165165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167167msgid "Return to Call"
168−msgstr ""
168+msgstr "Zu Anruf zurückkehren"
169169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171171msgid "Emergency Call"
172172msgstr "Notruf"
173173
174−#: qml/Components/Lockscreen.qml:255
174+#: qml/Components/Lockscreen.qml:270
175175msgid "OK"
176176msgstr "OK"
177177
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
179179msgid "See less"
180180msgstr "Weniger ansehen"
181181
182−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:485
183183msgid "See all"
184184msgstr "Alle anzeigen"
185185
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187187#: qml/Panel/SearchIndicator.qml:27
188188msgid "Search"
189189msgstr "Suchen"
190190
191−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:267
192+msgid "Store"
193+msgstr "Store"
194+
195+#: qml/Dash/PageHeader.qml:284
192196msgid "Settings"
193197msgstr "Einstellungen"
194198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196200msgid "Remove from Favorites"
197201msgstr "Aus den Favoriten entfernen"
198202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200204msgid "Add to Favorites"
201205msgstr "Zu Favoriten hinzufügen"
202206
@@ -228,31 +232,23 @@ msgstr "Zum Aktualisieren ziehen …"
228232msgid "Release to refresh…"
229233msgstr "Zum Aktualisieren loslassen …"
230234
231−#: qml/Dash/ScopesOverview.qml:215
232−msgid "Manage Scopes"
233−msgstr "Filter verwalten"
234−
235−#: qml/Dash/ScopesOverview.qml:437
236−msgid "Done"
237−msgstr "Erledigt"
238−
239−#: qml/Dash/ScopesOverview.qml:463
240−msgid "Store"
241−msgstr "Store"
235+#: qml/Dash/ScopesList.qml:66
236+msgid "Manage"
237+msgstr "Verwalten"
242238
243−#: qml/Dash/ScopesOverviewTab.qml:36
244−msgid "Favorites"
245−msgstr "Favoriten"
239+#: qml/Dash/ScopesList.qml:112
240+msgid "Home"
241+msgstr "Startseite"
246242
247−#: qml/Dash/ScopesOverviewTab.qml:54
248−msgid "All"
249−msgstr "Alle"
243+#: qml/Dash/ScopesList.qml:113
244+msgid "Also installed"
245+msgstr "Ebenfalls installiert"
250246
251−#: qml/Greeter/Greeter.qml:174
247+#: qml/Greeter/Greeter.qml:133
252248msgid "Unlock"
253249msgstr "Entsperren"
254250
255−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
256252msgid "Show password"
257253msgstr "Passwort anzeigen"
258254
@@ -292,6 +288,10 @@ msgstr "Erledigt"
292288msgid "Failed, tap to retry"
293289msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
294290
291+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
292+msgid "Reply"
293+msgstr "Antworten"
294+
295295#: qml/Panel/Indicators/ModemInfoItem.qml:105
296296msgid "Unlock SIM"
297297msgstr "SIM-Karte entsperren"
@@ -300,49 +300,49 @@ msgstr "SIM-Karte entsperren"
300300msgid "Roaming"
301301msgstr "Roaming"
302302
303−#: qml/Shell.qml:391
303+#: qml/Shell.qml:390
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "%1 eingeben"
307+
308+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
304309msgid "Enter passphrase"
305310msgstr "Passwort eingeben"
306311
307312#: qml/Shell.qml:392
313+msgid "Enter passcode"
314+msgstr "PIN eingeben"
315+
316+#: qml/Shell.qml:393
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "%1 falsch"
320+
321+#: qml/Shell.qml:394
308322msgid "Sorry, incorrect passphrase"
309323msgstr "Das Passwort ist nicht korrekt"
310324
311−#: qml/Shell.qml:393
325+#: qml/Shell.qml:395
312326msgid "Please re-enter"
313327msgstr "Bitte erneut eingeben"
314328
315−#: qml/Shell.qml:395
316−msgid "Enter passcode"
317−msgstr "PIN eingeben"
318−
319329#: qml/Shell.qml:396
320330msgid "Sorry, incorrect passcode"
321331msgstr "Falsches Passwort"
322332
323−#: qml/Shell.qml:399
324−#, qt-format
325−msgid "Enter %1"
326−msgstr "%1 eingeben"
327−
328−#: qml/Shell.qml:400
329−#, qt-format
330−msgid "Sorry, incorrect %1"
331−msgstr "%1 falsch"
332−
333−#: qml/Shell.qml:441
333+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
334334msgid "Sorry, incorrect passphrase."
335335msgstr "Entschuldigung, falsches Passwort."
336336
337−#: qml/Shell.qml:442
337+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338338msgid "Sorry, incorrect passcode."
339339msgstr "Falsche PIN"
340340
341−#: qml/Shell.qml:443
341+#: qml/Shell.qml:492
342342msgid "This will be your last attempt."
343343msgstr "Dies ist Ihr letzter Versuch."
344344
345−#: qml/Shell.qml:445
345+#: qml/Shell.qml:494
346346msgid ""
347347"If passphrase is entered incorrectly, your phone will conduct a factory "
348348"reset and all personal data will be deleted."
@@ -350,7 +350,7 @@ msgstr ""
350350"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
351351"zurückgesetzt und alle Daten werden gelöscht."
352352
353−#: qml/Shell.qml:446
353+#: qml/Shell.qml:495
354354msgid ""
355355"If passcode is entered incorrectly, your phone will conduct a factory reset "
356356"and all personal data will be deleted."
@@ -358,6 +358,191 @@ msgstr ""
358358"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
359359"zurückgesetzt und alle Daten werden gelöscht."
360360
361+#: qml/Wizard/Page.qml:89
362+msgid "Back"
363+msgstr "Zurück"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:27
366+msgid "Hi!"
367+msgstr "Hallo!"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:44
370+msgid "Welcome to your Ubuntu phone."
371+msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
372+
373+#: qml/Wizard/Pages/10-welcome.qml:52
374+msgid "Let’s get started."
375+msgstr "Fangen wir an!"
376+
377+#: 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
379+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380+#: qml/Wizard/Pages/passwd-set.qml:90
381+msgid "Continue"
382+msgstr "Weiter"
383+
384+#: qml/Wizard/Pages/20-sim.qml:25
385+msgid "Add a SIM card and restart your device"
386+msgstr "SIM-Karte einlegen und Gerät neustarten"
387+
388+#: qml/Wizard/Pages/20-sim.qml:55
389+msgid "Without it, you won’t be able to make calls or use text messaging."
390+msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
391+
392+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
393+msgid "Skip"
394+msgstr "Überspringen"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:39
397+msgid "Lock security"
398+msgstr "Sicherheit nach dem Sperren"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:74
401+msgid "Please select how you’d like to unlock your phone."
402+msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:97
405+msgid "Swipe"
406+msgstr "Wischgeste"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:98
409+msgid "No security"
410+msgstr "Keine Sicherheitssperre"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:100
413+msgid "Passcode"
414+msgstr "PIN"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:101
417+msgid "4 digits only"
418+msgstr "Nur 4 Ziffern"
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:103
421+msgid "Passphrase"
422+msgstr "Passwort"
423+
424+#: qml/Wizard/Pages/30-passwd-type.qml:104
425+msgid "Numbers and letters"
426+msgstr "Ziffern und Buchstaben"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:28
429+msgid "Connect to Wi‑Fi"
430+msgstr "Mit WLAN verbinden"
431+
432+#: qml/Wizard/Pages/40-wifi.qml:147
433+msgid "Available networks…"
434+msgstr "Verfügbare Netzwerke …"
435+
436+#: qml/Wizard/Pages/40-wifi.qml:148
437+msgid "No available networks."
438+msgstr "Keine verfügbaren Netzwerke."
439+
440+#: qml/Wizard/Pages/50-location.qml:27
441+msgid "Location"
442+msgstr "Position"
443+
444+#: qml/Wizard/Pages/50-location.qml:62
445+msgid "Let the phone detect your location:"
446+msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
447+
448+#: qml/Wizard/Pages/50-location.qml:69
449+msgid "Using GPS only (less accurate)"
450+msgstr "Nur durch GPS (ungenauer)"
451+
452+#: qml/Wizard/Pages/50-location.qml:86
453+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
454+msgstr ""
455+"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
456+
457+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
458+#: qml/Wizard/Pages/50-location.qml:103
459+msgid ""
460+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
461+"conditions</a>."
462+msgstr ""
463+"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
464+"href='#'>allgemeinen Geschäftsbedingungen</a> zu."
465+
466+#: qml/Wizard/Pages/50-location.qml:112
467+msgid "Not at all"
468+msgstr "Gar nicht"
469+
470+#: qml/Wizard/Pages/50-location.qml:124
471+msgid "You can change your mind later in <b>System Settings</b>."
472+msgstr ""
473+"Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
474+
475+#: qml/Wizard/Pages/60-reporting.qml:24
476+msgid "Improving your experience"
477+msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
478+
479+#: qml/Wizard/Pages/60-reporting.qml:36
480+msgid ""
481+"Your phone is set up to automatically report errors to Canonical and its "
482+"partners, the makers of the operating system."
483+msgstr ""
484+"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
485+"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
486+
487+#: qml/Wizard/Pages/60-reporting.qml:43
488+msgid ""
489+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
490+"Privacy</b>"
491+msgstr ""
492+"Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
493+"Datenschutz</b> deaktiviert werden"
494+
495+#: qml/Wizard/Pages/80-finished.qml:24
496+msgid "All done"
497+msgstr "Alles erledigt"
498+
499+#: qml/Wizard/Pages/80-finished.qml:39
500+msgid "Nice work!"
501+msgstr "Gute Arbeit!"
502+
503+#: qml/Wizard/Pages/80-finished.qml:46
504+msgid "Your phone is now ready to use."
505+msgstr "Ihr Telefon ist nun einsatzbereit."
506+
507+#: qml/Wizard/Pages/80-finished.qml:53
508+msgid "Finish"
509+msgstr "Beenden"
510+
511+#: qml/Wizard/Pages/here-terms.qml:27
512+msgid "Terms & Conditions"
513+msgstr "Nutzungsbedingungen"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:49
516+msgid "Confirm passphrase"
517+msgstr "Passwort bestätigen"
518+
519+#: qml/Wizard/Pages/passwd-confirm.qml:50
520+msgid "Confirm passcode"
521+msgstr "PIN bestätigen"
522+
523+#: qml/Wizard/Pages/passwd-confirm.qml:53
524+#: qml/Wizard/Pages/passwd-confirm.qml:54
525+msgid "Please try again."
526+msgstr "Bitte versuchen Sie es erneut."
527+
528+#: qml/Wizard/Pages/passwd-set.qml:61
529+msgid "Choose your passcode"
530+msgstr "Wählen Sie Ihre PIN"
531+
532+#: qml/Wizard/Pages/passwd-set.qml:68
533+msgid "Passphrase must be 4 characters long"
534+msgstr "Passwörter müssen 4 Buchstaben lang sein"
535+
536+#: qml/Wizard/StackButton.qml:39
537+#, qt-format
538+msgid "〈 %1"
539+msgstr "〈 %1"
540+
541+#: qml/Wizard/StackButton.qml:42
542+#, qt-format
543+msgid "%1 〉"
544+msgstr "%1 〉"
545+
361546#~ msgid "Confirm"
362547#~ msgstr "Bestätigen"
363548
@@ -372,3 +557,15 @@ msgstr ""
372557
373558#~ msgid "Speaking..."
374559#~ msgstr "Sprechen Sie …"
560+
561+#~ msgid "All"
562+#~ msgstr "Alle"
563+
564+#~ msgid "Done"
565+#~ msgstr "Erledigt"
566+
567+#~ msgid "Favorites"
568+#~ msgstr "Favoriten"
569+
570+#~ msgid "Manage Scopes"
571+#~ msgstr "Filter verwalten"
po/el.po+265−79
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-11-08 18:38+0000\n"
12−"Last-Translator: Stathis Iosifidis <Unknown>\n"
12+"Last-Translator: Efstathios Iosifidis <Unknown>\n"
1313"Language-Team: Greek <el@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Κωδικός πρόσβασης: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Καρφίτσωμα συντόμευσης"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Ξεκαρφίτσωμα συντόμευσης"
3333
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Παρακαλώ περιμένετε %1 λεπτό και δοκιμάστε ξανά..."
5555msgstr[1] "Παρακαλώ περιμένετε %1 λεπτά και δοκιμάστε ξανά..."
5656
57−#: qml/Components/Dialogs.qml:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Αποσύνδεση"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε;"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "Όχι"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Ναι"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Τερματισμός λειτουργίας"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Επιθυμείτε σίγουρα τερματισμό;"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Επανεκκίνηση"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Επιθυμείτε σίγουρα επανεκκίνηση;"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr ""
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Επιθυμείτε σίγουρα τον\n"
101101"τερματισμό λειτουργίας;"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Τερματισμός"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Επανεκκίνηση"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Ακύρωση"
114114
@@ -116,45 +116,45 @@ msgstr "Ακύρωση"
116116msgid "Skip intro"
117117msgstr "Παράλειψη εισαγωγής"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Δεξί άκρο"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
126126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128128msgid "Top edge"
129129msgstr "Πάνω άκρο"
130130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132132msgid "Try swiping from the top edge to access the indicators"
133133msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
134134
135−#: qml/Components/EdgeDemo.qml:170
135+#: qml/Components/EdgeDemo.qml:183
136136msgid "Close"
137137msgstr "Κλείσιμο"
138138
139−#: qml/Components/EdgeDemo.qml:171
139+#: qml/Components/EdgeDemo.qml:184
140140msgid "Swipe up again to close the settings screen"
141141msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
142142
143−#: qml/Components/EdgeDemo.qml:201
143+#: qml/Components/EdgeDemo.qml:214
144144msgid "Left edge"
145145msgstr "Αριστερό άκρο"
146146
147−#: qml/Components/EdgeDemo.qml:202
147+#: qml/Components/EdgeDemo.qml:215
148148msgid "Swipe from the left to reveal the launcher for quick access to apps"
149149msgstr ""
150150"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
151151"στις εφαρμογές"
152152
153−#: qml/Components/EdgeDemo.qml:229
153+#: qml/Components/EdgeDemo.qml:242
154154msgid "Well done"
155155msgstr "Συγχαρητήρια"
156156
157−#: qml/Components/EdgeDemo.qml:230
157+#: qml/Components/EdgeDemo.qml:243
158158msgid ""
159159"You have now mastered the edge gestures and can start using the "
160160"phone<br><br>Tap on the screen to start"
@@ -162,40 +162,44 @@ msgstr ""
162162"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
163163"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
164164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166166msgid "Return to Call"
167167msgstr "Επιστροφή στην κλήση"
168168
169−#: qml/Components/Lockscreen.qml:223
169+#: qml/Components/Lockscreen.qml:238
170170msgid "Emergency Call"
171171msgstr "Κλήση έκτακτης ανάγκης"
172172
173−#: qml/Components/Lockscreen.qml:255
173+#: qml/Components/Lockscreen.qml:270
174174msgid "OK"
175175msgstr "OK"
176176
177−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
177+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
178178msgid "See less"
179179msgstr "Λιγότερα"
180180
181−#: qml/Dash/GenericScopeView.qml:434
181+#: qml/Dash/GenericScopeView.qml:485
182182msgid "See all"
183183msgstr "Εμφάνιση όλων"
184184
185−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
185+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
186186#: qml/Panel/SearchIndicator.qml:27
187187msgid "Search"
188188msgstr "Αναζήτηση"
189189
190−#: qml/Dash/PageHeader.qml:268
190+#: qml/Dash/PageHeader.qml:267
191+msgid "Store"
192+msgstr "Κατάστημα"
193+
194+#: qml/Dash/PageHeader.qml:284
191195msgid "Settings"
192196msgstr "Ρυθμίσεις"
193197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195199msgid "Remove from Favorites"
196200msgstr "Αφαίρεση από τα αγαπημένα"
197201
198−#: qml/Dash/PageHeader.qml:275
202+#: qml/Dash/PageHeader.qml:291
199203msgid "Add to Favorites"
200204msgstr "Προσθήκη στα αγαπημένα"
201205
@@ -227,31 +231,23 @@ msgstr ""
227231msgid "Release to refresh…"
228232msgstr ""
229233
230−#: qml/Dash/ScopesOverview.qml:215
231−msgid "Manage Scopes"
234+#: qml/Dash/ScopesList.qml:66
235+msgid "Manage"
232236msgstr ""
233237
234−#: qml/Dash/ScopesOverview.qml:437
235−msgid "Done"
236−msgstr "Ολοκληρώθηκε"
237−
238−#: qml/Dash/ScopesOverview.qml:463
239−msgid "Store"
240−msgstr "Κατάστημα"
241−
242−#: qml/Dash/ScopesOverviewTab.qml:36
243−msgid "Favorites"
244−msgstr "Αγαπημένα"
238+#: qml/Dash/ScopesList.qml:112
239+msgid "Home"
240+msgstr ""
245241
246−#: qml/Dash/ScopesOverviewTab.qml:54
247−msgid "All"
248−msgstr "Όλα"
242+#: qml/Dash/ScopesList.qml:113
243+msgid "Also installed"
244+msgstr ""
249245
250−#: qml/Greeter/Greeter.qml:174
246+#: qml/Greeter/Greeter.qml:133
251247msgid "Unlock"
252248msgstr "Ξεκλείδωμα"
253249
254−#: qml/Notifications/NotificationMenuItemFactory.qml:116
250+#: qml/Notifications/NotificationMenuItemFactory.qml:128
255251msgid "Show password"
256252msgstr "Εμφάνιση κωδικού"
257253
@@ -291,6 +287,10 @@ msgstr "Ολοκληρώθηκε"
291287msgid "Failed, tap to retry"
292288msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
293289
290+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
291+msgid "Reply"
292+msgstr ""
293+
294294#: qml/Panel/Indicators/ModemInfoItem.qml:105
295295msgid "Unlock SIM"
296296msgstr "Ξεκλείδωμα SIM"
@@ -299,60 +299,237 @@ msgstr "Ξεκλείδωμα SIM"
299299msgid "Roaming"
300300msgstr "Περιαγωγή"
301301
302−#: qml/Shell.qml:391
302+#: qml/Shell.qml:390
303+#, qt-format
304+msgid "Enter %1"
305+msgstr "Εισάγετε %1"
306+
307+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
303308msgid "Enter passphrase"
304309msgstr "Εισαγωγή συνθηματικού"
305310
306311#: qml/Shell.qml:392
312+msgid "Enter passcode"
313+msgstr "Εισαγωγή κωδικού"
314+
315+#: qml/Shell.qml:393
316+#, qt-format
317+msgid "Sorry, incorrect %1"
318+msgstr "Συγνώμη, μη έγκυρο %1"
319+
320+#: qml/Shell.qml:394
307321msgid "Sorry, incorrect passphrase"
308322msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
309323
310−#: qml/Shell.qml:393
324+#: qml/Shell.qml:395
311325msgid "Please re-enter"
312326msgstr "Παρακαλώ πληκτρολογήστε ξανά"
313327
314−#: qml/Shell.qml:395
315−msgid "Enter passcode"
316−msgstr "Εισαγωγή κωδικού"
317−
318328#: qml/Shell.qml:396
319329msgid "Sorry, incorrect passcode"
320330msgstr ""
321331
322−#: qml/Shell.qml:399
323−#, qt-format
324−msgid "Enter %1"
325−msgstr "Εισάγετε %1"
326−
327−#: qml/Shell.qml:400
328−#, qt-format
329−msgid "Sorry, incorrect %1"
330−msgstr "Συγνώμη, μη έγκυρο %1"
331−
332−#: qml/Shell.qml:441
332+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
333333msgid "Sorry, incorrect passphrase."
334334msgstr ""
335335
336−#: qml/Shell.qml:442
336+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
337337msgid "Sorry, incorrect passcode."
338338msgstr ""
339339
340−#: qml/Shell.qml:443
340+#: qml/Shell.qml:492
341341msgid "This will be your last attempt."
342342msgstr ""
343343
344−#: qml/Shell.qml:445
344+#: qml/Shell.qml:494
345345msgid ""
346346"If passphrase is entered incorrectly, your phone will conduct a factory "
347347"reset and all personal data will be deleted."
348348msgstr ""
349349
350−#: qml/Shell.qml:446
350+#: qml/Shell.qml:495
351351msgid ""
352352"If passcode is entered incorrectly, your phone will conduct a factory reset "
353353"and all personal data will be deleted."
354354msgstr ""
355355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr ""
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr ""
371+
372+#: 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
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+
387+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
388+msgid "Skip"
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:39
392+msgid "Lock security"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:74
396+msgid "Please select how you’d like to unlock your phone."
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:97
400+msgid "Swipe"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:98
404+msgid "No security"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:100
408+msgid "Passcode"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:101
412+msgid "4 digits only"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/30-passwd-type.qml:103
416+msgid "Passphrase"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/30-passwd-type.qml:104
420+msgid "Numbers and letters"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:28
424+msgid "Connect to Wi‑Fi"
425+msgstr ""
426+
427+#: qml/Wizard/Pages/40-wifi.qml:147
428+msgid "Available networks…"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/40-wifi.qml:148
432+msgid "No available networks."
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:27
436+msgid "Location"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:62
440+msgid "Let the phone detect your location:"
441+msgstr ""
442+
443+#: qml/Wizard/Pages/50-location.qml:69
444+msgid "Using GPS only (less accurate)"
445+msgstr ""
446+
447+#: qml/Wizard/Pages/50-location.qml:86
448+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
449+msgstr ""
450+
451+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
452+#: qml/Wizard/Pages/50-location.qml:103
453+msgid ""
454+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
455+"conditions</a>."
456+msgstr ""
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr ""
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+
476+#: qml/Wizard/Pages/60-reporting.qml:43
477+msgid ""
478+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
479+"Privacy</b>"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:24
483+msgid "All done"
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:39
487+msgid "Nice work!"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/80-finished.qml:46
491+msgid "Your phone is now ready to use."
492+msgstr ""
493+
494+#: qml/Wizard/Pages/80-finished.qml:53
495+msgid "Finish"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/here-terms.qml:27
499+msgid "Terms & Conditions"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:49
503+msgid "Confirm passphrase"
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:50
507+msgid "Confirm passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:53
511+#: qml/Wizard/Pages/passwd-confirm.qml:54
512+msgid "Please try again."
513+msgstr ""
514+
515+#: qml/Wizard/Pages/passwd-set.qml:61
516+msgid "Choose your passcode"
517+msgstr ""
518+
519+#: qml/Wizard/Pages/passwd-set.qml:68
520+msgid "Passphrase must be 4 characters long"
521+msgstr ""
522+
523+#: qml/Wizard/StackButton.qml:39
524+#, qt-format
525+msgid "〈 %1"
526+msgstr ""
527+
528+#: qml/Wizard/StackButton.qml:42
529+#, qt-format
530+msgid "%1 〉"
531+msgstr ""
532+
356533#~ msgid "Confirm"
357534#~ msgstr "Επιβεβαίωση"
358535
@@ -367,3 +544,12 @@ msgstr ""
367544
368545#~ msgid "Loading. Please Wait..."
369546#~ msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."
547+
548+#~ msgid "All"
549+#~ msgstr "Όλα"
550+
551+#~ msgid "Favorites"
552+#~ msgstr "Αγαπημένα"
553+
554+#~ msgid "Done"
555+#~ msgstr "Ολοκληρώθηκε"
po/en_AU.po+276−81
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-10-12 09:41+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-29 01:35+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: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -50,45 +50,45 @@ msgid_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:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "Log out"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "Are you sure you want to log out?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "No"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "Yes"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "Shut down"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "Are you sure you want to shut down?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "Reboot"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "Are you sure you want to reboot?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "Power"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Are you sure you would like\n"
9797"to power off?"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100100msgid "Power off"
101101msgstr "Power off"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104104msgid "Restart"
105105msgstr "Restart"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108108msgid "Cancel"
109109msgstr "Cancel"
110110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Right edge"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Top edge"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Left edge"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Well done"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161−msgstr ""
161+msgstr "Return to Call"
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr "Emergency Call"
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr "OK"
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr "See less"
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr "See all"
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Search"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr "Settings"
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr "Remove from Favourites"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr "Add to Favourites"
195199
@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"
221225msgid "Release to refresh…"
222226msgstr "Release to refresh…"
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
226−msgstr "Manage Scopes"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
230+msgstr "Manage"
227231
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "Done"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
234+msgstr "Home"
231235
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Store"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
238+msgstr "Also installed"
235239
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Favourites"
239−
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "All"
243−
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr "Unlock"
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "Show password"
251247
@@ -285,6 +281,10 @@ msgstr "Finished"
285281msgid "Failed, tap to retry"
286282msgstr "Failed, tap to retry"
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "Reply"
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr "Unlock SIM"
@@ -293,49 +293,49 @@ msgstr "Unlock SIM"
293293msgid "Roaming"
294294msgstr "Roaming"
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Enter %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr "Enter passphrase"
299304
300305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Enter passcode"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sorry, incorrect %1"
313+
314+#: qml/Shell.qml:394
301315msgid "Sorry, incorrect passphrase"
302316msgstr "Sorry, incorrect passphrase"
303317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305319msgid "Please re-enter"
306320msgstr "Please re-enter"
307321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Enter passcode"
311−
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr "Sorry, incorrect passcode"
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Enter %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sorry, incorrect %1"
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr "Sorry, incorrect passphrase."
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr "Sorry, incorrect passcode."
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr "This will be your last attempt."
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343343"If passphrase is entered incorrectly, your phone will conduct a factory "
344344"reset and all personal data will be deleted."
345345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347347msgid ""
348348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349349"and all personal data will be deleted."
@@ -351,6 +351,189 @@ msgstr ""
351351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352352"and all personal data will be deleted."
353353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Back"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Hi!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Welcome to your Ubuntu phone."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Let’s get started."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continue"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Add a SIM card and restart your device"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr "Without it, you won’t be able to make calls or use text messaging."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Skip"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lock security"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Please select how you’d like to unlock your phone."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Swipe"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "No security"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Passcode"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 digits only"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Passphrase"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numbers and letters"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Connect to Wi‑Fi"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Available networks…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "No available networks."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Location"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Let the phone detect your location:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Using GPS only (less accurate)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr "Not at all"
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr "You can change your mind later in <b>System Settings</b>."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Improving your experience"
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+
478+#: qml/Wizard/Pages/60-reporting.qml:43
479+msgid ""
480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
481+"Privacy</b>"
482+msgstr ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "All done"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Nice work!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "Your phone is now ready to use."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Finish"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Terms & Conditions"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Confirm passphrase"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Confirm passcode"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Please try again."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Choose your passcode"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "Passphrase must be 4 characters long"
526+
527+#: qml/Wizard/StackButton.qml:39
528+#, qt-format
529+msgid "〈 %1"
530+msgstr "〈 %1"
531+
532+#: qml/Wizard/StackButton.qml:42
533+#, qt-format
534+msgid "%1 〉"
535+msgstr "%1 〉"
536+
354537#~ msgid "Confirm"
355538#~ msgstr "Confirm"
356539
@@ -365,3 +548,15 @@ msgstr ""
365548
366549#~ msgid "Speaking..."
367550#~ msgstr "Speaking..."
551+
552+#~ msgid "All"
553+#~ msgstr "All"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favourites"
557+
558+#~ msgid "Done"
559+#~ msgstr "Done"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Manage Scopes"
po/en_GB.po+275−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-05 18:59+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"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"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:31+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -50,45 +50,45 @@ msgid_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:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "Log out"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "Are you sure you want to log out?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "No"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "Yes"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "Shut down"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "Are you sure you want to shut down?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "Reboot"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "Are you sure you want to reboot?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "Power"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Are you sure you would like\n"
9797"to power off?"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100100msgid "Power off"
101101msgstr "Power off"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104104msgid "Restart"
105105msgstr "Restart"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108108msgid "Cancel"
109109msgstr "Cancel"
110110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Right edge"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Top edge"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Left edge"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Well done"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161161msgstr "Return to Call"
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr "Emergency Call"
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr "OK"
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr "See less"
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr "See all"
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Search"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Store"
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr "Settings"
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr "Remove from Favourites"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr "Add to Favourites"
195199
@@ -221,31 +225,23 @@ msgstr "Pull to refresh…"
221225msgid "Release to refresh…"
222226msgstr "Release to refresh…"
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
226−msgstr "Manage Scopes"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
230+msgstr "Manage"
227231
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "Done"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Store"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
234+msgstr "Home"
235235
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Favourites"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
238+msgstr "Also installed"
239239
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "All"
243−
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr "Unlock"
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "Show password"
251247
@@ -285,6 +281,10 @@ msgstr "Finished"
285281msgid "Failed, tap to retry"
286282msgstr "Failed, tap to retry"
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr "Unlock SIM"
@@ -293,49 +293,49 @@ msgstr "Unlock SIM"
293293msgid "Roaming"
294294msgstr "Roaming"
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Enter %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr "Enter passphrase"
299304
300305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Enter passcode"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sorry, incorrect %1"
313+
314+#: qml/Shell.qml:394
301315msgid "Sorry, incorrect passphrase"
302316msgstr "Sorry, incorrect passphrase"
303317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305319msgid "Please re-enter"
306320msgstr "Please re-enter"
307321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Enter passcode"
311−
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr "Sorry, incorrect passcode"
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Enter %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sorry, incorrect %1"
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr "Sorry, incorrect passphrase."
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr "Sorry, incorrect passcode."
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr "This will be your last attempt."
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343343"If passphrase is entered incorrectly, your phone will conduct a factory "
344344"reset and all personal data will be deleted."
345345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347347msgid ""
348348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349349"and all personal data will be deleted."
@@ -351,6 +351,189 @@ msgstr ""
351351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352352"and all personal data will be deleted."
353353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Back"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Hi!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Welcome to your Ubuntu phone."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Let’s get started."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continue"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Add a SIM card and restart your device"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr "Without it, you won’t be able to make calls or use text messaging."
384+
385+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386+msgid "Skip"
387+msgstr "Skip"
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:39
390+msgid "Lock security"
391+msgstr "Lock security"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:74
394+msgid "Please select how you’d like to unlock your phone."
395+msgstr "Please select how you’d like to unlock your phone."
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:97
398+msgid "Swipe"
399+msgstr "Swipe"
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:98
402+msgid "No security"
403+msgstr "No security"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:100
406+msgid "Passcode"
407+msgstr "Passcode"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:101
410+msgid "4 digits only"
411+msgstr "4 digits only"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:103
414+msgid "Passphrase"
415+msgstr "Passphrase"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:104
418+msgid "Numbers and letters"
419+msgstr "Numbers and letters"
420+
421+#: qml/Wizard/Pages/40-wifi.qml:28
422+msgid "Connect to Wi‑Fi"
423+msgstr "Connect to Wi‑Fi"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:147
426+msgid "Available networks…"
427+msgstr "Available networks…"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:148
430+msgid "No available networks."
431+msgstr "No available networks."
432+
433+#: qml/Wizard/Pages/50-location.qml:27
434+msgid "Location"
435+msgstr "Location"
436+
437+#: qml/Wizard/Pages/50-location.qml:62
438+msgid "Let the phone detect your location:"
439+msgstr "Let the phone detect your location:"
440+
441+#: qml/Wizard/Pages/50-location.qml:69
442+msgid "Using GPS only (less accurate)"
443+msgstr "Using GPS only (less accurate)"
444+
445+#: qml/Wizard/Pages/50-location.qml:86
446+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
448+
449+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450+#: qml/Wizard/Pages/50-location.qml:103
451+msgid ""
452+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453+"conditions</a>."
454+msgstr ""
455+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456+"conditions</a>."
457+
458+#: qml/Wizard/Pages/50-location.qml:112
459+msgid "Not at all"
460+msgstr "Not at all"
461+
462+#: qml/Wizard/Pages/50-location.qml:124
463+msgid "You can change your mind later in <b>System Settings</b>."
464+msgstr "You can change your mind later in <b>System Settings</b>."
465+
466+#: qml/Wizard/Pages/60-reporting.qml:24
467+msgid "Improving your experience"
468+msgstr "Improving your experience"
469+
470+#: qml/Wizard/Pages/60-reporting.qml:36
471+msgid ""
472+"Your phone is set up to automatically report errors to Canonical and its "
473+"partners, the makers of the operating system."
474+msgstr ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+
478+#: qml/Wizard/Pages/60-reporting.qml:43
479+msgid ""
480+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
481+"Privacy</b>"
482+msgstr ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+
486+#: qml/Wizard/Pages/80-finished.qml:24
487+msgid "All done"
488+msgstr "All done"
489+
490+#: qml/Wizard/Pages/80-finished.qml:39
491+msgid "Nice work!"
492+msgstr "Nice work!"
493+
494+#: qml/Wizard/Pages/80-finished.qml:46
495+msgid "Your phone is now ready to use."
496+msgstr "Your phone is now ready to use."
497+
498+#: qml/Wizard/Pages/80-finished.qml:53
499+msgid "Finish"
500+msgstr "Finish"
501+
502+#: qml/Wizard/Pages/here-terms.qml:27
503+msgid "Terms & Conditions"
504+msgstr "Terms & Conditions"
505+
506+#: qml/Wizard/Pages/passwd-confirm.qml:49
507+msgid "Confirm passphrase"
508+msgstr "Confirm passphrase"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:50
511+msgid "Confirm passcode"
512+msgstr "Confirm passcode"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:53
515+#: qml/Wizard/Pages/passwd-confirm.qml:54
516+msgid "Please try again."
517+msgstr "Please try again."
518+
519+#: qml/Wizard/Pages/passwd-set.qml:61
520+msgid "Choose your passcode"
521+msgstr "Choose your passcode"
522+
523+#: qml/Wizard/Pages/passwd-set.qml:68
524+msgid "Passphrase must be 4 characters long"
525+msgstr "Passphrase must be 4 characters long"
526+
527+#: qml/Wizard/StackButton.qml:39
528+#, qt-format
529+msgid "〈 %1"
530+msgstr "〈 %1"
531+
532+#: qml/Wizard/StackButton.qml:42
533+#, qt-format
534+msgid "%1 〉"
535+msgstr "%1 〉"
536+
354537#~ msgid "Confirm"
355538#~ msgstr "Confirm"
356539
@@ -365,3 +548,15 @@ msgstr ""
365548
366549#~ msgid "Speaking..."
367550#~ msgstr "Speaking..."
551+
552+#~ msgid "All"
553+#~ msgstr "All"
554+
555+#~ msgid "Favorites"
556+#~ msgstr "Favourites"
557+
558+#~ msgid "Done"
559+#~ msgstr "Done"
560+
561+#~ msgid "Manage Scopes"
562+#~ msgstr "Manage Scopes"
po/eo.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Esperanto <eo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,82 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr ""
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr ""
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr ""
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156156msgid "Return to Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Emergency Call"
161161msgstr ""
162162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164164msgid "OK"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168168msgid "See less"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172172msgid "See all"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176176#: qml/Panel/SearchIndicator.qml:27
177177msgid "Search"
178178msgstr ""
179179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181185msgid "Settings"
182186msgstr ""
183187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185189msgid "Remove from Favorites"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Add to Favorites"
190194msgstr ""
191195
@@ -217,31 +221,23 @@ msgstr ""
217221msgid "Release to refresh…"
218222msgstr ""
219223
220−#: qml/Dash/ScopesOverview.qml:215
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
224+#: qml/Dash/ScopesList.qml:66
225+msgid "Manage"
230226msgstr ""
231227
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:112
229+msgid "Home"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
232+#: qml/Dash/ScopesList.qml:113
233+msgid "Also installed"
238234msgstr ""
239235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241237msgid "Unlock"
242238msgstr ""
243239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245241msgid "Show password"
246242msgstr ""
247243
@@ -281,6 +277,10 @@ msgstr ""
281277msgid "Failed, tap to retry"
282278msgstr ""
283279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285285msgid "Unlock SIM"
286286msgstr ""
@@ -289,56 +289,233 @@ msgstr ""
289289msgid "Roaming"
290290msgstr ""
291291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293298msgid "Enter passphrase"
294299msgstr ""
295300
296301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298303msgstr ""
299304
300305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302312msgstr ""
303313
304314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306316msgstr ""
307317
308318#: qml/Shell.qml:396
309319msgid "Sorry, incorrect passcode"
310320msgstr ""
311321
312−#: qml/Shell.qml:399
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323323msgid "Sorry, incorrect passphrase."
324324msgstr ""
325325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327327msgid "Sorry, incorrect passcode."
328328msgstr ""
329329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331331msgid "This will be your last attempt."
332332msgstr ""
333333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
338338msgstr ""
339339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341341msgid ""
342342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343343"and all personal data will be deleted."
344344msgstr ""
345+
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
po/es.po+276−81
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"
12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-02-01 03:20+0000\n"
12+"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: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-02-02 06:54+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contraseña: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Anclar"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Desanclar"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Cerrar la sesión"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "̉¿Está seguro de que quiere cerrar la sesión?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "No"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Sí"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Apagar"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "¿Está seguro de que quiere apagar?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Reiniciar"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "¿Esta seguro de que quiere reiniciar?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Apagar"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"¿Está seguro de que quiere\n"
101101"apagar?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Apagar"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Reiniciar"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Cancelar"
114114
@@ -116,46 +116,46 @@ msgstr "Cancelar"
116116msgid "Skip intro"
117117msgstr "Omitir la introducción"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Borde derecho"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
126126
127−#: qml/Components/EdgeDemo.qml:144
127+#: qml/Components/EdgeDemo.qml:157
128128msgid "Top edge"
129129msgstr "Borde superior"
130130
131−#: qml/Components/EdgeDemo.qml:145
131+#: qml/Components/EdgeDemo.qml:158
132132msgid "Try swiping from the top edge to access the indicators"
133133msgstr ""
134134"Deslice el dedo desde el borde superior para acceder a los indicadores"
135135
136−#: qml/Components/EdgeDemo.qml:170
136+#: qml/Components/EdgeDemo.qml:183
137137msgid "Close"
138138msgstr "Cerrar"
139139
140−#: qml/Components/EdgeDemo.qml:171
140+#: qml/Components/EdgeDemo.qml:184
141141msgid "Swipe up again to close the settings screen"
142142msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
143143
144−#: qml/Components/EdgeDemo.qml:201
144+#: qml/Components/EdgeDemo.qml:214
145145msgid "Left edge"
146146msgstr "Borde izquierdo"
147147
148−#: qml/Components/EdgeDemo.qml:202
148+#: qml/Components/EdgeDemo.qml:215
149149msgid "Swipe from the left to reveal the launcher for quick access to apps"
150150msgstr ""
151151"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
152152"rápidamente a las aplicaciones"
153153
154−#: qml/Components/EdgeDemo.qml:229
154+#: qml/Components/EdgeDemo.qml:242
155155msgid "Well done"
156156msgstr "Bien hecho"
157157
158−#: qml/Components/EdgeDemo.qml:230
158+#: qml/Components/EdgeDemo.qml:243
159159msgid ""
160160"You have now mastered the edge gestures and can start using the "
161161"phone<br><br>Tap on the screen to start"
@@ -163,40 +163,44 @@ msgstr ""
163163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
164164"la pantalla para comenzar"
165165
166−#: qml/Components/Lockscreen.qml:223
166+#: qml/Components/Lockscreen.qml:238
167167msgid "Return to Call"
168168msgstr "Volver a la llamada"
169169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171171msgid "Emergency Call"
172172msgstr "Llamada de emergencia"
173173
174−#: qml/Components/Lockscreen.qml:255
174+#: qml/Components/Lockscreen.qml:270
175175msgid "OK"
176176msgstr "Aceptar"
177177
178−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
178+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
179179msgid "See less"
180180msgstr "Ver menos"
181181
182−#: qml/Dash/GenericScopeView.qml:434
182+#: qml/Dash/GenericScopeView.qml:485
183183msgid "See all"
184184msgstr "Ver todo"
185185
186−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
187187#: qml/Panel/SearchIndicator.qml:27
188188msgid "Search"
189189msgstr "Buscar"
190190
191−#: qml/Dash/PageHeader.qml:268
191+#: qml/Dash/PageHeader.qml:267
192+msgid "Store"
193+msgstr "Tienda"
194+
195+#: qml/Dash/PageHeader.qml:284
192196msgid "Settings"
193197msgstr "Configuración"
194198
195−#: qml/Dash/PageHeader.qml:275
199+#: qml/Dash/PageHeader.qml:291
196200msgid "Remove from Favorites"
197201msgstr "Quitar de favoritos"
198202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200204msgid "Add to Favorites"
201205msgstr "Añadir a favoritos"
202206
@@ -228,31 +232,23 @@ msgstr "Deslice para actualizar…"
228232msgid "Release to refresh…"
229233msgstr "Suelte para actualizar…"
230234
231−#: qml/Dash/ScopesOverview.qml:215
232−msgid "Manage Scopes"
233−msgstr "Administrar Scopes"
234−
235−#: qml/Dash/ScopesOverview.qml:437
236−msgid "Done"
237−msgstr "Hecho"
238−
239−#: qml/Dash/ScopesOverview.qml:463
240−msgid "Store"
241−msgstr "Tienda"
235+#: qml/Dash/ScopesList.qml:66
236+msgid "Manage"
237+msgstr "Administrar"
242238
243−#: qml/Dash/ScopesOverviewTab.qml:36
244−msgid "Favorites"
245−msgstr "Favoritos"
239+#: qml/Dash/ScopesList.qml:112
240+msgid "Home"
241+msgstr "Inicio"
246242
247−#: qml/Dash/ScopesOverviewTab.qml:54
248−msgid "All"
249−msgstr "Todo"
243+#: qml/Dash/ScopesList.qml:113
244+msgid "Also installed"
245+msgstr "También instalados"
250246
251−#: qml/Greeter/Greeter.qml:174
247+#: qml/Greeter/Greeter.qml:133
252248msgid "Unlock"
253249msgstr "Desbloquear"
254250
255−#: qml/Notifications/NotificationMenuItemFactory.qml:116
251+#: qml/Notifications/NotificationMenuItemFactory.qml:128
256252msgid "Show password"
257253msgstr "Mostrar contraseña"
258254
@@ -292,6 +288,10 @@ msgstr "Finalizado"
292288msgid "Failed, tap to retry"
293289msgstr "Falló, toque para reintentar"
294290
291+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
292+msgid "Reply"
293+msgstr "Responder"
294+
295295#: qml/Panel/Indicators/ModemInfoItem.qml:105
296296msgid "Unlock SIM"
297297msgstr "Desbloquear SIM"
@@ -300,49 +300,49 @@ msgstr "Desbloquear SIM"
300300msgid "Roaming"
301301msgstr "Itinerancia"
302302
303−#: qml/Shell.qml:391
303+#: qml/Shell.qml:390
304+#, qt-format
305+msgid "Enter %1"
306+msgstr "Introduzca %1"
307+
308+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
304309msgid "Enter passphrase"
305310msgstr "Introduzca la contraseña"
306311
307312#: qml/Shell.qml:392
313+msgid "Enter passcode"
314+msgstr "Introduzca el código"
315+
316+#: qml/Shell.qml:393
317+#, qt-format
318+msgid "Sorry, incorrect %1"
319+msgstr "Incorrecto (%1)"
320+
321+#: qml/Shell.qml:394
308322msgid "Sorry, incorrect passphrase"
309323msgstr "La contraseña es incorrecta"
310324
311−#: qml/Shell.qml:393
325+#: qml/Shell.qml:395
312326msgid "Please re-enter"
313327msgstr "Reintroduzca"
314328
315−#: qml/Shell.qml:395
316−msgid "Enter passcode"
317−msgstr "Introduzca el código"
318−
319329#: qml/Shell.qml:396
320330msgid "Sorry, incorrect passcode"
321331msgstr "El código es incorrecto"
322332
323−#: qml/Shell.qml:399
324−#, qt-format
325−msgid "Enter %1"
326−msgstr "Introduzca %1"
327−
328−#: qml/Shell.qml:400
329−#, qt-format
330−msgid "Sorry, incorrect %1"
331−msgstr "Incorrecto (%1)"
332−
333−#: qml/Shell.qml:441
333+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
334334msgid "Sorry, incorrect passphrase."
335335msgstr "La contraseña es incorrecta."
336336
337−#: qml/Shell.qml:442
337+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
338338msgid "Sorry, incorrect passcode."
339339msgstr "Código de acceso incorrecto."
340340
341−#: qml/Shell.qml:443
341+#: qml/Shell.qml:492
342342msgid "This will be your last attempt."
343343msgstr "Este será su último intento."
344344
345−#: qml/Shell.qml:445
345+#: qml/Shell.qml:494
346346msgid ""
347347"If passphrase is entered incorrectly, your phone will conduct a factory "
348348"reset and all personal data will be deleted."
@@ -350,7 +350,7 @@ msgstr ""
350350"Si se introduce la frase incorrectamente, el teléfono volverá a la "
351351"configuración de fábrica y se perderán todos los datos personales."
352352
353−#: qml/Shell.qml:446
353+#: qml/Shell.qml:495
354354msgid ""
355355"If passcode is entered incorrectly, your phone will conduct a factory reset "
356356"and all personal data will be deleted."
@@ -358,6 +358,189 @@ msgstr ""
358358"Si se introduce el código incorrectamente, el teléfono volverá a la "
359359"configuración de fábrica y se perderán todos los datos personales."
360360
361+#: qml/Wizard/Page.qml:89
362+msgid "Back"
363+msgstr "Atrás"
364+
365+#: qml/Wizard/Pages/10-welcome.qml:27
366+msgid "Hi!"
367+msgstr "¡Hola!"
368+
369+#: qml/Wizard/Pages/10-welcome.qml:44
370+msgid "Welcome to your Ubuntu phone."
371+msgstr "Bienvenido a su teléfono Ubuntu."
372+
373+#: qml/Wizard/Pages/10-welcome.qml:52
374+msgid "Let’s get started."
375+msgstr "Comencemos."
376+
377+#: 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
379+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
380+#: qml/Wizard/Pages/passwd-set.qml:90
381+msgid "Continue"
382+msgstr "Continuar"
383+
384+#: qml/Wizard/Pages/20-sim.qml:25
385+msgid "Add a SIM card and restart your device"
386+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
387+
388+#: qml/Wizard/Pages/20-sim.qml:55
389+msgid "Without it, you won’t be able to make calls or use text messaging."
390+msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
391+
392+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
393+msgid "Skip"
394+msgstr "Omitir"
395+
396+#: qml/Wizard/Pages/30-passwd-type.qml:39
397+msgid "Lock security"
398+msgstr "Seguridad de bloqueo"
399+
400+#: qml/Wizard/Pages/30-passwd-type.qml:74
401+msgid "Please select how you’d like to unlock your phone."
402+msgstr "Seleccione el método de desbloqueo del teléfono."
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:97
405+msgid "Swipe"
406+msgstr "Deslizar"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:98
409+msgid "No security"
410+msgstr "Sin seguridad"
411+
412+#: qml/Wizard/Pages/30-passwd-type.qml:100
413+msgid "Passcode"
414+msgstr "Código"
415+
416+#: qml/Wizard/Pages/30-passwd-type.qml:101
417+msgid "4 digits only"
418+msgstr "Solo 4 dígitos"
419+
420+#: qml/Wizard/Pages/30-passwd-type.qml:103
421+msgid "Passphrase"
422+msgstr "Contraseña"
423+
424+#: qml/Wizard/Pages/30-passwd-type.qml:104
425+msgid "Numbers and letters"
426+msgstr "Números y letras"
427+
428+#: qml/Wizard/Pages/40-wifi.qml:28
429+msgid "Connect to Wi‑Fi"
430+msgstr "Conectar con wifi"
431+
432+#: qml/Wizard/Pages/40-wifi.qml:147
433+msgid "Available networks…"
434+msgstr "Redes disponibles…"
435+
436+#: qml/Wizard/Pages/40-wifi.qml:148
437+msgid "No available networks."
438+msgstr "No hay redes disponibles."
439+
440+#: qml/Wizard/Pages/50-location.qml:27
441+msgid "Location"
442+msgstr "Ubicación"
443+
444+#: qml/Wizard/Pages/50-location.qml:62
445+msgid "Let the phone detect your location:"
446+msgstr "Permitir que el teléfono detecte su ubicación:"
447+
448+#: qml/Wizard/Pages/50-location.qml:69
449+msgid "Using GPS only (less accurate)"
450+msgstr "Usando solo GPS (poco preciso)"
451+
452+#: qml/Wizard/Pages/50-location.qml:86
453+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
454+msgstr "Usando GPS, wifi anonimizado y red de datos móviles (recomendado)"
455+
456+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
457+#: qml/Wizard/Pages/50-location.qml:103
458+msgid ""
459+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
460+"conditions</a>."
461+msgstr ""
462+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "
463+"de Nokia HERE."
464+
465+#: qml/Wizard/Pages/50-location.qml:112
466+msgid "Not at all"
467+msgstr "De ningún modo"
468+
469+#: qml/Wizard/Pages/50-location.qml:124
470+msgid "You can change your mind later in <b>System Settings</b>."
471+msgstr "Si cambia de opinión, vaya a <b>Configuración del sistema</b>."
472+
473+#: qml/Wizard/Pages/60-reporting.qml:24
474+msgid "Improving your experience"
475+msgstr "Mejorar la experiencia"
476+
477+#: qml/Wizard/Pages/60-reporting.qml:36
478+msgid ""
479+"Your phone is set up to automatically report errors to Canonical and its "
480+"partners, the makers of the operating system."
481+msgstr ""
482+"El teléfono está configurado para enviar automáticamente informes de error a "
483+"Canonical y sus socios, los creadores del sistema operativo."
484+
485+#: qml/Wizard/Pages/60-reporting.qml:43
486+msgid ""
487+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
488+"Privacy</b>"
489+msgstr ""
490+"Esto se puede desactivar en <b>Configuración del sistema</b> &gt; "
491+"<b>Seguridad y privacidad</b>."
492+
493+#: qml/Wizard/Pages/80-finished.qml:24
494+msgid "All done"
495+msgstr "Hecho"
496+
497+#: qml/Wizard/Pages/80-finished.qml:39
498+msgid "Nice work!"
499+msgstr "¡Buen trabajo!"
500+
501+#: qml/Wizard/Pages/80-finished.qml:46
502+msgid "Your phone is now ready to use."
503+msgstr "El teléfono ya está listo para usarse."
504+
505+#: qml/Wizard/Pages/80-finished.qml:53
506+msgid "Finish"
507+msgstr "Finalizar"
508+
509+#: qml/Wizard/Pages/here-terms.qml:27
510+msgid "Terms & Conditions"
511+msgstr "Términos y condiciones"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:49
514+msgid "Confirm passphrase"
515+msgstr "Confirme la contraseña"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:50
518+msgid "Confirm passcode"
519+msgstr "Confirme el código"
520+
521+#: qml/Wizard/Pages/passwd-confirm.qml:53
522+#: qml/Wizard/Pages/passwd-confirm.qml:54
523+msgid "Please try again."
524+msgstr "Inténtelo de nuevo."
525+
526+#: qml/Wizard/Pages/passwd-set.qml:61
527+msgid "Choose your passcode"
528+msgstr "Elija su código"
529+
530+#: qml/Wizard/Pages/passwd-set.qml:68
531+msgid "Passphrase must be 4 characters long"
532+msgstr "El código debe tener 4 caracteres"
533+
534+#: qml/Wizard/StackButton.qml:39
535+#, qt-format
536+msgid "〈 %1"
537+msgstr "〈 %1"
538+
539+#: qml/Wizard/StackButton.qml:42
540+#, qt-format
541+msgid "%1 〉"
542+msgstr "%1 〉"
543+
361544#~ msgid "Confirm"
362545#~ msgstr "Confirmar"
363546
@@ -372,3 +555,15 @@ msgstr ""
372555
373556#~ msgid "Speaking..."
374557#~ msgstr "Hablando…"
558+
559+#~ msgid "All"
560+#~ msgstr "Todo"
561+
562+#~ msgid "Favorites"
563+#~ msgstr "Favoritos"
564+
565+#~ msgid "Done"
566+#~ msgstr "Hecho"
567+
568+#~ msgid "Manage Scopes"
569+#~ msgstr "Administrar Scopes"
po/eu.po+277−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-08 14:44+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"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"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Pasahitza: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Ainguratu lasterbidea"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Askatu lasterbidea"
3333
@@ -53,59 +53,59 @@ msgid_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:74
56+#: qml/Components/Dialogs.qml:86
5757msgid "Log out"
5858msgstr "Amaitu saioa"
5959
60−#: qml/Components/Dialogs.qml:75
60+#: qml/Components/Dialogs.qml:87
6161msgid "Are you sure you want to log out?"
6262msgstr "Ziur saioa amaitu nahi duzula?"
6363
64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65−#: qml/Components/Dialogs.qml:126
64+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
65+#: qml/Components/Dialogs.qml:134
6666msgid "No"
6767msgstr "Ez"
6868
69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70−#: qml/Components/Dialogs.qml:133
69+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
70+#: qml/Components/Dialogs.qml:140
7171msgid "Yes"
7272msgstr "Bai"
7373
74−#: qml/Components/Dialogs.qml:98
74+#: qml/Components/Dialogs.qml:108
7575msgid "Shut down"
7676msgstr "Itzali"
7777
78−#: qml/Components/Dialogs.qml:99
78+#: qml/Components/Dialogs.qml:109
7979msgid "Are you sure you want to shut down?"
8080msgstr "Ziur itzali nahi duzula?"
8181
82−#: qml/Components/Dialogs.qml:123
82+#: qml/Components/Dialogs.qml:131
8383msgid "Reboot"
8484msgstr "Berrabiarazi"
8585
86−#: qml/Components/Dialogs.qml:124
86+#: qml/Components/Dialogs.qml:132
8787msgid "Are you sure you want to reboot?"
8888msgstr "Ziur berrabiarazi nahi duzula?"
8989
90−#: qml/Components/Dialogs.qml:148
90+#: qml/Components/Dialogs.qml:154
9191msgid "Power"
9292msgstr "Piztu/itzali"
9393
94−#: qml/Components/Dialogs.qml:149
94+#: qml/Components/Dialogs.qml:155
9595msgid ""
9696"Are you sure you would like\n"
9797"to power off?"
9898msgstr "Ziur itzali nahi duzula?"
9999
100−#: qml/Components/Dialogs.qml:151
100+#: qml/Components/Dialogs.qml:157
101101msgid "Power off"
102102msgstr "Itzali"
103103
104−#: qml/Components/Dialogs.qml:161
104+#: qml/Components/Dialogs.qml:166
105105msgid "Restart"
106106msgstr "Berrabiarazi"
107107
108−#: qml/Components/Dialogs.qml:171
108+#: qml/Components/Dialogs.qml:175
109109msgid "Cancel"
110110msgstr "Utzi"
111111
@@ -113,46 +113,46 @@ msgstr "Utzi"
113113msgid "Skip intro"
114114msgstr "Saltatu aurkezpena"
115115
116−#: qml/Components/EdgeDemo.qml:112
116+#: qml/Components/EdgeDemo.qml:125
117117msgid "Right edge"
118118msgstr "Eskuineko ertza"
119119
120−#: qml/Components/EdgeDemo.qml:113
120+#: qml/Components/EdgeDemo.qml:126
121121msgid "Try swiping from the right edge to unlock the phone"
122122msgstr ""
123123"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Goiko ertza"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Itxi"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
140140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Ezkerreko ertza"
144144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr ""
148148"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
149149"izateko"
150150
151−#: qml/Components/EdgeDemo.qml:229
151+#: qml/Components/EdgeDemo.qml:242
152152msgid "Well done"
153153msgstr "Bikain"
154154
155−#: qml/Components/EdgeDemo.qml:230
155+#: qml/Components/EdgeDemo.qml:243
156156msgid ""
157157"You have now mastered the edge gestures and can start using the "
158158"phone<br><br>Tap on the screen to start"
@@ -160,40 +160,44 @@ msgstr ""
160160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
161161"zaitezke<br><br>Sakatu pantailan hasteko"
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Return to Call"
165165msgstr "Itzuli deira"
166166
167−#: qml/Components/Lockscreen.qml:223
167+#: qml/Components/Lockscreen.qml:238
168168msgid "Emergency Call"
169169msgstr "Larrialdi-deia"
170170
171−#: qml/Components/Lockscreen.qml:255
171+#: qml/Components/Lockscreen.qml:270
172172msgid "OK"
173173msgstr "Ados"
174174
175−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
175+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
176176msgid "See less"
177177msgstr "Ikusi gutxiago"
178178
179−#: qml/Dash/GenericScopeView.qml:434
179+#: qml/Dash/GenericScopeView.qml:485
180180msgid "See all"
181181msgstr "Ikusi guztiak"
182182
183−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
183+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
184184#: qml/Panel/SearchIndicator.qml:27
185185msgid "Search"
186186msgstr "Bilatu"
187187
188−#: qml/Dash/PageHeader.qml:268
188+#: qml/Dash/PageHeader.qml:267
189+msgid "Store"
190+msgstr "Denda"
191+
192+#: qml/Dash/PageHeader.qml:284
189193msgid "Settings"
190194msgstr "Ezarpenak"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Remove from Favorites"
194198msgstr "Kendu gogokoetatik"
195199
196−#: qml/Dash/PageHeader.qml:275
200+#: qml/Dash/PageHeader.qml:291
197201msgid "Add to Favorites"
198202msgstr "Gehitu gogokoetara"
199203
@@ -225,31 +229,23 @@ msgstr "Tiratu freskatzeko…"
225229msgid "Release to refresh…"
226230msgstr "Askatu freskatzeko…"
227231
228−#: qml/Dash/ScopesOverview.qml:215
229−msgid "Manage Scopes"
230−msgstr "Kudeatu eremuak"
231−
232−#: qml/Dash/ScopesOverview.qml:437
233−msgid "Done"
234−msgstr "Eginda"
235−
236−#: qml/Dash/ScopesOverview.qml:463
237−msgid "Store"
238−msgstr "Denda"
232+#: qml/Dash/ScopesList.qml:66
233+msgid "Manage"
234+msgstr "Kudeatu"
239235
240−#: qml/Dash/ScopesOverviewTab.qml:36
241−msgid "Favorites"
242−msgstr "Gogokoak"
236+#: qml/Dash/ScopesList.qml:112
237+msgid "Home"
238+msgstr "Hasiera"
243239
244−#: qml/Dash/ScopesOverviewTab.qml:54
245−msgid "All"
246−msgstr "Guztiak"
240+#: qml/Dash/ScopesList.qml:113
241+msgid "Also installed"
242+msgstr "Hau ere instalatuta"
247243
248−#: qml/Greeter/Greeter.qml:174
244+#: qml/Greeter/Greeter.qml:133
249245msgid "Unlock"
250246msgstr "Desblokeatu"
251247
252−#: qml/Notifications/NotificationMenuItemFactory.qml:116
248+#: qml/Notifications/NotificationMenuItemFactory.qml:128
253249msgid "Show password"
254250msgstr "Erakutsi pasahitza"
255251
@@ -289,6 +285,10 @@ msgstr "Amaituta"
289285msgid "Failed, tap to retry"
290286msgstr "Huts egin du, sakatu berriro saiatzeko"
291287
288+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
289+msgid "Reply"
290+msgstr ""
291+
292292#: qml/Panel/Indicators/ModemInfoItem.qml:105
293293msgid "Unlock SIM"
294294msgstr "Desblokeatu SIMa"
@@ -297,49 +297,49 @@ msgstr "Desblokeatu SIMa"
297297msgid "Roaming"
298298msgstr "Ibiltaritza"
299299
300−#: qml/Shell.qml:391
300+#: qml/Shell.qml:390
301+#, qt-format
302+msgid "Enter %1"
303+msgstr "Sartu %1"
304+
305+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
301306msgid "Enter passphrase"
302307msgstr "Sartu pasaesaldia"
303308
304309#: qml/Shell.qml:392
310+msgid "Enter passcode"
311+msgstr "Sartu pasakodea"
312+
313+#: qml/Shell.qml:393
314+#, qt-format
315+msgid "Sorry, incorrect %1"
316+msgstr "Sentitzen dugu, %1 okerra da"
317+
318+#: qml/Shell.qml:394
305319msgid "Sorry, incorrect passphrase"
306320msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
307321
308−#: qml/Shell.qml:393
322+#: qml/Shell.qml:395
309323msgid "Please re-enter"
310324msgstr "Errepikatu"
311325
312−#: qml/Shell.qml:395
313−msgid "Enter passcode"
314−msgstr "Sartu pasakodea"
315−
316326#: qml/Shell.qml:396
317327msgid "Sorry, incorrect passcode"
318328msgstr "Sentitzen dugu, pasakodea okerra da"
319329
320−#: qml/Shell.qml:399
321−#, qt-format
322−msgid "Enter %1"
323−msgstr "Sartu %1"
324−
325−#: qml/Shell.qml:400
326−#, qt-format
327−msgid "Sorry, incorrect %1"
328−msgstr "Sentitzen dugu, %1 okerra da"
329−
330−#: qml/Shell.qml:441
330+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
331331msgid "Sorry, incorrect passphrase."
332332msgstr "Sentitzen dugu, pasaesaldia okerra da."
333333
334−#: qml/Shell.qml:442
334+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
335335msgid "Sorry, incorrect passcode."
336336msgstr "Sentitzen dugu, pasakodea okerra da."
337337
338−#: qml/Shell.qml:443
338+#: qml/Shell.qml:492
339339msgid "This will be your last attempt."
340340msgstr "Hau duzu azken saiakera."
341341
342−#: qml/Shell.qml:445
342+#: qml/Shell.qml:494
343343msgid ""
344344"If passphrase is entered incorrectly, your phone will conduct a factory "
345345"reset and all personal data will be deleted."
@@ -347,7 +347,7 @@ msgstr ""
347347"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
348348"berrezarri eta datu pertsonal guztiak ezabatuko dira."
349349
350−#: qml/Shell.qml:446
350+#: qml/Shell.qml:495
351351msgid ""
352352"If passcode is entered incorrectly, your phone will conduct a factory reset "
353353"and all personal data will be deleted."
@@ -355,6 +355,191 @@ msgstr ""
355355"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
356356"berrezarri eta datu pertsonal guztiak ezabatuko dira."
357357
358+#: qml/Wizard/Page.qml:89
359+msgid "Back"
360+msgstr "Atzera"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:27
363+msgid "Hi!"
364+msgstr "Epa!"
365+
366+#: qml/Wizard/Pages/10-welcome.qml:44
367+msgid "Welcome to your Ubuntu phone."
368+msgstr "Ongi etorri zure Ubuntu telefonora."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:52
371+msgid "Let’s get started."
372+msgstr "Has gaitezen."
373+
374+#: 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
376+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
377+#: qml/Wizard/Pages/passwd-set.qml:90
378+msgid "Continue"
379+msgstr "Jarraitu"
380+
381+#: qml/Wizard/Pages/20-sim.qml:25
382+msgid "Add a SIM card and restart your device"
383+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
384+
385+#: qml/Wizard/Pages/20-sim.qml:55
386+msgid "Without it, you won’t be able to make calls or use text messaging."
387+msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Saltatu"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Blokeo-segurtasuna"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Pasatu hatza"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Segurtasunik gabe"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Pasakodea"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "4 digitu soilik"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Pasaesaldia"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Zenbakiak eta hizkiak"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Konektatu wifira"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Sare erabilgarriak…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Ez dago sare erabilgarririk."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Kokalekua"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "Utzi telefonoari zure kokalekua detektatzen:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr ""
452+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "
453+"(gomendatua)"
454+
455+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
456+#: qml/Wizard/Pages/50-location.qml:103
457+msgid ""
458+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
459+"conditions</a>."
460+msgstr ""
461+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "
462+"dituzu."
463+
464+#: qml/Wizard/Pages/50-location.qml:112
465+msgid "Not at all"
466+msgstr "Bat ere ez"
467+
468+#: qml/Wizard/Pages/50-location.qml:124
469+msgid "You can change your mind later in <b>System Settings</b>."
470+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."
471+
472+#: qml/Wizard/Pages/60-reporting.qml:24
473+msgid "Improving your experience"
474+msgstr "Zure esperientzia hobetuz"
475+
476+#: qml/Wizard/Pages/60-reporting.qml:36
477+msgid ""
478+"Your phone is set up to automatically report errors to Canonical and its "
479+"partners, the makers of the operating system."
480+msgstr ""
481+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "
482+"emateko konfiguratuta dago, sistema eragilearen egileei."
483+
484+#: qml/Wizard/Pages/60-reporting.qml:43
485+msgid ""
486+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
487+"Privacy</b>"
488+msgstr ""
489+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "
490+"pribatutasuna</b> atalean"
491+
492+#: qml/Wizard/Pages/80-finished.qml:24
493+msgid "All done"
494+msgstr "Eginda"
495+
496+#: qml/Wizard/Pages/80-finished.qml:39
497+msgid "Nice work!"
498+msgstr "Bikain!"
499+
500+#: qml/Wizard/Pages/80-finished.qml:46
501+msgid "Your phone is now ready to use."
502+msgstr "Zure telefonoa erabiltzeko prest dago."
503+
504+#: qml/Wizard/Pages/80-finished.qml:53
505+msgid "Finish"
506+msgstr "Amaitu"
507+
508+#: qml/Wizard/Pages/here-terms.qml:27
509+msgid "Terms & Conditions"
510+msgstr "Baldintzak"
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:49
513+msgid "Confirm passphrase"
514+msgstr "Berretsi pasaesaldia"
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:50
517+msgid "Confirm passcode"
518+msgstr "Berretsi pasakodea"
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:53
521+#: qml/Wizard/Pages/passwd-confirm.qml:54
522+msgid "Please try again."
523+msgstr "Saiatu berriro."
524+
525+#: qml/Wizard/Pages/passwd-set.qml:61
526+msgid "Choose your passcode"
527+msgstr "Aukeratu zure pasakodea"
528+
529+#: qml/Wizard/Pages/passwd-set.qml:68
530+msgid "Passphrase must be 4 characters long"
531+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
532+
533+#: qml/Wizard/StackButton.qml:39
534+#, qt-format
535+msgid "〈 %1"
536+msgstr "〈 %1"
537+
538+#: qml/Wizard/StackButton.qml:42
539+#, qt-format
540+msgid "%1 〉"
541+msgstr "%1 〉"
542+
358543#~ msgid "Type or say a command"
359544#~ msgstr "Idatzi edo esan agindu bat"
360545
@@ -367,5 +552,17 @@ msgstr ""
367552#~ msgid "Speaking..."
368553#~ msgstr "Hitz egiten..."
369554
555+#~ msgid "Done"
556+#~ msgstr "Eginda"
557+
558+#~ msgid "All"
559+#~ msgstr "Guztiak"
560+
561+#~ msgid "Favorites"
562+#~ msgstr "Gogokoak"
563+
370564#~ msgid "Confirm"
371565#~ msgstr "Berretsi"
566+
567+#~ msgid "Manage Scopes"
568+#~ msgstr "Kudeatu eremuak"
po/fa.po+277−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-07 12:53+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-02-04 01:20+0000\n"
1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
1313"Language-Team: Persian <fa@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-02-05 07:41+0000\n"
19+"X-Generator: Launchpad (build 17331)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "گذرواژه: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "سنجاق کردن میانبر"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "برداشتن سنجاق میانبر"
3333
@@ -50,45 +50,45 @@ msgid "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:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "خروج از حساب"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "مطمئنید که می‌خواهید از حساب خارج شوید"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "خیر"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "بله"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "خاموش کردن"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "راه‌اندازی مجدّد"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "مطمئنید که می‌خواهید مجدّداً راه‌اندازی کنسد؟"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "توان"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"آیا مطمئن هستید که\n"
9797"می‌خواهید خاموش کنید؟"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100100msgid "Power off"
101101msgstr "خاموش کردن"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104104msgid "Restart"
105105msgstr "شروع مجدّد"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108108msgid "Cancel"
109109msgstr "لغو"
110110
@@ -112,43 +112,43 @@ msgstr "لغو"
112112msgid "Skip intro"
113113msgstr "پرش از مقدّمه"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "لبه‌ی راست"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "لبه‌ی بالا"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "بستن"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "لبه‌ی چپ"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "عالی بود"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
157157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161161msgstr "بازگشت به تماس"
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr "تماس اضطراری"
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr "قبول"
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr "کم‌تر ببینید"
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr "دیدن همه"
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "جست‌وجو"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "فروشگاه"
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr "تنظیمات"
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr "برداشتن از برگزیده‌ها"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr "افزودن به برگزیده‌ها"
195199
@@ -221,31 +225,23 @@ msgstr "برای تازه‌سازی بکشید…"
221225msgid "Release to refresh…"
222226msgstr "برای تازه‌سازی رها کنید…"
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
226−msgstr "مدیریت حوزه‌ها"
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "انجام شد"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "فروشگاه"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
230+msgstr "مدیریت"
235231
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "برگزیده‌ها"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
234+msgstr "خانه"
239235
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "همه"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
238+msgstr "هم‌چنین نصب شده"
243239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr "بازکردن قفل"
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "نمایش گذرواژه"
251247
@@ -285,6 +281,10 @@ msgstr "پایان یافت"
285281msgid "Failed, tap to retry"
286282msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "پاسخ"
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr "باز کردن قفل سیم‌کارت"
@@ -293,49 +293,49 @@ msgstr "باز کردن قفل سیم‌کارت"
293293msgid "Roaming"
294294msgstr "رومینگ"
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "%1 را وارد کنید"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr "عبارت‌عبور را وارد کنید"
299304
300305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "رمزعبور را وارد کنید"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "متأسّفیم، %1 نادرست بود"
313+
314+#: qml/Shell.qml:394
301315msgid "Sorry, incorrect passphrase"
302316msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
303317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305319msgid "Please re-enter"
306320msgstr "لطفاً دوباره وارد کنید"
307321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "رمزعبور را وارد کنید"
311−
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr "متأسّفیم، رمزعبور نادرست بود"
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "%1 را وارد کنید"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "متأسّفیم، %1 نادرست بود"
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr "متأسّفیم، عبارت‌عبور نادرست است."
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr "متأسّفیم، رمزعبور نادرست است."
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr "این آخرین تلاش شما خواهد بود."
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343343"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
344344"اطّلاعات شخصی حذف خواهند شد."
345345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347347msgid ""
348348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349349"and all personal data will be deleted."
@@ -351,6 +351,191 @@ msgstr ""
351351"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
352352"اطّلاعات شخصی حذف خواهند شد."
353353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "بازگشت"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "سلام!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "به تلفن اوبونتوی خودتان خوش آمدید."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "بیایید شروع کینم."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "ادامه"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr ""
384+"بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."
385+
386+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387+msgid "Skip"
388+msgstr "پرش"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:39
391+msgid "Lock security"
392+msgstr "امنیت قفل"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:74
395+msgid "Please select how you’d like to unlock your phone."
396+msgstr "لطفاً برگزینید که می‌خواهید چگونه قفل تلفنتان را باز کنید."
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:97
399+msgid "Swipe"
400+msgstr "لغزش"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:98
403+msgid "No security"
404+msgstr "بدون امنیت"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:100
407+msgid "Passcode"
408+msgstr "رمزعبور"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:101
411+msgid "4 digits only"
412+msgstr "فقط ۴ رقم"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:103
415+msgid "Passphrase"
416+msgstr "عبارت‌عبور"
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:104
419+msgid "Numbers and letters"
420+msgstr "اعداد و حروف"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:28
423+msgid "Connect to Wi‑Fi"
424+msgstr "اتّصال به بی‌سیم"
425+
426+#: qml/Wizard/Pages/40-wifi.qml:147
427+msgid "Available networks…"
428+msgstr "شبکه‌های موجود…"
429+
430+#: qml/Wizard/Pages/40-wifi.qml:148
431+msgid "No available networks."
432+msgstr "هیچ شبکه‌ای موجود نیست."
433+
434+#: qml/Wizard/Pages/50-location.qml:27
435+msgid "Location"
436+msgstr "موقعیت"
437+
438+#: qml/Wizard/Pages/50-location.qml:62
439+msgid "Let the phone detect your location:"
440+msgstr "اجازه به تلفن برای تشخیص موقعیّتتان:"
441+
442+#: qml/Wizard/Pages/50-location.qml:69
443+msgid "Using GPS only (less accurate)"
444+msgstr "فقط با استفاده از جی‌پی‌اس (دقّت کم‌تر)"
445+
446+#: qml/Wizard/Pages/50-location.qml:86
447+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
448+msgstr ""
449+"با استفاده از جی‌پی‌اس، بی‌سیم ناشناس و اطّلاعات شبکه‌ی سلّولی (پیشنهاد شده)"
450+
451+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
452+#: qml/Wizard/Pages/50-location.qml:103
453+msgid ""
454+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
455+"conditions</a>."
456+msgstr ""
457+"با انتخاب این گزینه، با <a href='#'>شرایط و ضوابط</a> HERE نوکیا موافقت "
458+"می‌کنید."
459+
460+#: qml/Wizard/Pages/50-location.qml:112
461+msgid "Not at all"
462+msgstr "به هیچ وجه"
463+
464+#: qml/Wizard/Pages/50-location.qml:124
465+msgid "You can change your mind later in <b>System Settings</b>."
466+msgstr "می‌توانید بعدها نظرتان را در <b>تنظیمات سامانه</b> تغییر دهید."
467+
468+#: qml/Wizard/Pages/60-reporting.qml:24
469+msgid "Improving your experience"
470+msgstr "ارتقای تجربه‌ی شما"
471+
472+#: qml/Wizard/Pages/60-reporting.qml:36
473+msgid ""
474+"Your phone is set up to automatically report errors to Canonical and its "
475+"partners, the makers of the operating system."
476+msgstr ""
477+"تلفن شما تنظیم شده تا خطاها را به صورت خودکار به سازندگان سیستم‌عامل یعنی "
478+"شرکت کنونیکال و شرکایش گزارش دهد."
479+
480+#: qml/Wizard/Pages/60-reporting.qml:43
481+msgid ""
482+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
483+"Privacy</b>"
484+msgstr ""
485+"این می‌تواند در <b>تنظیمات سامانه</b> ذیل <b>امنیت و محرمانگی</b> غیرفعَال "
486+"شود"
487+
488+#: qml/Wizard/Pages/80-finished.qml:24
489+msgid "All done"
490+msgstr "همه‌چیز انجام شد"
491+
492+#: qml/Wizard/Pages/80-finished.qml:39
493+msgid "Nice work!"
494+msgstr "عالی بود!"
495+
496+#: qml/Wizard/Pages/80-finished.qml:46
497+msgid "Your phone is now ready to use."
498+msgstr "هم‌اکنون تلفن شما آماده‌ی استفاده است."
499+
500+#: qml/Wizard/Pages/80-finished.qml:53
501+msgid "Finish"
502+msgstr "پایان"
503+
504+#: qml/Wizard/Pages/here-terms.qml:27
505+msgid "Terms & Conditions"
506+msgstr "شرایط و ضوابط"
507+
508+#: qml/Wizard/Pages/passwd-confirm.qml:49
509+msgid "Confirm passphrase"
510+msgstr "تأیید عبارت‌عبور"
511+
512+#: qml/Wizard/Pages/passwd-confirm.qml:50
513+msgid "Confirm passcode"
514+msgstr "تأیید رمزعبور"
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:53
517+#: qml/Wizard/Pages/passwd-confirm.qml:54
518+msgid "Please try again."
519+msgstr "لطفاً دوباره سعی کنید."
520+
521+#: qml/Wizard/Pages/passwd-set.qml:61
522+msgid "Choose your passcode"
523+msgstr "رمزعبور خود را انتخاب کنید"
524+
525+#: qml/Wizard/Pages/passwd-set.qml:68
526+msgid "Passphrase must be 4 characters long"
527+msgstr "عبارت‌عبور باید ۴ نویسه طول داشته باشد"
528+
529+#: qml/Wizard/StackButton.qml:39
530+#, qt-format
531+msgid "〈 %1"
532+msgstr "〈 %1"
533+
534+#: qml/Wizard/StackButton.qml:42
535+#, qt-format
536+msgid "%1 〉"
537+msgstr "%1 〉"
538+
354539#~ msgid "Type or say a command"
355540#~ msgstr "دستوری را بنویسید یا بگویید"
356541
@@ -365,3 +550,15 @@ msgstr ""
365550
366551#~ msgid "Speak Now..."
367552#~ msgstr "اکنون صحبت کنید…"
553+
554+#~ msgid "All"
555+#~ msgstr "همه"
556+
557+#~ msgid "Favorites"
558+#~ msgstr "برگزیده‌ها"
559+
560+#~ msgid "Done"
561+#~ msgstr "انجام شد"
562+
563+#~ msgid "Manage Scopes"
564+#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+276−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-05 11:49+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-29 09:21+0000\n"
1212"Last-Translator: Jiri Grönroos <Unknown>\n"
1313"Language-Team: Finnish <fi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Salasana: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Kiinnitä pikakuvake"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Poista pikakuvakkeen kiinnitys"
3333
@@ -52,45 +52,45 @@ msgid_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:74
55+#: qml/Components/Dialogs.qml:86
5656msgid "Log out"
5757msgstr "Kirjaudu ulos"
5858
59−#: qml/Components/Dialogs.qml:75
59+#: qml/Components/Dialogs.qml:87
6060msgid "Are you sure you want to log out?"
6161msgstr "Haluatko varmasti kirjautua ulos?"
6262
63−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
64−#: qml/Components/Dialogs.qml:126
63+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
64+#: qml/Components/Dialogs.qml:134
6565msgid "No"
6666msgstr "Ei"
6767
68−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
69−#: qml/Components/Dialogs.qml:133
68+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
69+#: qml/Components/Dialogs.qml:140
7070msgid "Yes"
7171msgstr "Kyllä"
7272
73−#: qml/Components/Dialogs.qml:98
73+#: qml/Components/Dialogs.qml:108
7474msgid "Shut down"
7575msgstr "Sammuta"
7676
77−#: qml/Components/Dialogs.qml:99
77+#: qml/Components/Dialogs.qml:109
7878msgid "Are you sure you want to shut down?"
7979msgstr "Haluatko varmasti sammuttaa laitteen?"
8080
81−#: qml/Components/Dialogs.qml:123
81+#: qml/Components/Dialogs.qml:131
8282msgid "Reboot"
8383msgstr "Käynnistä uudelleen"
8484
85−#: qml/Components/Dialogs.qml:124
85+#: qml/Components/Dialogs.qml:132
8686msgid "Are you sure you want to reboot?"
8787msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"
8888
89−#: qml/Components/Dialogs.qml:148
89+#: qml/Components/Dialogs.qml:154
9090msgid "Power"
9191msgstr "Virran katkaisu"
9292
93−#: qml/Components/Dialogs.qml:149
93+#: qml/Components/Dialogs.qml:155
9494msgid ""
9595"Are you sure you would like\n"
9696"to power off?"
@@ -98,15 +98,15 @@ msgstr ""
9898"Haluatko varmasti\n"
9999"sammuttaa laitteen?"
100100
101−#: qml/Components/Dialogs.qml:151
101+#: qml/Components/Dialogs.qml:157
102102msgid "Power off"
103103msgstr "Sammuta"
104104
105−#: qml/Components/Dialogs.qml:161
105+#: qml/Components/Dialogs.qml:166
106106msgid "Restart"
107107msgstr "Käynnistä uudelleen"
108108
109−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:175
110110msgid "Cancel"
111111msgstr "Peru"
112112
@@ -114,43 +114,43 @@ msgstr "Peru"
114114msgid "Skip intro"
115115msgstr "Ohita esittely"
116116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118118msgid "Right edge"
119119msgstr "Oikea reuna"
120120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122122msgid "Try swiping from the right edge to unlock the phone"
123123msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Yläreuna"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Sulje"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
140140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Vasen reuna"
144144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
148148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Hyvin tehty"
152152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,40 +158,44 @@ msgstr ""
158158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
159159"käytön<br><br>Napauta näyttöä aloittaaksesi"
160160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162162msgid "Return to Call"
163163msgstr "Palaa puheluun"
164164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166166msgid "Emergency Call"
167167msgstr "Hätäpuhelu"
168168
169−#: qml/Components/Lockscreen.qml:255
169+#: qml/Components/Lockscreen.qml:270
170170msgid "OK"
171171msgstr "OK"
172172
173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
174174msgid "See less"
175175msgstr "Näytä vähemmän"
176176
177−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:485
178178msgid "See all"
179179msgstr "Näytä kaikki"
180180
181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
182182#: qml/Panel/SearchIndicator.qml:27
183183msgid "Search"
184184msgstr "Hae"
185185
186−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:267
187+msgid "Store"
188+msgstr "Kauppa"
189+
190+#: qml/Dash/PageHeader.qml:284
187191msgid "Settings"
188192msgstr "Asetukset"
189193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191195msgid "Remove from Favorites"
192196msgstr "Poista suosikeista"
193197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195199msgid "Add to Favorites"
196200msgstr "Lisää suosikkeihin"
197201
@@ -223,31 +227,23 @@ msgstr "Vedä päivittääksesi…"
223227msgid "Release to refresh…"
224228msgstr "Vapauta päivittääksesi…"
225229
226−#: qml/Dash/ScopesOverview.qml:215
227−msgid "Manage Scopes"
228−msgstr "Näkymien hallinta"
229−
230−#: qml/Dash/ScopesOverview.qml:437
231−msgid "Done"
232−msgstr "Valmis"
233−
234−#: qml/Dash/ScopesOverview.qml:463
235−msgid "Store"
236−msgstr "Kauppa"
230+#: qml/Dash/ScopesList.qml:66
231+msgid "Manage"
232+msgstr "Hallitse"
237233
238−#: qml/Dash/ScopesOverviewTab.qml:36
239−msgid "Favorites"
240−msgstr "Suosikit"
234+#: qml/Dash/ScopesList.qml:112
235+msgid "Home"
236+msgstr "Koti"
241237
242−#: qml/Dash/ScopesOverviewTab.qml:54
243−msgid "All"
244−msgstr "Kaikki"
238+#: qml/Dash/ScopesList.qml:113
239+msgid "Also installed"
240+msgstr "Myös asennettu"
245241
246−#: qml/Greeter/Greeter.qml:174
242+#: qml/Greeter/Greeter.qml:133
247243msgid "Unlock"
248244msgstr "Avaa lukitus"
249245
250−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
251247msgid "Show password"
252248msgstr "Näytä salasana"
253249
@@ -287,6 +283,10 @@ msgstr "Valmistunut"
287283msgid "Failed, tap to retry"
288284msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
289285
286+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
287+msgid "Reply"
288+msgstr "Vastaa"
289+
290290#: qml/Panel/Indicators/ModemInfoItem.qml:105
291291msgid "Unlock SIM"
292292msgstr "Avaa SIM-kortin lukitus"
@@ -295,49 +295,49 @@ msgstr "Avaa SIM-kortin lukitus"
295295msgid "Roaming"
296296msgstr "Verkkovierailu"
297297
298−#: qml/Shell.qml:391
298+#: qml/Shell.qml:390
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Anna %1"
302+
303+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
299304msgid "Enter passphrase"
300305msgstr "Anna tunnuslause"
301306
302307#: qml/Shell.qml:392
308+msgid "Enter passcode"
309+msgstr "Anna suojakoodi"
310+
311+#: qml/Shell.qml:393
312+#, qt-format
313+msgid "Sorry, incorrect %1"
314+msgstr "Väärä %1"
315+
316+#: qml/Shell.qml:394
303317msgid "Sorry, incorrect passphrase"
304318msgstr "Virheellinen tunnuslause"
305319
306−#: qml/Shell.qml:393
320+#: qml/Shell.qml:395
307321msgid "Please re-enter"
308322msgstr "Anna uudelleen"
309323
310−#: qml/Shell.qml:395
311−msgid "Enter passcode"
312−msgstr "Anna suojakoodi"
313−
314324#: qml/Shell.qml:396
315325msgid "Sorry, incorrect passcode"
316326msgstr "Väärä suojakoodi"
317327
318−#: qml/Shell.qml:399
319−#, qt-format
320−msgid "Enter %1"
321−msgstr "Anna %1"
322−
323−#: qml/Shell.qml:400
324−#, qt-format
325−msgid "Sorry, incorrect %1"
326−msgstr "Väärä %1"
327−
328−#: qml/Shell.qml:441
328+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
329329msgid "Sorry, incorrect passphrase."
330330msgstr "Virheellinen tunnuslause."
331331
332−#: qml/Shell.qml:442
332+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
333333msgid "Sorry, incorrect passcode."
334334msgstr "Virheellinen suojakoodi."
335335
336−#: qml/Shell.qml:443
336+#: qml/Shell.qml:492
337337msgid "This will be your last attempt."
338338msgstr "Tämä on viimeinen yritys."
339339
340−#: qml/Shell.qml:445
340+#: qml/Shell.qml:494
341341msgid ""
342342"If passphrase is entered incorrectly, your phone will conduct a factory "
343343"reset and all personal data will be deleted."
@@ -345,7 +345,7 @@ msgstr ""
345345"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
346346"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
347347
348−#: qml/Shell.qml:446
348+#: qml/Shell.qml:495
349349msgid ""
350350"If passcode is entered incorrectly, your phone will conduct a factory reset "
351351"and all personal data will be deleted."
@@ -353,6 +353,190 @@ msgstr ""
353353"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
354354"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
355355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr "Takaisin"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr "Hei!"
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr "Tervetuloa Ubuntu-puhelimen pariin."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr "Aloitetaanpa."
371+
372+#: 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
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr "Jatka"
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+"Ilman sitä et voi soittaa tai vastaanottaa puheluja tai käyttää "
387+"tekstiviestejä."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Ohita"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Lukitusturva"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Valitse puhelimen lukituksen avaustapa."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Pyyhkäisy"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Ei suojausta"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Suojakoodi"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "Vain 4 numeroa"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Salasana"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Numerot ja kirjaimet"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Yhdistä wifi-verkkoon"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Käytettävissä olevat verkot…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Ei käytettävissä olevia verkkoja."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Sijainti"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "Salli puhelimen havaita sijaintisi:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "Vain GPS:llä (epätarkempi)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr "GPS:llä, wifi- ja matkapuhelinverkon tiedoin (suositeltu)"
452+
453+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
454+#: qml/Wizard/Pages/50-location.qml:103
455+msgid ""
456+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
457+"conditions</a>."
458+msgstr ""
459+"Valitsemalla tämän hyväksyt Nokia HERE -palvelun <a href='#'>käyttöehdot</a>."
460+
461+#: qml/Wizard/Pages/50-location.qml:112
462+msgid "Not at all"
463+msgstr "Ei mitään"
464+
465+#: qml/Wizard/Pages/50-location.qml:124
466+msgid "You can change your mind later in <b>System Settings</b>."
467+msgstr "Voit vaihtaa valintaasi myöhemmin <b>Järjestelmän asetuksissa</b>."
468+
469+#: qml/Wizard/Pages/60-reporting.qml:24
470+msgid "Improving your experience"
471+msgstr "Käyttökokemuksen parantaminen"
472+
473+#: qml/Wizard/Pages/60-reporting.qml:36
474+msgid ""
475+"Your phone is set up to automatically report errors to Canonical and its "
476+"partners, the makers of the operating system."
477+msgstr ""
478+"Puhelimesi on asetettu ilmoittamaan virheistä automaattisesti Canonicalille "
479+"ja partnereille, eli käyttöjärjestelmän kehittäjille."
480+
481+#: qml/Wizard/Pages/60-reporting.qml:43
482+msgid ""
483+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
484+"Privacy</b>"
485+msgstr ""
486+"Tämä on mahdollista poistaa käytöstä <b>Järjestelmän asetukset</b> -osion "
487+"kohdasta <b>Turvallisuus ja yksityisyys</b>"
488+
489+#: qml/Wizard/Pages/80-finished.qml:24
490+msgid "All done"
491+msgstr "Kaikki valmiina"
492+
493+#: qml/Wizard/Pages/80-finished.qml:39
494+msgid "Nice work!"
495+msgstr "Hyvä!"
496+
497+#: qml/Wizard/Pages/80-finished.qml:46
498+msgid "Your phone is now ready to use."
499+msgstr "Puhelimesi on nyt valmis käytettäväksi."
500+
501+#: qml/Wizard/Pages/80-finished.qml:53
502+msgid "Finish"
503+msgstr "Valmis"
504+
505+#: qml/Wizard/Pages/here-terms.qml:27
506+msgid "Terms & Conditions"
507+msgstr "Käyttöehdot"
508+
509+#: qml/Wizard/Pages/passwd-confirm.qml:49
510+msgid "Confirm passphrase"
511+msgstr "Vahvista salasana"
512+
513+#: qml/Wizard/Pages/passwd-confirm.qml:50
514+msgid "Confirm passcode"
515+msgstr "Vahvista suojakoodi"
516+
517+#: qml/Wizard/Pages/passwd-confirm.qml:53
518+#: qml/Wizard/Pages/passwd-confirm.qml:54
519+msgid "Please try again."
520+msgstr "Yritä uudelleen."
521+
522+#: qml/Wizard/Pages/passwd-set.qml:61
523+msgid "Choose your passcode"
524+msgstr "Valitse suojakoodi"
525+
526+#: qml/Wizard/Pages/passwd-set.qml:68
527+msgid "Passphrase must be 4 characters long"
528+msgstr "Salasanan tulee olla neljä merkkiä pitkä"
529+
530+#: qml/Wizard/StackButton.qml:39
531+#, qt-format
532+msgid "〈 %1"
533+msgstr "〈 %1"
534+
535+#: qml/Wizard/StackButton.qml:42
536+#, qt-format
537+msgid "%1 〉"
538+msgstr "%1 〉"
539+
356540#~ msgid "Confirm"
357541#~ msgstr "Hyväksy"
358542
@@ -367,3 +551,15 @@ msgstr ""
367551
368552#~ msgid "Loading. Please Wait..."
369553#~ msgstr "Ladataan, pieni hetki..."
554+
555+#~ msgid "All"
556+#~ msgstr "Kaikki"
557+
558+#~ msgid "Favorites"
559+#~ msgstr "Suosikit"
560+
561+#~ msgid "Done"
562+#~ msgstr "Valmis"
563+
564+#~ msgid "Manage Scopes"
565+#~ msgstr "Näkymien hallinta"
po/fo.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-01-14 20:08+0000\n"
1212"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
1313"Language-Team: Faroese <fo@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,82 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr ""
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Høgra kant"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Topp kantur"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156156msgid "Return to Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Emergency Call"
161161msgstr ""
162162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164164msgid "OK"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168168msgid "See less"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172172msgid "See all"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176176#: qml/Panel/SearchIndicator.qml:27
177177msgid "Search"
178178msgstr "Leita"
179179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181185msgid "Settings"
182186msgstr ""
183187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185189msgid "Remove from Favorites"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Add to Favorites"
190194msgstr ""
191195
@@ -217,31 +221,23 @@ msgstr ""
217221msgid "Release to refresh…"
218222msgstr ""
219223
220−#: qml/Dash/ScopesOverview.qml:215
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
224+#: qml/Dash/ScopesList.qml:66
225+msgid "Manage"
230226msgstr ""
231227
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:112
229+msgid "Home"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
232+#: qml/Dash/ScopesList.qml:113
233+msgid "Also installed"
238234msgstr ""
239235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241237msgid "Unlock"
242238msgstr ""
243239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245241msgid "Show password"
246242msgstr ""
247243
@@ -281,6 +277,10 @@ msgstr ""
281277msgid "Failed, tap to retry"
282278msgstr ""
283279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285285msgid "Unlock SIM"
286286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289289msgid "Roaming"
290290msgstr ""
291291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293298msgid "Enter passphrase"
294299msgstr ""
295300
296301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298303msgstr ""
299304
300305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302312msgstr ""
303313
304314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306316msgstr ""
307317
308318#: qml/Shell.qml:396
309319msgid "Sorry, incorrect passcode"
310320msgstr ""
311321
312−#: qml/Shell.qml:399
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323323msgid "Sorry, incorrect passphrase."
324324msgstr ""
325325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327327msgid "Sorry, incorrect passcode."
328328msgstr ""
329329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331331msgid "This will be your last attempt."
332332msgstr ""
333333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
338338msgstr ""
339339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341341msgid ""
342342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343343"and all personal data will be deleted."
344344msgstr ""
345345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346523#~ msgid "Confirm"
347524#~ msgstr "Vátta"
348525
po/fr.po+282−81
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-05 17:30+0000\n"
12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\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"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-02-04 07:13+0000\n"
19+"X-Generator: Launchpad (build 17331)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Mot de passe : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Épingler le raccourci"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Détacher le raccourci"
3333
@@ -54,45 +54,45 @@ msgid_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:74
57+#: qml/Components/Dialogs.qml:86
5858msgid "Log out"
5959msgstr "Se déconnecter"
6060
61−#: qml/Components/Dialogs.qml:75
61+#: qml/Components/Dialogs.qml:87
6262msgid "Are you sure you want to log out?"
6363msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
6464
65−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66−#: qml/Components/Dialogs.qml:126
65+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
66+#: qml/Components/Dialogs.qml:134
6767msgid "No"
6868msgstr "Non"
6969
70−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71−#: qml/Components/Dialogs.qml:133
70+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
71+#: qml/Components/Dialogs.qml:140
7272msgid "Yes"
7373msgstr "Oui"
7474
75−#: qml/Components/Dialogs.qml:98
75+#: qml/Components/Dialogs.qml:108
7676msgid "Shut down"
7777msgstr "Éteindre"
7878
79−#: qml/Components/Dialogs.qml:99
79+#: qml/Components/Dialogs.qml:109
8080msgid "Are you sure you want to shut down?"
8181msgstr "Êtes-vous sûr de vouloir éteindre ?"
8282
83−#: qml/Components/Dialogs.qml:123
83+#: qml/Components/Dialogs.qml:131
8484msgid "Reboot"
8585msgstr "Redémarrer"
8686
87−#: qml/Components/Dialogs.qml:124
87+#: qml/Components/Dialogs.qml:132
8888msgid "Are you sure you want to reboot?"
8989msgstr "Êtes-vous sûr de vouloir redémarrer ?"
9090
91−#: qml/Components/Dialogs.qml:148
91+#: qml/Components/Dialogs.qml:154
9292msgid "Power"
9393msgstr "Alimentation"
9494
95−#: qml/Components/Dialogs.qml:149
95+#: qml/Components/Dialogs.qml:155
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Êtes-vous sûr de vouloir\n"
101101"couper l'alimentation ?"
102102
103−#: qml/Components/Dialogs.qml:151
103+#: qml/Components/Dialogs.qml:157
104104msgid "Power off"
105105msgstr "Éteindre"
106106
107−#: qml/Components/Dialogs.qml:161
107+#: qml/Components/Dialogs.qml:166
108108msgid "Restart"
109109msgstr "Redémarrer"
110110
111−#: qml/Components/Dialogs.qml:171
111+#: qml/Components/Dialogs.qml:175
112112msgid "Cancel"
113113msgstr "Annuler"
114114
@@ -116,50 +116,50 @@ msgstr "Annuler"
116116msgid "Skip intro"
117117msgstr "Passer l'intro"
118118
119−#: qml/Components/EdgeDemo.qml:112
119+#: qml/Components/EdgeDemo.qml:125
120120msgid "Right edge"
121121msgstr "Bord droit"
122122
123−#: qml/Components/EdgeDemo.qml:113
123+#: qml/Components/EdgeDemo.qml:126
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
127127
128−#: qml/Components/EdgeDemo.qml:144
128+#: qml/Components/EdgeDemo.qml:157
129129msgid "Top edge"
130130msgstr "Bord supérieur"
131131
132−#: qml/Components/EdgeDemo.qml:145
132+#: qml/Components/EdgeDemo.qml:158
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
136136"indicateurs."
137137
138−#: qml/Components/EdgeDemo.qml:170
138+#: qml/Components/EdgeDemo.qml:183
139139msgid "Close"
140140msgstr "Fermer"
141141
142−#: qml/Components/EdgeDemo.qml:171
142+#: qml/Components/EdgeDemo.qml:184
143143msgid "Swipe up again to close the settings screen"
144144msgstr ""
145145"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
146146"l'écran des paramètres"
147147
148−#: qml/Components/EdgeDemo.qml:201
148+#: qml/Components/EdgeDemo.qml:214
149149msgid "Left edge"
150150msgstr "Bord gauche"
151151
152−#: qml/Components/EdgeDemo.qml:202
152+#: qml/Components/EdgeDemo.qml:215
153153msgid "Swipe from the left to reveal the launcher for quick access to apps"
154154msgstr ""
155155"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
156156"d'applications."
157157
158−#: qml/Components/EdgeDemo.qml:229
158+#: qml/Components/EdgeDemo.qml:242
159159msgid "Well done"
160160msgstr "Félicitations"
161161
162−#: qml/Components/EdgeDemo.qml:230
162+#: qml/Components/EdgeDemo.qml:243
163163msgid ""
164164"You have now mastered the edge gestures and can start using the "
165165"phone<br><br>Tap on the screen to start"
@@ -167,40 +167,44 @@ msgstr ""
167167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
168168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
169169
170−#: qml/Components/Lockscreen.qml:223
170+#: qml/Components/Lockscreen.qml:238
171171msgid "Return to Call"
172172msgstr "Retourner à l'appel"
173173
174−#: qml/Components/Lockscreen.qml:223
174+#: qml/Components/Lockscreen.qml:238
175175msgid "Emergency Call"
176176msgstr "Appel d'urgence"
177177
178−#: qml/Components/Lockscreen.qml:255
178+#: qml/Components/Lockscreen.qml:270
179179msgid "OK"
180180msgstr "OK"
181181
182−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
182+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
183183msgid "See less"
184184msgstr "Voir moins"
185185
186−#: qml/Dash/GenericScopeView.qml:434
186+#: qml/Dash/GenericScopeView.qml:485
187187msgid "See all"
188188msgstr "Tout voir"
189189
190−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
190+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
191191#: qml/Panel/SearchIndicator.qml:27
192192msgid "Search"
193193msgstr "Rechercher"
194194
195−#: qml/Dash/PageHeader.qml:268
195+#: qml/Dash/PageHeader.qml:267
196+msgid "Store"
197+msgstr "Logithèque"
198+
199+#: qml/Dash/PageHeader.qml:284
196200msgid "Settings"
197201msgstr "Paramètres"
198202
199−#: qml/Dash/PageHeader.qml:275
203+#: qml/Dash/PageHeader.qml:291
200204msgid "Remove from Favorites"
201205msgstr "Retirer des favoris"
202206
203−#: qml/Dash/PageHeader.qml:275
207+#: qml/Dash/PageHeader.qml:291
204208msgid "Add to Favorites"
205209msgstr "Ajouter aux favoris"
206210
@@ -232,31 +236,23 @@ msgstr "Tirer pour actualiser..."
232236msgid "Release to refresh…"
233237msgstr "Relâcher pour actualiser..."
234238
235−#: qml/Dash/ScopesOverview.qml:215
236−msgid "Manage Scopes"
237−msgstr "Gérer les moteurs de recherche"
238−
239−#: qml/Dash/ScopesOverview.qml:437
240−msgid "Done"
241−msgstr "Terminé"
242−
243−#: qml/Dash/ScopesOverview.qml:463
244−msgid "Store"
245−msgstr "Logithèque"
239+#: qml/Dash/ScopesList.qml:66
240+msgid "Manage"
241+msgstr "Gérer"
246242
247−#: qml/Dash/ScopesOverviewTab.qml:36
248−msgid "Favorites"
249−msgstr "Favorites"
243+#: qml/Dash/ScopesList.qml:112
244+msgid "Home"
245+msgstr "Accueil"
250246
251−#: qml/Dash/ScopesOverviewTab.qml:54
252−msgid "All"
253−msgstr "Toutes"
247+#: qml/Dash/ScopesList.qml:113
248+msgid "Also installed"
249+msgstr "Également installées"
254250
255−#: qml/Greeter/Greeter.qml:174
251+#: qml/Greeter/Greeter.qml:133
256252msgid "Unlock"
257253msgstr "Déverrouiller"
258254
259−#: qml/Notifications/NotificationMenuItemFactory.qml:116
255+#: qml/Notifications/NotificationMenuItemFactory.qml:128
260256msgid "Show password"
261257msgstr "Afficher le mot de passe"
262258
@@ -296,6 +292,10 @@ msgstr "Terminé"
296292msgid "Failed, tap to retry"
297293msgstr "Échec, appuyez pour réessayer"
298294
295+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
296+msgid "Reply"
297+msgstr "Répondre"
298+
299299#: qml/Panel/Indicators/ModemInfoItem.qml:105
300300msgid "Unlock SIM"
301301msgstr "Déverrouiller la carte SIM"
@@ -304,49 +304,49 @@ msgstr "Déverrouiller la carte SIM"
304304msgid "Roaming"
305305msgstr "Roaming"
306306
307−#: qml/Shell.qml:391
307+#: qml/Shell.qml:390
308+#, qt-format
309+msgid "Enter %1"
310+msgstr "Saisissez %1"
311+
312+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
308313msgid "Enter passphrase"
309314msgstr "Saisissez la phrase de passe"
310315
311316#: qml/Shell.qml:392
317+msgid "Enter passcode"
318+msgstr "Saisissez le mot de passe"
319+
320+#: qml/Shell.qml:393
321+#, qt-format
322+msgid "Sorry, incorrect %1"
323+msgstr "Désolé, %1 incorrect"
324+
325+#: qml/Shell.qml:394
312326msgid "Sorry, incorrect passphrase"
313327msgstr "Désolé, phrase secrète incorrecte"
314328
315−#: qml/Shell.qml:393
329+#: qml/Shell.qml:395
316330msgid "Please re-enter"
317331msgstr "Veuillez ressaisir"
318332
319−#: qml/Shell.qml:395
320−msgid "Enter passcode"
321−msgstr "Saisissez le mot de passe"
322−
323333#: qml/Shell.qml:396
324334msgid "Sorry, incorrect passcode"
325335msgstr "Désolé, code incorrect"
326336
327−#: qml/Shell.qml:399
328−#, qt-format
329−msgid "Enter %1"
330−msgstr "Saisissez %1"
331−
332−#: qml/Shell.qml:400
333−#, qt-format
334−msgid "Sorry, incorrect %1"
335−msgstr "Désolé, %1 incorrect"
336−
337−#: qml/Shell.qml:441
337+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
338338msgid "Sorry, incorrect passphrase."
339339msgstr "Désolé, phrase secrète incorrecte."
340340
341−#: qml/Shell.qml:442
341+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
342342msgid "Sorry, incorrect passcode."
343343msgstr "Désolé, code incorrect."
344344
345−#: qml/Shell.qml:443
345+#: qml/Shell.qml:492
346346msgid "This will be your last attempt."
347347msgstr "Ceci sera votre dernière tentative."
348348
349−#: qml/Shell.qml:445
349+#: qml/Shell.qml:494
350350msgid ""
351351"If passphrase is entered incorrectly, your phone will conduct a factory "
352352"reset and all personal data will be deleted."
@@ -355,7 +355,7 @@ msgstr ""
355355"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
356356"personnelles seront supprimées."
357357
358−#: qml/Shell.qml:446
358+#: qml/Shell.qml:495
359359msgid ""
360360"If passcode is entered incorrectly, your phone will conduct a factory reset "
361361"and all personal data will be deleted."
@@ -364,6 +364,195 @@ msgstr ""
364364"réinitialisation aux paramètres d'usine et toutes les données personnelles "
365365"seront supprimées."
366366
367+#: qml/Wizard/Page.qml:89
368+msgid "Back"
369+msgstr "Retour"
370+
371+#: qml/Wizard/Pages/10-welcome.qml:27
372+msgid "Hi!"
373+msgstr "Salut !"
374+
375+#: qml/Wizard/Pages/10-welcome.qml:44
376+msgid "Welcome to your Ubuntu phone."
377+msgstr "Bienvenue sur votre téléphone Ubuntu."
378+
379+#: qml/Wizard/Pages/10-welcome.qml:52
380+msgid "Let’s get started."
381+msgstr "Commençons."
382+
383+#: 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
385+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
386+#: qml/Wizard/Pages/passwd-set.qml:90
387+msgid "Continue"
388+msgstr "Continuer"
389+
390+#: qml/Wizard/Pages/20-sim.qml:25
391+msgid "Add a SIM card and restart your device"
392+msgstr "Ajoutez une carte SIM et redémarrez votre appareil"
393+
394+#: qml/Wizard/Pages/20-sim.qml:55
395+msgid "Without it, you won’t be able to make calls or use text messaging."
396+msgstr ""
397+"Sans elle, vous ne serez pas en mesure de passer des appels ou d'envoyer des "
398+"SMS."
399+
400+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
401+msgid "Skip"
402+msgstr "Passer"
403+
404+#: qml/Wizard/Pages/30-passwd-type.qml:39
405+msgid "Lock security"
406+msgstr "Sécurité de verrouillage"
407+
408+#: qml/Wizard/Pages/30-passwd-type.qml:74
409+msgid "Please select how you’d like to unlock your phone."
410+msgstr ""
411+"Veuillez sélectionner comment vous souhaitez déverrouiller votre téléphone."
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:97
414+msgid "Swipe"
415+msgstr "Glissement"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:98
418+msgid "No security"
419+msgstr "Aucune sécurité"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:100
422+msgid "Passcode"
423+msgstr "Code"
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:101
426+msgid "4 digits only"
427+msgstr "4 chiffres seulement"
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:103
430+msgid "Passphrase"
431+msgstr "Phrase de passe"
432+
433+#: qml/Wizard/Pages/30-passwd-type.qml:104
434+msgid "Numbers and letters"
435+msgstr "Chiffres et lettres"
436+
437+#: qml/Wizard/Pages/40-wifi.qml:28
438+msgid "Connect to Wi‑Fi"
439+msgstr "Se connecter au Wi-Fi"
440+
441+#: qml/Wizard/Pages/40-wifi.qml:147
442+msgid "Available networks…"
443+msgstr "Réseaux disponibles..."
444+
445+#: qml/Wizard/Pages/40-wifi.qml:148
446+msgid "No available networks."
447+msgstr "Aucun réseau disponible."
448+
449+#: qml/Wizard/Pages/50-location.qml:27
450+msgid "Location"
451+msgstr "Position"
452+
453+#: qml/Wizard/Pages/50-location.qml:62
454+msgid "Let the phone detect your location:"
455+msgstr "Laisser le téléphone détecter votre position :"
456+
457+#: qml/Wizard/Pages/50-location.qml:69
458+msgid "Using GPS only (less accurate)"
459+msgstr "Utilisation du GPS seulement (moins précis)"
460+
461+#: qml/Wizard/Pages/50-location.qml:86
462+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
463+msgstr ""
464+"Utilisation des informations du GPS, du Wi-Fi anonymisé et du réseau "
465+"cellulaire (recommandé)"
466+
467+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
468+#: qml/Wizard/Pages/50-location.qml:103
469+msgid ""
470+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
471+"conditions</a>."
472+msgstr ""
473+"En sélectionnant cette option, vous acceptez les <a href='#'>conditions "
474+"générales d'utilisation</a> de Nokia HERE."
475+
476+#: qml/Wizard/Pages/50-location.qml:112
477+msgid "Not at all"
478+msgstr "Pas du tout"
479+
480+#: qml/Wizard/Pages/50-location.qml:124
481+msgid "You can change your mind later in <b>System Settings</b>."
482+msgstr ""
483+"Vous pouvez changer d'avis plus tard dans les <b>Paramètres Système</b>."
484+
485+#: qml/Wizard/Pages/60-reporting.qml:24
486+msgid "Improving your experience"
487+msgstr "Amélioration de votre expérience"
488+
489+#: qml/Wizard/Pages/60-reporting.qml:36
490+msgid ""
491+"Your phone is set up to automatically report errors to Canonical and its "
492+"partners, the makers of the operating system."
493+msgstr ""
494+"Votre téléphone est réglé pour envoyer automatiquement des rapports d'erreur "
495+"à Canonical et à ses partenaires, les fabricants du système d'exploitation."
496+
497+#: qml/Wizard/Pages/60-reporting.qml:43
498+msgid ""
499+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
500+"Privacy</b>"
501+msgstr ""
502+"Ceci peut être désactivé dans les <b>Paramètres système</b> sous <b>Sécurité "
503+"&amp; vie privée</b>"
504+
505+#: qml/Wizard/Pages/80-finished.qml:24
506+msgid "All done"
507+msgstr "Ça y est"
508+
509+#: qml/Wizard/Pages/80-finished.qml:39
510+msgid "Nice work!"
511+msgstr "Beau travail !"
512+
513+#: qml/Wizard/Pages/80-finished.qml:46
514+msgid "Your phone is now ready to use."
515+msgstr "Votre téléphone est maintenant prêt à être utilisé."
516+
517+#: qml/Wizard/Pages/80-finished.qml:53
518+msgid "Finish"
519+msgstr "Terminer"
520+
521+#: qml/Wizard/Pages/here-terms.qml:27
522+msgid "Terms & Conditions"
523+msgstr "Conditions générales d'utilisation"
524+
525+#: qml/Wizard/Pages/passwd-confirm.qml:49
526+msgid "Confirm passphrase"
527+msgstr "Confirmez votre phrase de passe"
528+
529+#: qml/Wizard/Pages/passwd-confirm.qml:50
530+msgid "Confirm passcode"
531+msgstr "Confirmez votre code"
532+
533+#: qml/Wizard/Pages/passwd-confirm.qml:53
534+#: qml/Wizard/Pages/passwd-confirm.qml:54
535+msgid "Please try again."
536+msgstr "Veuillez réessayer."
537+
538+#: qml/Wizard/Pages/passwd-set.qml:61
539+msgid "Choose your passcode"
540+msgstr "Choisissez votre code"
541+
542+#: qml/Wizard/Pages/passwd-set.qml:68
543+msgid "Passphrase must be 4 characters long"
544+msgstr "La phrase de passe doit comporter 4 caractères"
545+
546+#: qml/Wizard/StackButton.qml:39
547+#, qt-format
548+msgid "〈 %1"
549+msgstr "〈 %1"
550+
551+#: qml/Wizard/StackButton.qml:42
552+#, qt-format
553+msgid "%1 〉"
554+msgstr "%1 〉"
555+
367556#~ msgid "Speaking..."
368557#~ msgstr "En cours d'écoute..."
369558
@@ -378,3 +567,15 @@ msgstr ""
378567
379568#~ msgid "Speak Now..."
380569#~ msgstr "Parlez maintenant…"
570+
571+#~ msgid "All"
572+#~ msgstr "Toutes"
573+
574+#~ msgid "Done"
575+#~ msgstr "Terminé"
576+
577+#~ msgid "Favorites"
578+#~ msgstr "Favorites"
579+
580+#~ msgid "Manage Scopes"
581+#~ msgstr "Gérer les moteurs de recherche"
po/gd.po+268−79
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-11-09 08:18+0000\n"
1212"Last-Translator: GunChleoc <Unknown>\n"
1313"Language-Team: Fòram na Gàidhlig\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
1818"(n > 2 && n < 20) ? 2 : 3;\n"
19−"X-Launchpad-Export-Date: 2014-11-10 06:09+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20+"X-Generator: Launchpad (build 17306)\n"
2121"Language: gd\n"
2222
2323#: plugins/LightDM/Greeter.cpp:130
@@ -25,11 +25,11 @@ msgid "Password: "
2525msgstr "Facal-faire: "
2626
2727#: plugins/Unity/Launcher/launcheritem.cpp:45
28−#: plugins/Unity/Launcher/launcheritem.cpp:91
28+#: plugins/Unity/Launcher/launcheritem.cpp:100
2929msgid "Pin shortcut"
3030msgstr "Prìnich ath-ghoirid"
3131
32−#: plugins/Unity/Launcher/launcheritem.cpp:91
32+#: plugins/Unity/Launcher/launcheritem.cpp:100
3333msgid "Unpin shortcut"
3434msgstr "Neo-phrìnich an ath-ghoirid"
3535
@@ -58,45 +58,45 @@ msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"
5858msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"
5959msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
6060
61−#: qml/Components/Dialogs.qml:74
61+#: qml/Components/Dialogs.qml:86
6262msgid "Log out"
6363msgstr "Clàraich a-mach"
6464
65−#: qml/Components/Dialogs.qml:75
65+#: qml/Components/Dialogs.qml:87
6666msgid "Are you sure you want to log out?"
6767msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"
6868
69−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
70−#: qml/Components/Dialogs.qml:126
69+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
70+#: qml/Components/Dialogs.qml:134
7171msgid "No"
7272msgstr "Chan eil"
7373
74−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
75−#: qml/Components/Dialogs.qml:133
74+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
75+#: qml/Components/Dialogs.qml:140
7676msgid "Yes"
7777msgstr "Tha"
7878
79−#: qml/Components/Dialogs.qml:98
79+#: qml/Components/Dialogs.qml:108
8080msgid "Shut down"
8181msgstr "Dùin sìos"
8282
83−#: qml/Components/Dialogs.qml:99
83+#: qml/Components/Dialogs.qml:109
8484msgid "Are you sure you want to shut down?"
8585msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"
8686
87−#: qml/Components/Dialogs.qml:123
87+#: qml/Components/Dialogs.qml:131
8888msgid "Reboot"
8989msgstr "Ath-thòisich an siostam"
9090
91−#: qml/Components/Dialogs.qml:124
91+#: qml/Components/Dialogs.qml:132
9292msgid "Are you sure you want to reboot?"
9393msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"
9494
95−#: qml/Components/Dialogs.qml:148
95+#: qml/Components/Dialogs.qml:154
9696msgid "Power"
9797msgstr "Cumhachd"
9898
99−#: qml/Components/Dialogs.qml:149
99+#: qml/Components/Dialogs.qml:155
100100msgid ""
101101"Are you sure you would like\n"
102102"to power off?"
@@ -104,15 +104,15 @@ msgstr ""
104104"A bheil thu cinnteach gu bheil thu\n"
105105"airson a' chumhachd a chur dheth?"
106106
107−#: qml/Components/Dialogs.qml:151
107+#: qml/Components/Dialogs.qml:157
108108msgid "Power off"
109109msgstr "Cuir a' chumhachd dheth"
110110
111−#: qml/Components/Dialogs.qml:161
111+#: qml/Components/Dialogs.qml:166
112112msgid "Restart"
113113msgstr "Ath-thòisich"
114114
115−#: qml/Components/Dialogs.qml:171
115+#: qml/Components/Dialogs.qml:175
116116msgid "Cancel"
117117msgstr "Sguir dheth"
118118
@@ -120,49 +120,49 @@ msgstr "Sguir dheth"
120120msgid "Skip intro"
121121msgstr "Gearr leum thairis air an ro-ràdh"
122122
123−#: qml/Components/EdgeDemo.qml:112
123+#: qml/Components/EdgeDemo.qml:125
124124msgid "Right edge"
125125msgstr "An oir dheas"
126126
127−#: qml/Components/EdgeDemo.qml:113
127+#: qml/Components/EdgeDemo.qml:126
128128msgid "Try swiping from the right edge to unlock the phone"
129129msgstr ""
130130"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
131131"far an fhòn"
132132
133−#: qml/Components/EdgeDemo.qml:144
133+#: qml/Components/EdgeDemo.qml:157
134134msgid "Top edge"
135135msgstr "An oir aig a' bharr"
136136
137−#: qml/Components/EdgeDemo.qml:145
137+#: qml/Components/EdgeDemo.qml:158
138138msgid "Try swiping from the top edge to access the indicators"
139139msgstr ""
140140"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
141141"fhaighinn air na taisbeanairean"
142142
143−#: qml/Components/EdgeDemo.qml:170
143+#: qml/Components/EdgeDemo.qml:183
144144msgid "Close"
145145msgstr "Dùin"
146146
147−#: qml/Components/EdgeDemo.qml:171
147+#: qml/Components/EdgeDemo.qml:184
148148msgid "Swipe up again to close the settings screen"
149149msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
150150
151−#: qml/Components/EdgeDemo.qml:201
151+#: qml/Components/EdgeDemo.qml:214
152152msgid "Left edge"
153153msgstr "An oir chlì"
154154
155−#: qml/Components/EdgeDemo.qml:202
155+#: qml/Components/EdgeDemo.qml:215
156156msgid "Swipe from the left to reveal the launcher for quick access to apps"
157157msgstr ""
158158"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
159159"luath air na h-aplacaidean"
160160
161−#: qml/Components/EdgeDemo.qml:229
161+#: qml/Components/EdgeDemo.qml:242
162162msgid "Well done"
163163msgstr "Gasta!"
164164
165−#: qml/Components/EdgeDemo.qml:230
165+#: qml/Components/EdgeDemo.qml:243
166166msgid ""
167167"You have now mastered the edge gestures and can start using the "
168168"phone<br><br>Tap on the screen to start"
@@ -170,40 +170,44 @@ msgstr ""
170170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
171171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
172172
173−#: qml/Components/Lockscreen.qml:223
173+#: qml/Components/Lockscreen.qml:238
174174msgid "Return to Call"
175175msgstr "Till dhan ghairm"
176176
177−#: qml/Components/Lockscreen.qml:223
177+#: qml/Components/Lockscreen.qml:238
178178msgid "Emergency Call"
179179msgstr "Gairm èiginn"
180180
181−#: qml/Components/Lockscreen.qml:255
181+#: qml/Components/Lockscreen.qml:270
182182msgid "OK"
183183msgstr "Ceart ma-thà"
184184
185−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
185+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
186186msgid "See less"
187187msgstr "Seall nas lugha"
188188
189−#: qml/Dash/GenericScopeView.qml:434
189+#: qml/Dash/GenericScopeView.qml:485
190190msgid "See all"
191191msgstr "Seall na h-uile"
192192
193−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
193+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
194194#: qml/Panel/SearchIndicator.qml:27
195195msgid "Search"
196196msgstr "Lorg"
197197
198−#: qml/Dash/PageHeader.qml:268
198+#: qml/Dash/PageHeader.qml:267
199+msgid "Store"
200+msgstr "Am bùth"
201+
202+#: qml/Dash/PageHeader.qml:284
199203msgid "Settings"
200204msgstr "Roghainnean"
201205
202−#: qml/Dash/PageHeader.qml:275
206+#: qml/Dash/PageHeader.qml:291
203207msgid "Remove from Favorites"
204208msgstr "Thoir air falbh o na h-annsachdan"
205209
206−#: qml/Dash/PageHeader.qml:275
210+#: qml/Dash/PageHeader.qml:291
207211msgid "Add to Favorites"
208212msgstr "Cuir ris na h-annsachdan"
209213
@@ -235,31 +239,23 @@ msgstr "Tarraing airson ath-nuadhachadh…"
235239msgid "Release to refresh…"
236240msgstr "Leig às airson ath-nuadhachadh…"
237241
238−#: qml/Dash/ScopesOverview.qml:215
239−msgid "Manage Scopes"
240−msgstr "Stiùirich na sgòpaichean"
241−
242−#: qml/Dash/ScopesOverview.qml:437
243−msgid "Done"
244−msgstr "Deiseil"
245−
246−#: qml/Dash/ScopesOverview.qml:463
247−msgid "Store"
248−msgstr "Am bùth"
242+#: qml/Dash/ScopesList.qml:66
243+msgid "Manage"
244+msgstr ""
249245
250−#: qml/Dash/ScopesOverviewTab.qml:36
251−msgid "Favorites"
252−msgstr "Annsachdan"
246+#: qml/Dash/ScopesList.qml:112
247+msgid "Home"
248+msgstr ""
253249
254−#: qml/Dash/ScopesOverviewTab.qml:54
255−msgid "All"
256−msgstr "Na h-uile"
250+#: qml/Dash/ScopesList.qml:113
251+msgid "Also installed"
252+msgstr ""
257253
258−#: qml/Greeter/Greeter.qml:174
254+#: qml/Greeter/Greeter.qml:133
259255msgid "Unlock"
260256msgstr "Thoir a' ghlas dheth"
261257
262−#: qml/Notifications/NotificationMenuItemFactory.qml:116
258+#: qml/Notifications/NotificationMenuItemFactory.qml:128
263259msgid "Show password"
264260msgstr "Seall am facal-faire"
265261
@@ -299,6 +295,10 @@ msgstr "Coileanta"
299295msgid "Failed, tap to retry"
300296msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
301297
298+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
299+msgid "Reply"
300+msgstr ""
301+
302302#: qml/Panel/Indicators/ModemInfoItem.qml:105
303303msgid "Unlock SIM"
304304msgstr "Thoir a' ghlas far an SIM"
@@ -307,49 +307,49 @@ msgstr "Thoir a' ghlas far an SIM"
307307msgid "Roaming"
308308msgstr "Air fàrsan"
309309
310−#: qml/Shell.qml:391
310+#: qml/Shell.qml:390
311+#, qt-format
312+msgid "Enter %1"
313+msgstr "Cuir a-steach %1"
314+
315+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
311316msgid "Enter passphrase"
312317msgstr "Cuir abairt-fhaire a-steach"
313318
314319#: qml/Shell.qml:392
320+msgid "Enter passcode"
321+msgstr "Cuir còd-faire a-steach"
322+
323+#: qml/Shell.qml:393
324+#, qt-format
325+msgid "Sorry, incorrect %1"
326+msgstr "Duilich ach tha a' %1 cearr"
327+
328+#: qml/Shell.qml:394
315329msgid "Sorry, incorrect passphrase"
316330msgstr "Duilich ach tha an abairt-fhaire cearr"
317331
318−#: qml/Shell.qml:393
332+#: qml/Shell.qml:395
319333msgid "Please re-enter"
320334msgstr "Cuir a-steach e a-rithist"
321335
322−#: qml/Shell.qml:395
323−msgid "Enter passcode"
324−msgstr "Cuir còd-faire a-steach"
325−
326336#: qml/Shell.qml:396
327337msgid "Sorry, incorrect passcode"
328338msgstr "Duilich ach tha an còd-faire cearr"
329339
330−#: qml/Shell.qml:399
331−#, qt-format
332−msgid "Enter %1"
333−msgstr "Cuir a-steach %1"
334−
335−#: qml/Shell.qml:400
336−#, qt-format
337−msgid "Sorry, incorrect %1"
338−msgstr "Duilich ach tha a' %1 cearr"
339−
340−#: qml/Shell.qml:441
340+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
341341msgid "Sorry, incorrect passphrase."
342342msgstr "Duilich ach tha an abairt-fhaire cearr."
343343
344−#: qml/Shell.qml:442
344+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
345345msgid "Sorry, incorrect passcode."
346346msgstr "Duilich ach tha an còd-faire cearr."
347347
348−#: qml/Shell.qml:443
348+#: qml/Shell.qml:492
349349msgid "This will be your last attempt."
350350msgstr "Seo an oidhirp mu dheireadh agad."
351351
352−#: qml/Shell.qml:445
352+#: qml/Shell.qml:494
353353msgid ""
354354"If passphrase is entered incorrectly, your phone will conduct a factory "
355355"reset and all personal data will be deleted."
@@ -358,7 +358,7 @@ msgstr ""
358358"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
359359"pearsanta a sguabadh às."
360360
361−#: qml/Shell.qml:446
361+#: qml/Shell.qml:495
362362msgid ""
363363"If passcode is entered incorrectly, your phone will conduct a factory reset "
364364"and all personal data will be deleted."
@@ -367,6 +367,183 @@ msgstr ""
367367"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
368368"a sguabadh às."
369369
370+#: qml/Wizard/Page.qml:89
371+msgid "Back"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/10-welcome.qml:27
375+msgid "Hi!"
376+msgstr ""
377+
378+#: qml/Wizard/Pages/10-welcome.qml:44
379+msgid "Welcome to your Ubuntu phone."
380+msgstr ""
381+
382+#: qml/Wizard/Pages/10-welcome.qml:52
383+msgid "Let’s get started."
384+msgstr ""
385+
386+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
387+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
388+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
389+#: qml/Wizard/Pages/passwd-set.qml:90
390+msgid "Continue"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/20-sim.qml:25
394+msgid "Add a SIM card and restart your device"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/20-sim.qml:55
398+msgid "Without it, you won’t be able to make calls or use text messaging."
399+msgstr ""
400+
401+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
402+msgid "Skip"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:39
406+msgid "Lock security"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:74
410+msgid "Please select how you’d like to unlock your phone."
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:97
414+msgid "Swipe"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:98
418+msgid "No security"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:100
422+msgid "Passcode"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/30-passwd-type.qml:101
426+msgid "4 digits only"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/30-passwd-type.qml:103
430+msgid "Passphrase"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/30-passwd-type.qml:104
434+msgid "Numbers and letters"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/40-wifi.qml:28
438+msgid "Connect to Wi‑Fi"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/40-wifi.qml:147
442+msgid "Available networks…"
443+msgstr ""
444+
445+#: qml/Wizard/Pages/40-wifi.qml:148
446+msgid "No available networks."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:27
450+msgid "Location"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:62
454+msgid "Let the phone detect your location:"
455+msgstr ""
456+
457+#: qml/Wizard/Pages/50-location.qml:69
458+msgid "Using GPS only (less accurate)"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/50-location.qml:86
462+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
463+msgstr ""
464+
465+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
466+#: qml/Wizard/Pages/50-location.qml:103
467+msgid ""
468+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
469+"conditions</a>."
470+msgstr ""
471+
472+#: qml/Wizard/Pages/50-location.qml:112
473+msgid "Not at all"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/50-location.qml:124
477+msgid "You can change your mind later in <b>System Settings</b>."
478+msgstr ""
479+
480+#: qml/Wizard/Pages/60-reporting.qml:24
481+msgid "Improving your experience"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/60-reporting.qml:36
485+msgid ""
486+"Your phone is set up to automatically report errors to Canonical and its "
487+"partners, the makers of the operating system."
488+msgstr ""
489+
490+#: qml/Wizard/Pages/60-reporting.qml:43
491+msgid ""
492+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
493+"Privacy</b>"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/80-finished.qml:24
497+msgid "All done"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/80-finished.qml:39
501+msgid "Nice work!"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/80-finished.qml:46
505+msgid "Your phone is now ready to use."
506+msgstr ""
507+
508+#: qml/Wizard/Pages/80-finished.qml:53
509+msgid "Finish"
510+msgstr ""
511+
512+#: qml/Wizard/Pages/here-terms.qml:27
513+msgid "Terms & Conditions"
514+msgstr ""
515+
516+#: qml/Wizard/Pages/passwd-confirm.qml:49
517+msgid "Confirm passphrase"
518+msgstr ""
519+
520+#: qml/Wizard/Pages/passwd-confirm.qml:50
521+msgid "Confirm passcode"
522+msgstr ""
523+
524+#: qml/Wizard/Pages/passwd-confirm.qml:53
525+#: qml/Wizard/Pages/passwd-confirm.qml:54
526+msgid "Please try again."
527+msgstr ""
528+
529+#: qml/Wizard/Pages/passwd-set.qml:61
530+msgid "Choose your passcode"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/passwd-set.qml:68
534+msgid "Passphrase must be 4 characters long"
535+msgstr ""
536+
537+#: qml/Wizard/StackButton.qml:39
538+#, qt-format
539+msgid "〈 %1"
540+msgstr ""
541+
542+#: qml/Wizard/StackButton.qml:42
543+#, qt-format
544+msgid "%1 〉"
545+msgstr ""
546+
370547#~ msgid "Confirm"
371548#~ msgstr "Dearbhaich"
372549
@@ -381,3 +558,15 @@ msgstr ""
381558
382559#~ msgid "Speak Now..."
383560#~ msgstr "Can rud a-nis..."
561+
562+#~ msgid "All"
563+#~ msgstr "Na h-uile"
564+
565+#~ msgid "Favorites"
566+#~ msgstr "Annsachdan"
567+
568+#~ msgid "Done"
569+#~ msgstr "Deiseil"
570+
571+#~ msgid "Manage Scopes"
572+#~ msgstr "Stiùirich na sgòpaichean"
po/gl.po+276−80
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-06 13:30+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-28 10:25+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-29 06:00+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasinal : "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Fixar o atallo"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Eliminar o atallo"
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Agarde %1 minuto e ténteo de novo…"
5151msgstr[1] "Agarde %1 minutos e ténteo de novo…"
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "Saír da sesión"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "Está seguro de querer pechar a sesión?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "Non"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "Si"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "Apagar"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "Está seguro de querer apagar?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "Reiniciar"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "Está seguro de querer reiniciar?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "Enerxía"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr "Está seguro de querer apagar?"
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr "Apagar"
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr "Reiniciar"
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr "Cancelar"
108108
@@ -110,45 +110,45 @@ msgstr "Cancelar"
110110msgid "Skip intro"
111111msgstr "Saltar introdución"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "Bordo dereito"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "Bordo superior"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "Pechar"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "Bordo esquerdo"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
145145"aplicativos"
146146
147−#: qml/Components/EdgeDemo.qml:229
147+#: qml/Components/EdgeDemo.qml:242
148148msgid "Well done"
149149msgstr "Ben feito!"
150150
151−#: qml/Components/EdgeDemo.qml:230
151+#: qml/Components/EdgeDemo.qml:243
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,40 +156,44 @@ msgstr ""
156156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
157157"teléfono<br><br>Toque na pantalla para comezar"
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161161msgstr "Volver á chamada"
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr "Chamada de emerxencia"
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr "Aceptar"
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr "Ver menos"
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr "Ver todo"
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Buscar"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Tenda"
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr "Axustes"
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr "Eliminar dos favoritos"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr "Engadir aos favoritos"
195199
@@ -221,31 +225,23 @@ msgstr "Tirar para actualizar..."
221225msgid "Release to refresh…"
222226msgstr "Soltar para actualizar"
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
226−msgstr "Xestionar os Ámbitos"
227−
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "Feito"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Tenda"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
230+msgstr "Xestionar"
235231
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Favoritos"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
234+msgstr "Inicio"
239235
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "Todos"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
238+msgstr "Tamén instalado"
243239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr "Desbloquear"
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "Mostrar contrasinal"
251247
@@ -285,6 +281,10 @@ msgstr "Rematado"
285281msgid "Failed, tap to retry"
286282msgstr "Fallou, toque para reintentar"
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr "Responder"
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr "Desbloquear a SIM"
@@ -293,49 +293,49 @@ msgstr "Desbloquear a SIM"
293293msgid "Roaming"
294294msgstr "Itinerancia"
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Introducir %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr "Introduza a frase secreta"
299304
300305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Introduza a clave"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Sentímolo, %1 non coincide"
313+
314+#: qml/Shell.qml:394
301315msgid "Sorry, incorrect passphrase"
302316msgstr "Sentímolo a frase é incorrecta"
303317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305319msgid "Please re-enter"
306320msgstr "Introducir de novo"
307321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Introduza a clave"
311−
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr "Sentímolo, a clave é incorrecta"
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Introducir %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Sentímolo, %1 non coincide"
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr "Sentímolo a frase é incorrecta."
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr "Sentímolo, a clave é incorrecta."
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr "Este será o seu último intento."
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343343"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
344344"valores de fábrica e perderá todos os datos persoais."
345345
346−#: qml/Shell.qml:446
346+#: qml/Shell.qml:495
347347msgid ""
348348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349349"and all personal data will be deleted."
@@ -351,6 +351,190 @@ msgstr ""
351351"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
352352"fábrica e perderá todos os datos persoais."
353353
354+#: qml/Wizard/Page.qml:89
355+msgid "Back"
356+msgstr "Volver"
357+
358+#: qml/Wizard/Pages/10-welcome.qml:27
359+msgid "Hi!"
360+msgstr "Boas!"
361+
362+#: qml/Wizard/Pages/10-welcome.qml:44
363+msgid "Welcome to your Ubuntu phone."
364+msgstr "Benvido/a ao seu teléfono Ubuntu."
365+
366+#: qml/Wizard/Pages/10-welcome.qml:52
367+msgid "Let’s get started."
368+msgstr "Comezamos."
369+
370+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373+#: qml/Wizard/Pages/passwd-set.qml:90
374+msgid "Continue"
375+msgstr "Continuar"
376+
377+#: qml/Wizard/Pages/20-sim.qml:25
378+msgid "Add a SIM card and restart your device"
379+msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
380+
381+#: qml/Wizard/Pages/20-sim.qml:55
382+msgid "Without it, you won’t be able to make calls or use text messaging."
383+msgstr ""
384+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."
385+
386+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387+msgid "Skip"
388+msgstr "Saltar"
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:39
391+msgid "Lock security"
392+msgstr "Seguranza do bloqueo"
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:74
395+msgid "Please select how you’d like to unlock your phone."
396+msgstr "Por favor, seleccione a forma de desbloquear o teléfono."
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:97
399+msgid "Swipe"
400+msgstr "Esvarar o dedo"
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:98
403+msgid "No security"
404+msgstr "Sen seguranza"
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:100
407+msgid "Passcode"
408+msgstr "Clave"
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:101
411+msgid "4 digits only"
412+msgstr "Só 4 díxitos"
413+
414+#: qml/Wizard/Pages/30-passwd-type.qml:103
415+msgid "Passphrase"
416+msgstr "Frase secreta"
417+
418+#: qml/Wizard/Pages/30-passwd-type.qml:104
419+msgid "Numbers and letters"
420+msgstr "Números e letras"
421+
422+#: qml/Wizard/Pages/40-wifi.qml:28
423+msgid "Connect to Wi‑Fi"
424+msgstr "Conectar a unha wifi"
425+
426+#: qml/Wizard/Pages/40-wifi.qml:147
427+msgid "Available networks…"
428+msgstr "Redes dispoñíbeis..."
429+
430+#: qml/Wizard/Pages/40-wifi.qml:148
431+msgid "No available networks."
432+msgstr "Non hai redes dispoñíbeis."
433+
434+#: qml/Wizard/Pages/50-location.qml:27
435+msgid "Location"
436+msgstr "Localización"
437+
438+#: qml/Wizard/Pages/50-location.qml:62
439+msgid "Let the phone detect your location:"
440+msgstr "Permitir ao teléfono detectar a localizacón:"
441+
442+#: qml/Wizard/Pages/50-location.qml:69
443+msgid "Using GPS only (less accurate)"
444+msgstr "Usar só GPS (menos exacta)"
445+
446+#: qml/Wizard/Pages/50-location.qml:86
447+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
448+msgstr "Usar GPS, wifi anónimo e información da rede móbil (recomendado)"
449+
450+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
451+#: qml/Wizard/Pages/50-location.qml:103
452+msgid ""
453+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
454+"conditions</a>."
455+msgstr ""
456+"Seleccionando esta opción acepta os <a href='#'>termos e condicións</a> do "
457+"HERE de Nokia."
458+
459+#: qml/Wizard/Pages/50-location.qml:112
460+msgid "Not at all"
461+msgstr "De ningún xeito"
462+
463+#: qml/Wizard/Pages/50-location.qml:124
464+msgid "You can change your mind later in <b>System Settings</b>."
465+msgstr "Pode cambialo máis tarde nos <b>Axustes do sistema</b>."
466+
467+#: qml/Wizard/Pages/60-reporting.qml:24
468+msgid "Improving your experience"
469+msgstr "Mellorando a súa experiencia"
470+
471+#: qml/Wizard/Pages/60-reporting.qml:36
472+msgid ""
473+"Your phone is set up to automatically report errors to Canonical and its "
474+"partners, the makers of the operating system."
475+msgstr ""
476+"O teléfono configurouse para informar dos erros automaticamente a Canonical "
477+"e os seus socios, os creadores do sistema operativo."
478+
479+#: qml/Wizard/Pages/60-reporting.qml:43
480+msgid ""
481+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
482+"Privacy</b>"
483+msgstr ""
484+"Pode desactivalo nos <b>Axustes do sistema</b> en <b>Seguranza e "
485+"privacidade</b>"
486+
487+#: qml/Wizard/Pages/80-finished.qml:24
488+msgid "All done"
489+msgstr "Rematado"
490+
491+#: qml/Wizard/Pages/80-finished.qml:39
492+msgid "Nice work!"
493+msgstr "Bo traballo!"
494+
495+#: qml/Wizard/Pages/80-finished.qml:46
496+msgid "Your phone is now ready to use."
497+msgstr "Xa ten o teléfono listo para o seu uso."
498+
499+#: qml/Wizard/Pages/80-finished.qml:53
500+msgid "Finish"
501+msgstr "Rematar"
502+
503+#: qml/Wizard/Pages/here-terms.qml:27
504+msgid "Terms & Conditions"
505+msgstr "Termos e condicións"
506+
507+#: qml/Wizard/Pages/passwd-confirm.qml:49
508+msgid "Confirm passphrase"
509+msgstr "Confirmar a frase secreta"
510+
511+#: qml/Wizard/Pages/passwd-confirm.qml:50
512+msgid "Confirm passcode"
513+msgstr "Confirmar a clave"
514+
515+#: qml/Wizard/Pages/passwd-confirm.qml:53
516+#: qml/Wizard/Pages/passwd-confirm.qml:54
517+msgid "Please try again."
518+msgstr "Ténteo de novo."
519+
520+#: qml/Wizard/Pages/passwd-set.qml:61
521+msgid "Choose your passcode"
522+msgstr "Escolla unha clave"
523+
524+#: qml/Wizard/Pages/passwd-set.qml:68
525+msgid "Passphrase must be 4 characters long"
526+msgstr "A frase secreta debe ter 4 caracteres"
527+
528+#: qml/Wizard/StackButton.qml:39
529+#, qt-format
530+msgid "〈 %1"
531+msgstr "〈 %1"
532+
533+#: qml/Wizard/StackButton.qml:42
534+#, qt-format
535+msgid "%1 〉"
536+msgstr "%1 〉"
537+
354538#~ msgid "Confirm"
355539#~ msgstr "Confirmar"
356540
@@ -365,3 +549,15 @@ msgstr ""
365549
366550#~ msgid "Loading. Please Wait..."
367551#~ msgstr "Cargando, agarde…"
552+
553+#~ msgid "All"
554+#~ msgstr "Todos"
555+
556+#~ msgid "Favorites"
557+#~ msgstr "Favoritos"
558+
559+#~ msgid "Done"
560+#~ msgstr "Feito"
561+
562+#~ msgid "Manage Scopes"
563+#~ msgstr "Xestionar os Ámbitos"
po/he.po+263−77
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-08-23 14:19+0000\n"
1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
1313"Language-Team: Hebrew <he@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "ססמה: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "הצמדת קיצור דרך"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "הפרדת קיצור הדרך"
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr "כיבוי"
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr "ביטול"
108108
@@ -110,43 +110,43 @@ msgstr "ביטול"
110110msgid "Skip intro"
111111msgstr "לדלג על הפתיחה"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "שול ימני"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "השול העליון"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "סגירה"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "שול שמאלי"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "כל הכבוד"
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
@@ -154,40 +154,44 @@ msgstr ""
154154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
155155"לגעת במסך כדי להתחיל"
156156
157−#: qml/Components/Lockscreen.qml:223
157+#: qml/Components/Lockscreen.qml:238
158158msgid "Return to Call"
159159msgstr ""
160160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162162msgid "Emergency Call"
163163msgstr "שיחת חירום"
164164
165−#: qml/Components/Lockscreen.qml:255
165+#: qml/Components/Lockscreen.qml:270
166166msgid "OK"
167167msgstr "אישור"
168168
169−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
169+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
170170msgid "See less"
171171msgstr "לראות פחות"
172172
173−#: qml/Dash/GenericScopeView.qml:434
173+#: qml/Dash/GenericScopeView.qml:485
174174msgid "See all"
175175msgstr "להציג הכול"
176176
177−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
178178#: qml/Panel/SearchIndicator.qml:27
179179msgid "Search"
180180msgstr "חיפוש"
181181
182−#: qml/Dash/PageHeader.qml:268
182+#: qml/Dash/PageHeader.qml:267
183+msgid "Store"
184+msgstr "אחסון"
185+
186+#: qml/Dash/PageHeader.qml:284
183187msgid "Settings"
184188msgstr ""
185189
186−#: qml/Dash/PageHeader.qml:275
190+#: qml/Dash/PageHeader.qml:291
187191msgid "Remove from Favorites"
188192msgstr ""
189193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191195msgid "Add to Favorites"
192196msgstr ""
193197
@@ -219,31 +223,23 @@ msgstr ""
219223msgid "Release to refresh…"
220224msgstr ""
221225
222−#: qml/Dash/ScopesOverview.qml:215
223−msgid "Manage Scopes"
226+#: qml/Dash/ScopesList.qml:66
227+msgid "Manage"
224228msgstr ""
225229
226−#: qml/Dash/ScopesOverview.qml:437
227−msgid "Done"
228−msgstr "סיימתי"
229−
230−#: qml/Dash/ScopesOverview.qml:463
231−msgid "Store"
232−msgstr "אחסון"
233−
234−#: qml/Dash/ScopesOverviewTab.qml:36
235−msgid "Favorites"
236−msgstr "מועדפים"
230+#: qml/Dash/ScopesList.qml:112
231+msgid "Home"
232+msgstr ""
237233
238−#: qml/Dash/ScopesOverviewTab.qml:54
239−msgid "All"
240−msgstr "הכול"
234+#: qml/Dash/ScopesList.qml:113
235+msgid "Also installed"
236+msgstr ""
241237
242−#: qml/Greeter/Greeter.qml:174
238+#: qml/Greeter/Greeter.qml:133
243239msgid "Unlock"
244240msgstr ""
245241
246−#: qml/Notifications/NotificationMenuItemFactory.qml:116
242+#: qml/Notifications/NotificationMenuItemFactory.qml:128
247243msgid "Show password"
248244msgstr "הצגת הססמה"
249245
@@ -283,6 +279,10 @@ msgstr "הושלם"
283279msgid "Failed, tap to retry"
284280msgstr "נכשל, יש לגעת כדי לנסות שוב"
285281
282+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
283+msgid "Reply"
284+msgstr ""
285+
286286#: qml/Panel/Indicators/ModemInfoItem.qml:105
287287msgid "Unlock SIM"
288288msgstr ""
@@ -291,60 +291,237 @@ msgstr ""
291291msgid "Roaming"
292292msgstr "נדידה"
293293
294−#: qml/Shell.qml:391
294+#: qml/Shell.qml:390
295+#, qt-format
296+msgid "Enter %1"
297+msgstr ""
298+
299+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
295300msgid "Enter passphrase"
296301msgstr ""
297302
298303#: qml/Shell.qml:392
299−msgid "Sorry, incorrect passphrase"
300−msgstr "מילת הצופן שגויה, עמך הסליחה."
304+msgid "Enter passcode"
305+msgstr ""
301306
302307#: qml/Shell.qml:393
303−msgid "Please re-enter"
308+#, qt-format
309+msgid "Sorry, incorrect %1"
304310msgstr ""
305311
312+#: qml/Shell.qml:394
313+msgid "Sorry, incorrect passphrase"
314+msgstr "מילת הצופן שגויה, עמך הסליחה."
315+
306316#: qml/Shell.qml:395
307−msgid "Enter passcode"
317+msgid "Please re-enter"
308318msgstr ""
309319
310320#: qml/Shell.qml:396
311321msgid "Sorry, incorrect passcode"
312322msgstr ""
313323
314−#: qml/Shell.qml:399
315−#, qt-format
316−msgid "Enter %1"
317−msgstr ""
318−
319−#: qml/Shell.qml:400
320−#, qt-format
321−msgid "Sorry, incorrect %1"
322−msgstr ""
323−
324−#: qml/Shell.qml:441
324+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
325325msgid "Sorry, incorrect passphrase."
326326msgstr "מילת הצופן שגויה, עמך הסליחה."
327327
328−#: qml/Shell.qml:442
328+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
329329msgid "Sorry, incorrect passcode."
330330msgstr "הצופן שגוי, עם הסליחה."
331331
332−#: qml/Shell.qml:443
332+#: qml/Shell.qml:492
333333msgid "This will be your last attempt."
334334msgstr "זה יהיה הניסיון האחרון שלך."
335335
336−#: qml/Shell.qml:445
336+#: qml/Shell.qml:494
337337msgid ""
338338"If passphrase is entered incorrectly, your phone will conduct a factory "
339339"reset and all personal data will be deleted."
340340msgstr ""
341341
342−#: qml/Shell.qml:446
342+#: qml/Shell.qml:495
343343msgid ""
344344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345345"and all personal data will be deleted."
346346msgstr ""
347347
348+#: qml/Wizard/Page.qml:89
349+msgid "Back"
350+msgstr ""
351+
352+#: qml/Wizard/Pages/10-welcome.qml:27
353+msgid "Hi!"
354+msgstr ""
355+
356+#: qml/Wizard/Pages/10-welcome.qml:44
357+msgid "Welcome to your Ubuntu phone."
358+msgstr ""
359+
360+#: qml/Wizard/Pages/10-welcome.qml:52
361+msgid "Let’s get started."
362+msgstr ""
363+
364+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
365+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
366+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
367+#: qml/Wizard/Pages/passwd-set.qml:90
368+msgid "Continue"
369+msgstr ""
370+
371+#: qml/Wizard/Pages/20-sim.qml:25
372+msgid "Add a SIM card and restart your device"
373+msgstr ""
374+
375+#: qml/Wizard/Pages/20-sim.qml:55
376+msgid "Without it, you won’t be able to make calls or use text messaging."
377+msgstr ""
378+
379+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
380+msgid "Skip"
381+msgstr ""
382+
383+#: qml/Wizard/Pages/30-passwd-type.qml:39
384+msgid "Lock security"
385+msgstr ""
386+
387+#: qml/Wizard/Pages/30-passwd-type.qml:74
388+msgid "Please select how you’d like to unlock your phone."
389+msgstr ""
390+
391+#: qml/Wizard/Pages/30-passwd-type.qml:97
392+msgid "Swipe"
393+msgstr ""
394+
395+#: qml/Wizard/Pages/30-passwd-type.qml:98
396+msgid "No security"
397+msgstr ""
398+
399+#: qml/Wizard/Pages/30-passwd-type.qml:100
400+msgid "Passcode"
401+msgstr ""
402+
403+#: qml/Wizard/Pages/30-passwd-type.qml:101
404+msgid "4 digits only"
405+msgstr ""
406+
407+#: qml/Wizard/Pages/30-passwd-type.qml:103
408+msgid "Passphrase"
409+msgstr ""
410+
411+#: qml/Wizard/Pages/30-passwd-type.qml:104
412+msgid "Numbers and letters"
413+msgstr ""
414+
415+#: qml/Wizard/Pages/40-wifi.qml:28
416+msgid "Connect to Wi‑Fi"
417+msgstr ""
418+
419+#: qml/Wizard/Pages/40-wifi.qml:147
420+msgid "Available networks…"
421+msgstr ""
422+
423+#: qml/Wizard/Pages/40-wifi.qml:148
424+msgid "No available networks."
425+msgstr ""
426+
427+#: qml/Wizard/Pages/50-location.qml:27
428+msgid "Location"
429+msgstr ""
430+
431+#: qml/Wizard/Pages/50-location.qml:62
432+msgid "Let the phone detect your location:"
433+msgstr ""
434+
435+#: qml/Wizard/Pages/50-location.qml:69
436+msgid "Using GPS only (less accurate)"
437+msgstr ""
438+
439+#: qml/Wizard/Pages/50-location.qml:86
440+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
441+msgstr ""
442+
443+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
444+#: qml/Wizard/Pages/50-location.qml:103
445+msgid ""
446+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
447+"conditions</a>."
448+msgstr ""
449+
450+#: qml/Wizard/Pages/50-location.qml:112
451+msgid "Not at all"
452+msgstr ""
453+
454+#: qml/Wizard/Pages/50-location.qml:124
455+msgid "You can change your mind later in <b>System Settings</b>."
456+msgstr ""
457+
458+#: qml/Wizard/Pages/60-reporting.qml:24
459+msgid "Improving your experience"
460+msgstr ""
461+
462+#: qml/Wizard/Pages/60-reporting.qml:36
463+msgid ""
464+"Your phone is set up to automatically report errors to Canonical and its "
465+"partners, the makers of the operating system."
466+msgstr ""
467+
468+#: qml/Wizard/Pages/60-reporting.qml:43
469+msgid ""
470+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
471+"Privacy</b>"
472+msgstr ""
473+
474+#: qml/Wizard/Pages/80-finished.qml:24
475+msgid "All done"
476+msgstr ""
477+
478+#: qml/Wizard/Pages/80-finished.qml:39
479+msgid "Nice work!"
480+msgstr ""
481+
482+#: qml/Wizard/Pages/80-finished.qml:46
483+msgid "Your phone is now ready to use."
484+msgstr ""
485+
486+#: qml/Wizard/Pages/80-finished.qml:53
487+msgid "Finish"
488+msgstr ""
489+
490+#: qml/Wizard/Pages/here-terms.qml:27
491+msgid "Terms & Conditions"
492+msgstr ""
493+
494+#: qml/Wizard/Pages/passwd-confirm.qml:49
495+msgid "Confirm passphrase"
496+msgstr ""
497+
498+#: qml/Wizard/Pages/passwd-confirm.qml:50
499+msgid "Confirm passcode"
500+msgstr ""
501+
502+#: qml/Wizard/Pages/passwd-confirm.qml:53
503+#: qml/Wizard/Pages/passwd-confirm.qml:54
504+msgid "Please try again."
505+msgstr ""
506+
507+#: qml/Wizard/Pages/passwd-set.qml:61
508+msgid "Choose your passcode"
509+msgstr ""
510+
511+#: qml/Wizard/Pages/passwd-set.qml:68
512+msgid "Passphrase must be 4 characters long"
513+msgstr ""
514+
515+#: qml/Wizard/StackButton.qml:39
516+#, qt-format
517+msgid "〈 %1"
518+msgstr ""
519+
520+#: qml/Wizard/StackButton.qml:42
521+#, qt-format
522+msgid "%1 〉"
523+msgstr ""
524+
348525#~ msgid "Confirm"
349526#~ msgstr "אישור"
350527
@@ -359,3 +536,12 @@ msgstr ""
359536
360537#~ msgid "Speaking..."
361538#~ msgstr "הדיבור מושמע…"
539+
540+#~ msgid "Done"
541+#~ msgstr "סיימתי"
542+
543+#~ msgid "All"
544+#~ msgstr "הכול"
545+
546+#~ msgid "Favorites"
547+#~ msgstr "מועדפים"
po/hi.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-01-15 01:49+0000\n"
1212"Last-Translator: Siddhanathan S. <Unknown>\n"
1313"Language-Team: Hindi <hi@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr ""
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr ""
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr ""
3333
@@ -50,59 +50,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr ""
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr ""
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr ""
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr ""
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr ""
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr ""
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr ""
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
9595msgstr ""
9696
97−#: qml/Components/Dialogs.qml:151
97+#: qml/Components/Dialogs.qml:157
9898msgid "Power off"
9999msgstr ""
100100
101−#: qml/Components/Dialogs.qml:161
101+#: qml/Components/Dialogs.qml:166
102102msgid "Restart"
103103msgstr ""
104104
105−#: qml/Components/Dialogs.qml:171
105+#: qml/Components/Dialogs.qml:175
106106msgid "Cancel"
107107msgstr ""
108108
@@ -110,82 +110,86 @@ msgstr ""
110110msgid "Skip intro"
111111msgstr "परिचय छोड़"
112112
113−#: qml/Components/EdgeDemo.qml:112
113+#: qml/Components/EdgeDemo.qml:125
114114msgid "Right edge"
115115msgstr "दायाँ किनारा"
116116
117−#: qml/Components/EdgeDemo.qml:113
117+#: qml/Components/EdgeDemo.qml:126
118118msgid "Try swiping from the right edge to unlock the phone"
119119msgstr ""
120120
121−#: qml/Components/EdgeDemo.qml:144
121+#: qml/Components/EdgeDemo.qml:157
122122msgid "Top edge"
123123msgstr "ऊपर किनारे"
124124
125−#: qml/Components/EdgeDemo.qml:145
125+#: qml/Components/EdgeDemo.qml:158
126126msgid "Try swiping from the top edge to access the indicators"
127127msgstr ""
128128
129−#: qml/Components/EdgeDemo.qml:170
129+#: qml/Components/EdgeDemo.qml:183
130130msgid "Close"
131131msgstr "बंद करें"
132132
133−#: qml/Components/EdgeDemo.qml:171
133+#: qml/Components/EdgeDemo.qml:184
134134msgid "Swipe up again to close the settings screen"
135135msgstr ""
136136
137−#: qml/Components/EdgeDemo.qml:201
137+#: qml/Components/EdgeDemo.qml:214
138138msgid "Left edge"
139139msgstr "बायाँ किनारा"
140140
141−#: qml/Components/EdgeDemo.qml:202
141+#: qml/Components/EdgeDemo.qml:215
142142msgid "Swipe from the left to reveal the launcher for quick access to apps"
143143msgstr ""
144144
145−#: qml/Components/EdgeDemo.qml:229
145+#: qml/Components/EdgeDemo.qml:242
146146msgid "Well done"
147147msgstr "शाबाश"
148148
149−#: qml/Components/EdgeDemo.qml:230
149+#: qml/Components/EdgeDemo.qml:243
150150msgid ""
151151"You have now mastered the edge gestures and can start using the "
152152"phone<br><br>Tap on the screen to start"
153153msgstr ""
154154
155−#: qml/Components/Lockscreen.qml:223
155+#: qml/Components/Lockscreen.qml:238
156156msgid "Return to Call"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Emergency Call"
161161msgstr "आपातकालीन कॉल"
162162
163−#: qml/Components/Lockscreen.qml:255
163+#: qml/Components/Lockscreen.qml:270
164164msgid "OK"
165165msgstr ""
166166
167−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
168168msgid "See less"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434
171+#: qml/Dash/GenericScopeView.qml:485
172172msgid "See all"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
176176#: qml/Panel/SearchIndicator.qml:27
177177msgid "Search"
178178msgstr "खोजें"
179179
180−#: qml/Dash/PageHeader.qml:268
180+#: qml/Dash/PageHeader.qml:267
181+msgid "Store"
182+msgstr ""
183+
184+#: qml/Dash/PageHeader.qml:284
181185msgid "Settings"
182186msgstr ""
183187
184−#: qml/Dash/PageHeader.qml:275
188+#: qml/Dash/PageHeader.qml:291
185189msgid "Remove from Favorites"
186190msgstr ""
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Add to Favorites"
190194msgstr ""
191195
@@ -217,31 +221,23 @@ msgstr ""
217221msgid "Release to refresh…"
218222msgstr ""
219223
220−#: qml/Dash/ScopesOverview.qml:215
221−msgid "Manage Scopes"
222−msgstr ""
223−
224−#: qml/Dash/ScopesOverview.qml:437
225−msgid "Done"
226−msgstr ""
227−
228−#: qml/Dash/ScopesOverview.qml:463
229−msgid "Store"
224+#: qml/Dash/ScopesList.qml:66
225+msgid "Manage"
230226msgstr ""
231227
232−#: qml/Dash/ScopesOverviewTab.qml:36
233−msgid "Favorites"
228+#: qml/Dash/ScopesList.qml:112
229+msgid "Home"
234230msgstr ""
235231
236−#: qml/Dash/ScopesOverviewTab.qml:54
237−msgid "All"
232+#: qml/Dash/ScopesList.qml:113
233+msgid "Also installed"
238234msgstr ""
239235
240−#: qml/Greeter/Greeter.qml:174
236+#: qml/Greeter/Greeter.qml:133
241237msgid "Unlock"
242238msgstr ""
243239
244−#: qml/Notifications/NotificationMenuItemFactory.qml:116
240+#: qml/Notifications/NotificationMenuItemFactory.qml:128
245241msgid "Show password"
246242msgstr ""
247243
@@ -281,6 +277,10 @@ msgstr ""
281277msgid "Failed, tap to retry"
282278msgstr ""
283279
280+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
281+msgid "Reply"
282+msgstr ""
283+
284284#: qml/Panel/Indicators/ModemInfoItem.qml:105
285285msgid "Unlock SIM"
286286msgstr ""
@@ -289,60 +289,237 @@ msgstr ""
289289msgid "Roaming"
290290msgstr ""
291291
292−#: qml/Shell.qml:391
292+#: qml/Shell.qml:390
293+#, qt-format
294+msgid "Enter %1"
295+msgstr ""
296+
297+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
293298msgid "Enter passphrase"
294299msgstr ""
295300
296301#: qml/Shell.qml:392
297−msgid "Sorry, incorrect passphrase"
302+msgid "Enter passcode"
298303msgstr ""
299304
300305#: qml/Shell.qml:393
301−msgid "Please re-enter"
306+#, qt-format
307+msgid "Sorry, incorrect %1"
308+msgstr ""
309+
310+#: qml/Shell.qml:394
311+msgid "Sorry, incorrect passphrase"
302312msgstr ""
303313
304314#: qml/Shell.qml:395
305−msgid "Enter passcode"
315+msgid "Please re-enter"
306316msgstr ""
307317
308318#: qml/Shell.qml:396
309319msgid "Sorry, incorrect passcode"
310320msgstr ""
311321
312−#: qml/Shell.qml:399
313−#, qt-format
314−msgid "Enter %1"
315−msgstr ""
316−
317−#: qml/Shell.qml:400
318−#, qt-format
319−msgid "Sorry, incorrect %1"
320−msgstr ""
321−
322−#: qml/Shell.qml:441
322+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
323323msgid "Sorry, incorrect passphrase."
324324msgstr ""
325325
326−#: qml/Shell.qml:442
326+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
327327msgid "Sorry, incorrect passcode."
328328msgstr ""
329329
330−#: qml/Shell.qml:443
330+#: qml/Shell.qml:492
331331msgid "This will be your last attempt."
332332msgstr ""
333333
334−#: qml/Shell.qml:445
334+#: qml/Shell.qml:494
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
338338msgstr ""
339339
340−#: qml/Shell.qml:446
340+#: qml/Shell.qml:495
341341msgid ""
342342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343343"and all personal data will be deleted."
344344msgstr ""
345345
346+#: qml/Wizard/Page.qml:89
347+msgid "Back"
348+msgstr ""
349+
350+#: qml/Wizard/Pages/10-welcome.qml:27
351+msgid "Hi!"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:44
355+msgid "Welcome to your Ubuntu phone."
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:52
359+msgid "Let’s get started."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
363+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
364+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
365+#: qml/Wizard/Pages/passwd-set.qml:90
366+msgid "Continue"
367+msgstr ""
368+
369+#: qml/Wizard/Pages/20-sim.qml:25
370+msgid "Add a SIM card and restart your device"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:55
374+msgid "Without it, you won’t be able to make calls or use text messaging."
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
378+msgid "Skip"
379+msgstr ""
380+
381+#: qml/Wizard/Pages/30-passwd-type.qml:39
382+msgid "Lock security"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:74
386+msgid "Please select how you’d like to unlock your phone."
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:97
390+msgid "Swipe"
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:98
394+msgid "No security"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:100
398+msgid "Passcode"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:101
402+msgid "4 digits only"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:103
406+msgid "Passphrase"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:104
410+msgid "Numbers and letters"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/40-wifi.qml:28
414+msgid "Connect to Wi‑Fi"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:147
418+msgid "Available networks…"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:148
422+msgid "No available networks."
423+msgstr ""
424+
425+#: qml/Wizard/Pages/50-location.qml:27
426+msgid "Location"
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:62
430+msgid "Let the phone detect your location:"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:69
434+msgid "Using GPS only (less accurate)"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:86
438+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
439+msgstr ""
440+
441+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
442+#: qml/Wizard/Pages/50-location.qml:103
443+msgid ""
444+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
445+"conditions</a>."
446+msgstr ""
447+
448+#: qml/Wizard/Pages/50-location.qml:112
449+msgid "Not at all"
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:124
453+msgid "You can change your mind later in <b>System Settings</b>."
454+msgstr ""
455+
456+#: qml/Wizard/Pages/60-reporting.qml:24
457+msgid "Improving your experience"
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:36
461+msgid ""
462+"Your phone is set up to automatically report errors to Canonical and its "
463+"partners, the makers of the operating system."
464+msgstr ""
465+
466+#: qml/Wizard/Pages/60-reporting.qml:43
467+msgid ""
468+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
469+"Privacy</b>"
470+msgstr ""
471+
472+#: qml/Wizard/Pages/80-finished.qml:24
473+msgid "All done"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:39
477+msgid "Nice work!"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:46
481+msgid "Your phone is now ready to use."
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:53
485+msgid "Finish"
486+msgstr ""
487+
488+#: qml/Wizard/Pages/here-terms.qml:27
489+msgid "Terms & Conditions"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/passwd-confirm.qml:49
493+msgid "Confirm passphrase"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:50
497+msgid "Confirm passcode"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:53
501+#: qml/Wizard/Pages/passwd-confirm.qml:54
502+msgid "Please try again."
503+msgstr ""
504+
505+#: qml/Wizard/Pages/passwd-set.qml:61
506+msgid "Choose your passcode"
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:68
510+msgid "Passphrase must be 4 characters long"
511+msgstr ""
512+
513+#: qml/Wizard/StackButton.qml:39
514+#, qt-format
515+msgid "〈 %1"
516+msgstr ""
517+
518+#: qml/Wizard/StackButton.qml:42
519+#, qt-format
520+msgid "%1 〉"
521+msgstr ""
522+
346523#~ msgid "Speaking..."
347524#~ msgstr "अब बोल रहे हैं"
348525
po/hr.po+251−74
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"
1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
1313"Language-Team: Croatian <hr@li.org>\n"
@@ -16,19 +16,19 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
20−"X-Generator: Launchpad (build 17231)\n"
19+"X-Launchpad-Export-Date: 2015-01-28 06:30+0000\n"
20+"X-Generator: Launchpad (build 17306)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
2424msgstr ""
2525
2626#: plugins/Unity/Launcher/launcheritem.cpp:45
27−#: plugins/Unity/Launcher/launcheritem.cpp:91
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
2828msgid "Pin shortcut"
2929msgstr ""
3030
31−#: plugins/Unity/Launcher/launcheritem.cpp:91
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
3232msgid "Unpin shortcut"
3333msgstr ""
3434
@@ -51,59 +51,59 @@ msgid_plural "Please wait %1 minutes and then try again…"
5151msgstr[0] ""
5252msgstr[1] ""
5353
54−#: qml/Components/Dialogs.qml:74
54+#: qml/Components/Dialogs.qml:86
5555msgid "Log out"
5656msgstr ""
5757
58−#: qml/Components/Dialogs.qml:75
58+#: qml/Components/Dialogs.qml:87
5959msgid "Are you sure you want to log out?"
6060msgstr ""
6161
62−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
63−#: qml/Components/Dialogs.qml:126
62+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
63+#: qml/Components/Dialogs.qml:134
6464msgid "No"
6565msgstr ""
6666
67−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
68−#: qml/Components/Dialogs.qml:133
67+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
68+#: qml/Components/Dialogs.qml:140
6969msgid "Yes"
7070msgstr ""
7171
72−#: qml/Components/Dialogs.qml:98
72+#: qml/Components/Dialogs.qml:108
7373msgid "Shut down"
7474msgstr ""
7575
76−#: qml/Components/Dialogs.qml:99
76+#: qml/Components/Dialogs.qml:109
7777msgid "Are you sure you want to shut down?"
7878msgstr ""
7979
80−#: qml/Components/Dialogs.qml:123
80+#: qml/Components/Dialogs.qml:131
8181msgid "Reboot"
8282msgstr ""
8383
84−#: qml/Components/Dialogs.qml:124
84+#: qml/Components/Dialogs.qml:132
8585msgid "Are you sure you want to reboot?"
8686msgstr ""
8787
88−#: qml/Components/Dialogs.qml:148
88+#: qml/Components/Dialogs.qml:154
8989msgid "Power"
9090msgstr ""
9191
92−#: qml/Components/Dialogs.qml:149
92+#: qml/Components/Dialogs.qml:155
9393msgid ""
9494"Are you sure you would like\n"
9595"to power off?"
9696msgstr ""
9797
98−#: qml/Components/Dialogs.qml:151
98+#: qml/Components/Dialogs.qml:157
9999msgid "Power off"
100100msgstr ""
101101
102−#: qml/Components/Dialogs.qml:161
102+#: qml/Components/Dialogs.qml:166
103103msgid "Restart"
104104msgstr ""
105105
106−#: qml/Components/Dialogs.qml:171
106+#: qml/Components/Dialogs.qml:175
107107msgid "Cancel"
108108msgstr ""
109109
@@ -111,82 +111,86 @@ msgstr ""
111111msgid "Skip intro"
112112msgstr ""
113113
114−#: qml/Components/EdgeDemo.qml:112
114+#: qml/Components/EdgeDemo.qml:125
115115msgid "Right edge"
116116msgstr ""
117117
118−#: qml/Components/EdgeDemo.qml:113
118+#: qml/Components/EdgeDemo.qml:126
119119msgid "Try swiping from the right edge to unlock the phone"
120120msgstr ""
121121
122−#: qml/Components/EdgeDemo.qml:144
122+#: qml/Components/EdgeDemo.qml:157
123123msgid "Top edge"
124124msgstr ""
125125
126−#: qml/Components/EdgeDemo.qml:145
126+#: qml/Components/EdgeDemo.qml:158
127127msgid "Try swiping from the top edge to access the indicators"
128128msgstr ""
129129
130−#: qml/Components/EdgeDemo.qml:170
130+#: qml/Components/EdgeDemo.qml:183
131131msgid "Close"
132132msgstr ""
133133
134−#: qml/Components/EdgeDemo.qml:171
134+#: qml/Components/EdgeDemo.qml:184
135135msgid "Swipe up again to close the settings screen"
136136msgstr ""
137137
138−#: qml/Components/EdgeDemo.qml:201
138+#: qml/Components/EdgeDemo.qml:214
139139msgid "Left edge"
140140msgstr ""
141141
142−#: qml/Components/EdgeDemo.qml:202
142+#: qml/Components/EdgeDemo.qml:215
143143msgid "Swipe from the left to reveal the launcher for quick access to apps"
144144msgstr ""
145145
146−#: qml/Components/EdgeDemo.qml:229
146+#: qml/Components/EdgeDemo.qml:242
147147msgid "Well done"
148148msgstr ""
149149
150−#: qml/Components/EdgeDemo.qml:230
150+#: qml/Components/EdgeDemo.qml:243
151151msgid ""
152152"You have now mastered the edge gestures and can start using the "
153153"phone<br><br>Tap on the screen to start"
154154msgstr ""
155155
156−#: qml/Components/Lockscreen.qml:223
156+#: qml/Components/Lockscreen.qml:238
157157msgid "Return to Call"
158158msgstr ""
159159
160−#: qml/Components/Lockscreen.qml:223
160+#: qml/Components/Lockscreen.qml:238
161161msgid "Emergency Call"
162162msgstr ""
163163
164−#: qml/Components/Lockscreen.qml:255
164+#: qml/Components/Lockscreen.qml:270
165165msgid "OK"
166166msgstr ""
167167
168−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
169169msgid "See less"
170170msgstr ""
171171
172−#: qml/Dash/GenericScopeView.qml:434
172+#: qml/Dash/GenericScopeView.qml:485
173173msgid "See all"
174174msgstr ""
175175
176−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
177177#: qml/Panel/SearchIndicator.qml:27
178178msgid "Search"
179179msgstr "Pretraživanje"
180180
181−#: qml/Dash/PageHeader.qml:268
181+#: qml/Dash/PageHeader.qml:267
182+msgid "Store"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:284
182186msgid "Settings"
183187msgstr ""
184188
185−#: qml/Dash/PageHeader.qml:275
189+#: qml/Dash/PageHeader.qml:291
186190msgid "Remove from Favorites"
187191msgstr ""
188192
189−#: qml/Dash/PageHeader.qml:275
193+#: qml/Dash/PageHeader.qml:291
190194msgid "Add to Favorites"
191195msgstr ""
192196
@@ -218,31 +222,23 @@ msgstr ""
218222msgid "Release to refresh…"
219223msgstr ""
220224
221−#: qml/Dash/ScopesOverview.qml:215
222−msgid "Manage Scopes"
223−msgstr ""
224−
225−#: qml/Dash/ScopesOverview.qml:437
226−msgid "Done"
227−msgstr ""
228−
229−#: qml/Dash/ScopesOverview.qml:463
230−msgid "Store"
225+#: qml/Dash/ScopesList.qml:66
226+msgid "Manage"
231227msgstr ""
232228
233−#: qml/Dash/ScopesOverviewTab.qml:36
234−msgid "Favorites"
229+#: qml/Dash/ScopesList.qml:112
230+msgid "Home"
235231msgstr ""
236232
237−#: qml/Dash/ScopesOverviewTab.qml:54
238−msgid "All"
233+#: qml/Dash/ScopesList.qml:113
234+msgid "Also installed"
239235msgstr ""
240236
241−#: qml/Greeter/Greeter.qml:174
237+#: qml/Greeter/Greeter.qml:133
242238msgid "Unlock"
243239msgstr ""
244240
245−#: qml/Notifications/NotificationMenuItemFactory.qml:116
241+#: qml/Notifications/NotificationMenuItemFactory.qml:128
246242msgid "Show password"
247243msgstr ""
248244
@@ -282,6 +278,10 @@ msgstr ""
282278msgid "Failed, tap to retry"
283279msgstr ""
284280
281+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
282+msgid "Reply"
283+msgstr ""
284+
285285#: qml/Panel/Indicators/ModemInfoItem.qml:105
286286msgid "Unlock SIM"
287287msgstr ""
@@ -290,60 +290,237 @@ msgstr ""
290290msgid "Roaming"
291291msgstr ""
292292
293−#: qml/Shell.qml:391
293+#: qml/Shell.qml:390
294+#, qt-format
295+msgid "Enter %1"
296+msgstr ""
297+
298+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
294299msgid "Enter passphrase"
295300msgstr ""
296301
297302#: qml/Shell.qml:392
298−msgid "Sorry, incorrect passphrase"
303+msgid "Enter passcode"
299304msgstr ""
300305
301306#: qml/Shell.qml:393
302−msgid "Please re-enter"
307+#, qt-format
308+msgid "Sorry, incorrect %1"
309+msgstr ""
310+
311+#: qml/Shell.qml:394
312+msgid "Sorry, incorrect passphrase"
303313msgstr ""
304314
305315#: qml/Shell.qml:395
306−msgid "Enter passcode"
316+msgid "Please re-enter"
307317msgstr ""
308318
309319#: qml/Shell.qml:396
310320msgid "Sorry, incorrect passcode"
311321msgstr ""
312322
313−#: qml/Shell.qml:399
314−#, qt-format
315−msgid "Enter %1"
316−msgstr ""
317−
318−#: qml/Shell.qml:400
319−#, qt-format
320−msgid "Sorry, incorrect %1"
321−msgstr ""
322−
323−#: qml/Shell.qml:441
323+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
324324msgid "Sorry, incorrect passphrase."
325325msgstr ""
326326
327−#: qml/Shell.qml:442
327+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
328328msgid "Sorry, incorrect passcode."
329329msgstr ""
330330
331−#: qml/Shell.qml:443
331+#: qml/Shell.qml:492
332332msgid "This will be your last attempt."
333333msgstr ""
334334
335−#: qml/Shell.qml:445
335+#: qml/Shell.qml:494
336336msgid ""
337337"If passphrase is entered incorrectly, your phone will conduct a factory "
338338"reset and all personal data will be deleted."
339339msgstr ""
340340
341−#: qml/Shell.qml:446
341+#: qml/Shell.qml:495
342342msgid ""
343343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344344"and all personal data will be deleted."
345345msgstr ""
346346
347+#: qml/Wizard/Page.qml:89
348+msgid "Back"
349+msgstr ""
350+
351+#: qml/Wizard/Pages/10-welcome.qml:27
352+msgid "Hi!"
353+msgstr ""
354+
355+#: qml/Wizard/Pages/10-welcome.qml:44
356+msgid "Welcome to your Ubuntu phone."
357+msgstr ""
358+
359+#: qml/Wizard/Pages/10-welcome.qml:52
360+msgid "Let’s get started."
361+msgstr ""
362+
363+#: 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
365+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
366+#: qml/Wizard/Pages/passwd-set.qml:90
367+msgid "Continue"
368+msgstr ""
369+
370+#: qml/Wizard/Pages/20-sim.qml:25
371+msgid "Add a SIM card and restart your device"
372+msgstr ""
373+
374+#: qml/Wizard/Pages/20-sim.qml:55
375+msgid "Without it, you won’t be able to make calls or use text messaging."
376+msgstr ""
377+
378+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
379+msgid "Skip"
380+msgstr ""
381+
382+#: qml/Wizard/Pages/30-passwd-type.qml:39
383+msgid "Lock security"
384+msgstr ""
385+
386+#: qml/Wizard/Pages/30-passwd-type.qml:74
387+msgid "Please select how you’d like to unlock your phone."
388+msgstr ""
389+
390+#: qml/Wizard/Pages/30-passwd-type.qml:97
391+msgid "Swipe"
392+msgstr ""
393+
394+#: qml/Wizard/Pages/30-passwd-type.qml:98
395+msgid "No security"
396+msgstr ""
397+
398+#: qml/Wizard/Pages/30-passwd-type.qml:100
399+msgid "Passcode"
400+msgstr ""
401+
402+#: qml/Wizard/Pages/30-passwd-type.qml:101
403+msgid "4 digits only"
404+msgstr ""
405+
406+#: qml/Wizard/Pages/30-passwd-type.qml:103
407+msgid "Passphrase"
408+msgstr ""
409+
410+#: qml/Wizard/Pages/30-passwd-type.qml:104
411+msgid "Numbers and letters"
412+msgstr ""
413+
414+#: qml/Wizard/Pages/40-wifi.qml:28
415+msgid "Connect to Wi‑Fi"
416+msgstr ""
417+
418+#: qml/Wizard/Pages/40-wifi.qml:147
419+msgid "Available networks…"
420+msgstr ""
421+
422+#: qml/Wizard/Pages/40-wifi.qml:148
423+msgid "No available networks."
424+msgstr ""
425+
426+#: qml/Wizard/Pages/50-location.qml:27
427+msgid "Location"
428+msgstr ""
429+
430+#: qml/Wizard/Pages/50-location.qml:62
431+msgid "Let the phone detect your location:"
432+msgstr ""
433+
434+#: qml/Wizard/Pages/50-location.qml:69
435+msgid "Using GPS only (less accurate)"
436+msgstr ""
437+
438+#: qml/Wizard/Pages/50-location.qml:86
439+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
440+msgstr ""
441+
442+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
443+#: qml/Wizard/Pages/50-location.qml:103
444+msgid ""
445+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
446+"conditions</a>."
447+msgstr ""
448+
449+#: qml/Wizard/Pages/50-location.qml:112
450+msgid "Not at all"
451+msgstr ""
452+
453+#: qml/Wizard/Pages/50-location.qml:124
454+msgid "You can change your mind later in <b>System Settings</b>."
455+msgstr ""
456+
457+#: qml/Wizard/Pages/60-reporting.qml:24
458+msgid "Improving your experience"
459+msgstr ""
460+
461+#: qml/Wizard/Pages/60-reporting.qml:36
462+msgid ""
463+"Your phone is set up to automatically report errors to Canonical and its "
464+"partners, the makers of the operating system."
465+msgstr ""
466+
467+#: qml/Wizard/Pages/60-reporting.qml:43
468+msgid ""
469+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
470+"Privacy</b>"
471+msgstr ""
472+
473+#: qml/Wizard/Pages/80-finished.qml:24
474+msgid "All done"
475+msgstr ""
476+
477+#: qml/Wizard/Pages/80-finished.qml:39
478+msgid "Nice work!"
479+msgstr ""
480+
481+#: qml/Wizard/Pages/80-finished.qml:46
482+msgid "Your phone is now ready to use."
483+msgstr ""
484+
485+#: qml/Wizard/Pages/80-finished.qml:53
486+msgid "Finish"
487+msgstr ""
488+
489+#: qml/Wizard/Pages/here-terms.qml:27
490+msgid "Terms & Conditions"
491+msgstr ""
492+
493+#: qml/Wizard/Pages/passwd-confirm.qml:49
494+msgid "Confirm passphrase"
495+msgstr ""
496+
497+#: qml/Wizard/Pages/passwd-confirm.qml:50
498+msgid "Confirm passcode"
499+msgstr ""
500+
501+#: qml/Wizard/Pages/passwd-confirm.qml:53
502+#: qml/Wizard/Pages/passwd-confirm.qml:54
503+msgid "Please try again."
504+msgstr ""
505+
506+#: qml/Wizard/Pages/passwd-set.qml:61
507+msgid "Choose your passcode"
508+msgstr ""
509+
510+#: qml/Wizard/Pages/passwd-set.qml:68
511+msgid "Passphrase must be 4 characters long"
512+msgstr ""
513+
514+#: qml/Wizard/StackButton.qml:39
515+#, qt-format
516+msgid "〈 %1"
517+msgstr ""
518+
519+#: qml/Wizard/StackButton.qml:42
520+#, qt-format
521+msgid "%1 〉"
522+msgstr ""
523+
347524#~ msgid "Confirm"
348525#~ msgstr "Potvrdi"
349526
po/hu.po+283−86
@@ -7,27 +7,27 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
11−"PO-Revision-Date: 2014-11-05 15:45+0000\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
11+"PO-Revision-Date: 2015-01-29 09:19+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-30 07:08+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Jelszó: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Indító rögzítése"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Indító feloldása"
3333
@@ -47,48 +47,48 @@ msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
50−msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"
51−msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"
50+msgstr[0] "Várjon %1 percet és próbálja újra…"
51+msgstr[1] "Várjon %1 percet és próbálja újra…"
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:86
5454msgid "Log out"
5555msgstr "Kijelentkezés"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:87
5858msgid "Are you sure you want to log out?"
5959msgstr "Biztos benne, hogy kijelentkezik?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62+#: qml/Components/Dialogs.qml:134
6363msgid "No"
6464msgstr "Nem"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67+#: qml/Components/Dialogs.qml:140
6868msgid "Yes"
6969msgstr "Igen"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:108
7272msgid "Shut down"
7373msgstr "Leállítás"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:109
7676msgid "Are you sure you want to shut down?"
7777msgstr "Biztosan le szeretné állítani?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:131
8080msgid "Reboot"
8181msgstr "Újraindítás"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:132
8484msgid "Are you sure you want to reboot?"
8585msgstr "Biztosan újra szeretné indítani?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:154
8888msgid "Power"
8989msgstr "Kikapcsolás"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:155
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Biztos benne, hogy ki\n"
9797"szeretné kapcsolni?"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:157
100100msgid "Power off"
101101msgstr "Kikapcsolás"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:166
104104msgid "Restart"
105105msgstr "Újraindítás"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:175
108108msgid "Cancel"
109109msgstr "Mégse"
110110
@@ -112,45 +112,45 @@ msgstr "Mégse"
112112msgid "Skip intro"
113113msgstr "A bemutató kihagyása"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Jobb szél"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Felső szél"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Bezárás"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Bal szél"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr ""
146146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
147147"eléréséhez"
148148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Rendben"
152152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,40 +158,44 @@ msgstr ""
158158"Elsajátította a gesztusokat, és megkezdheti a telefon "
159159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
160160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162162msgid "Return to Call"
163163msgstr "Vissza a híváshoz"
164164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166166msgid "Emergency Call"
167167msgstr "Vészhívás"
168168
169−#: qml/Components/Lockscreen.qml:255
169+#: qml/Components/Lockscreen.qml:270
170170msgid "OK"
171171msgstr "Ok"
172172
173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
174174msgid "See less"
175175msgstr "Kevesebb"
176176
177−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:485
178178msgid "See all"
179179msgstr "Összes megtekintése"
180180
181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
181+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
182182#: qml/Panel/SearchIndicator.qml:27
183183msgid "Search"
184184msgstr "Keresés"
185185
186−#: qml/Dash/PageHeader.qml:268
186+#: qml/Dash/PageHeader.qml:267
187+msgid "Store"
188+msgstr "Áruház"
189+
190+#: qml/Dash/PageHeader.qml:284
187191msgid "Settings"
188192msgstr "Beállítások"
189193
190−#: qml/Dash/PageHeader.qml:275
194+#: qml/Dash/PageHeader.qml:291
191195msgid "Remove from Favorites"
192196msgstr "Eltávolítás a kedvencek közül"
193197
194−#: qml/Dash/PageHeader.qml:275
198+#: qml/Dash/PageHeader.qml:291
195199msgid "Add to Favorites"
196200msgstr "Hozzáadás a kedvencekhez"
197201
@@ -223,31 +227,23 @@ msgstr "Húzza a frissítéshez…"
223227msgid "Release to refresh…"
224228msgstr "Engedje el a frissítéshez…"
225229
226−#: qml/Dash/ScopesOverview.qml:215
227−msgid "Manage Scopes"
228−msgstr "Lencsék kezelése"
230+#: qml/Dash/ScopesList.qml:66
231+msgid "Manage"
232+msgstr "Szerkesztés"
229233
230−#: qml/Dash/ScopesOverview.qml:437
231−msgid "Done"
232−msgstr "Kész"
233−
234−#: qml/Dash/ScopesOverview.qml:463
235−msgid "Store"
236−msgstr "Áruház"
234+#: qml/Dash/ScopesList.qml:112
235+msgid "Home"
236+msgstr "Kezdőlapon"
237237
238−#: qml/Dash/ScopesOverviewTab.qml:36
239−msgid "Favorites"
240−msgstr "Kedvencek"
238+#: qml/Dash/ScopesList.qml:113
239+msgid "Also installed"
240+msgstr "Telepítve"
241241
242−#: qml/Dash/ScopesOverviewTab.qml:54
243−msgid "All"
244−msgstr "Összes"
245−
246−#: qml/Greeter/Greeter.qml:174
242+#: qml/Greeter/Greeter.qml:133
247243msgid "Unlock"
248244msgstr "Feloldás"
249245
250−#: qml/Notifications/NotificationMenuItemFactory.qml:116
246+#: qml/Notifications/NotificationMenuItemFactory.qml:128
251247msgid "Show password"
252248msgstr "Jelszó megjelenítése"
253249
@@ -287,6 +283,10 @@ msgstr "Befejeződött"
287283msgid "Failed, tap to retry"
288284msgstr "Sikertelen, koppintson az újrapróbáláshoz"
289285
286+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
287+msgid "Reply"
288+msgstr "Válasz"
289+
290290#: qml/Panel/Indicators/ModemInfoItem.qml:105
291291msgid "Unlock SIM"
292292msgstr "SIM feloldása"
@@ -295,49 +295,49 @@ msgstr "SIM feloldása"
295295msgid "Roaming"
296296msgstr "Barangolás"
297297
298−#: qml/Shell.qml:391
298+#: qml/Shell.qml:390
299+#, qt-format
300+msgid "Enter %1"
301+msgstr "Adja meg: %1"
302+
303+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
299304msgid "Enter passphrase"
300305msgstr "Jelmondat megadása"
301306
302307#: qml/Shell.qml:392
303−msgid "Sorry, incorrect passphrase"
304−msgstr "Sajnáljuk, helytelen jelmondat"
308+msgid "Enter passcode"
309+msgstr "Jelkód megadása"
305310
306311#: qml/Shell.qml:393
307−msgid "Please re-enter"
308−msgstr "Kérjük próbálja újra"
312+#, qt-format
313+msgid "Sorry, incorrect %1"
314+msgstr "Sajnálom, helytelen %1"
315+
316+#: qml/Shell.qml:394
317+msgid "Sorry, incorrect passphrase"
318+msgstr "Sajnálom, helytelen jelmondat"
309319
310320#: qml/Shell.qml:395
311−msgid "Enter passcode"
312−msgstr "Jelkód megadása"
321+msgid "Please re-enter"
322+msgstr "Próbálja újra"
313323
314324#: qml/Shell.qml:396
315325msgid "Sorry, incorrect passcode"
316−msgstr "Sajnáljuk, helytelen jelkód"
317−
318−#: qml/Shell.qml:399
319−#, qt-format
320−msgid "Enter %1"
321−msgstr "Adja meg: %1"
326+msgstr "Sajnálom, helytelen jelkód"
322327
323−#: qml/Shell.qml:400
324−#, qt-format
325−msgid "Sorry, incorrect %1"
326−msgstr "Sajnáljuk, helytelen %1"
327−
328−#: qml/Shell.qml:441
328+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
329329msgid "Sorry, incorrect passphrase."
330−msgstr "Sajnáljuk, helytelen jelmondat."
330+msgstr "Sajnálom, helytelen jelmondat."
331331
332−#: qml/Shell.qml:442
332+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
333333msgid "Sorry, incorrect passcode."
334−msgstr "Sajnáljuk, helytelen jelkód."
334+msgstr "Sajnálom, helytelen jelkód."
335335
336−#: qml/Shell.qml:443
336+#: qml/Shell.qml:492
337337msgid "This will be your last attempt."
338338msgstr "Ez az utolsó próbálkozási lehetősége."
339339
340−#: qml/Shell.qml:445
340+#: qml/Shell.qml:494
341341msgid ""
342342"If passphrase is entered incorrectly, your phone will conduct a factory "
343343"reset and all personal data will be deleted."
@@ -345,7 +345,7 @@ msgstr ""
345345"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
346346"beállításokat és törli minden személyes adatát."
347347
348−#: qml/Shell.qml:446
348+#: qml/Shell.qml:495
349349msgid ""
350350"If passcode is entered incorrectly, your phone will conduct a factory reset "
351351"and all personal data will be deleted."
@@ -353,6 +353,191 @@ msgstr ""
353353"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
354354"beállításokat és törli minden személyes adatát."
355355
356+#: qml/Wizard/Page.qml:89
357+msgid "Back"
358+msgstr "Vissza"
359+
360+#: qml/Wizard/Pages/10-welcome.qml:27
361+msgid "Hi!"
362+msgstr "Üdv!"
363+
364+#: qml/Wizard/Pages/10-welcome.qml:44
365+msgid "Welcome to your Ubuntu phone."
366+msgstr "Üdvözöljük az Ubuntu telefonos változatában."
367+
368+#: qml/Wizard/Pages/10-welcome.qml:52
369+msgid "Let’s get started."
370+msgstr "Kezdjünk is bele."
371+
372+#: 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
374+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
375+#: qml/Wizard/Pages/passwd-set.qml:90
376+msgid "Continue"
377+msgstr "Folytatás"
378+
379+#: qml/Wizard/Pages/20-sim.qml:25
380+msgid "Add a SIM card and restart your device"
381+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
382+
383+#: qml/Wizard/Pages/20-sim.qml:55
384+msgid "Without it, you won’t be able to make calls or use text messaging."
385+msgstr ""
386+"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
387+"üzeneteket."
388+
389+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
390+msgid "Skip"
391+msgstr "Kihagyás"
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:39
394+msgid "Lock security"
395+msgstr "Képernyőzárolás"
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:74
398+msgid "Please select how you’d like to unlock your phone."
399+msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:97
402+msgid "Swipe"
403+msgstr "Csúsztatás"
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:98
406+msgid "No security"
407+msgstr "Nem biztonságos"
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:100
410+msgid "Passcode"
411+msgstr "Jelkód"
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:101
414+msgid "4 digits only"
415+msgstr "4 számjegy"
416+
417+#: qml/Wizard/Pages/30-passwd-type.qml:103
418+msgid "Passphrase"
419+msgstr "Jelmondat"
420+
421+#: qml/Wizard/Pages/30-passwd-type.qml:104
422+msgid "Numbers and letters"
423+msgstr "Betűk és számok"
424+
425+#: qml/Wizard/Pages/40-wifi.qml:28
426+msgid "Connect to Wi‑Fi"
427+msgstr "Csatlakozás Wi-Fi hálózathoz"
428+
429+#: qml/Wizard/Pages/40-wifi.qml:147
430+msgid "Available networks…"
431+msgstr "Elérhető hálózatok…"
432+
433+#: qml/Wizard/Pages/40-wifi.qml:148
434+msgid "No available networks."
435+msgstr "Nincsenek elérhető hálózatok."
436+
437+#: qml/Wizard/Pages/50-location.qml:27
438+msgid "Location"
439+msgstr "Tartózkodási hely"
440+
441+#: qml/Wizard/Pages/50-location.qml:62
442+msgid "Let the phone detect your location:"
443+msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
444+
445+#: qml/Wizard/Pages/50-location.qml:69
446+msgid "Using GPS only (less accurate)"
447+msgstr "Csak GPS használata (kevésbé pontos)"
448+
449+#: qml/Wizard/Pages/50-location.qml:86
450+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
451+msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
452+
453+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
454+#: qml/Wizard/Pages/50-location.qml:103
455+msgid ""
456+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
457+"conditions</a>."
458+msgstr ""
459+"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
460+"feltételeit</a>."
461+
462+#: qml/Wizard/Pages/50-location.qml:112
463+msgid "Not at all"
464+msgstr "Ne tegye"
465+
466+#: qml/Wizard/Pages/50-location.qml:124
467+msgid "You can change your mind later in <b>System Settings</b>."
468+msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
469+
470+#: qml/Wizard/Pages/60-reporting.qml:24
471+msgid "Improving your experience"
472+msgstr "Javítson az élményen"
473+
474+#: qml/Wizard/Pages/60-reporting.qml:36
475+msgid ""
476+"Your phone is set up to automatically report errors to Canonical and its "
477+"partners, the makers of the operating system."
478+msgstr ""
479+"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
480+"Canonical, és annak partnerei felé."
481+
482+#: qml/Wizard/Pages/60-reporting.qml:43
483+msgid ""
484+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
485+"Privacy</b>"
486+msgstr ""
487+"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
488+"és adatvédelem</b> alatt"
489+
490+#: qml/Wizard/Pages/80-finished.qml:24
491+msgid "All done"
492+msgstr "Készen van"
493+
494+#: qml/Wizard/Pages/80-finished.qml:39
495+msgid "Nice work!"
496+msgstr "Szép munka!"
497+
498+#: qml/Wizard/Pages/80-finished.qml:46
499+msgid "Your phone is now ready to use."
500+msgstr "A telefonja készen áll a használatra."
501+
502+#: qml/Wizard/Pages/80-finished.qml:53
503+msgid "Finish"
504+msgstr "Befejezés"
505+
506+#: qml/Wizard/Pages/here-terms.qml:27
507+msgid "Terms & Conditions"
508+msgstr "Felhasználási feltételek"
509+
510+#: qml/Wizard/Pages/passwd-confirm.qml:49
511+msgid "Confirm passphrase"
512+msgstr "Jelmondat megerősítése"
513+
514+#: qml/Wizard/Pages/passwd-confirm.qml:50
515+msgid "Confirm passcode"
516+msgstr "Jelkód megerősítése"
517+
518+#: qml/Wizard/Pages/passwd-confirm.qml:53
519+#: qml/Wizard/Pages/passwd-confirm.qml:54
520+msgid "Please try again."
521+msgstr "Próbálja újra."
522+
523+#: qml/Wizard/Pages/passwd-set.qml:61
524+msgid "Choose your passcode"
525+msgstr "Jelkód kiválasztása"
526+
527+#: qml/Wizard/Pages/passwd-set.qml:68
528+msgid "Passphrase must be 4 characters long"
529+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
530+
531+#: qml/Wizard/StackButton.qml:39
532+#, qt-format
533+msgid "〈 %1"
534+msgstr "〈 %1"
535+
536+#: qml/Wizard/StackButton.qml:42
537+#, qt-format
538+msgid "%1 〉"
539+msgstr "%1 〉"
540+
356541#~ msgid "Confirm"
357542#~ msgstr "Megerősítés"
358543
@@ -367,3 +552,15 @@ msgstr ""
367552
368553#~ msgid "Speak Now..."
369554#~ msgstr "Most beszéljen…"
555+
556+#~ msgid "All"
557+#~ msgstr "Összes"
558+
559+#~ msgid "Favorites"
560+#~ msgstr "Kedvencek"
561+
562+#~ msgid "Done"
563+#~ msgstr "Kész"
564+
565+#~ msgid "Manage Scopes"
566+#~ msgstr "Lencsék kezelése"
po/hy.po+264−78
@@ -7,7 +7,7 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-11-07 10:59+0100\n"
10+"POT-Creation-Date: 2015-01-22 11:09+0100\n"
1111"PO-Revision-Date: 2014-10-28 06:34+0000\n"
1212"Last-Translator: Vahan Harutyunyan <Unknown>\n"
1313"Language-Team: Armenian <hy@li.org>\n"
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2014-11-09 06:54+0000\n"
19−"X-Generator: Launchpad (build 17231)\n"
18+"X-Launchpad-Export-Date: 2015-01-28 06:29+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Գաղտնաբառ: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Փակցնել պիտակը"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Հեռացնել պիտակը"
3333
@@ -53,60 +53,60 @@ msgstr[0] ""
5353"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին...\r\n"
5454"Խնդրում ենք սպասել %1 րոպե և փորձել կրկին..."
5555
56−#: qml/Components/Dialogs.qml:74
56+#: qml/Components/Dialogs.qml:86
5757msgid "Log out"
5858msgstr "Ելք"
5959
60−#: qml/Components/Dialogs.qml:75
60+#: qml/Components/Dialogs.qml:87
6161msgid "Are you sure you want to log out?"
6262msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք դուրս գալ համակարգից"
6363
64−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
65−#: qml/Components/Dialogs.qml:126
64+#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
65+#: qml/Components/Dialogs.qml:134
6666msgid "No"
6767msgstr "Ոչ"
6868
69−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
70−#: qml/Components/Dialogs.qml:133
69+#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
70+#: qml/Components/Dialogs.qml:140
7171msgid "Yes"
7272msgstr "Այո"
7373
74−#: qml/Components/Dialogs.qml:98
74+#: qml/Components/Dialogs.qml:108
7575msgid "Shut down"
7676msgstr "Անջատել"
7777
78−#: qml/Components/Dialogs.qml:99
78+#: qml/Components/Dialogs.qml:109
7979msgid "Are you sure you want to shut down?"
8080msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը"
8181
82−#: qml/Components/Dialogs.qml:123
82+#: qml/Components/Dialogs.qml:131
8383msgid "Reboot"
8484msgstr "Վերաբեռնել"
8585
86−#: qml/Components/Dialogs.qml:124
86+#: qml/Components/Dialogs.qml:132
8787msgid "Are you sure you want to reboot?"
8888msgstr "Դուք համոզվա՞ծ եք, որ ցանկանում եք վերաբեռնել համակարգիչը"
8989
90−#: qml/Components/Dialogs.qml:148
90+#: qml/Components/Dialogs.qml:154
9191msgid "Power"
9292msgstr "Էլեկտրասնուցում"
9393
94−#: qml/Components/Dialogs.qml:149
94+#: qml/Components/Dialogs.qml:155
9595msgid ""
9696"Are you sure you would like\n"
9797"to power off?"
9898msgstr ""
9999"Դուք համոզվա՞ծ եք, որ ցանկանում եք անջատել համակարգիչը սնուցման աղբյուրից"
100100
101−#: qml/Components/Dialogs.qml:151
101+#: qml/Components/Dialogs.qml:157
102102msgid "Power off"
103103msgstr "Անջատել սնուցման աղբյուրից"
104104
105−#: qml/Components/Dialogs.qml:161
105+#: qml/Components/Dialogs.qml:166
106106msgid "Restart"
107107msgstr "Վերագործարկել"
108108
109−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:175
110110msgid "Cancel"
111111msgstr "Չեղյալ համարել"
112112
@@ -114,82 +114,86 @@ msgstr "Չեղյալ համարել"
114114msgid "Skip intro"
115115msgstr "Բաց թողնել ներածությունը"
116116
117−#: qml/Components/EdgeDemo.qml:112
117+#: qml/Components/EdgeDemo.qml:125
118118msgid "Right edge"
119119msgstr "Աջ եզրը"
120120
121−#: qml/Components/EdgeDemo.qml:113
121+#: qml/Components/EdgeDemo.qml:126
122122msgid "Try swiping from the right edge to unlock the phone"
123123msgstr ""
124124
125−#: qml/Components/EdgeDemo.qml:144
125+#: qml/Components/EdgeDemo.qml:157
126126msgid "Top edge"
127127msgstr "Վերին եզրը"
128128
129−#: qml/Components/EdgeDemo.qml:145
129+#: qml/Components/EdgeDemo.qml:158
130130msgid "Try swiping from the top edge to access the indicators"
131131msgstr ""
132132
133−#: qml/Components/EdgeDemo.qml:170
133+#: qml/Components/EdgeDemo.qml:183
134134msgid "Close"
135135msgstr "Փակել"
136136
137−#: qml/Components/EdgeDemo.qml:171
137+#: qml/Components/EdgeDemo.qml:184
138138msgid "Swipe up again to close the settings screen"
139139msgstr ""
140140
141−#: qml/Components/EdgeDemo.qml:201
141+#: qml/Components/EdgeDemo.qml:214
142142msgid "Left edge"
143143msgstr "Ձախ եզրը"
144144
145−#: qml/Components/EdgeDemo.qml:202
145+#: qml/Components/EdgeDemo.qml:215
146146msgid "Swipe from the left to reveal the launcher for quick access to apps"
147147msgstr ""
148148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Լավ է"
152152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
157157msgstr ""
158158
159−#: qml/Components/Lockscreen.qml:223
159+#: qml/Components/Lockscreen.qml:238
160160msgid "Return to Call"
161161msgstr ""
162162
163−#: qml/Components/Lockscreen.qml:223
163+#: qml/Components/Lockscreen.qml:238
164164msgid "Emergency Call"
165165msgstr ""
166166
167−#: qml/Components/Lockscreen.qml:255
167+#: qml/Components/Lockscreen.qml:270
168168msgid "OK"
169169msgstr ""
170170
171−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171+#: qml/Dash/GenericScopeView.qml:485 qml/Dash/GenericScopeView.qml:642
172172msgid "See less"
173173msgstr ""
174174
175−#: qml/Dash/GenericScopeView.qml:434
175+#: qml/Dash/GenericScopeView.qml:485
176176msgid "See all"
177177msgstr "Տեսնել բոլորը"
178178
179−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:547 qml/Dash/PageHeader.qml:274
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Որոնում"
183183
184−#: qml/Dash/PageHeader.qml:268
184+#: qml/Dash/PageHeader.qml:267
185+msgid "Store"
186+msgstr "Խանութ"
187+
188+#: qml/Dash/PageHeader.qml:284
185189msgid "Settings"
186190msgstr "Կարգավորումներ"
187191
188−#: qml/Dash/PageHeader.qml:275
192+#: qml/Dash/PageHeader.qml:291
189193msgid "Remove from Favorites"
190194msgstr "Հեռացնել ընտրյալների ցուցակից"
191195
192−#: qml/Dash/PageHeader.qml:275
196+#: qml/Dash/PageHeader.qml:291
193197msgid "Add to Favorites"
194198msgstr "Ավելացնել ընտրյալների ցուցակում"
195199
@@ -221,31 +225,23 @@ msgstr ""
221225msgid "Release to refresh…"
222226msgstr ""
223227
224−#: qml/Dash/ScopesOverview.qml:215
225−msgid "Manage Scopes"
228+#: qml/Dash/ScopesList.qml:66
229+msgid "Manage"
226230msgstr ""
227231
228−#: qml/Dash/ScopesOverview.qml:437
229−msgid "Done"
230−msgstr "Կատարված է"
231−
232−#: qml/Dash/ScopesOverview.qml:463
233−msgid "Store"
234−msgstr "Խանութ"
235−
236−#: qml/Dash/ScopesOverviewTab.qml:36
237−msgid "Favorites"
238−msgstr "Նախընտրելի"
232+#: qml/Dash/ScopesList.qml:112
233+msgid "Home"
234+msgstr ""
239235
240−#: qml/Dash/ScopesOverviewTab.qml:54
241−msgid "All"
242−msgstr "Բոլորը"
236+#: qml/Dash/ScopesList.qml:113
237+msgid "Also installed"
238+msgstr ""
243239
244−#: qml/Greeter/Greeter.qml:174
240+#: qml/Greeter/Greeter.qml:133
245241msgid "Unlock"
246242msgstr "Ապաբլոկավորել"
247243
248−#: qml/Notifications/NotificationMenuItemFactory.qml:116
244+#: qml/Notifications/NotificationMenuItemFactory.qml:128
249245msgid "Show password"
250246msgstr "Ցույց տալ գաղտնաբառը"
251247
@@ -285,6 +281,10 @@ msgstr "Ավարտված է"
285281msgid "Failed, tap to retry"
286282msgstr ""
287283
284+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
285+msgid "Reply"
286+msgstr ""
287+
288288#: qml/Panel/Indicators/ModemInfoItem.qml:105
289289msgid "Unlock SIM"
290290msgstr "Ապաբլոկավորել SIM-ը"
@@ -293,60 +293,237 @@ msgstr "Ապաբլոկավորել SIM-ը"
293293msgid "Roaming"
294294msgstr "Ռոումինգ"
295295
296−#: qml/Shell.qml:391
296+#: qml/Shell.qml:390
297+#, qt-format
298+msgid "Enter %1"
299+msgstr "Մուտքագրեք %1"
300+
301+#: qml/Shell.qml:391 qml/Wizard/Pages/passwd-set.qml:60
297302msgid "Enter passphrase"
298303msgstr "Մուտքագրե՛ք անցաբառը"
299304
300305#: qml/Shell.qml:392
306+msgid "Enter passcode"
307+msgstr "Մոտքագրեք ծածկագիրը"
308+
309+#: qml/Shell.qml:393
310+#, qt-format
311+msgid "Sorry, incorrect %1"
312+msgstr "Ներեցեք, սխալ %1"
313+
314+#: qml/Shell.qml:394
301315msgid "Sorry, incorrect passphrase"
302316msgstr "Ներեցեք, սխալ անցաբառ է"
303317
304−#: qml/Shell.qml:393
318+#: qml/Shell.qml:395
305319msgid "Please re-enter"
306320msgstr "Խնդրում ենք նորից մուտքագրել"
307321
308−#: qml/Shell.qml:395
309−msgid "Enter passcode"
310−msgstr "Մոտքագրեք ծածկագիրը"
311−
312322#: qml/Shell.qml:396
313323msgid "Sorry, incorrect passcode"
314324msgstr "Ներեցեք, սխալ ծածկագիր է"
315325
316−#: qml/Shell.qml:399
317−#, qt-format
318−msgid "Enter %1"
319−msgstr "Մուտքագրեք %1"
320−
321−#: qml/Shell.qml:400
322−#, qt-format
323−msgid "Sorry, incorrect %1"
324−msgstr "Ներեցեք, սխալ %1"
325−
326−#: qml/Shell.qml:441
326+#: qml/Shell.qml:490 qml/Wizard/Pages/passwd-confirm.qml:53
327327msgid "Sorry, incorrect passphrase."
328328msgstr "Ներեցեք, սխալ անցաբառ է"
329329
330−#: qml/Shell.qml:442
330+#: qml/Shell.qml:491 qml/Wizard/Pages/passwd-confirm.qml:54
331331msgid "Sorry, incorrect passcode."
332332msgstr "Ներեցեք, սխալ ծածկագիր է:"
333333
334−#: qml/Shell.qml:443
334+#: qml/Shell.qml:492
335335msgid "This will be your last attempt."
336336msgstr "Սա կլինի ձեր վերջին փորձը"
337337
338−#: qml/Shell.qml:445
338+#: qml/Shell.qml:494
339339msgid ""
340340"If passphrase is entered incorrectly, your phone will conduct a factory "
341341"reset and all personal data will be deleted."
342342msgstr ""
343343
344−#: qml/Shell.qml:446
344+#: qml/Shell.qml:495
345345msgid ""
346346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347347"and all personal data will be deleted."
348348msgstr ""
349349
350+#: qml/Wizard/Page.qml:89
351+msgid "Back"
352+msgstr ""
353+
354+#: qml/Wizard/Pages/10-welcome.qml:27
355+msgid "Hi!"
356+msgstr ""
357+
358+#: qml/Wizard/Pages/10-welcome.qml:44
359+msgid "Welcome to your Ubuntu phone."
360+msgstr ""
361+
362+#: qml/Wizard/Pages/10-welcome.qml:52
363+msgid "Let’s get started."
364+msgstr ""
365+
366+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367+#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369+#: qml/Wizard/Pages/passwd-set.qml:90
370+msgid "Continue"
371+msgstr ""
372+
373+#: qml/Wizard/Pages/20-sim.qml:25
374+msgid "Add a SIM card and restart your device"
375+msgstr ""
376+
377+#: qml/Wizard/Pages/20-sim.qml:55
378+msgid "Without it, you won’t be able to make calls or use text messaging."
379+msgstr ""
380+
381+#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382+msgid "Skip"
383+msgstr ""
384+
385+#: qml/Wizard/Pages/30-passwd-type.qml:39
386+msgid "Lock security"
387+msgstr ""
388+
389+#: qml/Wizard/Pages/30-passwd-type.qml:74
390+msgid "Please select how you’d like to unlock your phone."
391+msgstr ""
392+
393+#: qml/Wizard/Pages/30-passwd-type.qml:97
394+msgid "Swipe"
395+msgstr ""
396+
397+#: qml/Wizard/Pages/30-passwd-type.qml:98
398+msgid "No security"
399+msgstr ""
400+
401+#: qml/Wizard/Pages/30-passwd-type.qml:100
402+msgid "Passcode"
403+msgstr ""
404+
405+#: qml/Wizard/Pages/30-passwd-type.qml:101
406+msgid "4 digits only"
407+msgstr ""
408+
409+#: qml/Wizard/Pages/30-passwd-type.qml:103
410+msgid "Passphrase"
411+msgstr ""
412+
413+#: qml/Wizard/Pages/30-passwd-type.qml:104
414+msgid "Numbers and letters"
415+msgstr ""
416+
417+#: qml/Wizard/Pages/40-wifi.qml:28
418+msgid "Connect to Wi‑Fi"
419+msgstr ""
420+
421+#: qml/Wizard/Pages/40-wifi.qml:147
422+msgid "Available networks…"
423+msgstr ""
424+
425+#: qml/Wizard/Pages/40-wifi.qml:148
426+msgid "No available networks."
427+msgstr ""
428+
429+#: qml/Wizard/Pages/50-location.qml:27
430+msgid "Location"
431+msgstr ""
432+
433+#: qml/Wizard/Pages/50-location.qml:62
434+msgid "Let the phone detect your location:"
435+msgstr ""
436+
437+#: qml/Wizard/Pages/50-location.qml:69
438+msgid "Using GPS only (less accurate)"
439+msgstr ""
440+
441+#: qml/Wizard/Pages/50-location.qml:86
442+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443+msgstr ""
444+
445+#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446+#: qml/Wizard/Pages/50-location.qml:103
447+msgid ""
448+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449+"conditions</a>."
450+msgstr ""
451+
452+#: qml/Wizard/Pages/50-location.qml:112
453+msgid "Not at all"
454+msgstr ""
455+
456+#: qml/Wizard/Pages/50-location.qml:124
457+msgid "You can change your mind later in <b>System Settings</b>."
458+msgstr ""
459+
460+#: qml/Wizard/Pages/60-reporting.qml:24
461+msgid "Improving your experience"
462+msgstr ""
463+
464+#: qml/Wizard/Pages/60-reporting.qml:36
465+msgid ""
466+"Your phone is set up to automatically report errors to Canonical and its "
467+"partners, the makers of the operating system."
468+msgstr ""
469+
470+#: qml/Wizard/Pages/60-reporting.qml:43
471+msgid ""
472+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473+"Privacy</b>"
474+msgstr ""
475+
476+#: qml/Wizard/Pages/80-finished.qml:24
477+msgid "All done"
478+msgstr ""
479+
480+#: qml/Wizard/Pages/80-finished.qml:39
481+msgid "Nice work!"
482+msgstr ""
483+
484+#: qml/Wizard/Pages/80-finished.qml:46
485+msgid "Your phone is now ready to use."
486+msgstr ""
487+
488+#: qml/Wizard/Pages/80-finished.qml:53
489+msgid "Finish"
490+msgstr ""
491+
492+#: qml/Wizard/Pages/here-terms.qml:27
493+msgid "Terms & Conditions"
494+msgstr ""
495+
496+#: qml/Wizard/Pages/passwd-confirm.qml:49
497+msgid "Confirm passphrase"
498+msgstr ""
499+
500+#: qml/Wizard/Pages/passwd-confirm.qml:50
501+msgid "Confirm passcode"
502+msgstr ""
503+
504+#: qml/Wizard/Pages/passwd-confirm.qml:53
505+#: qml/Wizard/Pages/passwd-confirm.qml:54
506+msgid "Please try again."
507+msgstr ""
508+
509+#: qml/Wizard/Pages/passwd-set.qml:61
510+msgid "Choose your passcode"
511+msgstr ""
512+
513+#: qml/Wizard/Pages/passwd-set.qml:68
514+msgid "Passphrase must be 4 characters long"
515+msgstr ""
516+
517+#: qml/Wizard/StackButton.qml:39
518+#, qt-format
519+msgid "〈 %1"
520+msgstr ""
521+
522+#: qml/Wizard/StackButton.qml:42
523+#, qt-format
524+msgid "%1 〉"
525+msgstr ""
526+
350527#~ msgid "Confirm"
351528#~ msgstr "Հաստատել"
352529
@@ -356,8 +533,17 @@ msgstr ""
356533#~ msgid "Speaking..."
357534#~ msgstr "Խոսում եմ..."
358535
536+#~ msgid "Favorites"
537+#~ msgstr "Նախընտրելի"
538+
539+#~ msgid "Done"
540+#~ msgstr "Կատարված է"
541+
359542#~ msgid "Loading. Please Wait..."
360543#~ msgstr "Բեռնվում է: Խնդրում ենք սպասել..."
361544
362545#~ msgid "Speak Now..."
363546#~ msgstr "Հիմա խոսեք..."
547+
548+#~ msgid "All"
549+#~ msgstr "Բոլորը"
po/id.po+353−140

This diff is too big to show here.

po/is.po+277−88

This diff is too big to show here.

po/it.po+281−82

This diff is too big to show here.

po/ja.po+277−88

This diff is too big to show here.

po/km.po+264−78

This diff is too big to show here.

po/kn.po+251−74

This diff is too big to show here.

po/ko.po+268−79

This diff is too big to show here.

po/ku.po+264−78

This diff is too big to show here.

po/ky.po+251−74

This diff is too big to show here.

po/lo.po+251−74

This diff is too big to show here.

po/lt.po+251−74

This diff is too big to show here.

po/lv.po+262−76

This diff is too big to show here.

po/ml.po+251−74

This diff is too big to show here.

po/mr.po+251−74

This diff is too big to show here.

po/ms.po+268−79

This diff is too big to show here.

po/my.po+251−74

This diff is too big to show here.

po/nb.po+285−90

This diff is too big to show here.

po/nl.po+276−80

This diff is too big to show here.

po/pa.po+251−74

This diff is too big to show here.

po/pl.po+251−74

This diff is too big to show here.

po/pt.po+271−81

This diff is too big to show here.

po/pt_BR.po+275−86

This diff is too big to show here.

po/ro.po+290−90

This diff is too big to show here.

po/ru.po+280−82

This diff is too big to show here.

po/shn.po+251−74

This diff is too big to show here.

po/si.po+251−74

This diff is too big to show here.

po/sl.po+274−80

This diff is too big to show here.

po/sq.po+251−74

This diff is too big to show here.

po/sr.po+264−78

This diff is too big to show here.

po/sv.po+277−80

This diff is too big to show here.

po/sw.po+251−74

This diff is too big to show here.

po/ta.po+251−74

This diff is too big to show here.

po/te.po+251−74

This diff is too big to show here.

po/th.po+251−74

This diff is too big to show here.

po/tr.po+295−105

This diff is too big to show here.

po/ug.po+269−80

This diff is too big to show here.

po/uk.po+277−79

This diff is too big to show here.

po/unity8.pot+249−72

This diff is too big to show here.

po/vi.po+251−74

This diff is too big to show here.

po/xh.po+251−74

This diff is too big to show here.

po/zh_CN.po+265−79

This diff is too big to show here.

po/zh_HK.po+251−74

This diff is too big to show here.

po/zh_TW.po+273−87

This diff is too big to show here.

qml/CMakeLists.txt+1

This diff is too big to show here.

qml/Components/Carousel.qml+6−2

This diff is too big to show here.

qml/Components/Dialogs.qml+77−87

This diff is too big to show here.

qml/Components/DragHandle.qml+10−2

This diff is too big to show here.

qml/Components/EdgeDemo.qml+19−6

This diff is too big to show here.

qml/Components/EdgeDragEvaluator.qml+11−5

This diff is too big to show here.

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp → qml/Components/PanelState/PanelState.qmlrenamed+10−14

This diff is too big to show here.

qml/Components/PanelState/qmldirnew file+1

This diff is too big to show here.

qml/Components/ResponsiveVerticalJournal.qml+1

This diff is too big to show here.

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp → qml/Components/ShellDialog.qmlrenamed+15−24

This diff is too big to show here.

qml/Components/Showable.qml+13

This diff is too big to show here.

qml/Components/WindowControlButtons.qmlnew file+60

This diff is too big to show here.

qml/Dash/CardCarousel.qml+6−2

This diff is too big to show here.

qml/Dash/CardGrid.qml+1−2

This diff is too big to show here.

qml/Dash/CardHorizontalList.qml+7−2

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qml+1

This diff is too big to show here.

qml/Dash/Dash.qml+95−139

This diff is too big to show here.

qml/Dash/DashContent.qml+15−3

This diff is too big to show here.

qml/Dash/DashNavigation.qml+4

This diff is too big to show here.

qml/Dash/DashNavigationButton.qml+30−23

This diff is too big to show here.

qml/Dash/DashRenderer.qml+8−1

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+124−27

This diff is too big to show here.

qml/Dash/PageHeader.qml+18−1

This diff is too big to show here.

qml/Dash/Previews/PreviewTable.qml+6

This diff is too big to show here.

qml/Dash/ScopeListView.qml+4−2

This diff is too big to show here.

qml/Dash/ScopesList.qmlnew file+132

This diff is too big to show here.

qml/Dash/ScopesListCategory.qmlnew file+176

This diff is too big to show here.

qml/Dash/ScopesListCategoryItem.qmlnew file+107

This diff is too big to show here.

qml/Dash/ScopesOverview.qmldeleted−575

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qmldeleted−54

This diff is too big to show here.

qml/Dash/ScopesOverviewFavorites.qmldeleted−73

This diff is too big to show here.

qml/Dash/ScopesOverviewTab.qmldeleted−74

This diff is too big to show here.

qml/Greeter/Clock.qml+11−1

This diff is too big to show here.

qml/Greeter/Greeter.qml+99−82

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+11−2

This diff is too big to show here.

qml/Greeter/Infographics.qml+9−10

This diff is too big to show here.

qml/Launcher/Launcher.qml+13−4

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+2−1

This diff is too big to show here.

qml/Notifications/Notifications.qml+1−1

This diff is too big to show here.

qml/Panel/IndicatorItem.qml−8

This diff is too big to show here.

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

This diff is too big to show here.

qml/Panel/Indicators/IndicatorsLight.qml+19−1

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+1

This diff is too big to show here.

qml/Panel/Indicators/VisibleIndicators.qml → qml/Panel/Indicators/VisibleIndicators.qml.THISrenamed

The content is the same.

qml/Panel/IndicatorsBar.qml+29−20

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+5

This diff is too big to show here.

qml/Panel/Panel.qml+17−2

This diff is too big to show here.

qml/Shell.qml+95−37

This diff is too big to show here.

qml/Stages/DecoratedWindow.qmlnew file+60

This diff is too big to show here.

qml/Stages/DesktopStage.qmlnew file+139

This diff is too big to show here.

qml/Stages/PhoneStage.qml+2−2

This diff is too big to show here.

qml/Stages/TabletStage.qml+2−2

This diff is too big to show here.

qml/Stages/TransformedSpreadDelegate.qml+10−3

This diff is too big to show here.

qml/Stages/WindowDecoration.qmlnew file+65

This diff is too big to show here.

qml/Stages/WindowMoveResizeArea.qmlnew file+98

This diff is too big to show here.

qml/Wizard/CheckableSetting.qmlnew file+84

This diff is too big to show here.

qml/Wizard/Page.qmlnew file+108

This diff is too big to show here.

qml/Wizard/Pages.qmlnew file+138

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

Binary file not shown.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

qml/Wizard/StackButton.qmlnew file+47

This diff is too big to show here.

qml/Wizard/Wizard.qmlnew file+55

This diff is too big to show here.

run.sh+3−26

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.cpp+21−8

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.h+9−5

This diff is too big to show here.

src/main.cpp−6

This diff is too big to show here.

tests/autopilot/unity8/fixture_setup.py+35−1

This diff is too big to show here.

tests/autopilot/unity8/indicators/__init__.py+124

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/__init__.py+18−1

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_display_indicator.pynew file+53

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/create_interactive_notification.py−1

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+22−8

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/edges_demo.pynew file+140

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/main_window.py+11−1

This diff is too big to show here.

tests/autopilot/unity8/shell/fixture_setup.py+38

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+8−11

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_edges_demo.pynew file+51

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+6−5

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+20

This diff is too big to show here.

tests/mocks/CMakeLists.txt+3

This diff is too big to show here.

tests/mocks/LightDM/CMakeLists.txt+9−10

This diff is too big to show here.

tests/mocks/LightDM/single/GreeterPrivate.cpp → tests/mocks/LightDM/MockGreeter.cpprenamed+12−23

This diff is too big to show here.

tests/mocks/LightDM/MockGreeter.hnew file+37

This diff is too big to show here.

tests/mocks/LightDM/MockUsersModel.cppnew file+39

This diff is too big to show here.

tests/mocks/LightDM/MockUsersModel.hnew file+37

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/Greetermode 120000 → 100644+17−1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/InfographicModeldeleted−1

This diff is too big to show here.

tests/mocks/LightDM/QLightDM/UsersModelmode 120000 → 100644+17−1

This diff is too big to show here.

tests/mocks/LightDM/full/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/CMakeLists.txtnew file+18

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/Greeter.cppnew file+199

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/Greeter.hnew file+118

This diff is too big to show here.

tests/mocks/LightDM/full/GreeterPrivate.cpp → tests/mocks/LightDM/liblightdm/GreeterPrivate.cpprenamed+40−6

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/GreeterPrivate.hnew file+54

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/UsersModel.cppnew file+134

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/UsersModel.hnew file+69

This diff is too big to show here.

tests/mocks/LightDM/full/UsersModelPrivate.cpp → tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpprenamed+58−6

This diff is too big to show here.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.hnew file+63

This diff is too big to show here.

tests/mocks/LightDM/plugin.cppnew file+68

This diff is too big to show here.

tests/mocks/LightDM/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/GreeterPrivate.cppdeleted−46

This diff is too big to show here.

tests/mocks/LightDM/single-pin/CMakeLists.txtdeleted−19

This diff is too big to show here.

tests/mocks/LightDM/single/CMakeLists.txtdeleted−18

This diff is too big to show here.

tests/mocks/Lights/CMakeLists.txtnew file+8

This diff is too big to show here.

tests/mocks/Lights/Lights.cppnew file+84

This diff is too big to show here.

tests/mocks/Lights/Lights.hnew file+66

This diff is too big to show here.

tests/mocks/Lights/Lights.qmltypesnew file+45

This diff is too big to show here.

tests/mocks/Lights/plugin.cppnew file+33

This diff is too big to show here.

tests/mocks/Lights/plugin.hnew file+32

This diff is too big to show here.

tests/mocks/Lights/qmldirnew file+3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoManager.qmlnew file+23

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.cppnew file+33

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/plugin.hnew file+31

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/CMakeLists.txt+2

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+21−56

This diff is too big to show here.

tests/mocks/QMenuModel/actiondata.hnew file+52

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/QMenuModel/plugin.cpp+13

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp → tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qmlrenamed+6−16

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/LightDM/single/UsersModelPrivate.cpp → tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.cpprenamed+7−14

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.hnew file+31

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Indicators/ActionRootState.qmlnew file+46

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Indicators/RootActionState.qml → tests/mocks/Unity/Indicators/ModelActionRootState.qmlrenamed

The content is the same.

tests/mocks/Unity/Indicators/fakeplugin.cpp−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Wizard/qmldirnew file+3

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Dash/horizontaljournaltest.qml+1

This diff is too big to show here.

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

This diff is too big to show here.

tests/plugins/Dash/organicgridtest.qml+1

This diff is too big to show here.

tests/plugins/Dash/verticaljournaltest.qml+1

This diff is too big to show here.

tests/plugins/LightDM/CMakeLists.txt+6−11

This diff is too big to show here.

tests/plugins/LightDM/dbus.cpp+11−2

This diff is too big to show here.

tests/plugins/LightDM/greeter.qml+5

This diff is too big to show here.

tests/plugins/Unity/Indicators/rootactionstatetest.cpp+4−4

This diff is too big to show here.

tests/plugins/Utils/CMakeLists.txt+1−1

This diff is too big to show here.

tests/plugins/Utils/qsortfilterproxymodeltest.cpp → tests/plugins/Utils/unitysortfilterproxymodeltest.cpprenamed+14−14

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+23−19

This diff is too big to show here.

tests/qmltests/Components/tst_Carousel.qml+5−5

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle.cpp+4

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_Lockscreen.qml+1−1

This diff is too big to show here.

tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+1−1

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewActions.qml+3−3

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+5−5

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+2−2

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+5−5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+2−2

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml+2−2

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml+3−3

This diff is too big to show here.

tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml+2−2

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml+11−5

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+248−154

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+117−32

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+27−26

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Infographics.qml+10

This diff is too big to show here.

tests/qmltests/Greeter/tst_MultiGreeter.qml+106−17

This diff is too big to show here.

tests/qmltests/Greeter/tst_SingleGreeter.qml+104−16

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+8−13

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+6−6

This diff is too big to show here.

tests/qmltests/Notifications/tst_OptionToggle.qml+7−7

This diff is too big to show here.

tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1

This diff is too big to show here.

tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+2−2

This diff is too big to show here.

tests/qmltests/Panel/IndicatorTest.qml+1−7

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qmlnew file+129

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+1−1

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+26

This diff is too big to show here.

tests/qmltests/Stages/tst_WindowMoveResizeArea.qmlnew file+138

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+18−15

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+87

This diff is too big to show here.

tests/qmltests/tst_TabletShell.qml+24−13

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+88−69

This diff is too big to show here.